From da0b771e358fdc2539c9537c7f94871c78ffdd0b Mon Sep 17 00:00:00 2001 From: Arceliar Date: Thu, 30 May 2013 17:38:02 +0200 Subject: [PATCH 01/42] Workers get idle priority. --- src/proofofwork.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/proofofwork.py b/src/proofofwork.py index 03d7c22d..d8140707 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -1,6 +1,21 @@ +def _set_idle(): + import sys + try: + sys.getwindowsversion() + import win32api,win32process,win32con + pid = win32api.GetCurrentProcessId() + handle = win32api.OpenProcess(win32con.PROCESS_ALL_ACCESS, True, pid) + win32process.SetPriorityClass(handle, win32process.IDLE_PRIORITY_CLASS) + except: + import os + os.nice(20) + def _pool_worker(nonce, initialHash, target, pool_size): import hashlib + import sys + import os from struct import unpack, pack + _set_idle() trialValue = 99999999999999999999 while trialValue > target: nonce += pool_size @@ -8,7 +23,7 @@ def _pool_worker(nonce, initialHash, target, pool_size): return [trialValue, nonce] def run(target, initialHash): - from multiprocessing import Pool, cpu_count + from multiprocessing import Pool, cpu_count, Value import time try: pool_size = cpu_count() @@ -25,4 +40,3 @@ def run(target, initialHash): pool.terminate() return result[0], result[1] time.sleep(1) - -- 2.45.1 From 74b94e757198786b586aded87cc81e7213c6cfeb Mon Sep 17 00:00:00 2001 From: Arceliar Date: Thu, 30 May 2013 17:41:08 +0200 Subject: [PATCH 02/42] Removed extraneous import. --- src/proofofwork.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proofofwork.py b/src/proofofwork.py index d8140707..cb20e667 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -23,7 +23,7 @@ def _pool_worker(nonce, initialHash, target, pool_size): return [trialValue, nonce] def run(target, initialHash): - from multiprocessing import Pool, cpu_count, Value + from multiprocessing import Pool, cpu_count import time try: pool_size = cpu_count() -- 2.45.1 From 2ae1ef0d505fb18156bbc5ca11e25ae922cd0383 Mon Sep 17 00:00:00 2001 From: Arceliar Date: Thu, 30 May 2013 19:54:27 +0200 Subject: [PATCH 03/42] Messy hack to kill busy child processes on exit. --- src/shared.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/shared.py b/src/shared.py index 850c84f3..2edaf616 100644 --- a/src/shared.py +++ b/src/shared.py @@ -7,6 +7,7 @@ import highlevelcrypto import Queue import pickle import os +import signal myECCryptorObjects = {} MyECSubscriptionCryptorObjects = {} @@ -173,12 +174,18 @@ def doCleanShutdown(): print 'Finished flushing inventory.' printLock.release() - + if safeConfigGetBoolean('bitmessagesettings','daemon'): printLock.acquire() print 'Done.' printLock.release() os._exit(0) + + #Messy hack to kill child processes immediately. May not work on all platforms. + try: + os.killpg(os.getpgid(os.getpid()), signal.SIGTERM) + except: + os.kill(os.getpid(), signal.SIGTERM) #Wen you want to command a sendDataThread to do something, like shutdown or send some data, this function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are responsible for putting their queue into (and out of) the sendDataQueues list. def broadcastToSendDataQueues(data): @@ -197,4 +204,4 @@ def flushInventory(): sqlReturnQueue.get() del inventory[hash] sqlSubmitQueue.put('commit') - sqlLock.release() \ No newline at end of file + sqlLock.release() -- 2.45.1 From 2762de52e261317acf91dcbf4117467db40898bc Mon Sep 17 00:00:00 2001 From: Arceliar Date: Thu, 30 May 2013 19:58:05 +0200 Subject: [PATCH 04/42] Moved workaround code slightly. --- src/shared.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/shared.py b/src/shared.py index 2edaf616..9ca07e69 100644 --- a/src/shared.py +++ b/src/shared.py @@ -173,20 +173,19 @@ def doCleanShutdown(): printLock.acquire() print 'Finished flushing inventory.' printLock.release() - - - if safeConfigGetBoolean('bitmessagesettings','daemon'): - printLock.acquire() - print 'Done.' - printLock.release() - os._exit(0) - + #Messy hack to kill child processes immediately. May not work on all platforms. try: os.killpg(os.getpgid(os.getpid()), signal.SIGTERM) except: os.kill(os.getpid(), signal.SIGTERM) + if safeConfigGetBoolean('bitmessagesettings','daemon'): + printLock.acquire() + print 'Done.' + printLock.release() + os._exit(0) + #Wen you want to command a sendDataThread to do something, like shutdown or send some data, this function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are responsible for putting their queue into (and out of) the sendDataQueues list. def broadcastToSendDataQueues(data): #print 'running broadcastToSendDataQueues' -- 2.45.1 From 279f38ff97508297a69956785ee5f4311e05227e Mon Sep 17 00:00:00 2001 From: Arceliar Date: Wed, 5 Jun 2013 23:20:34 +0200 Subject: [PATCH 05/42] Trying to enable multicore PoW with single core as a fallback when it's a problem. --- src/proofofwork.py | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/proofofwork.py b/src/proofofwork.py index 5fd7e43a..062fada6 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -3,23 +3,23 @@ #from multiprocessing import Pool, cpu_count import hashlib from struct import unpack, pack -#import sys +import sys #import os def _set_idle(): - try: + if 'linux' in sys.platform: + import os + os.nice(20) + else: + try: sys.getwindowsversion() import win32api,win32process,win32con pid = win32api.GetCurrentProcessId() handle = win32api.OpenProcess(win32con.PROCESS_ALL_ACCESS, True, pid) win32process.SetPriorityClass(handle, win32process.IDLE_PRIORITY_CLASS) - except: - try: - #Linux - os.nice(20) - except: - #Windows 64-bit - pass + except: + #Windows 64-bit + pass def _pool_worker(nonce, initialHash, target, pool_size): _set_idle() @@ -29,25 +29,29 @@ def _pool_worker(nonce, initialHash, target, pool_size): trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) return [trialValue, nonce] -def run(target, initialHash): +def _doSafePoW(target, initialHash): nonce = 0 trialValue = 99999999999999999999 while trialValue > target: nonce += 1 trialValue, = unpack('>Q',hashlib.sha512(hashlib.sha512(pack('>Q',nonce) + initialHash).digest()).digest()[0:8]) return [trialValue, nonce] - """try: + +def _doFastPoW(target, initialHash): + import shared + import time + from multiprocessing import Pool, cpu_count + import os + try: pool_size = cpu_count() except: pool_size = 4 - try: maxCores = config.getint('bitmessagesettings', 'maxcores') except: maxCores = 99999 if pool_size > maxCores: pool_size = maxCores - pool = Pool(processes=pool_size) result = [] for i in range(pool_size): @@ -55,12 +59,17 @@ def run(target, initialHash): while True: if shared.shutdown: pool.terminate() - time.sleep(5) #Don't return anything (doing so will cause exceptions because we'll return an unusable response). Sit here and wait for this thread to close. + pool.join() #Don't return anything (doing so will cause exceptions because we'll return an unusable response). Sit here and wait for this thread to close. return for i in range(pool_size): if result[i].ready(): result = result[i].get() pool.terminate() return result[0], result[1] - time.sleep(0.2)""" + time.sleep(0.2) +def run(target, initialHash): + if linux in sys.platform: + return _doFastPoW(target, initialHash) + else: + return _doSafePoW(target, initialHash) -- 2.45.1 From 7f4fee40fbb5ed42c9b17597a82a6002eb9ef672 Mon Sep 17 00:00:00 2001 From: Arceliar Date: Wed, 5 Jun 2013 23:29:40 +0200 Subject: [PATCH 06/42] Removed an extraneous conditional import. --- src/proofofwork.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/proofofwork.py b/src/proofofwork.py index 062fada6..36c5563e 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -41,7 +41,6 @@ def _doFastPoW(target, initialHash): import shared import time from multiprocessing import Pool, cpu_count - import os try: pool_size = cpu_count() except: @@ -69,7 +68,7 @@ def _doFastPoW(target, initialHash): time.sleep(0.2) def run(target, initialHash): - if linux in sys.platform: + if 'linux' in sys.platform: return _doFastPoW(target, initialHash) else: return _doSafePoW(target, initialHash) -- 2.45.1 From 30d829d0d476c73d3663749a1fb7529300791c0a Mon Sep 17 00:00:00 2001 From: Arceliar Date: Thu, 6 Jun 2013 19:30:57 +0200 Subject: [PATCH 07/42] Wait for PoW processes to exit before returning a result. Hopefully not needed. --- src/proofofwork.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/proofofwork.py b/src/proofofwork.py index 36c5563e..058e4bf3 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -64,6 +64,7 @@ def _doFastPoW(target, initialHash): if result[i].ready(): result = result[i].get() pool.terminate() + pool.join() #Wait for the workers to exit... return result[0], result[1] time.sleep(0.2) -- 2.45.1 From 4f3b6751b39d92adf870694838b4fce026bdd673 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Wed, 12 Jun 2013 23:12:32 +0200 Subject: [PATCH 08/42] launched autopep8 --in-place --recursive --jobs=0 -aaaaa __init__.py --- src/bitmessageqt/__init__.py | 2134 +++++++++++++++++++++------------- 1 file changed, 1307 insertions(+), 827 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 195403ea..3bc19544 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -6,7 +6,7 @@ except: try: from PyQt4.QtCore import * from PyQt4.QtGui import * -except Exception, err: +except Exception as err: print 'PyBitmessage requires PyQt. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).' print 'Error message:', err sys.exit() @@ -39,6 +39,7 @@ import pickle import platform import string + class MyForm(QtGui.QMainWindow): str_broadcast_subscribers = '[Broadcast subscribers]' @@ -48,189 +49,256 @@ class MyForm(QtGui.QMainWindow): self.ui = Ui_MainWindow() self.ui.setupUi(self) - #Ask the user if we may delete their old version 1 addresses if they have any. + # Ask the user if we may delete their old version 1 addresses if they + # have any. configSections = shared.config.sections() for addressInKeysFile in configSections: - if addressInKeysFile <> 'bitmessagesettings': - status,addressVersionNumber,streamNumber,hash = decodeAddress(addressInKeysFile) + if addressInKeysFile != 'bitmessagesettings': + status, addressVersionNumber, streamNumber, hash = decodeAddress( + addressInKeysFile) if addressVersionNumber == 1: - displayMsg = "One of your addresses, "+addressInKeysFile+", is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now?" - reply = QtGui.QMessageBox.question(self, 'Message',displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) + displayMsg = QtGui.QApplication.translate( + "MainWindow", "One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. " + + "May we delete it now?").arg(addressInKeysFile) + reply = QtGui.QMessageBox.question( + self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) if reply == QtGui.QMessageBox.Yes: shared.config.remove_section(addressInKeysFile) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - #Configure Bitmessage to start on startup (or remove the configuration) based on the setting in the keys.dat file + # Configure Bitmessage to start on startup (or remove the + # configuration) based on the setting in the keys.dat file if 'win32' in sys.platform or 'win64' in sys.platform: - #Auto-startup for Windows + # Auto-startup for Windows RUN_PATH = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" self.settings = QSettings(RUN_PATH, QSettings.NativeFormat) - self.settings.remove("PyBitmessage") #In case the user moves the program and the registry entry is no longer valid, this will delete the old registry entry. + self.settings.remove( + "PyBitmessage") # In case the user moves the program and the registry entry is no longer valid, this will delete the old registry entry. if shared.config.getboolean('bitmessagesettings', 'startonlogon'): - self.settings.setValue("PyBitmessage",sys.argv[0]) + self.settings.setValue("PyBitmessage", sys.argv[0]) elif 'darwin' in sys.platform: - #startup for mac + # startup for mac pass elif 'linux' in sys.platform: - #startup for linux + # startup for linux pass self.ui.labelSendBroadcastWarning.setVisible(False) - #FILE MENU and other buttons - QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL("triggered()"), self.quit) - QtCore.QObject.connect(self.ui.actionManageKeys, QtCore.SIGNAL("triggered()"), self.click_actionManageKeys) - QtCore.QObject.connect(self.ui.actionDeleteAllTrashedMessages, QtCore.SIGNAL("triggered()"), self.click_actionDeleteAllTrashedMessages) - QtCore.QObject.connect(self.ui.actionRegenerateDeterministicAddresses, QtCore.SIGNAL("triggered()"), self.click_actionRegenerateDeterministicAddresses) - QtCore.QObject.connect(self.ui.pushButtonNewAddress, QtCore.SIGNAL("clicked()"), self.click_NewAddressDialog) - QtCore.QObject.connect(self.ui.comboBoxSendFrom, QtCore.SIGNAL("activated(int)"),self.redrawLabelFrom) - QtCore.QObject.connect(self.ui.pushButtonAddAddressBook, QtCore.SIGNAL("clicked()"), self.click_pushButtonAddAddressBook) - QtCore.QObject.connect(self.ui.pushButtonAddSubscription, QtCore.SIGNAL("clicked()"), self.click_pushButtonAddSubscription) - QtCore.QObject.connect(self.ui.pushButtonAddBlacklist, QtCore.SIGNAL("clicked()"), self.click_pushButtonAddBlacklist) - QtCore.QObject.connect(self.ui.pushButtonSend, QtCore.SIGNAL("clicked()"), self.click_pushButtonSend) - QtCore.QObject.connect(self.ui.pushButtonLoadFromAddressBook, QtCore.SIGNAL("clicked()"), self.click_pushButtonLoadFromAddressBook) - QtCore.QObject.connect(self.ui.radioButtonBlacklist, QtCore.SIGNAL("clicked()"), self.click_radioButtonBlacklist) - QtCore.QObject.connect(self.ui.radioButtonWhitelist, QtCore.SIGNAL("clicked()"), self.click_radioButtonWhitelist) - QtCore.QObject.connect(self.ui.pushButtonStatusIcon, QtCore.SIGNAL("clicked()"), self.click_pushButtonStatusIcon) - QtCore.QObject.connect(self.ui.actionSettings, QtCore.SIGNAL("triggered()"), self.click_actionSettings) - QtCore.QObject.connect(self.ui.actionAbout, QtCore.SIGNAL("triggered()"), self.click_actionAbout) - QtCore.QObject.connect(self.ui.actionHelp, QtCore.SIGNAL("triggered()"), self.click_actionHelp) + # FILE MENU and other buttons + QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL( + "triggered()"), self.quit) + QtCore.QObject.connect(self.ui.actionManageKeys, QtCore.SIGNAL( + "triggered()"), self.click_actionManageKeys) + QtCore.QObject.connect(self.ui.actionDeleteAllTrashedMessages, QtCore.SIGNAL( + "triggered()"), self.click_actionDeleteAllTrashedMessages) + QtCore.QObject.connect(self.ui.actionRegenerateDeterministicAddresses, QtCore.SIGNAL( + "triggered()"), self.click_actionRegenerateDeterministicAddresses) + QtCore.QObject.connect(self.ui.pushButtonNewAddress, QtCore.SIGNAL( + "clicked()"), self.click_NewAddressDialog) + QtCore.QObject.connect(self.ui.comboBoxSendFrom, QtCore.SIGNAL( + "activated(int)"), self.redrawLabelFrom) + QtCore.QObject.connect(self.ui.pushButtonAddAddressBook, QtCore.SIGNAL( + "clicked()"), self.click_pushButtonAddAddressBook) + QtCore.QObject.connect(self.ui.pushButtonAddSubscription, QtCore.SIGNAL( + "clicked()"), self.click_pushButtonAddSubscription) + QtCore.QObject.connect(self.ui.pushButtonAddBlacklist, QtCore.SIGNAL( + "clicked()"), self.click_pushButtonAddBlacklist) + QtCore.QObject.connect(self.ui.pushButtonSend, QtCore.SIGNAL( + "clicked()"), self.click_pushButtonSend) + QtCore.QObject.connect(self.ui.pushButtonLoadFromAddressBook, QtCore.SIGNAL( + "clicked()"), self.click_pushButtonLoadFromAddressBook) + QtCore.QObject.connect(self.ui.radioButtonBlacklist, QtCore.SIGNAL( + "clicked()"), self.click_radioButtonBlacklist) + QtCore.QObject.connect(self.ui.radioButtonWhitelist, QtCore.SIGNAL( + "clicked()"), self.click_radioButtonWhitelist) + QtCore.QObject.connect(self.ui.pushButtonStatusIcon, QtCore.SIGNAL( + "clicked()"), self.click_pushButtonStatusIcon) + QtCore.QObject.connect(self.ui.actionSettings, QtCore.SIGNAL( + "triggered()"), self.click_actionSettings) + QtCore.QObject.connect(self.ui.actionAbout, QtCore.SIGNAL( + "triggered()"), self.click_actionAbout) + QtCore.QObject.connect(self.ui.actionHelp, QtCore.SIGNAL( + "triggered()"), self.click_actionHelp) - #Popup menu for the Inbox tab + # Popup menu for the Inbox tab self.ui.inboxContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionReply = self.ui.inboxContextMenuToolbar.addAction("Reply", self.on_action_InboxReply) - self.actionAddSenderToAddressBook = self.ui.inboxContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Add sender to your Address Book"), self.on_action_InboxAddSenderToAddressBook) - self.actionTrashInboxMessage = self.ui.inboxContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Move to Trash"), self.on_action_InboxTrash) - self.actionForceHtml = self.ui.inboxContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "View HTML code as formatted text"), self.on_action_InboxMessageForceHtml) - self.ui.tableWidgetInbox.setContextMenuPolicy( QtCore.Qt.CustomContextMenu ) - self.connect(self.ui.tableWidgetInbox, QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), self.on_context_menuInbox) - self.popMenuInbox = QtGui.QMenu( self ) - self.popMenuInbox.addAction( self.actionForceHtml ) + self.actionReply = self.ui.inboxContextMenuToolbar.addAction( + "Reply", self.on_action_InboxReply) + self.actionAddSenderToAddressBook = self.ui.inboxContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Add sender to your Address Book"), self.on_action_InboxAddSenderToAddressBook) + self.actionTrashInboxMessage = self.ui.inboxContextMenuToolbar.addAction( + QtGui.QApplication.translate("MainWindow", "Move to Trash"), self.on_action_InboxTrash) + self.actionForceHtml = self.ui.inboxContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "View HTML code as formatted text"), self.on_action_InboxMessageForceHtml) + self.ui.tableWidgetInbox.setContextMenuPolicy( + QtCore.Qt.CustomContextMenu) + self.connect(self.ui.tableWidgetInbox, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), self.on_context_menuInbox) + self.popMenuInbox = QtGui.QMenu(self) + self.popMenuInbox.addAction(self.actionForceHtml) self.popMenuInbox.addSeparator() - self.popMenuInbox.addAction( self.actionReply ) - self.popMenuInbox.addAction( self.actionAddSenderToAddressBook ) + self.popMenuInbox.addAction(self.actionReply) + self.popMenuInbox.addAction(self.actionAddSenderToAddressBook) self.popMenuInbox.addSeparator() - self.popMenuInbox.addAction( self.actionTrashInboxMessage ) + self.popMenuInbox.addAction(self.actionTrashInboxMessage) - - #Popup menu for the Your Identities tab + # Popup menu for the Your Identities tab self.ui.addressContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionNew = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "New"), self.on_action_YourIdentitiesNew) - self.actionEnable = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Enable"), self.on_action_YourIdentitiesEnable) - self.actionDisable = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Disable"), self.on_action_YourIdentitiesDisable) - self.actionClipboard = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Copy address to clipboard"), self.on_action_YourIdentitiesClipboard) - self.actionSpecialAddressBehavior = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Special address behavior..."), self.on_action_SpecialAddressBehaviorDialog) - self.ui.tableWidgetYourIdentities.setContextMenuPolicy( QtCore.Qt.CustomContextMenu ) - self.connect(self.ui.tableWidgetYourIdentities, QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), self.on_context_menuYourIdentities) - self.popMenu = QtGui.QMenu( self ) - self.popMenu.addAction( self.actionNew ) + self.actionNew = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "New"), self.on_action_YourIdentitiesNew) + self.actionEnable = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Enable"), self.on_action_YourIdentitiesEnable) + self.actionDisable = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Disable"), self.on_action_YourIdentitiesDisable) + self.actionClipboard = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Copy address to clipboard"), self.on_action_YourIdentitiesClipboard) + self.actionSpecialAddressBehavior = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Special address behavior..."), self.on_action_SpecialAddressBehaviorDialog) + self.ui.tableWidgetYourIdentities.setContextMenuPolicy( + QtCore.Qt.CustomContextMenu) + self.connect(self.ui.tableWidgetYourIdentities, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), self.on_context_menuYourIdentities) + self.popMenu = QtGui.QMenu(self) + self.popMenu.addAction(self.actionNew) self.popMenu.addSeparator() - self.popMenu.addAction( self.actionClipboard ) + self.popMenu.addAction(self.actionClipboard) self.popMenu.addSeparator() - self.popMenu.addAction( self.actionEnable ) - self.popMenu.addAction( self.actionDisable ) - self.popMenu.addAction( self.actionSpecialAddressBehavior ) + self.popMenu.addAction(self.actionEnable) + self.popMenu.addAction(self.actionDisable) + self.popMenu.addAction(self.actionSpecialAddressBehavior) - #Popup menu for the Address Book page + # Popup menu for the Address Book page self.ui.addressBookContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionAddressBookSend = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Send message to this address"), self.on_action_AddressBookSend) - self.actionAddressBookClipboard = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Copy address to clipboard"), self.on_action_AddressBookClipboard) - self.actionAddressBookNew = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Add New Address"), self.on_action_AddressBookNew) - self.actionAddressBookDelete = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Delete"), self.on_action_AddressBookDelete) - self.ui.tableWidgetAddressBook.setContextMenuPolicy( QtCore.Qt.CustomContextMenu ) - self.connect(self.ui.tableWidgetAddressBook, QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), self.on_context_menuAddressBook) - self.popMenuAddressBook = QtGui.QMenu( self ) - self.popMenuAddressBook.addAction( self.actionAddressBookSend ) - self.popMenuAddressBook.addAction( self.actionAddressBookClipboard ) + self.actionAddressBookSend = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Send message to this address"), self.on_action_AddressBookSend) + self.actionAddressBookClipboard = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Copy address to clipboard"), self.on_action_AddressBookClipboard) + self.actionAddressBookNew = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Add New Address"), self.on_action_AddressBookNew) + self.actionAddressBookDelete = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Delete"), self.on_action_AddressBookDelete) + self.ui.tableWidgetAddressBook.setContextMenuPolicy( + QtCore.Qt.CustomContextMenu) + self.connect(self.ui.tableWidgetAddressBook, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), self.on_context_menuAddressBook) + self.popMenuAddressBook = QtGui.QMenu(self) + self.popMenuAddressBook.addAction(self.actionAddressBookSend) + self.popMenuAddressBook.addAction(self.actionAddressBookClipboard) self.popMenuAddressBook.addSeparator() - self.popMenuAddressBook.addAction( self.actionAddressBookNew ) - self.popMenuAddressBook.addAction( self.actionAddressBookDelete ) + self.popMenuAddressBook.addAction(self.actionAddressBookNew) + self.popMenuAddressBook.addAction(self.actionAddressBookDelete) - #Popup menu for the Subscriptions page + # Popup menu for the Subscriptions page self.ui.subscriptionsContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionsubscriptionsNew = self.ui.subscriptionsContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "New"), self.on_action_SubscriptionsNew) - self.actionsubscriptionsDelete = self.ui.subscriptionsContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Delete"), self.on_action_SubscriptionsDelete) - self.actionsubscriptionsClipboard = self.ui.subscriptionsContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Copy address to clipboard"), self.on_action_SubscriptionsClipboard) - self.actionsubscriptionsEnable = self.ui.subscriptionsContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Enable"), self.on_action_SubscriptionsEnable) - self.actionsubscriptionsDisable = self.ui.subscriptionsContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Disable"), self.on_action_SubscriptionsDisable) - self.ui.tableWidgetSubscriptions.setContextMenuPolicy( QtCore.Qt.CustomContextMenu ) - self.connect(self.ui.tableWidgetSubscriptions, QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), self.on_context_menuSubscriptions) - self.popMenuSubscriptions = QtGui.QMenu( self ) - self.popMenuSubscriptions.addAction( self.actionsubscriptionsNew ) - self.popMenuSubscriptions.addAction( self.actionsubscriptionsDelete ) + self.actionsubscriptionsNew = self.ui.subscriptionsContextMenuToolbar.addAction( + QtGui.QApplication.translate("MainWindow", "New"), self.on_action_SubscriptionsNew) + self.actionsubscriptionsDelete = self.ui.subscriptionsContextMenuToolbar.addAction( + QtGui.QApplication.translate("MainWindow", "Delete"), self.on_action_SubscriptionsDelete) + self.actionsubscriptionsClipboard = self.ui.subscriptionsContextMenuToolbar.addAction( + QtGui.QApplication.translate("MainWindow", "Copy address to clipboard"), self.on_action_SubscriptionsClipboard) + self.actionsubscriptionsEnable = self.ui.subscriptionsContextMenuToolbar.addAction( + QtGui.QApplication.translate("MainWindow", "Enable"), self.on_action_SubscriptionsEnable) + self.actionsubscriptionsDisable = self.ui.subscriptionsContextMenuToolbar.addAction( + QtGui.QApplication.translate("MainWindow", "Disable"), self.on_action_SubscriptionsDisable) + self.ui.tableWidgetSubscriptions.setContextMenuPolicy( + QtCore.Qt.CustomContextMenu) + self.connect(self.ui.tableWidgetSubscriptions, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), self.on_context_menuSubscriptions) + self.popMenuSubscriptions = QtGui.QMenu(self) + self.popMenuSubscriptions.addAction(self.actionsubscriptionsNew) + self.popMenuSubscriptions.addAction(self.actionsubscriptionsDelete) self.popMenuSubscriptions.addSeparator() - self.popMenuSubscriptions.addAction( self.actionsubscriptionsEnable ) - self.popMenuSubscriptions.addAction( self.actionsubscriptionsDisable ) + self.popMenuSubscriptions.addAction(self.actionsubscriptionsEnable) + self.popMenuSubscriptions.addAction(self.actionsubscriptionsDisable) self.popMenuSubscriptions.addSeparator() - self.popMenuSubscriptions.addAction( self.actionsubscriptionsClipboard ) + self.popMenuSubscriptions.addAction(self.actionsubscriptionsClipboard) - #Popup menu for the Sent page + # Popup menu for the Sent page self.ui.sentContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionTrashSentMessage = self.ui.sentContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Move to Trash"), self.on_action_SentTrash) - self.actionSentClipboard = self.ui.sentContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Copy destination address to clipboard"), self.on_action_SentClipboard) - self.actionForceSend = self.ui.sentContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Force send"), self.on_action_ForceSend) - self.ui.tableWidgetSent.setContextMenuPolicy( QtCore.Qt.CustomContextMenu ) - self.connect(self.ui.tableWidgetSent, QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), self.on_context_menuSent) - #self.popMenuSent = QtGui.QMenu( self ) - #self.popMenuSent.addAction( self.actionSentClipboard ) - #self.popMenuSent.addAction( self.actionTrashSentMessage ) + self.actionTrashSentMessage = self.ui.sentContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Move to Trash"), self.on_action_SentTrash) + self.actionSentClipboard = self.ui.sentContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Copy destination address to clipboard"), self.on_action_SentClipboard) + self.actionForceSend = self.ui.sentContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Force send"), self.on_action_ForceSend) + self.ui.tableWidgetSent.setContextMenuPolicy( + QtCore.Qt.CustomContextMenu) + self.connect(self.ui.tableWidgetSent, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), self.on_context_menuSent) + # self.popMenuSent = QtGui.QMenu( self ) + # self.popMenuSent.addAction( self.actionSentClipboard ) + # self.popMenuSent.addAction( self.actionTrashSentMessage ) - - #Popup menu for the Blacklist page + # Popup menu for the Blacklist page self.ui.blacklistContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionBlacklistNew = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Add new entry"), self.on_action_BlacklistNew) - self.actionBlacklistDelete = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Delete"), self.on_action_BlacklistDelete) - self.actionBlacklistClipboard = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Copy address to clipboard"), self.on_action_BlacklistClipboard) - self.actionBlacklistEnable = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Enable"), self.on_action_BlacklistEnable) - self.actionBlacklistDisable = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate("MainWindow", "Disable"), self.on_action_BlacklistDisable) - self.ui.tableWidgetBlacklist.setContextMenuPolicy( QtCore.Qt.CustomContextMenu ) - self.connect(self.ui.tableWidgetBlacklist, QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), self.on_context_menuBlacklist) - self.popMenuBlacklist = QtGui.QMenu( self ) - #self.popMenuBlacklist.addAction( self.actionBlacklistNew ) - self.popMenuBlacklist.addAction( self.actionBlacklistDelete ) + self.actionBlacklistNew = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Add new entry"), self.on_action_BlacklistNew) + self.actionBlacklistDelete = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Delete"), self.on_action_BlacklistDelete) + self.actionBlacklistClipboard = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Copy address to clipboard"), self.on_action_BlacklistClipboard) + self.actionBlacklistEnable = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Enable"), self.on_action_BlacklistEnable) + self.actionBlacklistDisable = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + "MainWindow", "Disable"), self.on_action_BlacklistDisable) + self.ui.tableWidgetBlacklist.setContextMenuPolicy( + QtCore.Qt.CustomContextMenu) + self.connect(self.ui.tableWidgetBlacklist, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), self.on_context_menuBlacklist) + self.popMenuBlacklist = QtGui.QMenu(self) + # self.popMenuBlacklist.addAction( self.actionBlacklistNew ) + self.popMenuBlacklist.addAction(self.actionBlacklistDelete) self.popMenuBlacklist.addSeparator() - self.popMenuBlacklist.addAction( self.actionBlacklistClipboard ) + self.popMenuBlacklist.addAction(self.actionBlacklistClipboard) self.popMenuBlacklist.addSeparator() - self.popMenuBlacklist.addAction( self.actionBlacklistEnable ) - self.popMenuBlacklist.addAction( self.actionBlacklistDisable ) + self.popMenuBlacklist.addAction(self.actionBlacklistEnable) + self.popMenuBlacklist.addAction(self.actionBlacklistDisable) - #Initialize the user's list of addresses on the 'Your Identities' tab. + # Initialize the user's list of addresses on the 'Your Identities' tab. configSections = shared.config.sections() for addressInKeysFile in configSections: - if addressInKeysFile <> 'bitmessagesettings': - isEnabled = shared.config.getboolean(addressInKeysFile, 'enabled') - newItem = QtGui.QTableWidgetItem(unicode(shared.config.get(addressInKeysFile, 'label'),'utf-8)')) + if addressInKeysFile != 'bitmessagesettings': + isEnabled = shared.config.getboolean( + addressInKeysFile, 'enabled') + newItem = QtGui.QTableWidgetItem(unicode( + shared.config.get(addressInKeysFile, 'label'), 'utf-8)')) if not isEnabled: - newItem.setTextColor(QtGui.QColor(128,128,128)) + newItem.setTextColor(QtGui.QColor(128, 128, 128)) self.ui.tableWidgetYourIdentities.insertRow(0) self.ui.tableWidgetYourIdentities.setItem(0, 0, newItem) newItem = QtGui.QTableWidgetItem(addressInKeysFile) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) if not isEnabled: - newItem.setTextColor(QtGui.QColor(128,128,128)) - if shared.safeConfigGetBoolean(addressInKeysFile,'mailinglist'): - newItem.setTextColor(QtGui.QColor(137,04,177))#magenta + newItem.setTextColor(QtGui.QColor(128, 128, 128)) + if shared.safeConfigGetBoolean(addressInKeysFile, 'mailinglist'): + newItem.setTextColor(QtGui.QColor(137, 04, 177)) # magenta self.ui.tableWidgetYourIdentities.setItem(0, 1, newItem) - newItem = QtGui.QTableWidgetItem(str(addressStream(addressInKeysFile))) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + newItem = QtGui.QTableWidgetItem(str( + addressStream(addressInKeysFile))) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) if not isEnabled: - newItem.setTextColor(QtGui.QColor(128,128,128)) + newItem.setTextColor(QtGui.QColor(128, 128, 128)) self.ui.tableWidgetYourIdentities.setItem(0, 2, newItem) if isEnabled: - status,addressVersionNumber,streamNumber,hash = decodeAddress(addressInKeysFile) + status, addressVersionNumber, streamNumber, hash = decodeAddress( + addressInKeysFile) - #Load inbox from messages database file + # Load inbox from messages database file font = QFont() font.setBold(True) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, received, message, read FROM inbox where folder='inbox' ORDER BY received''') + shared.sqlSubmitQueue.put( + '''SELECT msgid, toaddress, fromaddress, subject, received, message, read FROM inbox where folder='inbox' ORDER BY received''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -251,70 +319,80 @@ class MyForm(QtGui.QMainWindow): fromLabel = '' t = (fromAddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''select label from addressbook where address=?''') + shared.sqlSubmitQueue.put( + '''select label from addressbook where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: fromLabel, = row - if fromLabel == '': #If this address wasn't in our address book.. + if fromLabel == '': # If this address wasn't in our address book... t = (fromAddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''select label from subscriptions where address=?''') + shared.sqlSubmitQueue.put( + '''select label from subscriptions where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: fromLabel, = row self.ui.tableWidgetInbox.insertRow(0) - newItem = QtGui.QTableWidgetItem(unicode(toLabel,'utf-8')) - newItem.setToolTip(unicode(toLabel,'utf-8')) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + newItem = QtGui.QTableWidgetItem(unicode(toLabel, 'utf-8')) + newItem.setToolTip(unicode(toLabel, 'utf-8')) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) if not read: newItem.setFont(font) - newItem.setData(Qt.UserRole,str(toAddress)) - if shared.safeConfigGetBoolean(toAddress,'mailinglist'): - newItem.setTextColor(QtGui.QColor(137,04,177)) - self.ui.tableWidgetInbox.setItem(0,0,newItem) + newItem.setData(Qt.UserRole, str(toAddress)) + if shared.safeConfigGetBoolean(toAddress, 'mailinglist'): + newItem.setTextColor(QtGui.QColor(137, 04, 177)) + self.ui.tableWidgetInbox.setItem(0, 0, newItem) if fromLabel == '': - newItem = QtGui.QTableWidgetItem(unicode(fromAddress,'utf-8')) - newItem.setToolTip(unicode(fromAddress,'utf-8')) + newItem = QtGui.QTableWidgetItem( + unicode(fromAddress, 'utf-8')) + newItem.setToolTip(unicode(fromAddress, 'utf-8')) else: - newItem = QtGui.QTableWidgetItem(unicode(fromLabel,'utf-8')) - newItem.setToolTip(unicode(fromLabel,'utf-8')) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8')) + newItem.setToolTip(unicode(fromLabel, 'utf-8')) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) if not read: newItem.setFont(font) - newItem.setData(Qt.UserRole,str(fromAddress)) + newItem.setData(Qt.UserRole, str(fromAddress)) - self.ui.tableWidgetInbox.setItem(0,1,newItem) - newItem = QtGui.QTableWidgetItem(unicode(subject,'utf-8')) - newItem.setToolTip(unicode(subject,'utf-8')) - newItem.setData(Qt.UserRole,unicode(message,'utf-8)')) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + self.ui.tableWidgetInbox.setItem(0, 1, newItem) + newItem = QtGui.QTableWidgetItem(unicode(subject, 'utf-8')) + newItem.setToolTip(unicode(subject, 'utf-8')) + newItem.setData(Qt.UserRole, unicode(message, 'utf-8)')) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) if not read: newItem.setFont(font) - self.ui.tableWidgetInbox.setItem(0,2,newItem) - newItem = myTableWidgetItem(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(received))),'utf-8')) - newItem.setToolTip(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(received))),'utf-8')) - newItem.setData(Qt.UserRole,QByteArray(msgid)) - newItem.setData(33,int(received)) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + self.ui.tableWidgetInbox.setItem(0, 2, newItem) + newItem = myTableWidgetItem(unicode(strftime(shared.config.get( + 'bitmessagesettings', 'timeformat'), localtime(int(received))), 'utf-8')) + newItem.setToolTip(unicode(strftime(shared.config.get( + 'bitmessagesettings', 'timeformat'), localtime(int(received))), 'utf-8')) + newItem.setData(Qt.UserRole, QByteArray(msgid)) + newItem.setData(33, int(received)) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) if not read: newItem.setFont(font) - self.ui.tableWidgetInbox.setItem(0,3,newItem) - self.ui.tableWidgetInbox.sortItems(3,Qt.DescendingOrder) + self.ui.tableWidgetInbox.setItem(0, 3, newItem) + self.ui.tableWidgetInbox.sortItems(3, Qt.DescendingOrder) self.ui.tableWidgetInbox.keyPressEvent = self.tableWidgetInboxKeyPressEvent - #Load Sent items from database + # Load Sent items from database shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT toaddress, fromaddress, subject, message, status, ackdata, lastactiontime FROM sent where folder = 'sent' ORDER BY lastactiontime''') + shared.sqlSubmitQueue.put( + '''SELECT toaddress, fromaddress, subject, message, status, ackdata, lastactiontime FROM sent where folder = 'sent' ORDER BY lastactiontime''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -332,71 +410,88 @@ class MyForm(QtGui.QMainWindow): toLabel = '' t = (toAddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''select label from addressbook where address=?''') + shared.sqlSubmitQueue.put( + '''select label from addressbook where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: toLabel, = row self.ui.tableWidgetSent.insertRow(0) if toLabel == '': - newItem = QtGui.QTableWidgetItem(unicode(toAddress,'utf-8')) - newItem.setToolTip(unicode(toAddress,'utf-8')) + newItem = QtGui.QTableWidgetItem(unicode(toAddress, 'utf-8')) + newItem.setToolTip(unicode(toAddress, 'utf-8')) else: - newItem = QtGui.QTableWidgetItem(unicode(toLabel,'utf-8')) - newItem.setToolTip(unicode(toLabel,'utf-8')) - newItem.setData(Qt.UserRole,str(toAddress)) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetSent.setItem(0,0,newItem) + newItem = QtGui.QTableWidgetItem(unicode(toLabel, 'utf-8')) + newItem.setToolTip(unicode(toLabel, 'utf-8')) + newItem.setData(Qt.UserRole, str(toAddress)) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetSent.setItem(0, 0, newItem) if fromLabel == '': - newItem = QtGui.QTableWidgetItem(unicode(fromAddress,'utf-8')) - newItem.setToolTip(unicode(fromAddress,'utf-8')) + newItem = QtGui.QTableWidgetItem( + unicode(fromAddress, 'utf-8')) + newItem.setToolTip(unicode(fromAddress, 'utf-8')) else: - newItem = QtGui.QTableWidgetItem(unicode(fromLabel,'utf-8')) - newItem.setToolTip(unicode(fromLabel,'utf-8')) - newItem.setData(Qt.UserRole,str(fromAddress)) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetSent.setItem(0,1,newItem) - newItem = QtGui.QTableWidgetItem(unicode(subject,'utf-8')) - newItem.setToolTip(unicode(subject,'utf-8')) - newItem.setData(Qt.UserRole,unicode(message,'utf-8)')) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetSent.setItem(0,2,newItem) + newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8')) + newItem.setToolTip(unicode(fromLabel, 'utf-8')) + newItem.setData(Qt.UserRole, str(fromAddress)) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetSent.setItem(0, 1, newItem) + newItem = QtGui.QTableWidgetItem(unicode(subject, 'utf-8')) + newItem.setToolTip(unicode(subject, 'utf-8')) + newItem.setData(Qt.UserRole, unicode(message, 'utf-8)')) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetSent.setItem(0, 2, newItem) if status == 'awaitingpubkey': - statusText = QtGui.QApplication.translate("MainWindow", "Waiting on their encryption key. Will request it again soon.") + statusText = QtGui.QApplication.translate( + "MainWindow", "Waiting on their encryption key. Will request it again soon.") elif status == 'doingpowforpubkey': - statusText = QtGui.QApplication.translate("MainWindow", "Encryption key request queued.") + statusText = QtGui.QApplication.translate( + "MainWindow", "Encryption key request queued.") elif status == 'msgqueued': - statusText = QtGui.QApplication.translate("MainWindow", "Queued.") + statusText = QtGui.QApplication.translate( + "MainWindow", "Queued.") elif status == 'msgsent': - statusText = QtGui.QApplication.translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent at %1").arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(lastactiontime)))) + statusText = QtGui.QApplication.translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent at %1").arg( + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)))) elif status == 'doingmsgpow': - statusText = QtGui.QApplication.translate("MainWindow", "Need to do work to send message. Work is queued.") + statusText = QtGui.QApplication.translate( + "MainWindow", "Need to do work to send message. Work is queued.") elif status == 'ackreceived': - statusText = QtGui.QApplication.translate("MainWindow", "Acknowledgement of the message received %1").arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(lastactiontime))))) + statusText = QtGui.QApplication.translate("MainWindow", "Acknowledgement of the message received %1").arg( + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) elif status == 'broadcastqueued': - statusText = QtGui.QApplication.translate("MainWindow", "Broadcast queued.") + statusText = QtGui.QApplication.translate( + "MainWindow", "Broadcast queued.") elif status == 'broadcastsent': - statusText = QtGui.QApplication.translate("MainWindow", "Broadcast on %1").arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(lastactiontime))))) + statusText = QtGui.QApplication.translate("MainWindow", "Broadcast on %1").arg(unicode(strftime( + shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) elif status == 'toodifficult': - statusText = QtGui.QApplication.translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(lastactiontime))))) + statusText = QtGui.QApplication.translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg( + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) elif status == 'forcepow': - statusText = QtGui.QApplication.translate("MainWindow", "Forced difficulty override. Send should start soon.") + statusText = QtGui.QApplication.translate( + "MainWindow", "Forced difficulty override. Send should start soon.") else: - statusText = QtGui.QApplication.translate("Unknown status: %1 %2").arg(status).arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(lastactiontime))))) - newItem = myTableWidgetItem(statusText) + statusText = QtGui.QApplication.translate("MainWindow", "Unknown status: %1 %2").arg(status).arg(unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) + newItem = myTableWidgetItem(statusText) newItem.setToolTip(statusText) - newItem.setData(Qt.UserRole,QByteArray(ackdata)) - newItem.setData(33,int(lastactiontime)) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetSent.setItem(0,3,newItem) - self.ui.tableWidgetSent.sortItems(3,Qt.DescendingOrder) + newItem.setData(Qt.UserRole, QByteArray(ackdata)) + newItem.setData(33, int(lastactiontime)) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetSent.setItem(0, 3, newItem) + self.ui.tableWidgetSent.sortItems(3, Qt.DescendingOrder) self.ui.tableWidgetSent.keyPressEvent = self.tableWidgetSentKeyPressEvent - #Initialize the address book + # Initialize the address book shared.sqlLock.acquire() shared.sqlSubmitQueue.put('SELECT * FROM addressbook') shared.sqlSubmitQueue.put('') @@ -405,77 +500,98 @@ class MyForm(QtGui.QMainWindow): for row in queryreturn: label, address = row self.ui.tableWidgetAddressBook.insertRow(0) - newItem = QtGui.QTableWidgetItem(unicode(label,'utf-8')) - self.ui.tableWidgetAddressBook.setItem(0,0,newItem) - newItem = QtGui.QTableWidgetItem(address) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetAddressBook.setItem(0,1,newItem) + newItem = QtGui.QTableWidgetItem(unicode(label, 'utf-8')) + self.ui.tableWidgetAddressBook.setItem(0, 0, newItem) + newItem = QtGui.QTableWidgetItem(address) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetAddressBook.setItem(0, 1, newItem) - #Initialize the Subscriptions + # Initialize the Subscriptions self.rerenderSubscriptions() - #Initialize the Blacklist or Whitelist + # Initialize the Blacklist or Whitelist if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': self.loadBlackWhiteList() else: - self.ui.tabWidget.setTabText(6,'Whitelist') + self.ui.tabWidget.setTabText(6, 'Whitelist') self.ui.radioButtonWhitelist.click() self.loadBlackWhiteList() + QtCore.QObject.connect(self.ui.tableWidgetYourIdentities, QtCore.SIGNAL( + "itemChanged(QTableWidgetItem *)"), self.tableWidgetYourIdentitiesItemChanged) + QtCore.QObject.connect(self.ui.tableWidgetAddressBook, QtCore.SIGNAL( + "itemChanged(QTableWidgetItem *)"), self.tableWidgetAddressBookItemChanged) + QtCore.QObject.connect(self.ui.tableWidgetSubscriptions, QtCore.SIGNAL( + "itemChanged(QTableWidgetItem *)"), self.tableWidgetSubscriptionsItemChanged) + QtCore.QObject.connect(self.ui.tableWidgetInbox, QtCore.SIGNAL( + "itemSelectionChanged ()"), self.tableWidgetInboxItemClicked) + QtCore.QObject.connect(self.ui.tableWidgetSent, QtCore.SIGNAL( + "itemSelectionChanged ()"), self.tableWidgetSentItemClicked) - QtCore.QObject.connect(self.ui.tableWidgetYourIdentities, QtCore.SIGNAL("itemChanged(QTableWidgetItem *)"), self.tableWidgetYourIdentitiesItemChanged) - QtCore.QObject.connect(self.ui.tableWidgetAddressBook, QtCore.SIGNAL("itemChanged(QTableWidgetItem *)"), self.tableWidgetAddressBookItemChanged) - QtCore.QObject.connect(self.ui.tableWidgetSubscriptions, QtCore.SIGNAL("itemChanged(QTableWidgetItem *)"), self.tableWidgetSubscriptionsItemChanged) - QtCore.QObject.connect(self.ui.tableWidgetInbox, QtCore.SIGNAL("itemSelectionChanged ()"), self.tableWidgetInboxItemClicked) - QtCore.QObject.connect(self.ui.tableWidgetSent, QtCore.SIGNAL("itemSelectionChanged ()"), self.tableWidgetSentItemClicked) - - #Put the colored icon on the status bar - #self.ui.pushButtonStatusIcon.setIcon(QIcon(":/newPrefix/images/yellowicon.png")) + # Put the colored icon on the status bar + # self.ui.pushButtonStatusIcon.setIcon(QIcon(":/newPrefix/images/yellowicon.png")) self.statusbar = self.statusBar() - self.statusbar.insertPermanentWidget(0,self.ui.pushButtonStatusIcon) - self.ui.labelStartupTime.setText(QtGui.QApplication.translate("MainWindow", "Since startup on %1").arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time())))))) + self.statusbar.insertPermanentWidget(0, self.ui.pushButtonStatusIcon) + self.ui.labelStartupTime.setText(QtGui.QApplication.translate("MainWindow", "Since startup on %1").arg( + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time())))))) self.numberOfMessagesProcessed = 0 self.numberOfBroadcastsProcessed = 0 self.numberOfPubkeysProcessed = 0 self.UISignalThread = UISignaler() - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByHash) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByAckdata) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.displayNewInboxMessage) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.displayNewSentMessage) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("updateNetworkStatusTab()"), self.updateNetworkStatusTab) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("incrementNumberOfMessagesProcessed()"), self.incrementNumberOfMessagesProcessed) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("incrementNumberOfPubkeysProcessed()"), self.incrementNumberOfPubkeysProcessed) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("incrementNumberOfBroadcastsProcessed()"), self.incrementNumberOfBroadcastsProcessed) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("setStatusIcon(PyQt_PyObject)"), self.setStatusIcon) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("rerenderInboxFromLabels()"), self.rerenderInboxFromLabels) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("rerenderSubscriptions()"), self.rerenderSubscriptions) - QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("removeInboxRowByMsgid(PyQt_PyObject)"), self.removeInboxRowByMsgid) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByHash) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByAckdata) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.displayNewInboxMessage) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.displayNewSentMessage) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "updateNetworkStatusTab()"), self.updateNetworkStatusTab) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "incrementNumberOfMessagesProcessed()"), self.incrementNumberOfMessagesProcessed) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "incrementNumberOfPubkeysProcessed()"), self.incrementNumberOfPubkeysProcessed) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "incrementNumberOfBroadcastsProcessed()"), self.incrementNumberOfBroadcastsProcessed) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "setStatusIcon(PyQt_PyObject)"), self.setStatusIcon) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "rerenderInboxFromLabels()"), self.rerenderInboxFromLabels) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "rerenderSubscriptions()"), self.rerenderSubscriptions) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "removeInboxRowByMsgid(PyQt_PyObject)"), self.removeInboxRowByMsgid) self.UISignalThread.start() -#Below this point, it would be good if all of the necessary global data structures were initialized. +# Below this point, it would be good if all of the necessary global data +# structures were initialized. self.rerenderComboBoxSendFrom() - #Show or hide the application window after clicking an item within the tray icon or, on Windows, the try icon itself. + # Show or hide the application window after clicking an item within the + # tray icon or, on Windows, the try icon itself. def appIndicatorShowOrHideWindow(self): if not self.actionShow.isChecked(): self.hide() else: if sys.platform[0:3] == 'win': self.setWindowFlags(Qt.Window) - #else: - #self.showMaximized() + # else: + # self.showMaximized() self.show() - self.setWindowState(self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive) + self.setWindowState( + self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive) self.activateWindow() - # pointer to the application - #app = None - + # app = None # The most recent message newMessageItem = None @@ -484,7 +600,7 @@ class MyForm(QtGui.QMainWindow): # show the application window def appIndicatorShow(self): - if self.actionShow == None: + if self.actionShow is None: return if not self.actionShow.isChecked(): self.actionShow.setChecked(True) @@ -492,7 +608,7 @@ class MyForm(QtGui.QMainWindow): # unchecks the show item on the application indicator def appIndicatorHide(self): - if self.actionShow == None: + if self.actionShow is None: return if self.actionShow.isChecked(): self.actionShow.setChecked(False) @@ -531,11 +647,11 @@ class MyForm(QtGui.QMainWindow): try: self.ui.tableWidgetInbox.setCurrentItem(selectedItem) except Exception: - self.ui.tableWidgetInbox.setCurrentCell(0,0) + self.ui.tableWidgetInbox.setCurrentCell(0, 0) self.tableWidgetInboxItemClicked() else: # just select the first item - self.ui.tableWidgetInbox.setCurrentCell(0,0) + self.ui.tableWidgetInbox.setCurrentCell(0, 0) self.tableWidgetInboxItemClicked() # Show the program window and select send tab @@ -554,51 +670,60 @@ class MyForm(QtGui.QMainWindow): self.ui.tabWidget.setCurrentIndex(5) # create application indicator - def appIndicatorInit(self,app): - self.tray = QSystemTrayIcon(QtGui.QIcon(":/newPrefix/images/can-icon-24px-red.png"), app) + def appIndicatorInit(self, app): + self.tray = QSystemTrayIcon(QtGui.QIcon( + ":/newPrefix/images/can-icon-24px-red.png"), app) if sys.platform[0:3] == 'win': traySignal = "activated(QSystemTrayIcon::ActivationReason)" - QtCore.QObject.connect(self.tray, QtCore.SIGNAL(traySignal), self.__icon_activated) + QtCore.QObject.connect(self.tray, QtCore.SIGNAL( + traySignal), self.__icon_activated) m = QMenu() - self.actionStatus = QtGui.QAction(QtGui.QApplication.translate("MainWindow", "Not Connected"),m,checkable=False) + self.actionStatus = QtGui.QAction(QtGui.QApplication.translate( + "MainWindow", "Not Connected"), m, checkable=False) m.addAction(self.actionStatus) # separator - actionSeparator = QtGui.QAction('',m,checkable=False) + actionSeparator = QtGui.QAction('', m, checkable=False) actionSeparator.setSeparator(True) m.addAction(actionSeparator) # show bitmessage - self.actionShow = QtGui.QAction(QtGui.QApplication.translate("MainWindow", "Show Bitmessage"),m,checkable=True) - self.actionShow.setChecked(not shared.config.getboolean('bitmessagesettings', 'startintray')) + self.actionShow = QtGui.QAction(QtGui.QApplication.translate( + "MainWindow", "Show Bitmessage"), m, checkable=True) + self.actionShow.setChecked(not shared.config.getboolean( + 'bitmessagesettings', 'startintray')) self.actionShow.triggered.connect(self.appIndicatorShowOrHideWindow) if not sys.platform[0:3] == 'win': - m.addAction(self.actionShow) + m.addAction(self.actionShow) # Send - actionSend = QtGui.QAction(QtGui.QApplication.translate("MainWindow", "Send"),m,checkable=False) + actionSend = QtGui.QAction(QtGui.QApplication.translate( + "MainWindow", "Send"), m, checkable=False) actionSend.triggered.connect(self.appIndicatorSend) m.addAction(actionSend) # Subscribe - actionSubscribe = QtGui.QAction(QtGui.QApplication.translate("MainWindow", "Subscribe"),m,checkable=False) + actionSubscribe = QtGui.QAction(QtGui.QApplication.translate( + "MainWindow", "Subscribe"), m, checkable=False) actionSubscribe.triggered.connect(self.appIndicatorSubscribe) m.addAction(actionSubscribe) # Address book - actionAddressBook = QtGui.QAction(QtGui.QApplication.translate("MainWindow", "Address Book"),m,checkable=False) + actionAddressBook = QtGui.QAction(QtGui.QApplication.translate( + "MainWindow", "Address Book"), m, checkable=False) actionAddressBook.triggered.connect(self.appIndicatorAddressBook) m.addAction(actionAddressBook) # separator - actionSeparator = QtGui.QAction('',m,checkable=False) + actionSeparator = QtGui.QAction('', m, checkable=False) actionSeparator.setSeparator(True) m.addAction(actionSeparator) # Quit - m.addAction(QtGui.QApplication.translate("MainWindow", "Quit"), self.quit) + m.addAction(QtGui.QApplication.translate( + "MainWindow", "Quit"), self.quit) self.tray.setContextMenu(m) self.tray.show() @@ -631,7 +756,8 @@ class MyForm(QtGui.QMainWindow): return shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT toaddress, read FROM inbox WHERE msgid=?''') + shared.sqlSubmitQueue.put( + '''SELECT toaddress, read FROM inbox WHERE msgid=?''') shared.sqlSubmitQueue.put(inventoryHash) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -651,7 +777,8 @@ class MyForm(QtGui.QMainWindow): unreadSubscriptions = 0 shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, read FROM inbox where folder='inbox' ''') + shared.sqlSubmitQueue.put( + '''SELECT msgid, toaddress, read FROM inbox where folder='inbox' ''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -677,21 +804,24 @@ class MyForm(QtGui.QMainWindow): unreadMessages = unreadMessages + 1 return unreadMessages, unreadSubscriptions - # show the number of unread messages and subscriptions on the messaging menu + # show the number of unread messages and subscriptions on the messaging + # menu def ubuntuMessagingMenuUnread(self, drawAttention): unreadMessages, unreadSubscriptions = self.getUnread() # unread messages if unreadMessages > 0: - self.mmapp.append_source("Messages", None, "Messages (" + str(unreadMessages) + ")") + self.mmapp.append_source( + "Messages", None, "Messages (" + str(unreadMessages) + ")") if drawAttention: self.mmapp.draw_attention("Messages") # unread subscriptions if unreadSubscriptions > 0: - self.mmapp.append_source("Subscriptions", None, "Subscriptions (" + str(unreadSubscriptions) + ")") + self.mmapp.append_source("Subscriptions", None, "Subscriptions (" + str( + unreadSubscriptions) + ")") if drawAttention: self.mmapp.draw_attention("Subscriptions") - + # initialise the Ubuntu messaging menu def ubuntuMessagingMenuInit(self): global withMessagingMenu @@ -702,13 +832,14 @@ class MyForm(QtGui.QMainWindow): # has messageing menu been installed if not withMessagingMenu: - print 'WARNING: MessagingMenu is not available. Is libmessaging-menu-dev installed?' + print 'WARNING: MessagingMenu is not available. Is libmessaging-menu-dev installed?' return # create the menu server if withMessagingMenu: try: - self.mmapp = MessagingMenu.App(desktop_id='pybitmessage.desktop') + self.mmapp = MessagingMenu.App( + desktop_id='pybitmessage.desktop') self.mmapp.register() self.mmapp.connect('activate-source', self.appIndicatorInbox) self.ubuntuMessagingMenuUnread(True) @@ -726,7 +857,7 @@ class MyForm(QtGui.QMainWindow): # has messageing menu been installed if not withMessagingMenu: - print 'WARNING: messaging menu disabled or libmessaging-menu-dev not installed' + print 'WARNING: messaging menu disabled or libmessaging-menu-dev not installed' return # remember this item to that the messaging menu can find it @@ -756,18 +887,19 @@ class MyForm(QtGui.QMainWindow): def notifierShow(self, title, subtitle): global withMessagingMenu if withMessagingMenu: - n = Notify.Notification.new(title, subtitle,'notification-message-email') + n = Notify.Notification.new( + title, subtitle, 'notification-message-email') n.show() return else: self.tray.showMessage(title, subtitle, 1, 2000) - def tableWidgetInboxKeyPressEvent(self,event): + def tableWidgetInboxKeyPressEvent(self, event): if event.key() == QtCore.Qt.Key_Delete: self.on_action_InboxTrash() return QtGui.QTableWidget.keyPressEvent(self.ui.tableWidgetInbox, event) - def tableWidgetSentKeyPressEvent(self,event): + def tableWidgetSentKeyPressEvent(self, event): if event.key() == QtCore.Qt.Key_Delete: self.on_action_SentTrash() return QtGui.QTableWidget.keyPressEvent(self.ui.tableWidgetSent, event) @@ -775,40 +907,52 @@ class MyForm(QtGui.QMainWindow): def click_actionManageKeys(self): if 'darwin' in sys.platform or 'linux' in sys.platform: if shared.appdata == '': - #reply = QtGui.QMessageBox.information(self, 'keys.dat?','You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file.', QMessageBox.Ok) - reply = QtGui.QMessageBox.information(self, 'keys.dat?',QtGui.QApplication.translate("MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file."), QMessageBox.Ok) + # reply = QtGui.QMessageBox.information(self, 'keys.dat?','You + # may manage your keys by editing the keys.dat file stored in + # the same directory as this program. It is important that you + # back up this file.', QMessageBox.Ok) + reply = QtGui.QMessageBox.information(self, 'keys.dat?', QtGui.QApplication.translate( + "MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file."), QMessageBox.Ok) else: - QtGui.QMessageBox.information(self, 'keys.dat?',QtGui.QApplication.translate("MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file.").arg(shared.appdata), QMessageBox.Ok) + QtGui.QMessageBox.information(self, 'keys.dat?', QtGui.QApplication.translate( + "MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file.").arg(shared.appdata), QMessageBox.Ok) elif sys.platform == 'win32' or sys.platform == 'win64': if shared.appdata == '': - reply = QtGui.QMessageBox.question(self, QtGui.QApplication.translate("MainWindow", "Open keys.dat?"),QtGui.QApplication.translate("MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) + reply = QtGui.QMessageBox.question(self, QtGui.QApplication.translate("MainWindow", "Open keys.dat?"), QtGui.QApplication.translate( + "MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) else: - reply = QtGui.QMessageBox.question(self, QtGui.QApplication.translate("MainWindow", "Open keys.dat?"),QtGui.QApplication.translate("MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)").arg(shared.appdata), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) + reply = QtGui.QMessageBox.question(self, QtGui.QApplication.translate("MainWindow", "Open keys.dat?"), QtGui.QApplication.translate( + "MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)").arg(shared.appdata), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) if reply == QtGui.QMessageBox.Yes: self.openKeysFile() def click_actionDeleteAllTrashedMessages(self): - if QtGui.QMessageBox.question(self, QtGui.QApplication.translate("MainWindow", "Delete trash?"),QtGui.QApplication.translate("MainWindow", "Are you sure you want to delete all trashed messages?"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) == QtGui.QMessageBox.No: + if QtGui.QMessageBox.question(self, QtGui.QApplication.translate("MainWindow", "Delete trash?"), QtGui.QApplication.translate("MainWindow", "Are you sure you want to delete all trashed messages?"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) == QtGui.QMessageBox.No: return shared.sqlLock.acquire() shared.sqlSubmitQueue.put('deleteandvacuume') shared.sqlLock.release() def click_actionRegenerateDeterministicAddresses(self): - self.regenerateAddressesDialogInstance = regenerateAddressesDialog(self) + self.regenerateAddressesDialogInstance = regenerateAddressesDialog( + self) if self.regenerateAddressesDialogInstance.exec_(): if self.regenerateAddressesDialogInstance.ui.lineEditPassphrase.text() == "": - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "bad passphrase"), QtGui.QApplication.translate("MainWindow", "You must type your passphrase. If you don\'t have one then this is not the form for you.")) + QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "bad passphrase"), QtGui.QApplication.translate( + "MainWindow", "You must type your passphrase. If you don\'t have one then this is not the form for you.")) else: - streamNumberForAddress = int(self.regenerateAddressesDialogInstance.ui.lineEditStreamNumber.text()) - addressVersionNumber = int(self.regenerateAddressesDialogInstance.ui.lineEditAddressVersionNumber.text()) - #self.addressGenerator = addressGenerator() - #self.addressGenerator.setup(addressVersionNumber,streamNumberForAddress,"unused address",self.regenerateAddressesDialogInstance.ui.spinBoxNumberOfAddressesToMake.value(),self.regenerateAddressesDialogInstance.ui.lineEditPassphrase.text().toUtf8(),self.regenerateAddressesDialogInstance.ui.checkBoxEighteenByteRipe.isChecked()) - #QtCore.QObject.connect(self.addressGenerator, SIGNAL("writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable) - #QtCore.QObject.connect(self.addressGenerator, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) - #self.addressGenerator.start() - shared.addressGeneratorQueue.put(('createDeterministicAddresses',addressVersionNumber,streamNumberForAddress,"regenerated deterministic address",self.regenerateAddressesDialogInstance.ui.spinBoxNumberOfAddressesToMake.value(),self.regenerateAddressesDialogInstance.ui.lineEditPassphrase.text().toUtf8(),self.regenerateAddressesDialogInstance.ui.checkBoxEighteenByteRipe.isChecked())) + streamNumberForAddress = int( + self.regenerateAddressesDialogInstance.ui.lineEditStreamNumber.text()) + addressVersionNumber = int( + self.regenerateAddressesDialogInstance.ui.lineEditAddressVersionNumber.text()) + # self.addressGenerator = addressGenerator() + # self.addressGenerator.setup(addressVersionNumber,streamNumberForAddress,"unused address",self.regenerateAddressesDialogInstance.ui.spinBoxNumberOfAddressesToMake.value(),self.regenerateAddressesDialogInstance.ui.lineEditPassphrase.text().toUtf8(),self.regenerateAddressesDialogInstance.ui.checkBoxEighteenByteRipe.isChecked()) + # QtCore.QObject.connect(self.addressGenerator, SIGNAL("writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable) + # QtCore.QObject.connect(self.addressGenerator, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) + # self.addressGenerator.start() + shared.addressGeneratorQueue.put(('createDeterministicAddresses', addressVersionNumber, streamNumberForAddress, "regenerated deterministic address", self.regenerateAddressesDialogInstance.ui.spinBoxNumberOfAddressesToMake.value( + ), self.regenerateAddressesDialogInstance.ui.lineEditPassphrase.text().toUtf8(), self.regenerateAddressesDialogInstance.ui.checkBoxEighteenByteRipe.isChecked())) self.ui.tabWidget.setCurrentIndex(3) def openKeysFile(self): @@ -828,9 +972,10 @@ class MyForm(QtGui.QMainWindow): if 'win32' in sys.platform or 'win64' in sys.platform: self.setWindowFlags(Qt.ToolTip) elif event.oldState() & QtCore.Qt.WindowMinimized: - #The window state has just been changed to Normal/Maximised/FullScreen + # The window state has just been changed to + # Normal/Maximised/FullScreen pass - #QtGui.QWidget.changeEvent(self, event) + # QtGui.QWidget.changeEvent(self, event) def __icon_activated(self, reason): if reason == QtGui.QSystemTrayIcon.Trigger: @@ -839,19 +984,22 @@ class MyForm(QtGui.QMainWindow): def incrementNumberOfMessagesProcessed(self): self.numberOfMessagesProcessed += 1 - self.ui.labelMessageCount.setText(QtGui.QApplication.translate("MainWindow", "Processed %1 person-to-person messages.").arg(str(self.numberOfMessagesProcessed))) + self.ui.labelMessageCount.setText(QtGui.QApplication.translate( + "MainWindow", "Processed %1 person-to-person messages.").arg(str(self.numberOfMessagesProcessed))) def incrementNumberOfBroadcastsProcessed(self): self.numberOfBroadcastsProcessed += 1 - self.ui.labelBroadcastCount.setText(QtGui.QApplication.translate("MainWindow", "Processed %1 broadcast messages.").arg(str(self.numberOfBroadcastsProcessed))) + self.ui.labelBroadcastCount.setText(QtGui.QApplication.translate( + "MainWindow", "Processed %1 broadcast messages.").arg(str(self.numberOfBroadcastsProcessed))) def incrementNumberOfPubkeysProcessed(self): self.numberOfPubkeysProcessed += 1 - self.ui.labelPubkeyCount.setText(QtGui.QApplication.translate("MainWindow", "Processed %1 public keys.").arg(str(self.numberOfPubkeysProcessed))) + self.ui.labelPubkeyCount.setText(QtGui.QApplication.translate( + "MainWindow", "Processed %1 public keys.").arg(str(self.numberOfPubkeysProcessed))) def updateNetworkStatusTab(self): - #print 'updating network status tab' - totalNumberOfConnectionsFromAllStreams = 0 #One would think we could use len(sendDataQueues) for this but the number doesn't always match: just because we have a sendDataThread running doesn't mean that the connection has been fully established (with the exchange of version messages). + # print 'updating network status tab' + totalNumberOfConnectionsFromAllStreams = 0 # One would think we could use len(sendDataQueues) for this but the number doesn't always match: just because we have a sendDataThread running doesn't mean that the connection has been fully established (with the exchange of version messages). streamNumberTotals = {} for host, streamNumber in shared.connectedHostsList.items(): if not streamNumber in streamNumberTotals: @@ -864,14 +1012,16 @@ class MyForm(QtGui.QMainWindow): for streamNumber, connectionCount in streamNumberTotals.items(): self.ui.tableWidgetConnectionCount.insertRow(0) if streamNumber == 0: - newItem = QtGui.QTableWidgetItem("?") + newItem = QtGui.QTableWidgetItem("?") else: - newItem = QtGui.QTableWidgetItem(str(streamNumber)) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetConnectionCount.setItem(0,0,newItem) - newItem = QtGui.QTableWidgetItem(str(connectionCount)) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetConnectionCount.setItem(0,1,newItem) + newItem = QtGui.QTableWidgetItem(str(streamNumber)) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetConnectionCount.setItem(0, 0, newItem) + newItem = QtGui.QTableWidgetItem(str(connectionCount)) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetConnectionCount.setItem(0, 1, newItem) """for currentRow in range(self.ui.tableWidgetConnectionCount.rowCount()): rowStreamNumber = int(self.ui.tableWidgetConnectionCount.item(currentRow,0).text()) if streamNumber == rowStreamNumber: @@ -888,8 +1038,9 @@ class MyForm(QtGui.QMainWindow): newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) self.ui.tableWidgetConnectionCount.setItem(0,1,newItem) totalNumberOfConnectionsFromAllStreams += connectionCount""" - self.ui.labelTotalConnections.setText(QtGui.QApplication.translate("MainWindow", "Total Connections: %1").arg(str(len(shared.connectedHostsList)))) - if len(shared.connectedHostsList) > 0 and shared.statusIconColor == 'red': #FYI: The 'singlelistener' thread sets the icon color to green when it receives an incoming connection, meaning that the user's firewall is configured correctly. + self.ui.labelTotalConnections.setText(QtGui.QApplication.translate( + "MainWindow", "Total Connections: %1").arg(str(len(shared.connectedHostsList)))) + if len(shared.connectedHostsList) > 0 and shared.statusIconColor == 'red': # FYI: The 'singlelistener' thread sets the icon color to green when it receives an incoming connection, meaning that the user's firewall is configured correctly. self.setStatusIcon('yellow') elif len(shared.connectedHostsList) == 0: self.setStatusIcon('red') @@ -897,225 +1048,280 @@ class MyForm(QtGui.QMainWindow): # Indicates whether or not there is a connection to the Bitmessage network connected = False - def setStatusIcon(self,color): + def setStatusIcon(self, color): global withMessagingMenu - #print 'setting status icon color' + # print 'setting status icon color' if color == 'red': - self.ui.pushButtonStatusIcon.setIcon(QIcon(":/newPrefix/images/redicon.png")) + self.ui.pushButtonStatusIcon.setIcon( + QIcon(":/newPrefix/images/redicon.png")) shared.statusIconColor = 'red' # if the connection is lost then show a notification if self.connected: - self.notifierShow('Bitmessage',QtGui.QApplication.translate("MainWindow", "Connection lost")) + self.notifierShow('Bitmessage', QtGui.QApplication.translate( + "MainWindow", "Connection lost")) self.connected = False - if self.actionStatus != None: - self.actionStatus.setText(QtGui.QApplication.translate("MainWindow", "Not Connected")) - self.tray.setIcon(QtGui.QIcon(":/newPrefix/images/can-icon-24px-red.png")) + if self.actionStatus is not None: + self.actionStatus.setText(QtGui.QApplication.translate( + "MainWindow", "Not Connected")) + self.tray.setIcon(QtGui.QIcon( + ":/newPrefix/images/can-icon-24px-red.png")) if color == 'yellow': if self.statusBar().currentMessage() == 'Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.': self.statusBar().showMessage('') - self.ui.pushButtonStatusIcon.setIcon(QIcon(":/newPrefix/images/yellowicon.png")) + self.ui.pushButtonStatusIcon.setIcon(QIcon( + ":/newPrefix/images/yellowicon.png")) shared.statusIconColor = 'yellow' # if a new connection has been established then show a notification if not self.connected: - self.notifierShow('Bitmessage',QtGui.QApplication.translate("MainWindow", "Connected")) + self.notifierShow('Bitmessage', QtGui.QApplication.translate( + "MainWindow", "Connected")) self.connected = True - if self.actionStatus != None: - self.actionStatus.setText(QtGui.QApplication.translate("MainWindow", "Connected")) - self.tray.setIcon(QtGui.QIcon(":/newPrefix/images/can-icon-24px-yellow.png")) + if self.actionStatus is not None: + self.actionStatus.setText(QtGui.QApplication.translate( + "MainWindow", "Connected")) + self.tray.setIcon(QtGui.QIcon( + ":/newPrefix/images/can-icon-24px-yellow.png")) if color == 'green': if self.statusBar().currentMessage() == 'Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.': self.statusBar().showMessage('') - self.ui.pushButtonStatusIcon.setIcon(QIcon(":/newPrefix/images/greenicon.png")) + self.ui.pushButtonStatusIcon.setIcon( + QIcon(":/newPrefix/images/greenicon.png")) shared.statusIconColor = 'green' if not self.connected: - self.notifierShow('Bitmessage',QtGui.QApplication.translate("MainWindow", "Connected")) + self.notifierShow('Bitmessage', QtGui.QApplication.translate( + "MainWindow", "Connected")) self.connected = True - if self.actionStatus != None: - self.actionStatus.setText(QtGui.QApplication.translate("MainWindow", "Connected")) - self.tray.setIcon(QtGui.QIcon(":/newPrefix/images/can-icon-24px-green.png")) + if self.actionStatus is not None: + self.actionStatus.setText(QtGui.QApplication.translate( + "MainWindow", "Connected")) + self.tray.setIcon(QtGui.QIcon( + ":/newPrefix/images/can-icon-24px-green.png")) - def updateSentItemStatusByHash(self,toRipe,textToDisplay): + def updateSentItemStatusByHash(self, toRipe, textToDisplay): for i in range(self.ui.tableWidgetSent.rowCount()): - toAddress = str(self.ui.tableWidgetSent.item(i,0).data(Qt.UserRole).toPyObject()) - status,addressVersionNumber,streamNumber,ripe = decodeAddress(toAddress) + toAddress = str(self.ui.tableWidgetSent.item( + i, 0).data(Qt.UserRole).toPyObject()) + status, addressVersionNumber, streamNumber, ripe = decodeAddress( + toAddress) if ripe == toRipe: - self.ui.tableWidgetSent.item(i,3).setToolTip(textToDisplay) - parenPositionIndex = string.find(textToDisplay,'\n') + self.ui.tableWidgetSent.item(i, 3).setToolTip(textToDisplay) + parenPositionIndex = string.find(textToDisplay, '\n') if parenPositionIndex > 1: - self.ui.tableWidgetSent.item(i,3).setText(textToDisplay[:parenPositionIndex]) + self.ui.tableWidgetSent.item(i, 3).setText( + textToDisplay[:parenPositionIndex]) else: - self.ui.tableWidgetSent.item(i,3).setText(textToDisplay) - + self.ui.tableWidgetSent.item(i, 3).setText(textToDisplay) - def updateSentItemStatusByAckdata(self,ackdata,textToDisplay): + def updateSentItemStatusByAckdata(self, ackdata, textToDisplay): for i in range(self.ui.tableWidgetSent.rowCount()): - toAddress = str(self.ui.tableWidgetSent.item(i,0).data(Qt.UserRole).toPyObject()) - tableAckdata = self.ui.tableWidgetSent.item(i,3).data(Qt.UserRole).toPyObject() - status,addressVersionNumber,streamNumber,ripe = decodeAddress(toAddress) + toAddress = str(self.ui.tableWidgetSent.item( + i, 0).data(Qt.UserRole).toPyObject()) + tableAckdata = self.ui.tableWidgetSent.item( + i, 3).data(Qt.UserRole).toPyObject() + status, addressVersionNumber, streamNumber, ripe = decodeAddress( + toAddress) if ackdata == tableAckdata: - self.ui.tableWidgetSent.item(i,3).setToolTip(textToDisplay) - parenPositionIndex = string.find(textToDisplay,'\n') + self.ui.tableWidgetSent.item(i, 3).setToolTip(textToDisplay) + parenPositionIndex = string.find(textToDisplay, '\n') if parenPositionIndex > 1: - self.ui.tableWidgetSent.item(i,3).setText(textToDisplay[:parenPositionIndex]) + self.ui.tableWidgetSent.item(i, 3).setText( + textToDisplay[:parenPositionIndex]) else: - self.ui.tableWidgetSent.item(i,3).setText(textToDisplay) + self.ui.tableWidgetSent.item(i, 3).setText(textToDisplay) - def removeInboxRowByMsgid(self,msgid):#msgid and inventoryHash are the same thing + def removeInboxRowByMsgid(self, msgid): # msgid and inventoryHash are the same thing for i in range(self.ui.tableWidgetInbox.rowCount()): - if msgid == str(self.ui.tableWidgetInbox.item(i,3).data(Qt.UserRole).toPyObject()): - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Message trashed")) + if msgid == str(self.ui.tableWidgetInbox.item(i, 3).data(Qt.UserRole).toPyObject()): + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Message trashed")) self.ui.tableWidgetInbox.removeRow(i) break def rerenderInboxFromLabels(self): for i in range(self.ui.tableWidgetInbox.rowCount()): - addressToLookup = str(self.ui.tableWidgetInbox.item(i,1).data(Qt.UserRole).toPyObject()) + addressToLookup = str(self.ui.tableWidgetInbox.item( + i, 1).data(Qt.UserRole).toPyObject()) fromLabel = '' t = (addressToLookup,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''select label from addressbook where address=?''') + shared.sqlSubmitQueue.put( + '''select label from addressbook where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: fromLabel, = row - self.ui.tableWidgetInbox.item(i,1).setText(unicode(fromLabel,'utf-8')) + self.ui.tableWidgetInbox.item( + i, 1).setText(unicode(fromLabel, 'utf-8')) else: - #It might be a broadcast message. We should check for that label. + # It might be a broadcast message. We should check for that + # label. shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''select label from subscriptions where address=?''') + shared.sqlSubmitQueue.put( + '''select label from subscriptions where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: fromLabel, = row - self.ui.tableWidgetInbox.item(i,1).setText(unicode(fromLabel,'utf-8')) - + self.ui.tableWidgetInbox.item( + i, 1).setText(unicode(fromLabel, 'utf-8')) def rerenderInboxToLabels(self): for i in range(self.ui.tableWidgetInbox.rowCount()): - toAddress = str(self.ui.tableWidgetInbox.item(i,0).data(Qt.UserRole).toPyObject()) + toAddress = str(self.ui.tableWidgetInbox.item( + i, 0).data(Qt.UserRole).toPyObject()) try: toLabel = shared.config.get(toAddress, 'label') except: toLabel = '' if toLabel == '': toLabel = toAddress - self.ui.tableWidgetInbox.item(i,0).setText(unicode(toLabel,'utf-8')) - #Set the color according to whether it is the address of a mailing list or not. - if shared.safeConfigGetBoolean(toAddress,'mailinglist'): - self.ui.tableWidgetInbox.item(i,0).setTextColor(QtGui.QColor(137,04,177)) + self.ui.tableWidgetInbox.item( + i, 0).setText(unicode(toLabel, 'utf-8')) + # Set the color according to whether it is the address of a mailing + # list or not. + if shared.safeConfigGetBoolean(toAddress, 'mailinglist'): + self.ui.tableWidgetInbox.item(i, 0).setTextColor(QtGui.QColor(137, 04, 177)) else: - self.ui.tableWidgetInbox.item(i,0).setTextColor(QtGui.QColor(0,0,0)) + self.ui.tableWidgetInbox.item( + i, 0).setTextColor(QtGui.QColor(0, 0, 0)) def rerenderSentFromLabels(self): for i in range(self.ui.tableWidgetSent.rowCount()): - fromAddress = str(self.ui.tableWidgetSent.item(i,1).data(Qt.UserRole).toPyObject()) + fromAddress = str(self.ui.tableWidgetSent.item( + i, 1).data(Qt.UserRole).toPyObject()) try: fromLabel = shared.config.get(fromAddress, 'label') except: fromLabel = '' if fromLabel == '': fromLabel = fromAddress - self.ui.tableWidgetSent.item(i,1).setText(unicode(fromLabel,'utf-8')) + self.ui.tableWidgetSent.item( + i, 1).setText(unicode(fromLabel, 'utf-8')) def rerenderSentToLabels(self): for i in range(self.ui.tableWidgetSent.rowCount()): - addressToLookup = str(self.ui.tableWidgetSent.item(i,0).data(Qt.UserRole).toPyObject()) + addressToLookup = str(self.ui.tableWidgetSent.item( + i, 0).data(Qt.UserRole).toPyObject()) toLabel = '' t = (addressToLookup,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''select label from addressbook where address=?''') + shared.sqlSubmitQueue.put( + '''select label from addressbook where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: toLabel, = row - self.ui.tableWidgetSent.item(i,0).setText(unicode(toLabel,'utf-8')) + self.ui.tableWidgetSent.item( + i, 0).setText(unicode(toLabel, 'utf-8')) def rerenderSubscriptions(self): self.ui.tableWidgetSubscriptions.setRowCount(0) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('SELECT label, address, enabled FROM subscriptions') + shared.sqlSubmitQueue.put( + 'SELECT label, address, enabled FROM subscriptions') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() for row in queryreturn: label, address, enabled = row self.ui.tableWidgetSubscriptions.insertRow(0) - newItem = QtGui.QTableWidgetItem(unicode(label,'utf-8')) + newItem = QtGui.QTableWidgetItem(unicode(label, 'utf-8')) if not enabled: - newItem.setTextColor(QtGui.QColor(128,128,128)) - self.ui.tableWidgetSubscriptions.setItem(0,0,newItem) - newItem = QtGui.QTableWidgetItem(address) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + newItem.setTextColor(QtGui.QColor(128, 128, 128)) + self.ui.tableWidgetSubscriptions.setItem(0, 0, newItem) + newItem = QtGui.QTableWidgetItem(address) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) if not enabled: - newItem.setTextColor(QtGui.QColor(128,128,128)) - self.ui.tableWidgetSubscriptions.setItem(0,1,newItem) + newItem.setTextColor(QtGui.QColor(128, 128, 128)) + self.ui.tableWidgetSubscriptions.setItem(0, 1, newItem) def click_pushButtonSend(self): self.statusBar().showMessage('') toAddresses = str(self.ui.lineEditTo.text()) fromAddress = str(self.ui.labelFrom.text()) subject = str(self.ui.lineEditSubject.text().toUtf8()) - message = str(self.ui.textEditMessage.document().toPlainText().toUtf8()) - if self.ui.radioButtonSpecific.isChecked(): #To send a message to specific people (rather than broadcast) - toAddressesList = [s.strip() for s in toAddresses.replace(',', ';').split(';')] - toAddressesList = list(set(toAddressesList)) #remove duplicate addresses. If the user has one address with a BM- and the same address without the BM-, this will not catch it. They'll send the message to the person twice. + message = str( + self.ui.textEditMessage.document().toPlainText().toUtf8()) + if self.ui.radioButtonSpecific.isChecked(): # To send a message to specific people (rather than broadcast) + toAddressesList = [s.strip() + for s in toAddresses.replace(',', ';').split(';')] + toAddressesList = list(set( + toAddressesList)) # remove duplicate addresses. If the user has one address with a BM- and the same address without the BM-, this will not catch it. They'll send the message to the person twice. for toAddress in toAddressesList: - if toAddress <> '': - status,addressVersionNumber,streamNumber,ripe = decodeAddress(toAddress) - if status <> 'success': + if toAddress != '': + status, addressVersionNumber, streamNumber, ripe = decodeAddress( + toAddress) + if status != 'success': shared.printLock.acquire() print 'Error: Could not decode', toAddress, ':', status shared.printLock.release() if status == 'missingbm': - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: Bitmessage addresses start with BM- Please check %1").arg(toAddress)) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: Bitmessage addresses start with BM- Please check %1").arg(toAddress)) elif status == 'checksumfailed': - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: The address %1 is not typed or copied correctly. Please check it.").arg(toAddress)) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: The address %1 is not typed or copied correctly. Please check it.").arg(toAddress)) elif status == 'invalidcharacters': - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: The address %1 contains invalid characters. Please check it.").arg(toAddress)) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: The address %1 contains invalid characters. Please check it.").arg(toAddress)) elif status == 'versiontoohigh': - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.").arg(toAddress)) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.").arg(toAddress)) elif status == 'ripetooshort': - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance.").arg(toAddress)) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance.").arg(toAddress)) elif status == 'ripetoolong': - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance.").arg(toAddress)) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance.").arg(toAddress)) else: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: Something is wrong with the address %1.").arg(toAddress)) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: Something is wrong with the address %1.").arg(toAddress)) elif fromAddress == '': - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You must specify a From address. If you don\'t have one, go to the \'Your Identities\' tab.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: You must specify a From address. If you don\'t have one, go to the \'Your Identities\' tab.")) else: toAddress = addBMIfNotPresent(toAddress) try: shared.config.get(toAddress, 'enabled') - #The toAddress is one owned by me. We cannot send messages to ourselves without significant changes to the codebase. - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Sending to your address"), QtGui.QApplication.translate("MainWindow", "Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.").arg(toAddress)) + # The toAddress is one owned by me. We cannot send + # messages to ourselves without significant changes + # to the codebase. + QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Sending to your address"), QtGui.QApplication.translate( + "MainWindow", "Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.").arg(toAddress)) continue except: pass if addressVersionNumber > 3 or addressVersionNumber <= 1: - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Address version number"), QtGui.QApplication.translate("MainWindow", "Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(addressVersionNumber))) + QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Address version number"), QtGui.QApplication.translate( + "MainWindow", "Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(addressVersionNumber))) continue if streamNumber > 1 or streamNumber == 0: - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Stream number"), QtGui.QApplication.translate("MainWindow", "Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(streamNumber))) + QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Stream number"), QtGui.QApplication.translate( + "MainWindow", "Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(streamNumber))) continue self.statusBar().showMessage('') if shared.statusIconColor == 'red': - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.")) ackdata = OpenSSL.rand(32) shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'msgqueued',1,1,'sent',2) - shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') + t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int( + time.time()), 'msgqueued', 1, 1, 'sent', 2) + shared.sqlSubmitQueue.put( + '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') @@ -1124,16 +1330,18 @@ class MyForm(QtGui.QMainWindow): toLabel = '' t = (toAddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''select label from addressbook where address=?''') + shared.sqlSubmitQueue.put( + '''select label from addressbook where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: toLabel, = row - self.displayNewSentMessage(toAddress,toLabel,fromAddress, subject, message, ackdata) - shared.workerQueue.put(('sendmessage',toAddress)) + self.displayNewSentMessage( + toAddress, toLabel, fromAddress, subject, message, ackdata) + shared.workerQueue.put(('sendmessage', toAddress)) self.ui.comboBoxSendFrom.setCurrentIndex(0) self.ui.labelFrom.setText('') @@ -1141,27 +1349,33 @@ class MyForm(QtGui.QMainWindow): self.ui.lineEditSubject.setText('') self.ui.textEditMessage.setText('') self.ui.tabWidget.setCurrentIndex(2) - self.ui.tableWidgetSent.setCurrentCell(0,0) + self.ui.tableWidgetSent.setCurrentCell(0, 0) else: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Your \'To\' field is empty.")) - else: #User selected 'Broadcast' + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Your \'To\' field is empty.")) + else: # User selected 'Broadcast' if fromAddress == '': - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You must specify a From address. If you don\'t have one, go to the \'Your Identities\' tab.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: You must specify a From address. If you don\'t have one, go to the \'Your Identities\' tab.")) else: self.statusBar().showMessage('') - #We don't actually need the ackdata for acknowledgement since this is a broadcast message, but we can use it to update the user interface when the POW is done generating. + # We don't actually need the ackdata for acknowledgement since + # this is a broadcast message, but we can use it to update the + # user interface when the POW is done generating. ackdata = OpenSSL.rand(32) toAddress = self.str_broadcast_subscribers ripe = '' shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2) - shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') + t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int( + time.time()), 'broadcastqueued', 1, 1, 'sent', 2) + shared.sqlSubmitQueue.put( + '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.workerQueue.put(('sendbroadcast','')) + shared.workerQueue.put(('sendbroadcast', '')) try: fromLabel = shared.config.get(fromAddress, 'label') @@ -1173,26 +1387,32 @@ class MyForm(QtGui.QMainWindow): toLabel = self.str_broadcast_subscribers self.ui.tableWidgetSent.insertRow(0) - newItem = QtGui.QTableWidgetItem(unicode(toLabel,'utf-8')) - newItem.setData(Qt.UserRole,str(toAddress)) - self.ui.tableWidgetSent.setItem(0,0,newItem) + newItem = QtGui.QTableWidgetItem(unicode(toLabel, 'utf-8')) + newItem.setData(Qt.UserRole, str(toAddress)) + self.ui.tableWidgetSent.setItem(0, 0, newItem) if fromLabel == '': - newItem = QtGui.QTableWidgetItem(unicode(fromAddress,'utf-8')) + newItem = QtGui.QTableWidgetItem( + unicode(fromAddress, 'utf-8')) else: - newItem = QtGui.QTableWidgetItem(unicode(fromLabel,'utf-8')) - newItem.setData(Qt.UserRole,str(fromAddress)) - self.ui.tableWidgetSent.setItem(0,1,newItem) - newItem = QtGui.QTableWidgetItem(unicode(subject,'utf-8)')) - newItem.setData(Qt.UserRole,unicode(message,'utf-8)')) - self.ui.tableWidgetSent.setItem(0,2,newItem) - #newItem = QtGui.QTableWidgetItem('Doing work necessary to send broadcast...'+ unicode(strftime(config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')) - newItem = myTableWidgetItem('Work is queued.') - newItem.setData(Qt.UserRole,QByteArray(ackdata)) - newItem.setData(33,int(time.time())) - self.ui.tableWidgetSent.setItem(0,3,newItem) + newItem = QtGui.QTableWidgetItem( + unicode(fromLabel, 'utf-8')) + newItem.setData(Qt.UserRole, str(fromAddress)) + self.ui.tableWidgetSent.setItem(0, 1, newItem) + newItem = QtGui.QTableWidgetItem(unicode(subject, 'utf-8)')) + newItem.setData(Qt.UserRole, unicode(message, 'utf-8)')) + self.ui.tableWidgetSent.setItem(0, 2, newItem) + # newItem = QtGui.QTableWidgetItem('Doing work necessary to + # send broadcast...'+ + # unicode(strftime(config.get('bitmessagesettings', + # 'timeformat'),localtime(int(time.time()))),'utf-8')) + newItem = myTableWidgetItem('Work is queued.') + newItem.setData(Qt.UserRole, QByteArray(ackdata)) + newItem.setData(33, int(time.time())) + self.ui.tableWidgetSent.setItem(0, 3, newItem) - self.ui.textEditSentMessage.setPlainText(self.ui.tableWidgetSent.item(0,2).data(Qt.UserRole).toPyObject()) + self.ui.textEditSentMessage.setPlainText( + self.ui.tableWidgetSent.item(0, 2).data(Qt.UserRole).toPyObject()) self.ui.comboBoxSendFrom.setCurrentIndex(0) self.ui.labelFrom.setText('') @@ -1200,8 +1420,7 @@ class MyForm(QtGui.QMainWindow): self.ui.lineEditSubject.setText('') self.ui.textEditMessage.setText('') self.ui.tabWidget.setCurrentIndex(2) - self.ui.tableWidgetSent.setCurrentCell(0,0) - + self.ui.tableWidgetSent.setCurrentCell(0, 0) def click_pushButtonLoadFromAddressBook(self): self.ui.tabWidget.setCurrentIndex(5) @@ -1209,30 +1428,36 @@ class MyForm(QtGui.QMainWindow): time.sleep(0.1) self.statusBar().showMessage('') time.sleep(0.1) - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Right click one or more entries in your address book and select \'Send message to this address\'.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Right click one or more entries in your address book and select \'Send message to this address\'.")) - def redrawLabelFrom(self,index): - self.ui.labelFrom.setText(self.ui.comboBoxSendFrom.itemData(index).toPyObject()) + def redrawLabelFrom(self, index): + self.ui.labelFrom.setText( + self.ui.comboBoxSendFrom.itemData(index).toPyObject()) def rerenderComboBoxSendFrom(self): self.ui.comboBoxSendFrom.clear() self.ui.labelFrom.setText('') configSections = shared.config.sections() for addressInKeysFile in configSections: - if addressInKeysFile <> 'bitmessagesettings': - isEnabled = shared.config.getboolean(addressInKeysFile, 'enabled') #I realize that this is poor programming practice but I don't care. It's easier for others to read. + if addressInKeysFile != 'bitmessagesettings': + isEnabled = shared.config.getboolean( + addressInKeysFile, 'enabled') # I realize that this is poor programming practice but I don't care. It's easier for others to read. if isEnabled: - self.ui.comboBoxSendFrom.insertItem(0,unicode(shared.config.get(addressInKeysFile, 'label'),'utf-8'),addressInKeysFile) - self.ui.comboBoxSendFrom.insertItem(0,'','') + self.ui.comboBoxSendFrom.insertItem(0, unicode(shared.config.get( + addressInKeysFile, 'label'), 'utf-8'), addressInKeysFile) + self.ui.comboBoxSendFrom.insertItem(0, '', '') if(self.ui.comboBoxSendFrom.count() == 2): self.ui.comboBoxSendFrom.setCurrentIndex(1) self.redrawLabelFrom(self.ui.comboBoxSendFrom.currentIndex()) else: self.ui.comboBoxSendFrom.setCurrentIndex(0) - - #This function is called by the processmsg function when that function receives a message to an address that is acting as a pseudo-mailing-list. The message will be broadcast out. This function puts the message on the 'Sent' tab. - def displayNewSentMessage(self,toAddress,toLabel,fromAddress,subject,message,ackdata): + # This function is called by the processmsg function when that function + # receives a message to an address that is acting as a + # pseudo-mailing-list. The message will be broadcast out. This function + # puts the message on the 'Sent' tab. + def displayNewSentMessage(self, toAddress, toLabel, fromAddress, subject, message, ackdata): subject = shared.fixPotentiallyInvalidUTF8Data(subject) message = shared.fixPotentiallyInvalidUTF8Data(message) try: @@ -1245,56 +1470,64 @@ class MyForm(QtGui.QMainWindow): self.ui.tableWidgetSent.setSortingEnabled(False) self.ui.tableWidgetSent.insertRow(0) if toLabel == '': - newItem = QtGui.QTableWidgetItem(unicode(toAddress,'utf-8')) - newItem.setToolTip(unicode(toAddress,'utf-8')) + newItem = QtGui.QTableWidgetItem(unicode(toAddress, 'utf-8')) + newItem.setToolTip(unicode(toAddress, 'utf-8')) else: - newItem = QtGui.QTableWidgetItem(unicode(toLabel,'utf-8')) - newItem.setToolTip(unicode(toLabel,'utf-8')) - newItem.setData(Qt.UserRole,str(toAddress)) - self.ui.tableWidgetSent.setItem(0,0,newItem) + newItem = QtGui.QTableWidgetItem(unicode(toLabel, 'utf-8')) + newItem.setToolTip(unicode(toLabel, 'utf-8')) + newItem.setData(Qt.UserRole, str(toAddress)) + self.ui.tableWidgetSent.setItem(0, 0, newItem) if fromLabel == '': - newItem = QtGui.QTableWidgetItem(unicode(fromAddress,'utf-8')) - newItem.setToolTip(unicode(fromAddress,'utf-8')) + newItem = QtGui.QTableWidgetItem(unicode(fromAddress, 'utf-8')) + newItem.setToolTip(unicode(fromAddress, 'utf-8')) else: - newItem = QtGui.QTableWidgetItem(unicode(fromLabel,'utf-8')) - newItem.setToolTip(unicode(fromLabel,'utf-8')) - newItem.setData(Qt.UserRole,str(fromAddress)) - self.ui.tableWidgetSent.setItem(0,1,newItem) - newItem = QtGui.QTableWidgetItem(unicode(subject,'utf-8)')) - newItem.setToolTip(unicode(subject,'utf-8)')) - newItem.setData(Qt.UserRole,unicode(message,'utf-8)')) - self.ui.tableWidgetSent.setItem(0,2,newItem) - #newItem = QtGui.QTableWidgetItem('Doing work necessary to send broadcast...'+ unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')) - newItem = myTableWidgetItem('Work is queued. '+ unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')) - newItem.setToolTip('Work is queued. '+ unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')) - newItem.setData(Qt.UserRole,QByteArray(ackdata)) - newItem.setData(33,int(time.time())) - self.ui.tableWidgetSent.setItem(0,3,newItem) - self.ui.textEditSentMessage.setPlainText(self.ui.tableWidgetSent.item(0,2).data(Qt.UserRole).toPyObject()) + newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8')) + newItem.setToolTip(unicode(fromLabel, 'utf-8')) + newItem.setData(Qt.UserRole, str(fromAddress)) + self.ui.tableWidgetSent.setItem(0, 1, newItem) + newItem = QtGui.QTableWidgetItem(unicode(subject, 'utf-8)')) + newItem.setToolTip(unicode(subject, 'utf-8)')) + newItem.setData(Qt.UserRole, unicode(message, 'utf-8)')) + self.ui.tableWidgetSent.setItem(0, 2, newItem) + # newItem = QtGui.QTableWidgetItem('Doing work necessary to send + # broadcast...'+ + # unicode(strftime(shared.config.get('bitmessagesettings', + # 'timeformat'),localtime(int(time.time()))),'utf-8')) + newItem = myTableWidgetItem('Work is queued. ' + unicode(strftime(shared.config.get( + 'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')) + newItem.setToolTip('Work is queued. ' + unicode(strftime(shared.config.get( + 'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')) + newItem.setData(Qt.UserRole, QByteArray(ackdata)) + newItem.setData(33, int(time.time())) + self.ui.tableWidgetSent.setItem(0, 3, newItem) + self.ui.textEditSentMessage.setPlainText( + self.ui.tableWidgetSent.item(0, 2).data(Qt.UserRole).toPyObject()) self.ui.tableWidgetSent.setSortingEnabled(True) - def displayNewInboxMessage(self,inventoryHash,toAddress,fromAddress,subject,message): + def displayNewInboxMessage(self, inventoryHash, toAddress, fromAddress, subject, message): subject = shared.fixPotentiallyInvalidUTF8Data(subject) message = shared.fixPotentiallyInvalidUTF8Data(message) fromLabel = '' shared.sqlLock.acquire() t = (fromAddress,) - shared.sqlSubmitQueue.put('''select label from addressbook where address=?''') + shared.sqlSubmitQueue.put( + '''select label from addressbook where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: fromLabel, = row else: - #There might be a label in the subscriptions table + # There might be a label in the subscriptions table shared.sqlLock.acquire() t = (fromAddress,) - shared.sqlSubmitQueue.put('''select label from subscriptions where address=?''') + shared.sqlSubmitQueue.put( + '''select label from subscriptions where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: fromLabel, = row @@ -1311,39 +1544,41 @@ class MyForm(QtGui.QMainWindow): font = QFont() font.setBold(True) self.ui.tableWidgetInbox.setSortingEnabled(False) - newItem = QtGui.QTableWidgetItem(unicode(toLabel,'utf-8')) - newItem.setToolTip(unicode(toLabel,'utf-8')) + newItem = QtGui.QTableWidgetItem(unicode(toLabel, 'utf-8')) + newItem.setToolTip(unicode(toLabel, 'utf-8')) newItem.setFont(font) - newItem.setData(Qt.UserRole,str(toAddress)) - if shared.safeConfigGetBoolean(str(toAddress),'mailinglist'): - newItem.setTextColor(QtGui.QColor(137,04,177)) + newItem.setData(Qt.UserRole, str(toAddress)) + if shared.safeConfigGetBoolean(str(toAddress), 'mailinglist'): + newItem.setTextColor(QtGui.QColor(137, 04, 177)) self.ui.tableWidgetInbox.insertRow(0) - self.ui.tableWidgetInbox.setItem(0,0,newItem) + self.ui.tableWidgetInbox.setItem(0, 0, newItem) if fromLabel == '': - newItem = QtGui.QTableWidgetItem(unicode(fromAddress,'utf-8')) - newItem.setToolTip(unicode(fromAddress,'utf-8')) + newItem = QtGui.QTableWidgetItem(unicode(fromAddress, 'utf-8')) + newItem.setToolTip(unicode(fromAddress, 'utf-8')) if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'): - self.notifierShow('New Message', 'From '+ fromAddress) + self.notifierShow('New Message', 'From ' + fromAddress) else: - newItem = QtGui.QTableWidgetItem(unicode(fromLabel,'utf-8')) - newItem.setToolTip(unicode(unicode(fromLabel,'utf-8'))) + newItem = QtGui.QTableWidgetItem(unicode(fromLabel, 'utf-8')) + newItem.setToolTip(unicode(unicode(fromLabel, 'utf-8'))) if shared.config.getboolean('bitmessagesettings', 'showtraynotifications'): self.notifierShow('New Message', 'From ' + fromLabel) - newItem.setData(Qt.UserRole,str(fromAddress)) + newItem.setData(Qt.UserRole, str(fromAddress)) newItem.setFont(font) - self.ui.tableWidgetInbox.setItem(0,1,newItem) - newItem = QtGui.QTableWidgetItem(unicode(subject,'utf-8)')) - newItem.setToolTip(unicode(subject,'utf-8)')) - newItem.setData(Qt.UserRole,unicode(message,'utf-8)')) + self.ui.tableWidgetInbox.setItem(0, 1, newItem) + newItem = QtGui.QTableWidgetItem(unicode(subject, 'utf-8)')) + newItem.setToolTip(unicode(subject, 'utf-8)')) + newItem.setData(Qt.UserRole, unicode(message, 'utf-8)')) newItem.setFont(font) - self.ui.tableWidgetInbox.setItem(0,2,newItem) - newItem = myTableWidgetItem(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')) - newItem.setToolTip(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')) - newItem.setData(Qt.UserRole,QByteArray(inventoryHash)) - newItem.setData(33,int(time.time())) + self.ui.tableWidgetInbox.setItem(0, 2, newItem) + newItem = myTableWidgetItem(unicode(strftime(shared.config.get( + 'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')) + newItem.setToolTip(unicode(strftime(shared.config.get( + 'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')) + newItem.setData(Qt.UserRole, QByteArray(inventoryHash)) + newItem.setData(33, int(time.time())) newItem.setFont(font) - self.ui.tableWidgetInbox.setItem(0,3,newItem) + self.ui.tableWidgetInbox.setItem(0, 3, newItem) self.ui.tableWidgetInbox.setSortingEnabled(True) self.ubuntuMessagingMenuUpdate(True, newItem, toLabel) @@ -1351,25 +1586,34 @@ class MyForm(QtGui.QMainWindow): self.NewSubscriptionDialogInstance = NewSubscriptionDialog(self) if self.NewSubscriptionDialogInstance.exec_(): if self.NewSubscriptionDialogInstance.ui.labelSubscriptionAddressCheck.text() == 'Address is valid.': - #First we must check to see if the address is already in the address book. The user cannot add it again or else it will cause problems when updating and deleting the entry. + # First we must check to see if the address is already in the + # address book. The user cannot add it again or else it will + # cause problems when updating and deleting the entry. shared.sqlLock.acquire() - t = (addBMIfNotPresent(str(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())),) - shared.sqlSubmitQueue.put('''select * from addressbook where address=?''') + t = (addBMIfNotPresent(str( + self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())),) + shared.sqlSubmitQueue.put( + '''select * from addressbook where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() if queryreturn == []: self.ui.tableWidgetAddressBook.setSortingEnabled(False) self.ui.tableWidgetAddressBook.insertRow(0) - newItem = QtGui.QTableWidgetItem(unicode(self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8(),'utf-8')) - self.ui.tableWidgetAddressBook.setItem(0,0,newItem) - newItem = QtGui.QTableWidgetItem(addBMIfNotPresent(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetAddressBook.setItem(0,1,newItem) + newItem = QtGui.QTableWidgetItem(unicode( + self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8(), 'utf-8')) + self.ui.tableWidgetAddressBook.setItem(0, 0, newItem) + newItem = QtGui.QTableWidgetItem(addBMIfNotPresent( + self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetAddressBook.setItem(0, 1, newItem) self.ui.tableWidgetAddressBook.setSortingEnabled(True) - t = (str(self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8()),addBMIfNotPresent(str(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text()))) + t = (str(self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8()), addBMIfNotPresent( + str(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text()))) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''INSERT INTO addressbook VALUES (?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO addressbook VALUES (?,?)''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') @@ -1377,34 +1621,45 @@ class MyForm(QtGui.QMainWindow): self.rerenderInboxFromLabels() self.rerenderSentToLabels() else: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.")) else: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "The address you entered was invalid. Ignoring it.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "The address you entered was invalid. Ignoring it.")) def click_pushButtonAddSubscription(self): self.NewSubscriptionDialogInstance = NewSubscriptionDialog(self) if self.NewSubscriptionDialogInstance.exec_(): if self.NewSubscriptionDialogInstance.ui.labelSubscriptionAddressCheck.text() == 'Address is valid.': - #First we must check to see if the address is already in the subscriptions list. The user cannot add it again or else it will cause problems when updating and deleting the entry. + # First we must check to see if the address is already in the + # subscriptions list. The user cannot add it again or else it + # will cause problems when updating and deleting the entry. shared.sqlLock.acquire() - t = (addBMIfNotPresent(str(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())),) - shared.sqlSubmitQueue.put('''select * from subscriptions where address=?''') + t = (addBMIfNotPresent(str( + self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())),) + shared.sqlSubmitQueue.put( + '''select * from subscriptions where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() if queryreturn == []: self.ui.tableWidgetSubscriptions.setSortingEnabled(False) self.ui.tableWidgetSubscriptions.insertRow(0) - newItem = QtGui.QTableWidgetItem(unicode(self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8(),'utf-8')) - self.ui.tableWidgetSubscriptions.setItem(0,0,newItem) - newItem = QtGui.QTableWidgetItem(addBMIfNotPresent(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetSubscriptions.setItem(0,1,newItem) + newItem = QtGui.QTableWidgetItem(unicode( + self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8(), 'utf-8')) + self.ui.tableWidgetSubscriptions.setItem(0, 0, newItem) + newItem = QtGui.QTableWidgetItem(addBMIfNotPresent( + self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetSubscriptions.setItem(0, 1, newItem) self.ui.tableWidgetSubscriptions.setSortingEnabled(True) - t = (str(self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8()),addBMIfNotPresent(str(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())),True) + t = (str(self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8()), addBMIfNotPresent( + str(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())), True) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''INSERT INTO subscriptions VALUES (?,?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO subscriptions VALUES (?,?,?)''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') @@ -1412,33 +1667,38 @@ class MyForm(QtGui.QMainWindow): self.rerenderInboxFromLabels() shared.reloadBroadcastSendersForWhichImWatching() else: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want.")) else: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "The address you entered was invalid. Ignoring it.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "The address you entered was invalid. Ignoring it.")) def loadBlackWhiteList(self): - #Initialize the Blacklist or Whitelist table + # Initialize the Blacklist or Whitelist table listType = shared.config.get('bitmessagesettings', 'blackwhitelist') shared.sqlLock.acquire() if listType == 'black': - shared.sqlSubmitQueue.put('''SELECT label, address, enabled FROM blacklist''') + shared.sqlSubmitQueue.put( + '''SELECT label, address, enabled FROM blacklist''') else: - shared.sqlSubmitQueue.put('''SELECT label, address, enabled FROM whitelist''') + shared.sqlSubmitQueue.put( + '''SELECT label, address, enabled FROM whitelist''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() for row in queryreturn: label, address, enabled = row self.ui.tableWidgetBlacklist.insertRow(0) - newItem = QtGui.QTableWidgetItem(unicode(label,'utf-8')) + newItem = QtGui.QTableWidgetItem(unicode(label, 'utf-8')) if not enabled: - newItem.setTextColor(QtGui.QColor(128,128,128)) - self.ui.tableWidgetBlacklist.setItem(0,0,newItem) - newItem = QtGui.QTableWidgetItem(address) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + newItem.setTextColor(QtGui.QColor(128, 128, 128)) + self.ui.tableWidgetBlacklist.setItem(0, 0, newItem) + newItem = QtGui.QTableWidgetItem(address) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) if not enabled: - newItem.setTextColor(QtGui.QColor(128,128,128)) - self.ui.tableWidgetBlacklist.setItem(0,1,newItem) + newItem.setTextColor(QtGui.QColor(128, 128, 128)) + self.ui.tableWidgetBlacklist.setItem(0, 1, newItem) def click_pushButtonStatusIcon(self): print 'click_pushButtonStatusIcon' @@ -1457,64 +1717,82 @@ class MyForm(QtGui.QMainWindow): def click_actionSettings(self): self.settingsDialogInstance = settingsDialog(self) if self.settingsDialogInstance.exec_(): - shared.config.set('bitmessagesettings', 'startonlogon', str(self.settingsDialogInstance.ui.checkBoxStartOnLogon.isChecked())) - shared.config.set('bitmessagesettings', 'minimizetotray', str(self.settingsDialogInstance.ui.checkBoxMinimizeToTray.isChecked())) - shared.config.set('bitmessagesettings', 'showtraynotifications', str(self.settingsDialogInstance.ui.checkBoxShowTrayNotifications.isChecked())) - shared.config.set('bitmessagesettings', 'startintray', str(self.settingsDialogInstance.ui.checkBoxStartInTray.isChecked())) - if int(shared.config.get('bitmessagesettings','port')) != int(self.settingsDialogInstance.ui.lineEditTCPPort.text()): - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Restart"), QtGui.QApplication.translate("MainWindow", "You must restart Bitmessage for the port number change to take effect.")) - shared.config.set('bitmessagesettings', 'port', str(self.settingsDialogInstance.ui.lineEditTCPPort.text())) + shared.config.set('bitmessagesettings', 'startonlogon', str( + self.settingsDialogInstance.ui.checkBoxStartOnLogon.isChecked())) + shared.config.set('bitmessagesettings', 'minimizetotray', str( + self.settingsDialogInstance.ui.checkBoxMinimizeToTray.isChecked())) + shared.config.set('bitmessagesettings', 'showtraynotifications', str( + self.settingsDialogInstance.ui.checkBoxShowTrayNotifications.isChecked())) + shared.config.set('bitmessagesettings', 'startintray', str( + self.settingsDialogInstance.ui.checkBoxStartInTray.isChecked())) + if int(shared.config.get('bitmessagesettings', 'port')) != int(self.settingsDialogInstance.ui.lineEditTCPPort.text()): + QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Restart"), QtGui.QApplication.translate( + "MainWindow", "You must restart Bitmessage for the port number change to take effect.")) + shared.config.set('bitmessagesettings', 'port', str( + self.settingsDialogInstance.ui.lineEditTCPPort.text())) if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText())[0:5] == 'SOCKS': if shared.statusIconColor != 'red': - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Restart"), QtGui.QApplication.translate("MainWindow", "Bitmessage will use your proxy from now on now but you may want to manually restart Bitmessage now to close existing connections.")) + QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Restart"), QtGui.QApplication.translate( + "MainWindow", "Bitmessage will use your proxy from now on now but you may want to manually restart Bitmessage now to close existing connections.")) if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText()) == 'none': self.statusBar().showMessage('') - shared.config.set('bitmessagesettings', 'socksproxytype', str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText())) - shared.config.set('bitmessagesettings', 'socksauthentication', str(self.settingsDialogInstance.ui.checkBoxAuthentication.isChecked())) - shared.config.set('bitmessagesettings', 'sockshostname', str(self.settingsDialogInstance.ui.lineEditSocksHostname.text())) - shared.config.set('bitmessagesettings', 'socksport', str(self.settingsDialogInstance.ui.lineEditSocksPort.text())) - shared.config.set('bitmessagesettings', 'socksusername', str(self.settingsDialogInstance.ui.lineEditSocksUsername.text())) - shared.config.set('bitmessagesettings', 'sockspassword', str(self.settingsDialogInstance.ui.lineEditSocksPassword.text())) + shared.config.set('bitmessagesettings', 'socksproxytype', str( + self.settingsDialogInstance.ui.comboBoxProxyType.currentText())) + shared.config.set('bitmessagesettings', 'socksauthentication', str( + self.settingsDialogInstance.ui.checkBoxAuthentication.isChecked())) + shared.config.set('bitmessagesettings', 'sockshostname', str( + self.settingsDialogInstance.ui.lineEditSocksHostname.text())) + shared.config.set('bitmessagesettings', 'socksport', str( + self.settingsDialogInstance.ui.lineEditSocksPort.text())) + shared.config.set('bitmessagesettings', 'socksusername', str( + self.settingsDialogInstance.ui.lineEditSocksUsername.text())) + shared.config.set('bitmessagesettings', 'sockspassword', str( + self.settingsDialogInstance.ui.lineEditSocksPassword.text())) if float(self.settingsDialogInstance.ui.lineEditTotalDifficulty.text()) >= 1: - shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte',str(int(float(self.settingsDialogInstance.ui.lineEditTotalDifficulty.text())*shared.networkDefaultProofOfWorkNonceTrialsPerByte))) + shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(int(float( + self.settingsDialogInstance.ui.lineEditTotalDifficulty.text()) * shared.networkDefaultProofOfWorkNonceTrialsPerByte))) if float(self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text()) >= 1: - shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes',str(int(float(self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text())*shared.networkDefaultPayloadLengthExtraBytes))) + shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(int(float( + self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text()) * shared.networkDefaultPayloadLengthExtraBytes))) if float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) >= 1 or float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) == 0: - shared.config.set('bitmessagesettings', 'maxacceptablenoncetrialsperbyte',str(int(float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text())*shared.networkDefaultProofOfWorkNonceTrialsPerByte))) + shared.config.set('bitmessagesettings', 'maxacceptablenoncetrialsperbyte', str(int(float( + self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) * shared.networkDefaultProofOfWorkNonceTrialsPerByte))) if float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) >= 1 or float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) == 0: - shared.config.set('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes',str(int(float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text())*shared.networkDefaultPayloadLengthExtraBytes))) - - #if str(self.settingsDialogInstance.ui.comboBoxMaxCores.currentText()) == 'All': + shared.config.set('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', str(int(float( + self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) * shared.networkDefaultPayloadLengthExtraBytes))) + + # if str(self.settingsDialogInstance.ui.comboBoxMaxCores.currentText()) == 'All': # shared.config.set('bitmessagesettings', 'maxcores', '99999') - #else: - # shared.config.set('bitmessagesettings', 'maxcores', str(self.settingsDialogInstance.ui.comboBoxMaxCores.currentText())) + # else: + # shared.config.set('bitmessagesettings', 'maxcores', + # str(self.settingsDialogInstance.ui.comboBoxMaxCores.currentText())) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) if 'win32' in sys.platform or 'win64' in sys.platform: - #Auto-startup for Windows + # Auto-startup for Windows RUN_PATH = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" self.settings = QSettings(RUN_PATH, QSettings.NativeFormat) if shared.config.getboolean('bitmessagesettings', 'startonlogon'): - self.settings.setValue("PyBitmessage",sys.argv[0]) + self.settings.setValue("PyBitmessage", sys.argv[0]) else: self.settings.remove("PyBitmessage") elif 'darwin' in sys.platform: - #startup for mac + # startup for mac pass elif 'linux' in sys.platform: - #startup for linux + # startup for linux pass - if shared.appdata != '' and self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked(): #If we are NOT using portable mode now but the user selected that we should... - #Write the keys.dat file to disk in the new location + if shared.appdata != '' and self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked(): # If we are NOT using portable mode now but the user selected that we should... + # Write the keys.dat file to disk in the new location shared.sqlLock.acquire() shared.sqlSubmitQueue.put('movemessagstoprog') shared.sqlLock.release() with open('keys.dat', 'wb') as configfile: shared.config.write(configfile) - #Write the knownnodes.dat file to disk in the new location + # Write the knownnodes.dat file to disk in the new location shared.knownNodesLock.acquire() output = open('knownnodes.dat', 'wb') pickle.dump(shared.knownNodes, output) @@ -1524,17 +1802,17 @@ class MyForm(QtGui.QMainWindow): os.remove(shared.appdata + 'knownnodes.dat') shared.appdata = '' - if shared.appdata == '' and not self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked(): #If we ARE using portable mode now but the user selected that we shouldn't... + if shared.appdata == '' and not self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked(): # If we ARE using portable mode now but the user selected that we shouldn't... shared.appdata = shared.lookupAppdataFolder() if not os.path.exists(shared.appdata): os.makedirs(shared.appdata) shared.sqlLock.acquire() shared.sqlSubmitQueue.put('movemessagstoappdata') shared.sqlLock.release() - #Write the keys.dat file to disk in the new location + # Write the keys.dat file to disk in the new location with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - #Write the knownnodes.dat file to disk in the new location + # Write the knownnodes.dat file to disk in the new location shared.knownNodesLock.acquire() output = open(shared.appdata + 'knownnodes.dat', 'wb') pickle.dump(shared.knownNodes, output) @@ -1543,123 +1821,144 @@ class MyForm(QtGui.QMainWindow): os.remove('keys.dat') os.remove('knownnodes.dat') - def click_radioButtonBlacklist(self): if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'white': - shared.config.set('bitmessagesettings','blackwhitelist','black') + shared.config.set('bitmessagesettings', 'blackwhitelist', 'black') with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - #self.ui.tableWidgetBlacklist.clearContents() + # self.ui.tableWidgetBlacklist.clearContents() self.ui.tableWidgetBlacklist.setRowCount(0) self.loadBlackWhiteList() - self.ui.tabWidget.setTabText(6,'Blacklist') - + self.ui.tabWidget.setTabText(6, 'Blacklist') def click_radioButtonWhitelist(self): if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': - shared.config.set('bitmessagesettings','blackwhitelist','white') + shared.config.set('bitmessagesettings', 'blackwhitelist', 'white') with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - #self.ui.tableWidgetBlacklist.clearContents() + # self.ui.tableWidgetBlacklist.clearContents() self.ui.tableWidgetBlacklist.setRowCount(0) self.loadBlackWhiteList() - self.ui.tabWidget.setTabText(6,'Whitelist') + self.ui.tabWidget.setTabText(6, 'Whitelist') def click_pushButtonAddBlacklist(self): self.NewBlacklistDialogInstance = NewSubscriptionDialog(self) if self.NewBlacklistDialogInstance.exec_(): if self.NewBlacklistDialogInstance.ui.labelSubscriptionAddressCheck.text() == 'Address is valid.': - #First we must check to see if the address is already in the address book. The user cannot add it again or else it will cause problems when updating and deleting the entry. + # First we must check to see if the address is already in the + # address book. The user cannot add it again or else it will + # cause problems when updating and deleting the entry. shared.sqlLock.acquire() - t = (addBMIfNotPresent(str(self.NewBlacklistDialogInstance.ui.lineEditSubscriptionAddress.text())),) + t = (addBMIfNotPresent(str( + self.NewBlacklistDialogInstance.ui.lineEditSubscriptionAddress.text())),) if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': - shared.sqlSubmitQueue.put('''select * from blacklist where address=?''') + shared.sqlSubmitQueue.put( + '''select * from blacklist where address=?''') else: - shared.sqlSubmitQueue.put('''select * from whitelist where address=?''') + shared.sqlSubmitQueue.put( + '''select * from whitelist where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() if queryreturn == []: self.ui.tableWidgetBlacklist.setSortingEnabled(False) self.ui.tableWidgetBlacklist.insertRow(0) - newItem = QtGui.QTableWidgetItem(unicode(self.NewBlacklistDialogInstance.ui.newsubscriptionlabel.text().toUtf8(),'utf-8')) - self.ui.tableWidgetBlacklist.setItem(0,0,newItem) - newItem = QtGui.QTableWidgetItem(addBMIfNotPresent(self.NewBlacklistDialogInstance.ui.lineEditSubscriptionAddress.text())) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetBlacklist.setItem(0,1,newItem) + newItem = QtGui.QTableWidgetItem(unicode( + self.NewBlacklistDialogInstance.ui.newsubscriptionlabel.text().toUtf8(), 'utf-8')) + self.ui.tableWidgetBlacklist.setItem(0, 0, newItem) + newItem = QtGui.QTableWidgetItem(addBMIfNotPresent( + self.NewBlacklistDialogInstance.ui.lineEditSubscriptionAddress.text())) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetBlacklist.setItem(0, 1, newItem) self.ui.tableWidgetBlacklist.setSortingEnabled(True) - t = (str(self.NewBlacklistDialogInstance.ui.newsubscriptionlabel.text().toUtf8()),addBMIfNotPresent(str(self.NewBlacklistDialogInstance.ui.lineEditSubscriptionAddress.text())),True) + t = (str(self.NewBlacklistDialogInstance.ui.newsubscriptionlabel.text().toUtf8()), addBMIfNotPresent( + str(self.NewBlacklistDialogInstance.ui.lineEditSubscriptionAddress.text())), True) shared.sqlLock.acquire() if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': - shared.sqlSubmitQueue.put('''INSERT INTO blacklist VALUES (?,?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO blacklist VALUES (?,?,?)''') else: - shared.sqlSubmitQueue.put('''INSERT INTO whitelist VALUES (?,?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO whitelist VALUES (?,?,?)''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() else: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want.")) else: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "The address you entered was invalid. Ignoring it.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "The address you entered was invalid. Ignoring it.")) def on_action_SpecialAddressBehaviorDialog(self): self.dialog = SpecialAddressBehaviorDialog(self) # For Modal dialogs if self.dialog.exec_(): currentRow = self.ui.tableWidgetYourIdentities.currentRow() - addressAtCurrentRow = str(self.ui.tableWidgetYourIdentities.item(currentRow,1).text()) + addressAtCurrentRow = str( + self.ui.tableWidgetYourIdentities.item(currentRow, 1).text()) if self.dialog.ui.radioButtonBehaveNormalAddress.isChecked(): - shared.config.set(str(addressAtCurrentRow),'mailinglist','false') - #Set the color to either black or grey - if shared.config.getboolean(addressAtCurrentRow,'enabled'): - self.ui.tableWidgetYourIdentities.item(currentRow,1).setTextColor(QtGui.QColor(0,0,0)) + shared.config.set(str( + addressAtCurrentRow), 'mailinglist', 'false') + # Set the color to either black or grey + if shared.config.getboolean(addressAtCurrentRow, 'enabled'): + self.ui.tableWidgetYourIdentities.item( + currentRow, 1).setTextColor(QtGui.QColor(0, 0, 0)) else: - self.ui.tableWidgetYourIdentities.item(currentRow,1).setTextColor(QtGui.QColor(128,128,128)) + self.ui.tableWidgetYourIdentities.item( + currentRow, 1).setTextColor(QtGui.QColor(128, 128, 128)) else: - shared.config.set(str(addressAtCurrentRow),'mailinglist','true') - shared.config.set(str(addressAtCurrentRow),'mailinglistname',str(self.dialog.ui.lineEditMailingListName.text().toUtf8())) - self.ui.tableWidgetYourIdentities.item(currentRow,1).setTextColor(QtGui.QColor(137,04,177)) + shared.config.set(str( + addressAtCurrentRow), 'mailinglist', 'true') + shared.config.set(str(addressAtCurrentRow), 'mailinglistname', str( + self.dialog.ui.lineEditMailingListName.text().toUtf8())) + self.ui.tableWidgetYourIdentities.item(currentRow, 1).setTextColor(QtGui.QColor(137, 04, 177)) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) self.rerenderInboxToLabels() - def click_NewAddressDialog(self): self.dialog = NewAddressDialog(self) # For Modal dialogs if self.dialog.exec_(): - #self.dialog.ui.buttonBox.enabled = False + # self.dialog.ui.buttonBox.enabled = False if self.dialog.ui.radioButtonRandomAddress.isChecked(): if self.dialog.ui.radioButtonMostAvailable.isChecked(): streamNumberForAddress = 1 else: - #User selected 'Use the same stream as an existing address.' - streamNumberForAddress = addressStream(self.dialog.ui.comboBoxExisting.currentText()) + # User selected 'Use the same stream as an existing + # address.' + streamNumberForAddress = addressStream( + self.dialog.ui.comboBoxExisting.currentText()) - #self.addressGenerator = addressGenerator() - #self.addressGenerator.setup(3,streamNumberForAddress,str(self.dialog.ui.newaddresslabel.text().toUtf8()),1,"",self.dialog.ui.checkBoxEighteenByteRipe.isChecked()) - #QtCore.QObject.connect(self.addressGenerator, SIGNAL("writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable) - #QtCore.QObject.connect(self.addressGenerator, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) - #self.addressGenerator.start() - shared.addressGeneratorQueue.put(('createRandomAddress',3,streamNumberForAddress,str(self.dialog.ui.newaddresslabel.text().toUtf8()),1,"",self.dialog.ui.checkBoxEighteenByteRipe.isChecked())) + # self.addressGenerator = addressGenerator() + # self.addressGenerator.setup(3,streamNumberForAddress,str(self.dialog.ui.newaddresslabel.text().toUtf8()),1,"",self.dialog.ui.checkBoxEighteenByteRipe.isChecked()) + # QtCore.QObject.connect(self.addressGenerator, SIGNAL("writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable) + # QtCore.QObject.connect(self.addressGenerator, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) + # self.addressGenerator.start() + shared.addressGeneratorQueue.put(('createRandomAddress', 3, streamNumberForAddress, str( + self.dialog.ui.newaddresslabel.text().toUtf8()), 1, "", self.dialog.ui.checkBoxEighteenByteRipe.isChecked())) else: if self.dialog.ui.lineEditPassphrase.text() != self.dialog.ui.lineEditPassphraseAgain.text(): - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Passphrase mismatch"), QtGui.QApplication.translate("MainWindow", "The passphrase you entered twice doesn\'t match. Try again.")) + QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Passphrase mismatch"), QtGui.QApplication.translate( + "MainWindow", "The passphrase you entered twice doesn\'t match. Try again.")) elif self.dialog.ui.lineEditPassphrase.text() == "": - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Choose a passphrase"), QtGui.QApplication.translate("MainWindow", "You really do need a passphrase.")) + QMessageBox.about(self, QtGui.QApplication.translate( + "MainWindow", "Choose a passphrase"), QtGui.QApplication.translate("MainWindow", "You really do need a passphrase.")) else: - streamNumberForAddress = 1 #this will eventually have to be replaced by logic to determine the most available stream number. - #self.addressGenerator = addressGenerator() - #self.addressGenerator.setup(3,streamNumberForAddress,"unused address",self.dialog.ui.spinBoxNumberOfAddressesToMake.value(),self.dialog.ui.lineEditPassphrase.text().toUtf8(),self.dialog.ui.checkBoxEighteenByteRipe.isChecked()) - #QtCore.QObject.connect(self.addressGenerator, SIGNAL("writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable) - #QtCore.QObject.connect(self.addressGenerator, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) - #self.addressGenerator.start() - shared.addressGeneratorQueue.put(('createDeterministicAddresses',3,streamNumberForAddress,"unused deterministic address",self.dialog.ui.spinBoxNumberOfAddressesToMake.value(),self.dialog.ui.lineEditPassphrase.text().toUtf8(),self.dialog.ui.checkBoxEighteenByteRipe.isChecked())) + streamNumberForAddress = 1 # this will eventually have to be replaced by logic to determine the most available stream number. + # self.addressGenerator = addressGenerator() + # self.addressGenerator.setup(3,streamNumberForAddress,"unused address",self.dialog.ui.spinBoxNumberOfAddressesToMake.value(),self.dialog.ui.lineEditPassphrase.text().toUtf8(),self.dialog.ui.checkBoxEighteenByteRipe.isChecked()) + # QtCore.QObject.connect(self.addressGenerator, SIGNAL("writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable) + # QtCore.QObject.connect(self.addressGenerator, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) + # self.addressGenerator.start() + shared.addressGeneratorQueue.put(('createDeterministicAddresses', 3, streamNumberForAddress, "unused deterministic address", self.dialog.ui.spinBoxNumberOfAddressesToMake.value( + ), self.dialog.ui.lineEditPassphrase.text().toUtf8(), self.dialog.ui.checkBoxEighteenByteRipe.isChecked())) else: print 'new address dialog box rejected' - # Quit selected from menu or application indicator def quit(self): '''quit_msg = "Are you sure you want to exit Bitmessage?" @@ -1674,7 +1973,8 @@ class MyForm(QtGui.QMainWindow): # unregister the messaging system if self.mmapp is not None: self.mmapp.unregister() - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "All done. Closing user interface...")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "All done. Closing user interface...")) os._exit(0) # window close event @@ -1683,7 +1983,8 @@ class MyForm(QtGui.QMainWindow): minimizeonclose = False try: - minimizeonclose = shared.config.getboolean('bitmessagesettings', 'minimizeonclose') + minimizeonclose = shared.config.getboolean( + 'bitmessagesettings', 'minimizeonclose') except Exception: pass @@ -1697,10 +1998,12 @@ class MyForm(QtGui.QMainWindow): def on_action_InboxMessageForceHtml(self): currentInboxRow = self.ui.tableWidgetInbox.currentRow() - lines = self.ui.tableWidgetInbox.item(currentInboxRow,2).data(Qt.UserRole).toPyObject().split('\n') + lines = self.ui.tableWidgetInbox.item( + currentInboxRow, 2).data(Qt.UserRole).toPyObject().split('\n') for i in xrange(len(lines)): if lines[i].contains('Message ostensibly from '): - lines[i] = '

%s

' % (lines[i]) + lines[i] = '

%s

' % ( + lines[i]) elif lines[i] == '------------------------------------------------------': lines[i] = '
' content = '' @@ -1711,140 +2014,171 @@ class MyForm(QtGui.QMainWindow): def on_action_InboxReply(self): currentInboxRow = self.ui.tableWidgetInbox.currentRow() - toAddressAtCurrentInboxRow = str(self.ui.tableWidgetInbox.item(currentInboxRow,0).data(Qt.UserRole).toPyObject()) - fromAddressAtCurrentInboxRow = str(self.ui.tableWidgetInbox.item(currentInboxRow,1).data(Qt.UserRole).toPyObject()) + toAddressAtCurrentInboxRow = str(self.ui.tableWidgetInbox.item( + currentInboxRow, 0).data(Qt.UserRole).toPyObject()) + fromAddressAtCurrentInboxRow = str(self.ui.tableWidgetInbox.item( + currentInboxRow, 1).data(Qt.UserRole).toPyObject()) if toAddressAtCurrentInboxRow == self.str_broadcast_subscribers: self.ui.labelFrom.setText('') elif not shared.config.has_section(toAddressAtCurrentInboxRow): - QtGui.QMessageBox.information(self, QtGui.QApplication.translate("MainWindow", "Address is gone"),QtGui.QApplication.translate("MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(toAddressAtCurrentInboxRow), QMessageBox.Ok) + QtGui.QMessageBox.information(self, QtGui.QApplication.translate("MainWindow", "Address is gone"), QtGui.QApplication.translate( + "MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(toAddressAtCurrentInboxRow), QMessageBox.Ok) self.ui.labelFrom.setText('') - elif not shared.config.getboolean(toAddressAtCurrentInboxRow,'enabled'): - QtGui.QMessageBox.information(self, QtGui.QApplication.translate("MainWindow", "Address disabled"),QtGui.QApplication.translate("MainWindow", "Error: The address from which you are trying to send is disabled. You\'ll have to enable it on the \'Your Identities\' tab before using it."), QMessageBox.Ok) + elif not shared.config.getboolean(toAddressAtCurrentInboxRow, 'enabled'): + QtGui.QMessageBox.information(self, QtGui.QApplication.translate("MainWindow", "Address disabled"), QtGui.QApplication.translate( + "MainWindow", "Error: The address from which you are trying to send is disabled. You\'ll have to enable it on the \'Your Identities\' tab before using it."), QMessageBox.Ok) self.ui.labelFrom.setText('') else: self.ui.labelFrom.setText(toAddressAtCurrentInboxRow) self.ui.lineEditTo.setText(str(fromAddressAtCurrentInboxRow)) self.ui.comboBoxSendFrom.setCurrentIndex(0) - #self.ui.comboBoxSendFrom.setEditText(str(self.ui.tableWidgetInbox.item(currentInboxRow,0).text)) - self.ui.textEditMessage.setText('\n\n------------------------------------------------------\n'+self.ui.tableWidgetInbox.item(currentInboxRow,2).data(Qt.UserRole).toPyObject()) - if self.ui.tableWidgetInbox.item(currentInboxRow,2).text()[0:3] == 'Re:': - self.ui.lineEditSubject.setText(self.ui.tableWidgetInbox.item(currentInboxRow,2).text()) + # self.ui.comboBoxSendFrom.setEditText(str(self.ui.tableWidgetInbox.item(currentInboxRow,0).text)) + self.ui.textEditMessage.setText('\n\n------------------------------------------------------\n' + self.ui.tableWidgetInbox.item( + currentInboxRow, 2).data(Qt.UserRole).toPyObject()) + if self.ui.tableWidgetInbox.item(currentInboxRow, 2).text()[0:3] == 'Re:': + self.ui.lineEditSubject.setText( + self.ui.tableWidgetInbox.item(currentInboxRow, 2).text()) else: - self.ui.lineEditSubject.setText('Re: '+self.ui.tableWidgetInbox.item(currentInboxRow,2).text()) + self.ui.lineEditSubject.setText( + 'Re: ' + self.ui.tableWidgetInbox.item(currentInboxRow, 2).text()) self.ui.radioButtonSpecific.setChecked(True) self.ui.tabWidget.setCurrentIndex(1) def on_action_InboxAddSenderToAddressBook(self): currentInboxRow = self.ui.tableWidgetInbox.currentRow() - #self.ui.tableWidgetInbox.item(currentRow,1).data(Qt.UserRole).toPyObject() - addressAtCurrentInboxRow = str(self.ui.tableWidgetInbox.item(currentInboxRow,1).data(Qt.UserRole).toPyObject()) - #Let's make sure that it isn't already in the address book + # self.ui.tableWidgetInbox.item(currentRow,1).data(Qt.UserRole).toPyObject() + addressAtCurrentInboxRow = str(self.ui.tableWidgetInbox.item( + currentInboxRow, 1).data(Qt.UserRole).toPyObject()) + # Let's make sure that it isn't already in the address book shared.sqlLock.acquire() t = (addressAtCurrentInboxRow,) - shared.sqlSubmitQueue.put('''select * from addressbook where address=?''') + shared.sqlSubmitQueue.put( + '''select * from addressbook where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() if queryreturn == []: self.ui.tableWidgetAddressBook.insertRow(0) - newItem = QtGui.QTableWidgetItem('--New entry. Change label in Address Book.--') - self.ui.tableWidgetAddressBook.setItem(0,0,newItem) - newItem = QtGui.QTableWidgetItem(addressAtCurrentInboxRow) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) - self.ui.tableWidgetAddressBook.setItem(0,1,newItem) - t = ('--New entry. Change label in Address Book.--',addressAtCurrentInboxRow) + newItem = QtGui.QTableWidgetItem( + '--New entry. Change label in Address Book.--') + self.ui.tableWidgetAddressBook.setItem(0, 0, newItem) + newItem = QtGui.QTableWidgetItem(addressAtCurrentInboxRow) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) + self.ui.tableWidgetAddressBook.setItem(0, 1, newItem) + t = ('--New entry. Change label in Address Book.--', + addressAtCurrentInboxRow) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''INSERT INTO addressbook VALUES (?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO addressbook VALUES (?,?)''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() self.ui.tabWidget.setCurrentIndex(5) - self.ui.tableWidgetAddressBook.setCurrentCell(0,0) - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Entry added to the Address Book. Edit the label to your liking.")) + self.ui.tableWidgetAddressBook.setCurrentCell(0, 0) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Entry added to the Address Book. Edit the label to your liking.")) else: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.")) - #Send item on the Inbox tab to trash + # Send item on the Inbox tab to trash def on_action_InboxTrash(self): while self.ui.tableWidgetInbox.selectedIndexes() != []: currentRow = self.ui.tableWidgetInbox.selectedIndexes()[0].row() - inventoryHashToTrash = str(self.ui.tableWidgetInbox.item(currentRow,3).data(Qt.UserRole).toPyObject()) + inventoryHashToTrash = str(self.ui.tableWidgetInbox.item( + currentRow, 3).data(Qt.UserRole).toPyObject()) t = (inventoryHashToTrash,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE inbox SET folder='trash' WHERE msgid=?''') + shared.sqlSubmitQueue.put( + '''UPDATE inbox SET folder='trash' WHERE msgid=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlLock.release() self.ui.textEditInboxMessage.setText("") self.ui.tableWidgetInbox.removeRow(currentRow) - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.")) shared.sqlLock.acquire() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() if currentRow == 0: self.ui.tableWidgetInbox.selectRow(currentRow) else: - self.ui.tableWidgetInbox.selectRow(currentRow-1) + self.ui.tableWidgetInbox.selectRow(currentRow - 1) - #Send item on the Sent tab to trash + # Send item on the Sent tab to trash def on_action_SentTrash(self): while self.ui.tableWidgetSent.selectedIndexes() != []: currentRow = self.ui.tableWidgetSent.selectedIndexes()[0].row() - ackdataToTrash = str(self.ui.tableWidgetSent.item(currentRow,3).data(Qt.UserRole).toPyObject()) + ackdataToTrash = str(self.ui.tableWidgetSent.item( + currentRow, 3).data(Qt.UserRole).toPyObject()) t = (ackdataToTrash,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE sent SET folder='trash' WHERE ackdata=?''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET folder='trash' WHERE ackdata=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlLock.release() self.ui.textEditSentMessage.setPlainText("") self.ui.tableWidgetSent.removeRow(currentRow) - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.")) shared.sqlLock.acquire() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() if currentRow == 0: self.ui.tableWidgetSent.selectRow(currentRow) else: - self.ui.tableWidgetSent.selectRow(currentRow-1) + self.ui.tableWidgetSent.selectRow(currentRow - 1) def on_action_ForceSend(self): currentRow = self.ui.tableWidgetSent.currentRow() - addressAtCurrentRow = str(self.ui.tableWidgetSent.item(currentRow,0).data(Qt.UserRole).toPyObject()) + addressAtCurrentRow = str(self.ui.tableWidgetSent.item( + currentRow, 0).data(Qt.UserRole).toPyObject()) toRipe = decodeAddress(addressAtCurrentRow)[3] t = (toRipe,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE sent SET status='forcepow' WHERE toripe=? AND status='toodifficult' and folder='sent' ''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET status='forcepow' WHERE toripe=? AND status='toodifficult' and folder='sent' ''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') - shared.sqlSubmitQueue.put('''select ackdata FROM sent WHERE status='forcepow' ''') + shared.sqlSubmitQueue.put( + '''select ackdata FROM sent WHERE status='forcepow' ''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() for row in queryreturn: ackdata, = row - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Overriding maximum-difficulty setting. Work queued.'))) - shared.workerQueue.put(('sendmessage','')) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( + ackdata, 'Overriding maximum-difficulty setting. Work queued.'))) + shared.workerQueue.put(('sendmessage', '')) def on_action_SentClipboard(self): currentRow = self.ui.tableWidgetSent.currentRow() - addressAtCurrentRow = str(self.ui.tableWidgetSent.item(currentRow,0).data(Qt.UserRole).toPyObject()) + addressAtCurrentRow = str(self.ui.tableWidgetSent.item( + currentRow, 0).data(Qt.UserRole).toPyObject()) clipboard = QtGui.QApplication.clipboard() clipboard.setText(str(addressAtCurrentRow)) - #Group of functions for the Address Book dialog box + # Group of functions for the Address Book dialog box def on_action_AddressBookNew(self): self.click_pushButtonAddAddressBook() + def on_action_AddressBookDelete(self): while self.ui.tableWidgetAddressBook.selectedIndexes() != []: - currentRow = self.ui.tableWidgetAddressBook.selectedIndexes()[0].row() - labelAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,0).text().toUtf8() - addressAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,1).text() - t = (str(labelAtCurrentRow),str(addressAtCurrentRow)) + currentRow = self.ui.tableWidgetAddressBook.selectedIndexes()[ + 0].row() + labelAtCurrentRow = self.ui.tableWidgetAddressBook.item( + currentRow, 0).text().toUtf8() + addressAtCurrentRow = self.ui.tableWidgetAddressBook.item( + currentRow, 1).text() + t = (str(labelAtCurrentRow), str(addressAtCurrentRow)) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''DELETE FROM addressbook WHERE label=? AND address=?''') + shared.sqlSubmitQueue.put( + '''DELETE FROM addressbook WHERE label=? AND address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') @@ -1852,49 +2186,62 @@ class MyForm(QtGui.QMainWindow): self.ui.tableWidgetAddressBook.removeRow(currentRow) self.rerenderInboxFromLabels() self.rerenderSentToLabels() + def on_action_AddressBookClipboard(self): fullStringOfAddresses = '' listOfSelectedRows = {} for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())): - listOfSelectedRows[self.ui.tableWidgetAddressBook.selectedIndexes()[i].row()] = 0 + listOfSelectedRows[ + self.ui.tableWidgetAddressBook.selectedIndexes()[i].row()] = 0 for currentRow in listOfSelectedRows: - addressAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,1).text() + addressAtCurrentRow = self.ui.tableWidgetAddressBook.item( + currentRow, 1).text() if fullStringOfAddresses == '': fullStringOfAddresses = addressAtCurrentRow else: - fullStringOfAddresses += ', '+ str(addressAtCurrentRow) + fullStringOfAddresses += ', ' + str(addressAtCurrentRow) clipboard = QtGui.QApplication.clipboard() clipboard.setText(fullStringOfAddresses) + def on_action_AddressBookSend(self): listOfSelectedRows = {} for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())): - listOfSelectedRows[self.ui.tableWidgetAddressBook.selectedIndexes()[i].row()] = 0 + listOfSelectedRows[ + self.ui.tableWidgetAddressBook.selectedIndexes()[i].row()] = 0 for currentRow in listOfSelectedRows: - addressAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,1).text() + addressAtCurrentRow = self.ui.tableWidgetAddressBook.item( + currentRow, 1).text() if self.ui.lineEditTo.text() == '': self.ui.lineEditTo.setText(str(addressAtCurrentRow)) else: - self.ui.lineEditTo.setText(str(self.ui.lineEditTo.text()) + '; '+ str(addressAtCurrentRow)) + self.ui.lineEditTo.setText(str( + self.ui.lineEditTo.text()) + '; ' + str(addressAtCurrentRow)) if listOfSelectedRows == {}: - self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "No addresses selected.")) + self.statusBar().showMessage(QtGui.QApplication.translate( + "MainWindow", "No addresses selected.")) else: self.statusBar().showMessage('') self.ui.tabWidget.setCurrentIndex(1) + def on_context_menuAddressBook(self, point): - self.popMenuAddressBook.exec_( self.ui.tableWidgetAddressBook.mapToGlobal(point) ) + self.popMenuAddressBook.exec_( + self.ui.tableWidgetAddressBook.mapToGlobal(point)) - - #Group of functions for the Subscriptions dialog box + # Group of functions for the Subscriptions dialog box def on_action_SubscriptionsNew(self): self.click_pushButtonAddSubscription() + def on_action_SubscriptionsDelete(self): print 'clicked Delete' currentRow = self.ui.tableWidgetSubscriptions.currentRow() - labelAtCurrentRow = self.ui.tableWidgetSubscriptions.item(currentRow,0).text().toUtf8() - addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item(currentRow,1).text() - t = (str(labelAtCurrentRow),str(addressAtCurrentRow)) + labelAtCurrentRow = self.ui.tableWidgetSubscriptions.item( + currentRow, 0).text().toUtf8() + addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item( + currentRow, 1).text() + t = (str(labelAtCurrentRow), str(addressAtCurrentRow)) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''DELETE FROM subscriptions WHERE label=? AND address=?''') + shared.sqlSubmitQueue.put( + '''DELETE FROM subscriptions WHERE label=? AND address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') @@ -1902,187 +2249,251 @@ class MyForm(QtGui.QMainWindow): self.ui.tableWidgetSubscriptions.removeRow(currentRow) self.rerenderInboxFromLabels() shared.reloadBroadcastSendersForWhichImWatching() + def on_action_SubscriptionsClipboard(self): currentRow = self.ui.tableWidgetSubscriptions.currentRow() - addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item(currentRow,1).text() + addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item( + currentRow, 1).text() clipboard = QtGui.QApplication.clipboard() clipboard.setText(str(addressAtCurrentRow)) + def on_action_SubscriptionsEnable(self): currentRow = self.ui.tableWidgetSubscriptions.currentRow() - labelAtCurrentRow = self.ui.tableWidgetSubscriptions.item(currentRow,0).text().toUtf8() - addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item(currentRow,1).text() - t = (str(labelAtCurrentRow),str(addressAtCurrentRow)) + labelAtCurrentRow = self.ui.tableWidgetSubscriptions.item( + currentRow, 0).text().toUtf8() + addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item( + currentRow, 1).text() + t = (str(labelAtCurrentRow), str(addressAtCurrentRow)) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''update subscriptions set enabled=1 WHERE label=? AND address=?''') + shared.sqlSubmitQueue.put( + '''update subscriptions set enabled=1 WHERE label=? AND address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - self.ui.tableWidgetSubscriptions.item(currentRow,0).setTextColor(QtGui.QColor(0,0,0)) - self.ui.tableWidgetSubscriptions.item(currentRow,1).setTextColor(QtGui.QColor(0,0,0)) + self.ui.tableWidgetSubscriptions.item( + currentRow, 0).setTextColor(QtGui.QColor(0, 0, 0)) + self.ui.tableWidgetSubscriptions.item( + currentRow, 1).setTextColor(QtGui.QColor(0, 0, 0)) shared.reloadBroadcastSendersForWhichImWatching() + def on_action_SubscriptionsDisable(self): currentRow = self.ui.tableWidgetSubscriptions.currentRow() - labelAtCurrentRow = self.ui.tableWidgetSubscriptions.item(currentRow,0).text().toUtf8() - addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item(currentRow,1).text() - t = (str(labelAtCurrentRow),str(addressAtCurrentRow)) + labelAtCurrentRow = self.ui.tableWidgetSubscriptions.item( + currentRow, 0).text().toUtf8() + addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item( + currentRow, 1).text() + t = (str(labelAtCurrentRow), str(addressAtCurrentRow)) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''update subscriptions set enabled=0 WHERE label=? AND address=?''') + shared.sqlSubmitQueue.put( + '''update subscriptions set enabled=0 WHERE label=? AND address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - self.ui.tableWidgetSubscriptions.item(currentRow,0).setTextColor(QtGui.QColor(128,128,128)) - self.ui.tableWidgetSubscriptions.item(currentRow,1).setTextColor(QtGui.QColor(128,128,128)) + self.ui.tableWidgetSubscriptions.item( + currentRow, 0).setTextColor(QtGui.QColor(128, 128, 128)) + self.ui.tableWidgetSubscriptions.item( + currentRow, 1).setTextColor(QtGui.QColor(128, 128, 128)) shared.reloadBroadcastSendersForWhichImWatching() - def on_context_menuSubscriptions(self, point): - self.popMenuSubscriptions.exec_( self.ui.tableWidgetSubscriptions.mapToGlobal(point) ) - #Group of functions for the Blacklist dialog box + def on_context_menuSubscriptions(self, point): + self.popMenuSubscriptions.exec_( + self.ui.tableWidgetSubscriptions.mapToGlobal(point)) + + # Group of functions for the Blacklist dialog box def on_action_BlacklistNew(self): self.click_pushButtonAddBlacklist() + def on_action_BlacklistDelete(self): currentRow = self.ui.tableWidgetBlacklist.currentRow() - labelAtCurrentRow = self.ui.tableWidgetBlacklist.item(currentRow,0).text().toUtf8() - addressAtCurrentRow = self.ui.tableWidgetBlacklist.item(currentRow,1).text() - t = (str(labelAtCurrentRow),str(addressAtCurrentRow)) + labelAtCurrentRow = self.ui.tableWidgetBlacklist.item( + currentRow, 0).text().toUtf8() + addressAtCurrentRow = self.ui.tableWidgetBlacklist.item( + currentRow, 1).text() + t = (str(labelAtCurrentRow), str(addressAtCurrentRow)) shared.sqlLock.acquire() if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': - shared.sqlSubmitQueue.put('''DELETE FROM blacklist WHERE label=? AND address=?''') + shared.sqlSubmitQueue.put( + '''DELETE FROM blacklist WHERE label=? AND address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() else: - shared.sqlSubmitQueue.put('''DELETE FROM whitelist WHERE label=? AND address=?''') + shared.sqlSubmitQueue.put( + '''DELETE FROM whitelist WHERE label=? AND address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() self.ui.tableWidgetBlacklist.removeRow(currentRow) + def on_action_BlacklistClipboard(self): currentRow = self.ui.tableWidgetBlacklist.currentRow() - addressAtCurrentRow = self.ui.tableWidgetBlacklist.item(currentRow,1).text() + addressAtCurrentRow = self.ui.tableWidgetBlacklist.item( + currentRow, 1).text() clipboard = QtGui.QApplication.clipboard() clipboard.setText(str(addressAtCurrentRow)) + def on_context_menuBlacklist(self, point): - self.popMenuBlacklist.exec_( self.ui.tableWidgetBlacklist.mapToGlobal(point) ) + self.popMenuBlacklist.exec_( + self.ui.tableWidgetBlacklist.mapToGlobal(point)) + def on_action_BlacklistEnable(self): currentRow = self.ui.tableWidgetBlacklist.currentRow() - addressAtCurrentRow = self.ui.tableWidgetBlacklist.item(currentRow,1).text() - self.ui.tableWidgetBlacklist.item(currentRow,0).setTextColor(QtGui.QColor(0,0,0)) - self.ui.tableWidgetBlacklist.item(currentRow,1).setTextColor(QtGui.QColor(0,0,0)) + addressAtCurrentRow = self.ui.tableWidgetBlacklist.item( + currentRow, 1).text() + self.ui.tableWidgetBlacklist.item( + currentRow, 0).setTextColor(QtGui.QColor(0, 0, 0)) + self.ui.tableWidgetBlacklist.item( + currentRow, 1).setTextColor(QtGui.QColor(0, 0, 0)) t = (str(addressAtCurrentRow),) shared.sqlLock.acquire() if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': - shared.sqlSubmitQueue.put('''UPDATE blacklist SET enabled=1 WHERE address=?''') + shared.sqlSubmitQueue.put( + '''UPDATE blacklist SET enabled=1 WHERE address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() else: - shared.sqlSubmitQueue.put('''UPDATE whitelist SET enabled=1 WHERE address=?''') - shared.sqlSubmitQueue.put(t) - shared.sqlReturnQueue.get() - shared.sqlSubmitQueue.put('commit') - shared.sqlLock.release() - def on_action_BlacklistDisable(self): - currentRow = self.ui.tableWidgetBlacklist.currentRow() - addressAtCurrentRow = self.ui.tableWidgetBlacklist.item(currentRow,1).text() - self.ui.tableWidgetBlacklist.item(currentRow,0).setTextColor(QtGui.QColor(128,128,128)) - self.ui.tableWidgetBlacklist.item(currentRow,1).setTextColor(QtGui.QColor(128,128,128)) - t = (str(addressAtCurrentRow),) - shared.sqlLock.acquire() - if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': - shared.sqlSubmitQueue.put('''UPDATE blacklist SET enabled=0 WHERE address=?''') - shared.sqlSubmitQueue.put(t) - shared.sqlReturnQueue.get() - else: - shared.sqlSubmitQueue.put('''UPDATE whitelist SET enabled=0 WHERE address=?''') + shared.sqlSubmitQueue.put( + '''UPDATE whitelist SET enabled=1 WHERE address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - #Group of functions for the Your Identities dialog box + def on_action_BlacklistDisable(self): + currentRow = self.ui.tableWidgetBlacklist.currentRow() + addressAtCurrentRow = self.ui.tableWidgetBlacklist.item( + currentRow, 1).text() + self.ui.tableWidgetBlacklist.item( + currentRow, 0).setTextColor(QtGui.QColor(128, 128, 128)) + self.ui.tableWidgetBlacklist.item( + currentRow, 1).setTextColor(QtGui.QColor(128, 128, 128)) + t = (str(addressAtCurrentRow),) + shared.sqlLock.acquire() + if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': + shared.sqlSubmitQueue.put( + '''UPDATE blacklist SET enabled=0 WHERE address=?''') + shared.sqlSubmitQueue.put(t) + shared.sqlReturnQueue.get() + else: + shared.sqlSubmitQueue.put( + '''UPDATE whitelist SET enabled=0 WHERE address=?''') + shared.sqlSubmitQueue.put(t) + shared.sqlReturnQueue.get() + shared.sqlSubmitQueue.put('commit') + shared.sqlLock.release() + + # Group of functions for the Your Identities dialog box def on_action_YourIdentitiesNew(self): self.click_NewAddressDialog() + def on_action_YourIdentitiesEnable(self): currentRow = self.ui.tableWidgetYourIdentities.currentRow() - addressAtCurrentRow = str(self.ui.tableWidgetYourIdentities.item(currentRow,1).text()) - shared.config.set(addressAtCurrentRow,'enabled','true') + addressAtCurrentRow = str( + self.ui.tableWidgetYourIdentities.item(currentRow, 1).text()) + shared.config.set(addressAtCurrentRow, 'enabled', 'true') with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - self.ui.tableWidgetYourIdentities.item(currentRow,0).setTextColor(QtGui.QColor(0,0,0)) - self.ui.tableWidgetYourIdentities.item(currentRow,1).setTextColor(QtGui.QColor(0,0,0)) - self.ui.tableWidgetYourIdentities.item(currentRow,2).setTextColor(QtGui.QColor(0,0,0)) - if shared.safeConfigGetBoolean(addressAtCurrentRow,'mailinglist'): - self.ui.tableWidgetYourIdentities.item(currentRow,1).setTextColor(QtGui.QColor(137,04,177)) + self.ui.tableWidgetYourIdentities.item( + currentRow, 0).setTextColor(QtGui.QColor(0, 0, 0)) + self.ui.tableWidgetYourIdentities.item( + currentRow, 1).setTextColor(QtGui.QColor(0, 0, 0)) + self.ui.tableWidgetYourIdentities.item( + currentRow, 2).setTextColor(QtGui.QColor(0, 0, 0)) + if shared.safeConfigGetBoolean(addressAtCurrentRow, 'mailinglist'): + self.ui.tableWidgetYourIdentities.item(currentRow, 1).setTextColor(QtGui.QColor(137, 04, 177)) shared.reloadMyAddressHashes() + def on_action_YourIdentitiesDisable(self): currentRow = self.ui.tableWidgetYourIdentities.currentRow() - addressAtCurrentRow = str(self.ui.tableWidgetYourIdentities.item(currentRow,1).text()) - shared.config.set(str(addressAtCurrentRow),'enabled','false') - self.ui.tableWidgetYourIdentities.item(currentRow,0).setTextColor(QtGui.QColor(128,128,128)) - self.ui.tableWidgetYourIdentities.item(currentRow,1).setTextColor(QtGui.QColor(128,128,128)) - self.ui.tableWidgetYourIdentities.item(currentRow,2).setTextColor(QtGui.QColor(128,128,128)) - if shared.safeConfigGetBoolean(addressAtCurrentRow,'mailinglist'): - self.ui.tableWidgetYourIdentities.item(currentRow,1).setTextColor(QtGui.QColor(137,04,177)) + addressAtCurrentRow = str( + self.ui.tableWidgetYourIdentities.item(currentRow, 1).text()) + shared.config.set(str(addressAtCurrentRow), 'enabled', 'false') + self.ui.tableWidgetYourIdentities.item( + currentRow, 0).setTextColor(QtGui.QColor(128, 128, 128)) + self.ui.tableWidgetYourIdentities.item( + currentRow, 1).setTextColor(QtGui.QColor(128, 128, 128)) + self.ui.tableWidgetYourIdentities.item( + currentRow, 2).setTextColor(QtGui.QColor(128, 128, 128)) + if shared.safeConfigGetBoolean(addressAtCurrentRow, 'mailinglist'): + self.ui.tableWidgetYourIdentities.item(currentRow, 1).setTextColor(QtGui.QColor(137, 04, 177)) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) shared.reloadMyAddressHashes() + def on_action_YourIdentitiesClipboard(self): currentRow = self.ui.tableWidgetYourIdentities.currentRow() - addressAtCurrentRow = self.ui.tableWidgetYourIdentities.item(currentRow,1).text() + addressAtCurrentRow = self.ui.tableWidgetYourIdentities.item( + currentRow, 1).text() clipboard = QtGui.QApplication.clipboard() clipboard.setText(str(addressAtCurrentRow)) + def on_context_menuYourIdentities(self, point): - self.popMenu.exec_( self.ui.tableWidgetYourIdentities.mapToGlobal(point) ) + self.popMenu.exec_( + self.ui.tableWidgetYourIdentities.mapToGlobal(point)) + def on_context_menuInbox(self, point): - self.popMenuInbox.exec_( self.ui.tableWidgetInbox.mapToGlobal(point) ) + self.popMenuInbox.exec_(self.ui.tableWidgetInbox.mapToGlobal(point)) + def on_context_menuSent(self, point): - self.popMenuSent = QtGui.QMenu( self ) - self.popMenuSent.addAction( self.actionSentClipboard ) - self.popMenuSent.addAction( self.actionTrashSentMessage ) - - #Check to see if this item is toodifficult and display an additional menu option (Force Send) if it is. + self.popMenuSent = QtGui.QMenu(self) + self.popMenuSent.addAction(self.actionSentClipboard) + self.popMenuSent.addAction(self.actionTrashSentMessage) + + # Check to see if this item is toodifficult and display an additional + # menu option (Force Send) if it is. currentRow = self.ui.tableWidgetSent.currentRow() - ackData = str(self.ui.tableWidgetSent.item(currentRow,3).data(Qt.UserRole).toPyObject()) + ackData = str(self.ui.tableWidgetSent.item( + currentRow, 3).data(Qt.UserRole).toPyObject()) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT status FROM sent where ackdata=?''') + shared.sqlSubmitQueue.put( + '''SELECT status FROM sent where ackdata=?''') shared.sqlSubmitQueue.put((ackData,)) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() for row in queryreturn: status, = row if status == 'toodifficult': - self.popMenuSent.addAction( self.actionForceSend ) - self.popMenuSent.exec_( self.ui.tableWidgetSent.mapToGlobal(point) ) + self.popMenuSent.addAction(self.actionForceSend) + self.popMenuSent.exec_(self.ui.tableWidgetSent.mapToGlobal(point)) def tableWidgetInboxItemClicked(self): currentRow = self.ui.tableWidgetInbox.currentRow() if currentRow >= 0: - fromAddress = str(self.ui.tableWidgetInbox.item(currentRow,1).data(Qt.UserRole).toPyObject()) - #If we have received this message from either a broadcast address or from someone in our address book, display as HTML + fromAddress = str(self.ui.tableWidgetInbox.item( + currentRow, 1).data(Qt.UserRole).toPyObject()) + # If we have received this message from either a broadcast address + # or from someone in our address book, display as HTML if decodeAddress(fromAddress)[3] in shared.broadcastSendersForWhichImWatching or shared.isAddressInMyAddressBook(fromAddress): - if len(self.ui.tableWidgetInbox.item(currentRow,2).data(Qt.UserRole).toPyObject()) < 30000: - self.ui.textEditInboxMessage.setText(self.ui.tableWidgetInbox.item(currentRow,2).data(Qt.UserRole).toPyObject())#Only show the first 30K characters + if len(self.ui.tableWidgetInbox.item(currentRow, 2).data(Qt.UserRole).toPyObject()) < 30000: + self.ui.textEditInboxMessage.setText(self.ui.tableWidgetInbox.item( + currentRow, 2).data(Qt.UserRole).toPyObject()) # Only show the first 30K characters else: - self.ui.textEditInboxMessage.setText(self.ui.tableWidgetInbox.item(currentRow,2).data(Qt.UserRole).toPyObject()[:30000]+'\n\nDisplay of the remainder of the message truncated because it is too long.')#Only show the first 30K characters + self.ui.textEditInboxMessage.setText(self.ui.tableWidgetInbox.item(currentRow, 2).data(Qt.UserRole).toPyObject()[ + :30000] + '\n\nDisplay of the remainder of the message truncated because it is too long.') # Only show the first 30K characters else: - if len(self.ui.tableWidgetInbox.item(currentRow,2).data(Qt.UserRole).toPyObject()) < 30000: - self.ui.textEditInboxMessage.setPlainText(self.ui.tableWidgetInbox.item(currentRow,2).data(Qt.UserRole).toPyObject())#Only show the first 30K characters + if len(self.ui.tableWidgetInbox.item(currentRow, 2).data(Qt.UserRole).toPyObject()) < 30000: + self.ui.textEditInboxMessage.setPlainText(self.ui.tableWidgetInbox.item( + currentRow, 2).data(Qt.UserRole).toPyObject()) # Only show the first 30K characters else: - self.ui.textEditInboxMessage.setPlainText(self.ui.tableWidgetInbox.item(currentRow,2).data(Qt.UserRole).toPyObject()[:30000]+'\n\nDisplay of the remainder of the message truncated because it is too long.')#Only show the first 30K characters + self.ui.textEditInboxMessage.setPlainText(self.ui.tableWidgetInbox.item(currentRow, 2).data(Qt.UserRole).toPyObject()[ + :30000] + '\n\nDisplay of the remainder of the message truncated because it is too long.') # Only show the first 30K characters font = QFont() font.setBold(False) - self.ui.tableWidgetInbox.item(currentRow,0).setFont(font) - self.ui.tableWidgetInbox.item(currentRow,1).setFont(font) - self.ui.tableWidgetInbox.item(currentRow,2).setFont(font) - self.ui.tableWidgetInbox.item(currentRow,3).setFont(font) + self.ui.tableWidgetInbox.item(currentRow, 0).setFont(font) + self.ui.tableWidgetInbox.item(currentRow, 1).setFont(font) + self.ui.tableWidgetInbox.item(currentRow, 2).setFont(font) + self.ui.tableWidgetInbox.item(currentRow, 3).setFont(font) - inventoryHash = str(self.ui.tableWidgetInbox.item(currentRow,3).data(Qt.UserRole).toPyObject()) + inventoryHash = str(self.ui.tableWidgetInbox.item( + currentRow, 3).data(Qt.UserRole).toPyObject()) t = (inventoryHash,) self.ubuntuMessagingMenuClear(t) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''update inbox set read=1 WHERE msgid=?''') + shared.sqlSubmitQueue.put( + '''update inbox set read=1 WHERE msgid=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') @@ -2091,28 +2502,34 @@ class MyForm(QtGui.QMainWindow): def tableWidgetSentItemClicked(self): currentRow = self.ui.tableWidgetSent.currentRow() if currentRow >= 0: - self.ui.textEditSentMessage.setPlainText(self.ui.tableWidgetSent.item(currentRow,2).data(Qt.UserRole).toPyObject()) + self.ui.textEditSentMessage.setPlainText(self.ui.tableWidgetSent.item( + currentRow, 2).data(Qt.UserRole).toPyObject()) def tableWidgetYourIdentitiesItemChanged(self): currentRow = self.ui.tableWidgetYourIdentities.currentRow() if currentRow >= 0: - addressAtCurrentRow = self.ui.tableWidgetYourIdentities.item(currentRow,1).text() - shared.config.set(str(addressAtCurrentRow),'label',str(self.ui.tableWidgetYourIdentities.item(currentRow,0).text().toUtf8())) + addressAtCurrentRow = self.ui.tableWidgetYourIdentities.item( + currentRow, 1).text() + shared.config.set(str(addressAtCurrentRow), 'label', str( + self.ui.tableWidgetYourIdentities.item(currentRow, 0).text().toUtf8())) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) self.rerenderComboBoxSendFrom() - #self.rerenderInboxFromLabels() + # self.rerenderInboxFromLabels() self.rerenderInboxToLabels() self.rerenderSentFromLabels() - #self.rerenderSentToLabels() + # self.rerenderSentToLabels() def tableWidgetAddressBookItemChanged(self): currentRow = self.ui.tableWidgetAddressBook.currentRow() shared.sqlLock.acquire() if currentRow >= 0: - addressAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,1).text() - t = (str(self.ui.tableWidgetAddressBook.item(currentRow,0).text().toUtf8()),str(addressAtCurrentRow)) - shared.sqlSubmitQueue.put('''UPDATE addressbook set label=? WHERE address=?''') + addressAtCurrentRow = self.ui.tableWidgetAddressBook.item( + currentRow, 1).text() + t = (str(self.ui.tableWidgetAddressBook.item( + currentRow, 0).text().toUtf8()), str(addressAtCurrentRow)) + shared.sqlSubmitQueue.put( + '''UPDATE addressbook set label=? WHERE address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') @@ -2124,9 +2541,12 @@ class MyForm(QtGui.QMainWindow): currentRow = self.ui.tableWidgetSubscriptions.currentRow() shared.sqlLock.acquire() if currentRow >= 0: - addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item(currentRow,1).text() - t = (str(self.ui.tableWidgetSubscriptions.item(currentRow,0).text().toUtf8()),str(addressAtCurrentRow)) - shared.sqlSubmitQueue.put('''UPDATE subscriptions set label=? WHERE address=?''') + addressAtCurrentRow = self.ui.tableWidgetSubscriptions.item( + currentRow, 1).text() + t = (str(self.ui.tableWidgetSubscriptions.item( + currentRow, 0).text().toUtf8()), str(addressAtCurrentRow)) + shared.sqlSubmitQueue.put( + '''UPDATE subscriptions set label=? WHERE address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') @@ -2134,79 +2554,94 @@ class MyForm(QtGui.QMainWindow): self.rerenderInboxFromLabels() self.rerenderSentToLabels() - def writeNewAddressToTable(self,label,address,streamNumber): + def writeNewAddressToTable(self, label, address, streamNumber): self.ui.tableWidgetYourIdentities.setSortingEnabled(False) self.ui.tableWidgetYourIdentities.insertRow(0) - self.ui.tableWidgetYourIdentities.setItem(0, 0, QtGui.QTableWidgetItem(unicode(label,'utf-8'))) + self.ui.tableWidgetYourIdentities.setItem( + 0, 0, QtGui.QTableWidgetItem(unicode(label, 'utf-8'))) newItem = QtGui.QTableWidgetItem(address) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.ui.tableWidgetYourIdentities.setItem(0, 1, newItem) newItem = QtGui.QTableWidgetItem(streamNumber) - newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) + newItem.setFlags( + QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.ui.tableWidgetYourIdentities.setItem(0, 2, newItem) - #self.ui.tableWidgetYourIdentities.setSortingEnabled(True) + # self.ui.tableWidgetYourIdentities.setSortingEnabled(True) self.rerenderComboBoxSendFrom() - def updateStatusBar(self,data): + def updateStatusBar(self, data): if data != "": shared.printLock.acquire() print 'Status bar:', data shared.printLock.release() self.statusBar().showMessage(data) - - - class helpDialog(QtGui.QDialog): - def __init__(self,parent): + + def __init__(self, parent): QtGui.QWidget.__init__(self, parent) self.ui = Ui_helpDialog() self.ui.setupUi(self) self.parent = parent self.ui.labelHelpURI.setOpenExternalLinks(True) - QtGui.QWidget.resize(self,QtGui.QWidget.sizeHint(self)) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) + class aboutDialog(QtGui.QDialog): - def __init__(self,parent): + + def __init__(self, parent): QtGui.QWidget.__init__(self, parent) self.ui = Ui_aboutDialog() self.ui.setupUi(self) self.parent = parent self.ui.labelVersion.setText('version ' + shared.softwareVersion) + class regenerateAddressesDialog(QtGui.QDialog): - def __init__(self,parent): + + def __init__(self, parent): QtGui.QWidget.__init__(self, parent) self.ui = Ui_regenerateAddressesDialog() self.ui.setupUi(self) self.parent = parent - QtGui.QWidget.resize(self,QtGui.QWidget.sizeHint(self)) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) + class settingsDialog(QtGui.QDialog): - def __init__(self,parent): + + def __init__(self, parent): QtGui.QWidget.__init__(self, parent) self.ui = Ui_settingsDialog() self.ui.setupUi(self) self.parent = parent - self.ui.checkBoxStartOnLogon.setChecked(shared.config.getboolean('bitmessagesettings', 'startonlogon')) - self.ui.checkBoxMinimizeToTray.setChecked(shared.config.getboolean('bitmessagesettings', 'minimizetotray')) - self.ui.checkBoxShowTrayNotifications.setChecked(shared.config.getboolean('bitmessagesettings', 'showtraynotifications')) - self.ui.checkBoxStartInTray.setChecked(shared.config.getboolean('bitmessagesettings', 'startintray')) + self.ui.checkBoxStartOnLogon.setChecked( + shared.config.getboolean('bitmessagesettings', 'startonlogon')) + self.ui.checkBoxMinimizeToTray.setChecked( + shared.config.getboolean('bitmessagesettings', 'minimizetotray')) + self.ui.checkBoxShowTrayNotifications.setChecked( + shared.config.getboolean('bitmessagesettings', 'showtraynotifications')) + self.ui.checkBoxStartInTray.setChecked( + shared.config.getboolean('bitmessagesettings', 'startintray')) if shared.appdata == '': self.ui.checkBoxPortableMode.setChecked(True) if 'darwin' in sys.platform: self.ui.checkBoxStartOnLogon.setDisabled(True) self.ui.checkBoxMinimizeToTray.setDisabled(True) self.ui.checkBoxShowTrayNotifications.setDisabled(True) - self.ui.labelSettingsNote.setText(QtGui.QApplication.translate("MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system.")) + self.ui.labelSettingsNote.setText(QtGui.QApplication.translate( + "MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system.")) elif 'linux' in sys.platform: self.ui.checkBoxStartOnLogon.setDisabled(True) self.ui.checkBoxMinimizeToTray.setDisabled(True) - self.ui.labelSettingsNote.setText(QtGui.QApplication.translate("MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system.")) - #On the Network settings tab: - self.ui.lineEditTCPPort.setText(str(shared.config.get('bitmessagesettings', 'port'))) - self.ui.checkBoxAuthentication.setChecked(shared.config.getboolean('bitmessagesettings', 'socksauthentication')) + self.ui.labelSettingsNote.setText(QtGui.QApplication.translate( + "MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system.")) + # On the Network settings tab: + self.ui.lineEditTCPPort.setText(str( + shared.config.get('bitmessagesettings', 'port'))) + self.ui.checkBoxAuthentication.setChecked(shared.config.getboolean( + 'bitmessagesettings', 'socksauthentication')) if str(shared.config.get('bitmessagesettings', 'socksproxytype')) == 'none': self.ui.comboBoxProxyType.setCurrentIndex(0) self.ui.lineEditSocksHostname.setEnabled(False) @@ -2221,18 +2656,27 @@ class settingsDialog(QtGui.QDialog): self.ui.comboBoxProxyType.setCurrentIndex(2) self.ui.lineEditTCPPort.setEnabled(False) - self.ui.lineEditSocksHostname.setText(str(shared.config.get('bitmessagesettings', 'sockshostname'))) - self.ui.lineEditSocksPort.setText(str(shared.config.get('bitmessagesettings', 'socksport'))) - self.ui.lineEditSocksUsername.setText(str(shared.config.get('bitmessagesettings', 'socksusername'))) - self.ui.lineEditSocksPassword.setText(str(shared.config.get('bitmessagesettings', 'sockspassword'))) - QtCore.QObject.connect(self.ui.comboBoxProxyType, QtCore.SIGNAL("currentIndexChanged(int)"), self.comboBoxProxyTypeChanged) + self.ui.lineEditSocksHostname.setText(str( + shared.config.get('bitmessagesettings', 'sockshostname'))) + self.ui.lineEditSocksPort.setText(str( + shared.config.get('bitmessagesettings', 'socksport'))) + self.ui.lineEditSocksUsername.setText(str( + shared.config.get('bitmessagesettings', 'socksusername'))) + self.ui.lineEditSocksPassword.setText(str( + shared.config.get('bitmessagesettings', 'sockspassword'))) + QtCore.QObject.connect(self.ui.comboBoxProxyType, QtCore.SIGNAL( + "currentIndexChanged(int)"), self.comboBoxProxyTypeChanged) - self.ui.lineEditTotalDifficulty.setText(str((float(shared.config.getint('bitmessagesettings', 'defaultnoncetrialsperbyte'))/shared.networkDefaultProofOfWorkNonceTrialsPerByte))) - self.ui.lineEditSmallMessageDifficulty.setText(str((float(shared.config.getint('bitmessagesettings', 'defaultpayloadlengthextrabytes'))/shared.networkDefaultPayloadLengthExtraBytes))) + self.ui.lineEditTotalDifficulty.setText(str((float(shared.config.getint( + 'bitmessagesettings', 'defaultnoncetrialsperbyte')) / shared.networkDefaultProofOfWorkNonceTrialsPerByte))) + self.ui.lineEditSmallMessageDifficulty.setText(str((float(shared.config.getint( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes')) / shared.networkDefaultPayloadLengthExtraBytes))) - #Max acceptable difficulty tab - self.ui.lineEditMaxAcceptableTotalDifficulty.setText(str((float(shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte'))/shared.networkDefaultProofOfWorkNonceTrialsPerByte))) - self.ui.lineEditMaxAcceptableSmallMessageDifficulty.setText(str((float(shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes'))/shared.networkDefaultPayloadLengthExtraBytes))) + # Max acceptable difficulty tab + self.ui.lineEditMaxAcceptableTotalDifficulty.setText(str((float(shared.config.getint( + 'bitmessagesettings', 'maxacceptablenoncetrialsperbyte')) / shared.networkDefaultProofOfWorkNonceTrialsPerByte))) + self.ui.lineEditMaxAcceptableSmallMessageDifficulty.setText(str((float(shared.config.getint( + 'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes')) / shared.networkDefaultPayloadLengthExtraBytes))) #'System' tab removed for now. """try: @@ -2252,9 +2696,9 @@ class settingsDialog(QtGui.QDialog): else: self.ui.comboBoxMaxCores.setCurrentIndex(5)""" - QtGui.QWidget.resize(self,QtGui.QWidget.sizeHint(self)) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) - def comboBoxProxyTypeChanged(self,comboBoxIndex): + def comboBoxProxyTypeChanged(self, comboBoxIndex): if comboBoxIndex == 0: self.ui.lineEditSocksHostname.setEnabled(False) self.ui.lineEditSocksPort.setEnabled(False) @@ -2271,84 +2715,111 @@ class settingsDialog(QtGui.QDialog): self.ui.lineEditSocksPassword.setEnabled(True) self.ui.lineEditTCPPort.setEnabled(False) + class SpecialAddressBehaviorDialog(QtGui.QDialog): - def __init__(self,parent): + + def __init__(self, parent): QtGui.QWidget.__init__(self, parent) self.ui = Ui_SpecialAddressBehaviorDialog() self.ui.setupUi(self) self.parent = parent currentRow = parent.ui.tableWidgetYourIdentities.currentRow() - addressAtCurrentRow = str(parent.ui.tableWidgetYourIdentities.item(currentRow,1).text()) - if shared.safeConfigGetBoolean(addressAtCurrentRow,'mailinglist'): + addressAtCurrentRow = str( + parent.ui.tableWidgetYourIdentities.item(currentRow, 1).text()) + if shared.safeConfigGetBoolean(addressAtCurrentRow, 'mailinglist'): self.ui.radioButtonBehaviorMailingList.click() else: self.ui.radioButtonBehaveNormalAddress.click() try: - mailingListName = shared.config.get(addressAtCurrentRow, 'mailinglistname') + mailingListName = shared.config.get( + addressAtCurrentRow, 'mailinglistname') except: mailingListName = '' - self.ui.lineEditMailingListName.setText(unicode(mailingListName,'utf-8')) - QtGui.QWidget.resize(self,QtGui.QWidget.sizeHint(self)) + self.ui.lineEditMailingListName.setText( + unicode(mailingListName, 'utf-8')) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) + class NewSubscriptionDialog(QtGui.QDialog): - def __init__(self,parent): + + def __init__(self, parent): QtGui.QWidget.__init__(self, parent) self.ui = Ui_NewSubscriptionDialog() self.ui.setupUi(self) self.parent = parent - QtCore.QObject.connect(self.ui.lineEditSubscriptionAddress, QtCore.SIGNAL("textChanged(QString)"), self.subscriptionAddressChanged) + QtCore.QObject.connect(self.ui.lineEditSubscriptionAddress, QtCore.SIGNAL( + "textChanged(QString)"), self.subscriptionAddressChanged) - def subscriptionAddressChanged(self,QString): - status,a,b,c = decodeAddress(str(QString)) + def subscriptionAddressChanged(self, QString): + status, a, b, c = decodeAddress(str(QString)) if status == 'missingbm': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate("MainWindow", "The address should start with ''BM-''")) + self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + "MainWindow", "The address should start with ''BM-''")) elif status == 'checksumfailed': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate("MainWindow", "The address is not typed or copied correctly (the checksum failed).")) + self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + "MainWindow", "The address is not typed or copied correctly (the checksum failed).")) elif status == 'versiontoohigh': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate("MainWindow", "The version number of this address is higher than this software can support. Please upgrade Bitmessage.")) + self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + "MainWindow", "The version number of this address is higher than this software can support. Please upgrade Bitmessage.")) elif status == 'invalidcharacters': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate("MainWindow", "The address contains invalid characters.")) + self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + "MainWindow", "The address contains invalid characters.")) elif status == 'ripetooshort': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate("MainWindow", "Some data encoded in the address is too short.")) + self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + "MainWindow", "Some data encoded in the address is too short.")) elif status == 'ripetoolong': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate("MainWindow", "Some data encoded in the address is too long.")) + self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + "MainWindow", "Some data encoded in the address is too long.")) elif status == 'success': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate("MainWindow", "Address is valid.")) + self.ui.labelSubscriptionAddressCheck.setText( + QtGui.QApplication.translate("MainWindow", "Address is valid.")) + class NewAddressDialog(QtGui.QDialog): + def __init__(self, parent): QtGui.QWidget.__init__(self, parent) self.ui = Ui_NewAddressDialog() self.ui.setupUi(self) self.parent = parent row = 1 - #Let's fill out the 'existing address' combo box with addresses from the 'Your Identities' tab. - while self.parent.ui.tableWidgetYourIdentities.item(row-1,1): + # Let's fill out the 'existing address' combo box with addresses from + # the 'Your Identities' tab. + while self.parent.ui.tableWidgetYourIdentities.item(row - 1, 1): self.ui.radioButtonExisting.click() - #print self.parent.ui.tableWidgetYourIdentities.item(row-1,1).text() - self.ui.comboBoxExisting.addItem(self.parent.ui.tableWidgetYourIdentities.item(row-1,1).text()) + # print + # self.parent.ui.tableWidgetYourIdentities.item(row-1,1).text() + self.ui.comboBoxExisting.addItem( + self.parent.ui.tableWidgetYourIdentities.item(row - 1, 1).text()) row += 1 self.ui.groupBoxDeterministic.setHidden(True) - QtGui.QWidget.resize(self,QtGui.QWidget.sizeHint(self)) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) + class iconGlossaryDialog(QtGui.QDialog): - def __init__(self,parent): + + def __init__(self, parent): QtGui.QWidget.__init__(self, parent) self.ui = Ui_iconGlossaryDialog() self.ui.setupUi(self) self.parent = parent - self.ui.labelPortNumber.setText(QtGui.QApplication.translate("MainWindow", "You are using TCP port %1. (This can be changed in the settings).").arg(str(shared.config.getint('bitmessagesettings', 'port')))) - QtGui.QWidget.resize(self,QtGui.QWidget.sizeHint(self)) + self.ui.labelPortNumber.setText(QtGui.QApplication.translate( + "MainWindow", "You are using TCP port %1. (This can be changed in the settings).").arg(str(shared.config.getint('bitmessagesettings', 'port')))) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) -#In order for the time columns on the Inbox and Sent tabs to be sorted correctly (rather than alphabetically), we need to overload the < operator and use this class instead of QTableWidgetItem. +# In order for the time columns on the Inbox and Sent tabs to be sorted +# correctly (rather than alphabetically), we need to overload the < +# operator and use this class instead of QTableWidgetItem. class myTableWidgetItem(QTableWidgetItem): - def __lt__(self,other): + + def __lt__(self, other): return int(self.data(33).toPyObject()) < int(other.data(33).toPyObject()) class UISignaler(QThread): - def __init__(self, parent = None): + + def __init__(self, parent=None): QThread.__init__(self, parent) def run(self): @@ -2356,21 +2827,28 @@ class UISignaler(QThread): command, data = shared.UISignalQueue.get() if command == 'writeNewAddressToTable': label, address, streamNumber = data - self.emit(SIGNAL("writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),label,address,str(streamNumber)) + self.emit(SIGNAL( + "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), label, address, str(streamNumber)) elif command == 'updateStatusBar': - self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),data) + self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"), data) elif command == 'updateSentItemStatusByHash': hash, message = data - self.emit(SIGNAL("updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"),hash,message) + self.emit(SIGNAL( + "updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), hash, message) elif command == 'updateSentItemStatusByAckdata': ackData, message = data - self.emit(SIGNAL("updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"),ackData,message) + self.emit(SIGNAL( + "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), ackData, message) elif command == 'displayNewInboxMessage': - inventoryHash,toAddress,fromAddress,subject,body = data - self.emit(SIGNAL("displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),inventoryHash,toAddress,fromAddress,subject,body) + inventoryHash, toAddress, fromAddress, subject, body = data + self.emit(SIGNAL( + "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), + inventoryHash, toAddress, fromAddress, subject, body) elif command == 'displayNewSentMessage': - toAddress,fromLabel,fromAddress,subject,message,ackdata = data - self.emit(SIGNAL("displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),toAddress,fromLabel,fromAddress,subject,message,ackdata) + toAddress, fromLabel, fromAddress, subject, message, ackdata = data + self.emit(SIGNAL( + "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), + toAddress, fromLabel, fromAddress, subject, message, ackdata) elif command == 'updateNetworkStatusTab': self.emit(SIGNAL("updateNetworkStatusTab()")) elif command == 'incrementNumberOfMessagesProcessed': @@ -2380,20 +2858,22 @@ class UISignaler(QThread): elif command == 'incrementNumberOfBroadcastsProcessed': self.emit(SIGNAL("incrementNumberOfBroadcastsProcessed()")) elif command == 'setStatusIcon': - self.emit(SIGNAL("setStatusIcon(PyQt_PyObject)"),data) + self.emit(SIGNAL("setStatusIcon(PyQt_PyObject)"), data) elif command == 'rerenderInboxFromLabels': self.emit(SIGNAL("rerenderInboxFromLabels()")) elif command == 'rerenderSubscriptions': self.emit(SIGNAL("rerenderSubscriptions()")) elif command == 'removeInboxRowByMsgid': - self.emit(SIGNAL("removeInboxRowByMsgid(PyQt_PyObject)"),data) + self.emit(SIGNAL("removeInboxRowByMsgid(PyQt_PyObject)"), data) else: - sys.stderr.write('Command sent to UISignaler not recognized: %s\n' % command) + sys.stderr.write( + 'Command sent to UISignaler not recognized: %s\n' % command) + def run(): app = QtGui.QApplication(sys.argv) translator = QtCore.QTranslator() - translator.load("translations/bitmessage_"+str(locale.getlocale()[0])) + translator.load("translations/bitmessage_" + str(locale.getlocale()[0])) QtGui.QApplication.installTranslator(translator) app.setStyleSheet("QStatusBar::item { border: 0px solid black }") myapp = MyForm() -- 2.45.1 From da7332ae5be4f81712bcd45b148e10d303e96c57 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 00:57:46 +0200 Subject: [PATCH 09/42] fixed typo + translation files --- src/bitmessageui.ui | 6 +- src/translations/bitmessage_fr_BE.qm | Bin 49541 -> 50198 bytes src/translations/bitmessage_fr_BE.ts | 196 ++++++++++++++------------- 3 files changed, 108 insertions(+), 94 deletions(-) diff --git a/src/bitmessageui.ui b/src/bitmessageui.ui index bba6d3a5..c758e706 100644 --- a/src/bitmessageui.ui +++ b/src/bitmessageui.ui @@ -885,7 +885,7 @@ p, li { white-space: pre-wrap; } - Processed 0 person-to-person messages. + Processed 0 person-to-person message. @@ -898,7 +898,7 @@ p, li { white-space: pre-wrap; } - Processed 0 public keys. + Processed 0 public key. @@ -911,7 +911,7 @@ p, li { white-space: pre-wrap; } - Processed 0 broadcasts. + Processed 0 broadcast. diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm index 8e1dd0eb60706288ffff3616e690ac877b2ecb68..a91bc48f9d6b84cb3c5b5200950ecea429c09e79 100644 GIT binary patch delta 2377 zcmaJ?YgAO{72Wf=^I%@V01=IHg&-=30#d-Ls9-?UAx6ZYh#)gj1ZT($qk@4!@hvKf zH9(LOi;Ae2N>HPM?^U&i#FFZg*4D-@O|4P0B;d-bp?jFbAN|qAx_8g_edjx8pMB1` ztS^)8*(9s*a=ri%22?F4MiA=&;TVu|mCql5=r&-%DE|H)@~;Ac(eog`vk(Yvf&B4U zV2r|z6)_OX<-pWS5NhLrX(_}M;O!SsrcMLS-hk({=Rips0y=*Jf*&GyPzT_ACl28| z8Fc<6MBOR_%7T!v=Q2rLbYpo8X6^A{z%INqeJQ!#z`Lu?0^we6TvvkBEz5wzuVG$J z5iteniY-9v8(7$zO#-`+*Gj)JwJ6*d3cNK6s}DEGcPsoXUwAx{7i;8~3j=|H-^gzbxJZW(B!3A721E<`ph(tKE<`=6qV!LNnCs7g zk4_6yyN$r>J;IE8UjyFPgp86_AYrj!nnwlV0t9Pa3*(#;%1W8Yky4>5hH-LR1!v83 z8q@^}O-gr+oXOGYq_XHSaR>+=P zI5|*^w-EL3D>7|$K*f25qk_$Nq*c-I*Drxz-&7np(M3Wh6enFumOoW|-86vBy2+^= zP{AIEd7+H*=%AE)m9sCh6p;za)Cv+=`&;E|KRuiApmM`ZU!eH|Wle4~Fyg6lU*S5I z&PRE;{63%>=f-uh%8QXCaQr9bLnD>&Nmlj-wzJu8tD+U(lTe~+ntm{)Kd(w_-_3i@ zR@H`CKLKe8sx7~p53Cre+Bu3fTlPqG_RJ*C^G4P6#>)dOb+w7RLWY<^!51eqY^fAr$${!$p6#I38JvIL22Jeily=@0jWLN`Ts*;zwYi$veN>_;UX#6g3NY7CQ*n+poYADI z>5K#RR%vS0A80#;Ad9$Iyp zU4KG*+*OJ>Q?(}|>q%^<_LP+pueq!}BVjWq1iA63O8eC^64~Idy=fqk=v5j` zt5fuV?DsMxH%tPS$PCR1dVX^MZ8+su$L9OOaM7Ct z-d$pS2md7fLYZ)@O&BK ztQLzoyCBDE5%a9}f=W*>ua>?y8v|65$(ZYMPki`MtWLaW0j zW|>Sjv)yjChlqh;A!3eQ%(95qJd?P>Y_q$>3j4(*R80NfEics*E2~gkX%bGP>BmCB1lL{C@!oG?WPd delta 1858 zcmX98)<-vhB)1FUI;*cc5&1rRp_(Sy(>#Qn>~&^^Gv9{yeffW!I-g5GKZ zwsazNxC|(1L#*>MN%YQOMGrPO4Qy16#P}?7wd2`>_lY0RV5x|t${gVIJJ^!Fn|KX2 zZ6(m&gss!tNFW#6J6Jc|iozBP;P)+xS{;C)1AFos;K0fCI9#w0sCfeYAEp96Z)4D0 z4TR3YXkQy&^v9TY0+mU^)SoASXZES|%~Z>?T;=1%iG!h9ruYH7*QtWie*mgqR|VS} zfU|a0q%9P%-ch9|w*ckesVcUTz)SC{j+`ga_Gs0m69NlFrPdu)&2^a6uk6bM9{Q8I z_p%ZGUXYawvxUDn+!tf*jJ?-1dMd^>RLys*mpDB#{HM5c|Nt=q{lTM-TW2M>Z`e2xR`?-6jj$OG-6hm zXj&RVJ;ub)9}iR5<6?OKkBnxdxOUPCJUk^nJ^mFi=TkA&-oeSA5;L}N@-=tG{3bUW zr_p7X>SKX}@yK0?wFqp@sn}w@bINm(mCStV^mTfs!SSBNv}M0XREIRQt%AE@v*KqgpL1LuKUhP1w2){>BZf^%ZXB$_TOyug%o4* z27-1-$=wI}U5B)H!#zsfBUS!Bg;umkZ!M=qS=*%dFGWzXbgBRJWoD^Zy6RZS@kXRk zM?Ei=nx(1I-vah^()5aMK(3eWj&bc3t)G2k6HkLBdhb)W*)T^RYTHI{gY-MCEEMph zzTsH6{Bxnd7o&|_iUe_LO<)jUqB@ig7uRjek9(bzyIC=U{!@7E29ZG zf7IZ}8E1i_Lxu;~aMkdhJjsHa3?F1i01*a5UkN>q|H<&LckDoOimWfB)bmnggD?oJ zTq7@;>}Kk1^0E(7f%!@D>W3-qZv@$zz|ijQo5A{@xQj!hWUXic-jn-@^mcOaD0!=1)q;LW_Hzkk89b!XC2~1+c z*oDfP$2h>AJSEI!XJCIpqd~JYexo+GYRl{v|&p6y~0g`)-f3JCw(#aCe9@ - - + MainWindow @@ -267,107 +266,107 @@ p, li { white-space: pre-wrap; } Supprimer tous les messages dans la corbeille - + Total Connections: %1 Nombre total de connexions : %1 - + Not Connected Déconnecté - + Connected Connecté - + Show Bitmessage Afficher Bitmessage - + Subscribe S'abonner - + Processed %1 person-to-person messages. %1 messages de pair à pair traités. - + Processed %1 broadcast messages. %1 messages de diffusion traités. - + Processed %1 public keys. %1 clés publiques traitées. - + Since startup on %1 Depuis lancement le %1 - + Waiting on their encryption key. Will request it again soon. En attente de la clé de chiffrement. Une nouvelle requête sera bientôt lancée. - + Encryption key request queued. Demande de clé de chiffrement en attente. - + Queued. En attente. - + Need to do work to send message. Work is queued. Travail nécessaire pour envoyer le message. Travail en attente. - + Acknowledgement of the message received %1 Accusé de réception reçu le %1 - + Broadcast queued. Message de diffusion en attente. - + Broadcast on %1 Message de diffusion à %1 - + Problem: The work demanded by the recipient is more difficult than you are willing to do. %1 Problème : Le travail demandé par le destinataire est plus difficile que ce que vous avez paramétré. %1 - + Forced difficulty override. Send should start soon. Neutralisation forcée de la difficulté. L'envoi devrait bientôt commencer. - + Message sent. Waiting on acknowledgement. Sent at %1 Message envoyé. En attente de l'accusé de réception. Envoyé le %1 - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Vous pouvez éditer vos clés en éditant le fichier keys.dat stocké dans le même répertoire que ce programme. Il est important de faire des sauvegardes de ce fichier. - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. @@ -376,12 +375,12 @@ It is important that you back up this file. Il est important de faire des sauvegardes de ce fichier. - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) Vous pouvez éditer vos clés en éditant le fichier keys.dat stocké dans le même répertoire que ce programme. Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'ouvrir maintenant ? (Assurez-vous de fermer Bitmessage avant d'effectuer des changements.) - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) @@ -390,320 +389,335 @@ It is important that you back up this file. Would you like to open the file now? Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'ouvrir maintenant ? (Assurez-vous de fermer Bitmessage avant d'effectuer des changements.) - + Add sender to your Address Book Ajouter l'expéditeur au carnet d'adresse - + Move to Trash Envoyer à la Corbeille - + View HTML code as formatted text Voir le code HTML comme du texte formaté - + Enable Activer - + Disable Désactiver - + Copy address to clipboard Copier l'adresse dans le presse-papier - + Special address behavior... Comportement spécial de l'adresse... - + Send message to this address Envoyer un message à cette adresse - + Add New Address Ajouter nouvelle adresse - + Delete Supprimer - + Copy destination address to clipboard Copier l'adresse de destination dans le presse-papier - + Force send Forcer l'envoi - + Are you sure you want to delete all trashed messages? Êtes-vous sûr de vouloir supprimer tous les messages dans la corbeille ? - + You must type your passphrase. If you don't have one then this is not the form for you. Vous devez taper votre phrase secrète. Si vous n'en avez pas, ce formulaire n'est pas pour vous. - + Delete trash? Supprimer la corbeille ? - + Open keys.dat? Ouvrir keys.dat ? - + bad passphrase Mauvaise phrase secrète - + Restart Redémarrer - + You must restart Bitmessage for the port number change to take effect. Vous devez redémarrer Bitmessage pour que le changement de port prenne effet. - + Bitmessage will use your proxy from now on now but you may want to manually restart Bitmessage now to close existing connections. Bitmessage utilisera votre proxy à partir de maintenant mais il vous faudra redémarrer Bitmessage pour fermer les connexions existantes. - + Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want. Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre liste. Essayez de renommer l'adresse existante. - + The address you entered was invalid. Ignoring it. L'adresse que vous avez entré est invalide. Adresse ignorée. - + Passphrase mismatch Phrases secrètes différentes - + The passphrase you entered twice doesn't match. Try again. Les phrases secrètes entrées sont différentes. Réessayez. - + Choose a passphrase Choisissez une phrase secrète - + You really do need a passphrase. Vous devez vraiment utiliser une phrase secrète. - + All done. Closing user interface... Terminé. Fermeture de l'interface... - + Address is gone L'adresse a disparu - + Bitmessage cannot find your address %1. Perhaps you removed it? Bitmessage ne peut pas trouver votre adresse %1. Peut-être l'avez-vous supprimée ? - + Address disabled Adresse désactivée - + Error: The address from which you are trying to send is disabled. You'll have to enable it on the 'Your Identities' tab before using it. Erreur : L'adresse avec laquelle vous essayez de communiquer est désactivée. Vous devez d'abord l'activer dans l'onglet 'Vos identités' avant de l'utiliser. - + Entry added to the Address Book. Edit the label to your liking. Entrée ajoutée au carnet d'adresse. Éditez le label selon votre souhait. - + Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want. Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre carnet d'adresse. Essayez de renommer l'adresse existante. - + Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back. Messages déplacés dans la corbeille. Il n'y a pas d'interface utilisateur pour voir votre corbeille, mais ils sont toujours présents sur le disque si vous êtes désespérés pour les récupérer. - + No addresses selected. Aucune adresses sélectionnée. - + Options have been disabled because they either aren't applicable or because they haven't yet been implimented for your operating system. Certaines options ont été désactivées car elles n'étaient pas applicables ou car elles n'ont pas encore été implémentées pour votre système d'exploitation. - + The address should start with ''BM-'' L'adresse devrait commencer avec "BM-" - + The address is not typed or copied correctly (the checksum failed). L'adresse n'est pas correcte (la somme de contrôle a échoué). - + The version number of this address is higher than this software can support. Please upgrade Bitmessage. Le numéro de version de cette adresse est supérieure à celle que ce programme peut supporter. Veuiller mettre Bitmessage à jour. - + The address contains invalid characters. L'adresse contient des caractères invalides. - + Some data encoded in the address is too short. Certaines données encodées dans l'adresse sont trop courtes. - + Some data encoded in the address is too long. Certaines données encodées dans l'adresse sont trop longues. - + Address is valid. L'adresse est invalide. - + You are using TCP port %1. (This can be changed in the settings). Vous utilisez le port TCP %1. (Ceci peut être changé dans les paramètres). - + Error: Bitmessage addresses start with BM- Please check %1 Erreur : Les adresses Bitmessage commencent avec BM- Merci de vérifier %1 - + Error: The address %1 contains invalid characters. Please check it. Erreur : L'adresse %1 contient des caractères invalides. Veuillez la vérifier. - + Error: The address %1 is not typed or copied correctly. Please check it. Erreur : L'adresse %1 n'est pas correctement recopiée. Veuillez la vérifier. - + Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever. Erreur : La version de l'adresse %1 est trop grande. Pensez à mettre à jour Bitmessage. - + Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance. Erreur : Certaines données encodées dans l'adresse %1 sont trop courtes. Il peut y avoir un problème avec le logiciel ou votre connaissance. - + Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance. Erreur : Certaines données encodées dans l'adresse %1 sont trop longues. Il peut y avoir un problème avec le logiciel ou votre connaissance. - + Error: Something is wrong with the address %1. Erreur : Problème avec l'adresse %1. - + Error: You must specify a From address. If you don't have one, go to the 'Your Identities' tab. Erreur : Vous devez spécifier une adresse d'expéditeur. Si vous n'en avez pas, rendez-vous dans l'onglet 'Vos identités'. - + Sending to your address Envoi vers votre adresse - + Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM. Erreur : Une des adresses vers lesquelles vous envoyez un message, %1, est vôtre. Malheureusement, Bitmessage ne peut pas traiter ses propres messages. Essayez de lancer un second client sur une machine différente. - + Address version number Numéro de version de l'adresse - + Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version. Concernant l'adresse %1, Bitmessage ne peut pas comprendre les numéros de version de %2. Essayez de mettre à jour Bitmessage vers la dernière version. - + Stream number Numéro de flux - + Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version. Concernant l'adresse %1, Bitmessage ne peut pas supporter les nombres de flux de %2. Essayez de mettre à jour Bitmessage vers la dernière version. - + Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won't send until you connect. Avertissement : Vous êtes actuellement déconnecté. Bitmessage fera le travail nécessaire pour envoyer le message mais il ne sera pas envoyé tant que vous ne vous connecterez pas. - + Your 'To' field is empty. Votre champ 'Vers' est vide. - + Right click one or more entries in your address book and select 'Send message to this address'. Cliquez droit sur une ou plusieurs entrées dans votre carnet d'adresses et sélectionnez 'Envoyer un message à ces adresses'. - + Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want. Erreur : Vous ne pouvez pas ajouter une même adresse à vos abonnements deux fois. Essayez de renommer l'adresse existante. - + Message trashed Message envoyé à la corbeille + + + One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now? + Une de vos adresses, %1, est une vieille adresse de la version 1. Les adresses de la version 1 ne sont plus supportées. Nous pourrions la supprimer maintenant ? + + + + Unknown status: %1 %2 + Statut inconnu : %1 %2 + + + + Connection lost + Connexion perdue + NewAddressDialog @@ -716,8 +730,8 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a "deterministic" address. The 'Random Number' option is selected by default but deterministic addresses have several pros and cons: - Vous pouvez générer autant d'adresses que vous le souhaitez. En effet, nous vous encourageons à créer et à délaisser vos adresses. Vous pouvez générer des adresses en utilisant des nombres aléatoires ou en utilisant une phrase secrète. Si vous utilisez une phrase secrète, l'adresse sera une adresse \"déterministe\".\n" -L'option \'Nombre Aléatoire\' est sélectionnée par défaut mais les adresses déterministes ont certains avantages et inconvénients : + Vous pouvez générer autant d'adresses que vous le souhaitez. En effet, nous vous encourageons à créer et à délaisser vos adresses. Vous pouvez générer des adresses en utilisant des nombres aléatoires ou en utilisant une phrase secrète. Si vous utilisez une phrase secrète, l'adresse sera une adresse "déterministe". +L'option 'Nombre Aléatoire' est sélectionnée par défaut mais les adresses déterministes ont certains avantages et inconvénients : @@ -868,7 +882,7 @@ L'option \'Nombre Aléatoire\' est sélectionnée par défaut mai About À propos - + Copyright © 2013 Jonathan Warren Copyright © 2013 Jonathan Warren -- 2.45.1 From cbf160a8d95a09dbbb1b1525e878fd6d68c87dd6 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 01:11:01 +0200 Subject: [PATCH 10/42] fixed typos + translation files --- src/bitmessagemain.py | 2 +- src/bitmessageqt/__init__.py | 2 +- src/bitmessageui.py | 151 +++++++++++++++------------ src/translations/bitmessage_fr_BE.qm | Bin 50198 -> 0 bytes src/translations/bitmessage_fr_BE.ts | 18 ++-- 5 files changed, 96 insertions(+), 77 deletions(-) delete mode 100644 src/translations/bitmessage_fr_BE.qm diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index f0c6e402..6fd42dd1 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -2440,7 +2440,7 @@ class sqlThread(threading.Thread): self.conn.commit() if transmitdata == '': sys.stderr.write('Problem: The version of SQLite you have cannot store Null values. Please download and install the latest revision of your version of Python (for example, the latest Python 2.7 revision) and try again.\n') - sys.stderr.write('PyBitmessage will now exist very abruptly. You may now see threading errors related to this abrupt exit but the problem you need to solve is related to SQLite.\n\n') + sys.stderr.write('PyBitmessage will now exit very abruptly. You may now see threading errors related to this abrupt exit but the problem you need to solve is related to SQLite.\n\n') os._exit(0) except Exception, err: print err diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 3bc19544..08e2e93c 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1733,7 +1733,7 @@ class MyForm(QtGui.QMainWindow): if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText())[0:5] == 'SOCKS': if shared.statusIconColor != 'red': QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Restart"), QtGui.QApplication.translate( - "MainWindow", "Bitmessage will use your proxy from now on now but you may want to manually restart Bitmessage now to close existing connections.")) + "MainWindow", "Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections.")) if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText()) == 'none': self.statusBar().showMessage('') shared.config.set('bitmessagesettings', 'socksproxytype', str( diff --git a/src/bitmessageui.py b/src/bitmessageui.py index ac4ae3b6..fa0a11f3 100644 --- a/src/bitmessageui.py +++ b/src/bitmessageui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'bitmessageui.ui' # -# Created: Tue May 28 16:22:12 2013 -# by: PyQt4 UI code generator 4.9.4 +# Created: Thu Jun 13 01:02:50 2013 +# by: PyQt4 UI code generator 4.10.1 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - _fromUtf8 = lambda s: s + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_MainWindow(object): def setupUi(self, MainWindow): @@ -457,96 +466,106 @@ class Ui_MainWindow(object): MainWindow.setTabOrder(self.tableWidgetConnectionCount, self.pushButtonStatusIcon) def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Bitmessage", None, QtGui.QApplication.UnicodeUTF8)) + MainWindow.setWindowTitle(_translate("MainWindow", "Bitmessage", None)) self.tableWidgetInbox.setSortingEnabled(True) item = self.tableWidgetInbox.horizontalHeaderItem(0) - item.setText(QtGui.QApplication.translate("MainWindow", "To", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "To", None)) item = self.tableWidgetInbox.horizontalHeaderItem(1) - item.setText(QtGui.QApplication.translate("MainWindow", "From", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "From", None)) item = self.tableWidgetInbox.horizontalHeaderItem(2) - item.setText(QtGui.QApplication.translate("MainWindow", "Subject", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Subject", None)) item = self.tableWidgetInbox.horizontalHeaderItem(3) - item.setText(QtGui.QApplication.translate("MainWindow", "Received", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.inbox), QtGui.QApplication.translate("MainWindow", "Inbox", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButtonLoadFromAddressBook.setText(QtGui.QApplication.translate("MainWindow", "Load from Address book", None, QtGui.QApplication.UnicodeUTF8)) - self.label_4.setText(QtGui.QApplication.translate("MainWindow", "Message:", None, QtGui.QApplication.UnicodeUTF8)) - self.label_3.setText(QtGui.QApplication.translate("MainWindow", "Subject:", None, QtGui.QApplication.UnicodeUTF8)) - self.radioButtonSpecific.setText(QtGui.QApplication.translate("MainWindow", "Send to one or more specific people", None, QtGui.QApplication.UnicodeUTF8)) - self.textEditMessage.setHtml(QtGui.QApplication.translate("MainWindow", "\n" + item.setText(_translate("MainWindow", "Received", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.inbox), _translate("MainWindow", "Inbox", None)) + self.pushButtonLoadFromAddressBook.setText(_translate("MainWindow", "Load from Address book", None)) + self.label_4.setText(_translate("MainWindow", "Message:", None)) + self.label_3.setText(_translate("MainWindow", "Subject:", None)) + self.radioButtonSpecific.setText(_translate("MainWindow", "Send to one or more specific people", None)) + self.textEditMessage.setHtml(_translate("MainWindow", "\n" "\n" -"


", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("MainWindow", "To:", None, QtGui.QApplication.UnicodeUTF8)) - self.label_2.setText(QtGui.QApplication.translate("MainWindow", "From:", None, QtGui.QApplication.UnicodeUTF8)) - self.radioButtonBroadcast.setText(QtGui.QApplication.translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButtonSend.setText(QtGui.QApplication.translate("MainWindow", "Send", None, QtGui.QApplication.UnicodeUTF8)) - self.labelSendBroadcastWarning.setText(QtGui.QApplication.translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), QtGui.QApplication.translate("MainWindow", "Send", None, QtGui.QApplication.UnicodeUTF8)) +"


", None)) + self.label.setText(_translate("MainWindow", "To:", None)) + self.label_2.setText(_translate("MainWindow", "From:", None)) + self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None)) + self.pushButtonSend.setText(_translate("MainWindow", "Send", None)) + self.labelSendBroadcastWarning.setText(_translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None)) self.tableWidgetSent.setSortingEnabled(True) item = self.tableWidgetSent.horizontalHeaderItem(0) - item.setText(QtGui.QApplication.translate("MainWindow", "To", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "To", None)) item = self.tableWidgetSent.horizontalHeaderItem(1) - item.setText(QtGui.QApplication.translate("MainWindow", "From", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "From", None)) item = self.tableWidgetSent.horizontalHeaderItem(2) - item.setText(QtGui.QApplication.translate("MainWindow", "Subject", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Subject", None)) item = self.tableWidgetSent.horizontalHeaderItem(3) - item.setText(QtGui.QApplication.translate("MainWindow", "Status", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.sent), QtGui.QApplication.translate("MainWindow", "Sent", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButtonNewAddress.setText(QtGui.QApplication.translate("MainWindow", "New", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Status", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.sent), _translate("MainWindow", "Sent", None)) + self.pushButtonNewAddress.setText(_translate("MainWindow", "New", None)) self.tableWidgetYourIdentities.setSortingEnabled(True) item = self.tableWidgetYourIdentities.horizontalHeaderItem(0) - item.setText(QtGui.QApplication.translate("MainWindow", "Label (not shown to anyone)", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Label (not shown to anyone)", None)) item = self.tableWidgetYourIdentities.horizontalHeaderItem(1) - item.setText(QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Address", None)) item = self.tableWidgetYourIdentities.horizontalHeaderItem(2) - item.setText(QtGui.QApplication.translate("MainWindow", "Stream", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.youridentities), QtGui.QApplication.translate("MainWindow", "Your Identities", None, QtGui.QApplication.UnicodeUTF8)) - self.label_5.setText(QtGui.QApplication.translate("MainWindow", "Here you can subscribe to \'broadcast messages\' that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButtonAddSubscription.setText(QtGui.QApplication.translate("MainWindow", "Add new Subscription", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Stream", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.youridentities), _translate("MainWindow", "Your Identities", None)) + self.label_5.setText(_translate("MainWindow", "Here you can subscribe to \'broadcast messages\' that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.", None)) + self.pushButtonAddSubscription.setText(_translate("MainWindow", "Add new Subscription", None)) self.tableWidgetSubscriptions.setSortingEnabled(True) item = self.tableWidgetSubscriptions.horizontalHeaderItem(0) - item.setText(QtGui.QApplication.translate("MainWindow", "Label", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Label", None)) item = self.tableWidgetSubscriptions.horizontalHeaderItem(1) - item.setText(QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.subscriptions), QtGui.QApplication.translate("MainWindow", "Subscriptions", None, QtGui.QApplication.UnicodeUTF8)) - self.label_6.setText(QtGui.QApplication.translate("MainWindow", "The Address book is useful for adding names or labels to other people\'s Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the \'Add\' button, or from your inbox by right-clicking on a message.", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButtonAddAddressBook.setText(QtGui.QApplication.translate("MainWindow", "Add new entry", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Address", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.subscriptions), _translate("MainWindow", "Subscriptions", None)) + self.label_6.setText(_translate("MainWindow", "The Address book is useful for adding names or labels to other people\'s Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the \'Add\' button, or from your inbox by right-clicking on a message.", None)) + self.pushButtonAddAddressBook.setText(_translate("MainWindow", "Add new entry", None)) self.tableWidgetAddressBook.setSortingEnabled(True) item = self.tableWidgetAddressBook.horizontalHeaderItem(0) - item.setText(QtGui.QApplication.translate("MainWindow", "Name or Label", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Name or Label", None)) item = self.tableWidgetAddressBook.horizontalHeaderItem(1) - item.setText(QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.addressbook), QtGui.QApplication.translate("MainWindow", "Address Book", None, QtGui.QApplication.UnicodeUTF8)) - self.radioButtonBlacklist.setText(QtGui.QApplication.translate("MainWindow", "Use a Blacklist (Allow all incoming messages except those on the Blacklist)", None, QtGui.QApplication.UnicodeUTF8)) - self.radioButtonWhitelist.setText(QtGui.QApplication.translate("MainWindow", "Use a Whitelist (Block all incoming messages except those on the Whitelist)", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButtonAddBlacklist.setText(QtGui.QApplication.translate("MainWindow", "Add new entry", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Address", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.addressbook), _translate("MainWindow", "Address Book", None)) + self.radioButtonBlacklist.setText(_translate("MainWindow", "Use a Blacklist (Allow all incoming messages except those on the Blacklist)", None)) + self.radioButtonWhitelist.setText(_translate("MainWindow", "Use a Whitelist (Block all incoming messages except those on the Whitelist)", None)) + self.pushButtonAddBlacklist.setText(_translate("MainWindow", "Add new entry", None)) self.tableWidgetBlacklist.setSortingEnabled(True) item = self.tableWidgetBlacklist.horizontalHeaderItem(0) - item.setText(QtGui.QApplication.translate("MainWindow", "Name or Label", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Name or Label", None)) item = self.tableWidgetBlacklist.horizontalHeaderItem(1) - item.setText(QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.blackwhitelist), QtGui.QApplication.translate("MainWindow", "Blacklist", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Address", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.blackwhitelist), _translate("MainWindow", "Blacklist", None)) item = self.tableWidgetConnectionCount.horizontalHeaderItem(0) - item.setText(QtGui.QApplication.translate("MainWindow", "Stream Number", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Stream Number", None)) item = self.tableWidgetConnectionCount.horizontalHeaderItem(1) - item.setText(QtGui.QApplication.translate("MainWindow", "Number of Connections", None, QtGui.QApplication.UnicodeUTF8)) - self.labelTotalConnections.setText(QtGui.QApplication.translate("MainWindow", "Total connections: 0", None, QtGui.QApplication.UnicodeUTF8)) - self.labelStartupTime.setText(QtGui.QApplication.translate("MainWindow", "Since startup at asdf:", None, QtGui.QApplication.UnicodeUTF8)) - self.labelMessageCount.setText(QtGui.QApplication.translate("MainWindow", "Processed 0 person-to-person messages.", None, QtGui.QApplication.UnicodeUTF8)) - self.labelPubkeyCount.setText(QtGui.QApplication.translate("MainWindow", "Processed 0 public keys.", None, QtGui.QApplication.UnicodeUTF8)) - self.labelBroadcastCount.setText(QtGui.QApplication.translate("MainWindow", "Processed 0 broadcasts.", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.networkstatus), QtGui.QApplication.translate("MainWindow", "Network Status", None, QtGui.QApplication.UnicodeUTF8)) - self.menuFile.setTitle(QtGui.QApplication.translate("MainWindow", "File", None, QtGui.QApplication.UnicodeUTF8)) - self.menuSettings.setTitle(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8)) - self.menuHelp.setTitle(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8)) - self.actionImport_keys.setText(QtGui.QApplication.translate("MainWindow", "Import keys", None, QtGui.QApplication.UnicodeUTF8)) - self.actionManageKeys.setText(QtGui.QApplication.translate("MainWindow", "Manage keys", None, QtGui.QApplication.UnicodeUTF8)) - self.actionExit.setText(QtGui.QApplication.translate("MainWindow", "Quit", None, QtGui.QApplication.UnicodeUTF8)) - self.actionHelp.setText(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8)) - self.actionAbout.setText(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8)) - self.actionSettings.setText(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8)) - self.actionRegenerateDeterministicAddresses.setText(QtGui.QApplication.translate("MainWindow", "Regenerate deterministic addresses", None, QtGui.QApplication.UnicodeUTF8)) - self.actionDeleteAllTrashedMessages.setText(QtGui.QApplication.translate("MainWindow", "Delete all trashed messages", None, QtGui.QApplication.UnicodeUTF8)) + item.setText(_translate("MainWindow", "Number of Connections", None)) + self.labelTotalConnections.setText(_translate("MainWindow", "Total connections: 0", None)) + self.labelStartupTime.setText(_translate("MainWindow", "Since startup at asdf:", None)) + self.labelMessageCount.setText(_translate("MainWindow", "Processed 0 person-to-person message.", None)) + self.labelPubkeyCount.setText(_translate("MainWindow", "Processed 0 public key.", None)) + self.labelBroadcastCount.setText(_translate("MainWindow", "Processed 0 broadcast.", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.networkstatus), _translate("MainWindow", "Network Status", None)) + self.menuFile.setTitle(_translate("MainWindow", "File", None)) + self.menuSettings.setTitle(_translate("MainWindow", "Settings", None)) + self.menuHelp.setTitle(_translate("MainWindow", "Help", None)) + self.actionImport_keys.setText(_translate("MainWindow", "Import keys", None)) + self.actionManageKeys.setText(_translate("MainWindow", "Manage keys", None)) + self.actionExit.setText(_translate("MainWindow", "Quit", None)) + self.actionHelp.setText(_translate("MainWindow", "Help", None)) + self.actionAbout.setText(_translate("MainWindow", "About", None)) + self.actionSettings.setText(_translate("MainWindow", "Settings", None)) + self.actionRegenerateDeterministicAddresses.setText(_translate("MainWindow", "Regenerate deterministic addresses", None)) + self.actionDeleteAllTrashedMessages.setText(_translate("MainWindow", "Delete all trashed messages", None)) import bitmessage_icons_rc + +if __name__ == "__main__": + import sys + app = QtGui.QApplication(sys.argv) + MainWindow = QtGui.QMainWindow() + ui = Ui_MainWindow() + ui.setupUi(MainWindow) + MainWindow.show() + sys.exit(app.exec_()) + diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm deleted file mode 100644 index a91bc48f9d6b84cb3c5b5200950ecea429c09e79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50198 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 diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index 0afe5772..83fd97e7 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -35,7 +35,7 @@ Load from Address book - Charger depuis carnet d'adresse + Charger depuis carnet d'adresses @@ -148,7 +148,7 @@ p, li { white-space: pre-wrap; } The Address book is useful for adding names or labels to other people's Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the 'Add' button, or from your inbox by right-clicking on a message. - Le carnet d'adresse est utile pour mettre un nom sur une adresse Bitmessage et ainsi faciliter la gestion de votre boîte de réception. Vous pouvez ajouter des entrées ici en utilisant le bouton 'Ajouter', ou depuis votre boîte de réception en faisant un clic-droit sur un message. + Le carnet d'adresses est utile pour mettre un nom sur une adresse Bitmessage et ainsi faciliter la gestion de votre boîte de réception. Vous pouvez ajouter des entrées ici en utilisant le bouton 'Ajouter', ou depuis votre boîte de réception en faisant un clic-droit sur un message. @@ -202,17 +202,17 @@ p, li { white-space: pre-wrap; } - Processed 0 person-to-person messages. + Processed 0 person-to-person message. 0 message de pair à pair traité. - Processed 0 public keys. + Processed 0 public key. 0 clé publique traitée. - Processed 0 broadcasts. + Processed 0 broadcast. 0 message de diffusion traité. @@ -391,7 +391,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o Add sender to your Address Book - Ajouter l'expéditeur au carnet d'adresse + Ajouter l'expéditeur au carnet d'adresses @@ -546,12 +546,12 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o Entry added to the Address Book. Edit the label to your liking. - Entrée ajoutée au carnet d'adresse. Éditez le label selon votre souhait. + Entrée ajoutée au carnet d'adresses. Éditez le label selon votre souhait. Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want. - Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre carnet d'adresse. Essayez de renommer l'adresse existante. + Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre carnet d'adresses. Essayez de renommer l'adresse existante. @@ -1112,7 +1112,7 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. - Lorsque quelqu'un vous envoie un message, son ordinateur doit d'abord effectuer un travail. La difficulté de ce travail, par défaut, est de 1. Vous pouvez augmenter cette valeur pour les adresses que vous créez en changeant la valeur ici. Chaque nouvelle adresse que vous créez requerra à l'envoyeur de faire face à une difficulté supérieure. Il existe une exception : si vous ajoutez un ami ou une connaissance à votre carnet d'adresse, Bitmessage les notifiera automatiquement lors du prochain message que vous leur envoyez qu'ils ne doivent compléter que la charge de travail minimale : difficulté 1. + Lorsque quelqu'un vous envoie un message, son ordinateur doit d'abord effectuer un travail. La difficulté de ce travail, par défaut, est de 1. Vous pouvez augmenter cette valeur pour les adresses que vous créez en changeant la valeur ici. Chaque nouvelle adresse que vous créez requerra à l'envoyeur de faire face à une difficulté supérieure. Il existe une exception : si vous ajoutez un ami ou une connaissance à votre carnet d'adresses, Bitmessage les notifiera automatiquement lors du prochain message que vous leur envoyez qu'ils ne doivent compléter que la charge de travail minimale : difficulté 1. -- 2.45.1 From 7f97a27e8a019a4c13925d917194f516fa4bee0b Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 01:19:57 +0200 Subject: [PATCH 11/42] fixed typo in translation file --- src/translations/bitmessage_fr_BE.qm | Bin 0 -> 50175 bytes src/translations/bitmessage_fr_BE.ts | 114 +++++++++++++-------------- 2 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 src/translations/bitmessage_fr_BE.qm diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm new file mode 100644 index 0000000000000000000000000000000000000000..ed4cf2571c0562c0c2dce59c857a5ceb5aaaed7b GIT binary patch literal 50175 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 V4docqT?P?+58R8~)S|^*{}0S=j)VXJ literal 0 HcmV?d00001 diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index 83fd97e7..fe5cd06c 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -3,57 +3,57 @@ MainWindow - + Bitmessage Bitmessage - + To Vers - + From De - + Subject Sujet - + Received Reçu - + Inbox Boîte de réception - + Load from Address book Charger depuis carnet d'adresses - + Message: Message : - + Subject: Sujet : - + Send to one or more specific people Envoyer à une ou plusieurs personne(s) - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -66,202 +66,202 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> - + To: Vers : - + From: De : - + Broadcast to everyone who is subscribed to your address Diffuser à chaque abonné de cette adresse - + Send Envoyer - + Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them. Gardez en tête que les diffusions sont seulement chiffrées avec votre adresse. Quiconque disposant de votre adresse peut les lire. - + Status Statut - + Sent Envoyé - + New Nouveau - + Label (not shown to anyone) Label (seulement visible par vous) - + Address Adresse - + Stream Flux - + Your Identities Vos identités - + Here you can subscribe to 'broadcast messages' that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab. Vous pouvez ici souscrire aux 'messages de diffusion' envoyés par d'autres utilisateurs. Les messages apparaîtront dans votre boîte de récption. Les adresses placées ici outrepassent la liste noire. - + Add new Subscription Ajouter un nouvel abonnement - + Label Label - + Subscriptions Abonnements - + The Address book is useful for adding names or labels to other people's Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the 'Add' button, or from your inbox by right-clicking on a message. Le carnet d'adresses est utile pour mettre un nom sur une adresse Bitmessage et ainsi faciliter la gestion de votre boîte de réception. Vous pouvez ajouter des entrées ici en utilisant le bouton 'Ajouter', ou depuis votre boîte de réception en faisant un clic-droit sur un message. - + Add new entry Ajouter une nouvelle entrée - + Name or Label Nom ou Label - + Address Book Carnet d'adresses - + Use a Blacklist (Allow all incoming messages except those on the Blacklist) Utiliser une liste noire (autoriser tous les messages entrants exceptés ceux sur la liste noire) - + Use a Whitelist (Block all incoming messages except those on the Whitelist) Utiliser une liste blanche (refuser tous les messages entrants exceptés ceux sur la liste blanche) - + Blacklist Liste noire - + Stream Number Numéro de flux - + Number of Connections Nombre de connexions - + Total connections: 0 Nombre de connexions total : 0 - + Since startup at asdf: Depuis le lancement à asdf : - + Processed 0 person-to-person message. 0 message de pair à pair traité. - + Processed 0 public key. 0 clé publique traitée. - + Processed 0 broadcast. 0 message de diffusion traité. - + Network Status État du réseau - + File Fichier - + Settings Paramètres - + Help Aide - + Import keys Importer les clés - + Manage keys Gérer les clés - + Quit Quitter - + About À propos - + Regenerate deterministic addresses Regénérer les clés déterministes - + Delete all trashed messages Supprimer tous les messages dans la corbeille @@ -485,7 +485,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o - Bitmessage will use your proxy from now on now but you may want to manually restart Bitmessage now to close existing connections. + Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections. Bitmessage utilisera votre proxy à partir de maintenant mais il vous faudra redémarrer Bitmessage pour fermer les connexions existantes. @@ -496,7 +496,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o The address you entered was invalid. Ignoring it. - L'adresse que vous avez entré est invalide. Adresse ignorée. + L'adresse que vous avez entrée est invalide. Adresse ignorée. @@ -556,12 +556,12 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back. - Messages déplacés dans la corbeille. Il n'y a pas d'interface utilisateur pour voir votre corbeille, mais ils sont toujours présents sur le disque si vous êtes désespérés pour les récupérer. + Messages déplacés dans la corbeille. Il n'y a pas d'interface utilisateur pour voir votre corbeille, mais ils sont toujours présents sur le disque si vous souhaitez les récupérer. No addresses selected. - Aucune adresses sélectionnée. + Aucune adresse sélectionnée. @@ -581,7 +581,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o The version number of this address is higher than this software can support. Please upgrade Bitmessage. - Le numéro de version de cette adresse est supérieure à celle que ce programme peut supporter. Veuiller mettre Bitmessage à jour. + Le numéro de version de cette adresse est supérieur à celui que le programme peut supporter. Veuiller mettre Bitmessage à jour. @@ -601,7 +601,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o Address is valid. - L'adresse est invalide. + L'adresse est valide. -- 2.45.1 From eba8bbe55c3606ef8085ec1dc84c0b3d895bbe23 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 01:21:40 +0200 Subject: [PATCH 12/42] fixed typo in GUI --- src/newaddressdialog.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/newaddressdialog.ui b/src/newaddressdialog.ui index 3da926ae..72fc39ec 100644 --- a/src/newaddressdialog.ui +++ b/src/newaddressdialog.ui @@ -76,7 +76,7 @@ The 'Random Number' option is selected by default but deterministic addresses ha - Use a passpharase to make addresses + Use a passphrase to make addresses buttonGroup -- 2.45.1 From ce638ae07653ec2263bf71c4e97595b5ee393c6d Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 08:43:59 +0200 Subject: [PATCH 13/42] fixed typo + translation file --- src/iconglossary.ui | 2 +- src/translations/bitmessage_fr_BE.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/iconglossary.ui b/src/iconglossary.ui index 62ea6a98..870a90ee 100644 --- a/src/iconglossary.ui +++ b/src/iconglossary.ui @@ -50,7 +50,7 @@ - You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn't configured to foward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node. + You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn't configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node. Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index fe5cd06c..a483b4d9 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -745,7 +745,7 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais - Use a passpharase to make addresses + Use a passphrase to make addresses Utiliser une phrase secrète pour créer une adresse @@ -930,7 +930,7 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais - You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn't configured to foward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node. + You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn't configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node. Vous avez au moins une connexion sortante avec un pair mais vous n'avez encore reçu aucune connexion entrante. Votre pare-feu ou routeur n'est probablement pas configuré pour transmettre les connexions TCP vers votre ordinateur. Bitmessage fonctionnera correctement, mais le réseau Bitmessage se portera mieux si vous autorisez les connexions entrantes. Cela vous permettra d'être un nœud mieux connecté. -- 2.45.1 From 1540e99f6d5d4caca2909c572acd03ff65210fe0 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 08:48:03 +0200 Subject: [PATCH 14/42] fixed french typo --- src/translations/bitmessage_fr_BE.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index a483b4d9..7da2a0d1 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -999,7 +999,7 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais If you have previously made deterministic addresses but lost them due to an accident (like hard drive failure), you can regenerate them here. If you used the random number generator to make your addresses then this form will be of no use to you. - Si vous aviez généré des adresses déterministes mais les avez perdus à cause d'un accident, vous pouvez les regénérer ici. Si vous aviez utilisé le générateur de nombres aléatoires pour créer vos adresses, ce formulaire ne vous sera d'aucune utilité. + Si vous aviez généré des adresses déterministes mais les avez perdues à cause d'un accident, vous pouvez les regénérer ici. Si vous aviez utilisé le générateur de nombres aléatoires pour créer vos adresses, ce formulaire ne vous sera d'aucune utilité. -- 2.45.1 From 11334a0cdfc8e7dfca8a67bc238525fce0036746 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 08:53:16 +0200 Subject: [PATCH 15/42] fixed french typo --- src/translations/bitmessage_fr_BE.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index 7da2a0d1..c2186dfd 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -994,7 +994,7 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais You must check (or not check) this box just like you did (or didn't) when you made your addresses the first time. - Vous devez cocher (ou décocher) cette case comme vous l'avez fait (ou non) lors de la création de vos adresses la première fois. + Vous devez cocher (ou décocher) cette case comme vous l'aviez fait (ou non) lors de la création de vos adresses la première fois. -- 2.45.1 From c7358bdb84ab140dd121c49c3fbf0dfd7caf53f5 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 09:59:40 +0200 Subject: [PATCH 16/42] function _translate - lighter code replace QtGui.QApplication.translate with _translate --- src/bitmessageqt/__init__.py | 223 ++++++++++++++++++----------------- 1 file changed, 116 insertions(+), 107 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 08e2e93c..459745c7 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -4,6 +4,7 @@ except: pass try: + from PyQt4 import QtCore, QtGui from PyQt4.QtCore import * from PyQt4.QtGui import * except Exception as err: @@ -11,6 +12,14 @@ except Exception as err: print 'Error message:', err sys.exit() + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text): + return QtGui.QApplication.translate(context, text) +except AttributeError: + print 'Error message:', err + withMessagingMenu = False try: from gi.repository import MessagingMenu @@ -57,7 +66,7 @@ class MyForm(QtGui.QMainWindow): status, addressVersionNumber, streamNumber, hash = decodeAddress( addressInKeysFile) if addressVersionNumber == 1: - displayMsg = QtGui.QApplication.translate( + displayMsg = _translate( "MainWindow", "One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. " + "May we delete it now?").arg(addressInKeysFile) reply = QtGui.QMessageBox.question( @@ -125,13 +134,13 @@ class MyForm(QtGui.QMainWindow): # Popup menu for the Inbox tab self.ui.inboxContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionReply = self.ui.inboxContextMenuToolbar.addAction( - "Reply", self.on_action_InboxReply) - self.actionAddSenderToAddressBook = self.ui.inboxContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionReply = self.ui.inboxContextMenuToolbar.addAction(_translate( + "MainWindow", "Reply"), self.on_action_InboxReply) + self.actionAddSenderToAddressBook = self.ui.inboxContextMenuToolbar.addAction(_translate( "MainWindow", "Add sender to your Address Book"), self.on_action_InboxAddSenderToAddressBook) self.actionTrashInboxMessage = self.ui.inboxContextMenuToolbar.addAction( - QtGui.QApplication.translate("MainWindow", "Move to Trash"), self.on_action_InboxTrash) - self.actionForceHtml = self.ui.inboxContextMenuToolbar.addAction(QtGui.QApplication.translate( + _translate("MainWindow", "Move to Trash"), self.on_action_InboxTrash) + self.actionForceHtml = self.ui.inboxContextMenuToolbar.addAction(_translate( "MainWindow", "View HTML code as formatted text"), self.on_action_InboxMessageForceHtml) self.ui.tableWidgetInbox.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) @@ -148,15 +157,15 @@ class MyForm(QtGui.QMainWindow): # Popup menu for the Your Identities tab self.ui.addressContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionNew = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionNew = self.ui.addressContextMenuToolbar.addAction(_translate( "MainWindow", "New"), self.on_action_YourIdentitiesNew) - self.actionEnable = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionEnable = self.ui.addressContextMenuToolbar.addAction(_translate( "MainWindow", "Enable"), self.on_action_YourIdentitiesEnable) - self.actionDisable = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionDisable = self.ui.addressContextMenuToolbar.addAction(_translate( "MainWindow", "Disable"), self.on_action_YourIdentitiesDisable) - self.actionClipboard = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionClipboard = self.ui.addressContextMenuToolbar.addAction(_translate( "MainWindow", "Copy address to clipboard"), self.on_action_YourIdentitiesClipboard) - self.actionSpecialAddressBehavior = self.ui.addressContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionSpecialAddressBehavior = self.ui.addressContextMenuToolbar.addAction(_translate( "MainWindow", "Special address behavior..."), self.on_action_SpecialAddressBehaviorDialog) self.ui.tableWidgetYourIdentities.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) @@ -174,13 +183,13 @@ class MyForm(QtGui.QMainWindow): # Popup menu for the Address Book page self.ui.addressBookContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionAddressBookSend = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionAddressBookSend = self.ui.addressBookContextMenuToolbar.addAction(_translate( "MainWindow", "Send message to this address"), self.on_action_AddressBookSend) - self.actionAddressBookClipboard = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionAddressBookClipboard = self.ui.addressBookContextMenuToolbar.addAction(_translate( "MainWindow", "Copy address to clipboard"), self.on_action_AddressBookClipboard) - self.actionAddressBookNew = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionAddressBookNew = self.ui.addressBookContextMenuToolbar.addAction(_translate( "MainWindow", "Add New Address"), self.on_action_AddressBookNew) - self.actionAddressBookDelete = self.ui.addressBookContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionAddressBookDelete = self.ui.addressBookContextMenuToolbar.addAction(_translate( "MainWindow", "Delete"), self.on_action_AddressBookDelete) self.ui.tableWidgetAddressBook.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) @@ -197,15 +206,15 @@ class MyForm(QtGui.QMainWindow): self.ui.subscriptionsContextMenuToolbar = QtGui.QToolBar() # Actions self.actionsubscriptionsNew = self.ui.subscriptionsContextMenuToolbar.addAction( - QtGui.QApplication.translate("MainWindow", "New"), self.on_action_SubscriptionsNew) + _translate("MainWindow", "New"), self.on_action_SubscriptionsNew) self.actionsubscriptionsDelete = self.ui.subscriptionsContextMenuToolbar.addAction( - QtGui.QApplication.translate("MainWindow", "Delete"), self.on_action_SubscriptionsDelete) + _translate("MainWindow", "Delete"), self.on_action_SubscriptionsDelete) self.actionsubscriptionsClipboard = self.ui.subscriptionsContextMenuToolbar.addAction( - QtGui.QApplication.translate("MainWindow", "Copy address to clipboard"), self.on_action_SubscriptionsClipboard) + _translate("MainWindow", "Copy address to clipboard"), self.on_action_SubscriptionsClipboard) self.actionsubscriptionsEnable = self.ui.subscriptionsContextMenuToolbar.addAction( - QtGui.QApplication.translate("MainWindow", "Enable"), self.on_action_SubscriptionsEnable) + _translate("MainWindow", "Enable"), self.on_action_SubscriptionsEnable) self.actionsubscriptionsDisable = self.ui.subscriptionsContextMenuToolbar.addAction( - QtGui.QApplication.translate("MainWindow", "Disable"), self.on_action_SubscriptionsDisable) + _translate("MainWindow", "Disable"), self.on_action_SubscriptionsDisable) self.ui.tableWidgetSubscriptions.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) self.connect(self.ui.tableWidgetSubscriptions, QtCore.SIGNAL( @@ -222,11 +231,11 @@ class MyForm(QtGui.QMainWindow): # Popup menu for the Sent page self.ui.sentContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionTrashSentMessage = self.ui.sentContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionTrashSentMessage = self.ui.sentContextMenuToolbar.addAction(_translate( "MainWindow", "Move to Trash"), self.on_action_SentTrash) - self.actionSentClipboard = self.ui.sentContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionSentClipboard = self.ui.sentContextMenuToolbar.addAction(_translate( "MainWindow", "Copy destination address to clipboard"), self.on_action_SentClipboard) - self.actionForceSend = self.ui.sentContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionForceSend = self.ui.sentContextMenuToolbar.addAction(_translate( "MainWindow", "Force send"), self.on_action_ForceSend) self.ui.tableWidgetSent.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) @@ -239,15 +248,15 @@ class MyForm(QtGui.QMainWindow): # Popup menu for the Blacklist page self.ui.blacklistContextMenuToolbar = QtGui.QToolBar() # Actions - self.actionBlacklistNew = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionBlacklistNew = self.ui.blacklistContextMenuToolbar.addAction(_translate( "MainWindow", "Add new entry"), self.on_action_BlacklistNew) - self.actionBlacklistDelete = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionBlacklistDelete = self.ui.blacklistContextMenuToolbar.addAction(_translate( "MainWindow", "Delete"), self.on_action_BlacklistDelete) - self.actionBlacklistClipboard = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionBlacklistClipboard = self.ui.blacklistContextMenuToolbar.addAction(_translate( "MainWindow", "Copy address to clipboard"), self.on_action_BlacklistClipboard) - self.actionBlacklistEnable = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionBlacklistEnable = self.ui.blacklistContextMenuToolbar.addAction(_translate( "MainWindow", "Enable"), self.on_action_BlacklistEnable) - self.actionBlacklistDisable = self.ui.blacklistContextMenuToolbar.addAction(QtGui.QApplication.translate( + self.actionBlacklistDisable = self.ui.blacklistContextMenuToolbar.addAction(_translate( "MainWindow", "Disable"), self.on_action_BlacklistDisable) self.ui.tableWidgetBlacklist.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) @@ -449,37 +458,37 @@ class MyForm(QtGui.QMainWindow): QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) self.ui.tableWidgetSent.setItem(0, 2, newItem) if status == 'awaitingpubkey': - statusText = QtGui.QApplication.translate( + statusText = _translate( "MainWindow", "Waiting on their encryption key. Will request it again soon.") elif status == 'doingpowforpubkey': - statusText = QtGui.QApplication.translate( + statusText = _translate( "MainWindow", "Encryption key request queued.") elif status == 'msgqueued': - statusText = QtGui.QApplication.translate( + statusText = _translate( "MainWindow", "Queued.") elif status == 'msgsent': - statusText = QtGui.QApplication.translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent at %1").arg( + statusText = _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent at %1").arg( unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)))) elif status == 'doingmsgpow': - statusText = QtGui.QApplication.translate( + statusText = _translate( "MainWindow", "Need to do work to send message. Work is queued.") elif status == 'ackreceived': - statusText = QtGui.QApplication.translate("MainWindow", "Acknowledgement of the message received %1").arg( + statusText = _translate("MainWindow", "Acknowledgement of the message received %1").arg( unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) elif status == 'broadcastqueued': - statusText = QtGui.QApplication.translate( + statusText = _translate( "MainWindow", "Broadcast queued.") elif status == 'broadcastsent': - statusText = QtGui.QApplication.translate("MainWindow", "Broadcast on %1").arg(unicode(strftime( + statusText = _translate("MainWindow", "Broadcast on %1").arg(unicode(strftime( shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) elif status == 'toodifficult': - statusText = QtGui.QApplication.translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg( + statusText = _translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg( unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) elif status == 'forcepow': - statusText = QtGui.QApplication.translate( + statusText = _translate( "MainWindow", "Forced difficulty override. Send should start soon.") else: - statusText = QtGui.QApplication.translate("MainWindow", "Unknown status: %1 %2").arg(status).arg(unicode( + statusText = _translate("MainWindow", "Unknown status: %1 %2").arg(status).arg(unicode( strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) newItem = myTableWidgetItem(statusText) newItem.setToolTip(statusText) @@ -533,7 +542,7 @@ class MyForm(QtGui.QMainWindow): # self.ui.pushButtonStatusIcon.setIcon(QIcon(":/newPrefix/images/yellowicon.png")) self.statusbar = self.statusBar() self.statusbar.insertPermanentWidget(0, self.ui.pushButtonStatusIcon) - self.ui.labelStartupTime.setText(QtGui.QApplication.translate("MainWindow", "Since startup on %1").arg( + self.ui.labelStartupTime.setText(_translate("MainWindow", "Since startup on %1").arg( unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time())))))) self.numberOfMessagesProcessed = 0 self.numberOfBroadcastsProcessed = 0 @@ -680,7 +689,7 @@ class MyForm(QtGui.QMainWindow): m = QMenu() - self.actionStatus = QtGui.QAction(QtGui.QApplication.translate( + self.actionStatus = QtGui.QAction(_translate( "MainWindow", "Not Connected"), m, checkable=False) m.addAction(self.actionStatus) @@ -690,7 +699,7 @@ class MyForm(QtGui.QMainWindow): m.addAction(actionSeparator) # show bitmessage - self.actionShow = QtGui.QAction(QtGui.QApplication.translate( + self.actionShow = QtGui.QAction(_translate( "MainWindow", "Show Bitmessage"), m, checkable=True) self.actionShow.setChecked(not shared.config.getboolean( 'bitmessagesettings', 'startintray')) @@ -699,19 +708,19 @@ class MyForm(QtGui.QMainWindow): m.addAction(self.actionShow) # Send - actionSend = QtGui.QAction(QtGui.QApplication.translate( + actionSend = QtGui.QAction(_translate( "MainWindow", "Send"), m, checkable=False) actionSend.triggered.connect(self.appIndicatorSend) m.addAction(actionSend) # Subscribe - actionSubscribe = QtGui.QAction(QtGui.QApplication.translate( + actionSubscribe = QtGui.QAction(_translate( "MainWindow", "Subscribe"), m, checkable=False) actionSubscribe.triggered.connect(self.appIndicatorSubscribe) m.addAction(actionSubscribe) # Address book - actionAddressBook = QtGui.QAction(QtGui.QApplication.translate( + actionAddressBook = QtGui.QAction(_translate( "MainWindow", "Address Book"), m, checkable=False) actionAddressBook.triggered.connect(self.appIndicatorAddressBook) m.addAction(actionAddressBook) @@ -722,7 +731,7 @@ class MyForm(QtGui.QMainWindow): m.addAction(actionSeparator) # Quit - m.addAction(QtGui.QApplication.translate( + m.addAction(_translate( "MainWindow", "Quit"), self.quit) self.tray.setContextMenu(m) @@ -911,24 +920,24 @@ class MyForm(QtGui.QMainWindow): # may manage your keys by editing the keys.dat file stored in # the same directory as this program. It is important that you # back up this file.', QMessageBox.Ok) - reply = QtGui.QMessageBox.information(self, 'keys.dat?', QtGui.QApplication.translate( + reply = QtGui.QMessageBox.information(self, 'keys.dat?', _translate( "MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file."), QMessageBox.Ok) else: - QtGui.QMessageBox.information(self, 'keys.dat?', QtGui.QApplication.translate( + QtGui.QMessageBox.information(self, 'keys.dat?', _translate( "MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file.").arg(shared.appdata), QMessageBox.Ok) elif sys.platform == 'win32' or sys.platform == 'win64': if shared.appdata == '': - reply = QtGui.QMessageBox.question(self, QtGui.QApplication.translate("MainWindow", "Open keys.dat?"), QtGui.QApplication.translate( + reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Open keys.dat?"), _translate( "MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) else: - reply = QtGui.QMessageBox.question(self, QtGui.QApplication.translate("MainWindow", "Open keys.dat?"), QtGui.QApplication.translate( + reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Open keys.dat?"), _translate( "MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)").arg(shared.appdata), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) if reply == QtGui.QMessageBox.Yes: self.openKeysFile() def click_actionDeleteAllTrashedMessages(self): - if QtGui.QMessageBox.question(self, QtGui.QApplication.translate("MainWindow", "Delete trash?"), QtGui.QApplication.translate("MainWindow", "Are you sure you want to delete all trashed messages?"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) == QtGui.QMessageBox.No: + if QtGui.QMessageBox.question(self, _translate("MainWindow", "Delete trash?"), _translate("MainWindow", "Are you sure you want to delete all trashed messages?"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) == QtGui.QMessageBox.No: return shared.sqlLock.acquire() shared.sqlSubmitQueue.put('deleteandvacuume') @@ -939,7 +948,7 @@ class MyForm(QtGui.QMainWindow): self) if self.regenerateAddressesDialogInstance.exec_(): if self.regenerateAddressesDialogInstance.ui.lineEditPassphrase.text() == "": - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "bad passphrase"), QtGui.QApplication.translate( + QMessageBox.about(self, _translate("MainWindow", "bad passphrase"), _translate( "MainWindow", "You must type your passphrase. If you don\'t have one then this is not the form for you.")) else: streamNumberForAddress = int( @@ -984,17 +993,17 @@ class MyForm(QtGui.QMainWindow): def incrementNumberOfMessagesProcessed(self): self.numberOfMessagesProcessed += 1 - self.ui.labelMessageCount.setText(QtGui.QApplication.translate( + self.ui.labelMessageCount.setText(_translate( "MainWindow", "Processed %1 person-to-person messages.").arg(str(self.numberOfMessagesProcessed))) def incrementNumberOfBroadcastsProcessed(self): self.numberOfBroadcastsProcessed += 1 - self.ui.labelBroadcastCount.setText(QtGui.QApplication.translate( + self.ui.labelBroadcastCount.setText(_translate( "MainWindow", "Processed %1 broadcast messages.").arg(str(self.numberOfBroadcastsProcessed))) def incrementNumberOfPubkeysProcessed(self): self.numberOfPubkeysProcessed += 1 - self.ui.labelPubkeyCount.setText(QtGui.QApplication.translate( + self.ui.labelPubkeyCount.setText(_translate( "MainWindow", "Processed %1 public keys.").arg(str(self.numberOfPubkeysProcessed))) def updateNetworkStatusTab(self): @@ -1038,7 +1047,7 @@ class MyForm(QtGui.QMainWindow): newItem.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled ) self.ui.tableWidgetConnectionCount.setItem(0,1,newItem) totalNumberOfConnectionsFromAllStreams += connectionCount""" - self.ui.labelTotalConnections.setText(QtGui.QApplication.translate( + self.ui.labelTotalConnections.setText(_translate( "MainWindow", "Total Connections: %1").arg(str(len(shared.connectedHostsList)))) if len(shared.connectedHostsList) > 0 and shared.statusIconColor == 'red': # FYI: The 'singlelistener' thread sets the icon color to green when it receives an incoming connection, meaning that the user's firewall is configured correctly. self.setStatusIcon('yellow') @@ -1057,12 +1066,12 @@ class MyForm(QtGui.QMainWindow): shared.statusIconColor = 'red' # if the connection is lost then show a notification if self.connected: - self.notifierShow('Bitmessage', QtGui.QApplication.translate( + self.notifierShow('Bitmessage', _translate( "MainWindow", "Connection lost")) self.connected = False if self.actionStatus is not None: - self.actionStatus.setText(QtGui.QApplication.translate( + self.actionStatus.setText(_translate( "MainWindow", "Not Connected")) self.tray.setIcon(QtGui.QIcon( ":/newPrefix/images/can-icon-24px-red.png")) @@ -1074,12 +1083,12 @@ class MyForm(QtGui.QMainWindow): shared.statusIconColor = 'yellow' # if a new connection has been established then show a notification if not self.connected: - self.notifierShow('Bitmessage', QtGui.QApplication.translate( + self.notifierShow('Bitmessage', _translate( "MainWindow", "Connected")) self.connected = True if self.actionStatus is not None: - self.actionStatus.setText(QtGui.QApplication.translate( + self.actionStatus.setText(_translate( "MainWindow", "Connected")) self.tray.setIcon(QtGui.QIcon( ":/newPrefix/images/can-icon-24px-yellow.png")) @@ -1090,12 +1099,12 @@ class MyForm(QtGui.QMainWindow): QIcon(":/newPrefix/images/greenicon.png")) shared.statusIconColor = 'green' if not self.connected: - self.notifierShow('Bitmessage', QtGui.QApplication.translate( + self.notifierShow('Bitmessage', _translate( "MainWindow", "Connected")) self.connected = True if self.actionStatus is not None: - self.actionStatus.setText(QtGui.QApplication.translate( + self.actionStatus.setText(_translate( "MainWindow", "Connected")) self.tray.setIcon(QtGui.QIcon( ":/newPrefix/images/can-icon-24px-green.png")) @@ -1135,7 +1144,7 @@ class MyForm(QtGui.QMainWindow): def removeInboxRowByMsgid(self, msgid): # msgid and inventoryHash are the same thing for i in range(self.ui.tableWidgetInbox.rowCount()): if msgid == str(self.ui.tableWidgetInbox.item(i, 3).data(Qt.UserRole).toPyObject()): - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Message trashed")) self.ui.tableWidgetInbox.removeRow(i) break @@ -1269,28 +1278,28 @@ class MyForm(QtGui.QMainWindow): print 'Error: Could not decode', toAddress, ':', status shared.printLock.release() if status == 'missingbm': - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: Bitmessage addresses start with BM- Please check %1").arg(toAddress)) elif status == 'checksumfailed': - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: The address %1 is not typed or copied correctly. Please check it.").arg(toAddress)) elif status == 'invalidcharacters': - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: The address %1 contains invalid characters. Please check it.").arg(toAddress)) elif status == 'versiontoohigh': - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever.").arg(toAddress)) elif status == 'ripetooshort': - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance.").arg(toAddress)) elif status == 'ripetoolong': - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance.").arg(toAddress)) else: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: Something is wrong with the address %1.").arg(toAddress)) elif fromAddress == '': - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: You must specify a From address. If you don\'t have one, go to the \'Your Identities\' tab.")) else: toAddress = addBMIfNotPresent(toAddress) @@ -1299,22 +1308,22 @@ class MyForm(QtGui.QMainWindow): # The toAddress is one owned by me. We cannot send # messages to ourselves without significant changes # to the codebase. - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Sending to your address"), QtGui.QApplication.translate( + QMessageBox.about(self, _translate("MainWindow", "Sending to your address"), _translate( "MainWindow", "Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.").arg(toAddress)) continue except: pass if addressVersionNumber > 3 or addressVersionNumber <= 1: - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Address version number"), QtGui.QApplication.translate( + QMessageBox.about(self, _translate("MainWindow", "Address version number"), _translate( "MainWindow", "Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(addressVersionNumber))) continue if streamNumber > 1 or streamNumber == 0: - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Stream number"), QtGui.QApplication.translate( + QMessageBox.about(self, _translate("MainWindow", "Stream number"), _translate( "MainWindow", "Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(streamNumber))) continue self.statusBar().showMessage('') if shared.statusIconColor == 'red': - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.")) ackdata = OpenSSL.rand(32) shared.sqlLock.acquire() @@ -1351,11 +1360,11 @@ class MyForm(QtGui.QMainWindow): self.ui.tabWidget.setCurrentIndex(2) self.ui.tableWidgetSent.setCurrentCell(0, 0) else: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Your \'To\' field is empty.")) else: # User selected 'Broadcast' if fromAddress == '': - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: You must specify a From address. If you don\'t have one, go to the \'Your Identities\' tab.")) else: self.statusBar().showMessage('') @@ -1428,7 +1437,7 @@ class MyForm(QtGui.QMainWindow): time.sleep(0.1) self.statusBar().showMessage('') time.sleep(0.1) - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Right click one or more entries in your address book and select \'Send message to this address\'.")) def redrawLabelFrom(self, index): @@ -1621,10 +1630,10 @@ class MyForm(QtGui.QMainWindow): self.rerenderInboxFromLabels() self.rerenderSentToLabels() else: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.")) else: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "The address you entered was invalid. Ignoring it.")) def click_pushButtonAddSubscription(self): @@ -1667,10 +1676,10 @@ class MyForm(QtGui.QMainWindow): self.rerenderInboxFromLabels() shared.reloadBroadcastSendersForWhichImWatching() else: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want.")) else: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "The address you entered was invalid. Ignoring it.")) def loadBlackWhiteList(self): @@ -1726,13 +1735,13 @@ class MyForm(QtGui.QMainWindow): shared.config.set('bitmessagesettings', 'startintray', str( self.settingsDialogInstance.ui.checkBoxStartInTray.isChecked())) if int(shared.config.get('bitmessagesettings', 'port')) != int(self.settingsDialogInstance.ui.lineEditTCPPort.text()): - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Restart"), QtGui.QApplication.translate( + QMessageBox.about(self, _translate("MainWindow", "Restart"), _translate( "MainWindow", "You must restart Bitmessage for the port number change to take effect.")) shared.config.set('bitmessagesettings', 'port', str( self.settingsDialogInstance.ui.lineEditTCPPort.text())) if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText())[0:5] == 'SOCKS': if shared.statusIconColor != 'red': - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Restart"), QtGui.QApplication.translate( + QMessageBox.about(self, _translate("MainWindow", "Restart"), _translate( "MainWindow", "Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections.")) if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and str(self.settingsDialogInstance.ui.comboBoxProxyType.currentText()) == 'none': self.statusBar().showMessage('') @@ -1886,10 +1895,10 @@ class MyForm(QtGui.QMainWindow): shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() else: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want.")) else: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "The address you entered was invalid. Ignoring it.")) def on_action_SpecialAddressBehaviorDialog(self): @@ -1942,11 +1951,11 @@ class MyForm(QtGui.QMainWindow): self.dialog.ui.newaddresslabel.text().toUtf8()), 1, "", self.dialog.ui.checkBoxEighteenByteRipe.isChecked())) else: if self.dialog.ui.lineEditPassphrase.text() != self.dialog.ui.lineEditPassphraseAgain.text(): - QMessageBox.about(self, QtGui.QApplication.translate("MainWindow", "Passphrase mismatch"), QtGui.QApplication.translate( + QMessageBox.about(self, _translate("MainWindow", "Passphrase mismatch"), _translate( "MainWindow", "The passphrase you entered twice doesn\'t match. Try again.")) elif self.dialog.ui.lineEditPassphrase.text() == "": - QMessageBox.about(self, QtGui.QApplication.translate( - "MainWindow", "Choose a passphrase"), QtGui.QApplication.translate("MainWindow", "You really do need a passphrase.")) + QMessageBox.about(self, _translate( + "MainWindow", "Choose a passphrase"), _translate("MainWindow", "You really do need a passphrase.")) else: streamNumberForAddress = 1 # this will eventually have to be replaced by logic to determine the most available stream number. # self.addressGenerator = addressGenerator() @@ -1973,7 +1982,7 @@ class MyForm(QtGui.QMainWindow): # unregister the messaging system if self.mmapp is not None: self.mmapp.unregister() - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "All done. Closing user interface...")) os._exit(0) @@ -2021,11 +2030,11 @@ class MyForm(QtGui.QMainWindow): if toAddressAtCurrentInboxRow == self.str_broadcast_subscribers: self.ui.labelFrom.setText('') elif not shared.config.has_section(toAddressAtCurrentInboxRow): - QtGui.QMessageBox.information(self, QtGui.QApplication.translate("MainWindow", "Address is gone"), QtGui.QApplication.translate( + QtGui.QMessageBox.information(self, _translate("MainWindow", "Address is gone"), _translate( "MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(toAddressAtCurrentInboxRow), QMessageBox.Ok) self.ui.labelFrom.setText('') elif not shared.config.getboolean(toAddressAtCurrentInboxRow, 'enabled'): - QtGui.QMessageBox.information(self, QtGui.QApplication.translate("MainWindow", "Address disabled"), QtGui.QApplication.translate( + QtGui.QMessageBox.information(self, _translate("MainWindow", "Address disabled"), _translate( "MainWindow", "Error: The address from which you are trying to send is disabled. You\'ll have to enable it on the \'Your Identities\' tab before using it."), QMessageBox.Ok) self.ui.labelFrom.setText('') else: @@ -2077,10 +2086,10 @@ class MyForm(QtGui.QMainWindow): shared.sqlLock.release() self.ui.tabWidget.setCurrentIndex(5) self.ui.tableWidgetAddressBook.setCurrentCell(0, 0) - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Entry added to the Address Book. Edit the label to your liking.")) else: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.")) # Send item on the Inbox tab to trash @@ -2098,7 +2107,7 @@ class MyForm(QtGui.QMainWindow): shared.sqlLock.release() self.ui.textEditInboxMessage.setText("") self.ui.tableWidgetInbox.removeRow(currentRow) - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.")) shared.sqlLock.acquire() shared.sqlSubmitQueue.put('commit') @@ -2123,7 +2132,7 @@ class MyForm(QtGui.QMainWindow): shared.sqlLock.release() self.ui.textEditSentMessage.setPlainText("") self.ui.tableWidgetSent.removeRow(currentRow) - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.")) shared.sqlLock.acquire() shared.sqlSubmitQueue.put('commit') @@ -2217,7 +2226,7 @@ class MyForm(QtGui.QMainWindow): self.ui.lineEditTo.setText(str( self.ui.lineEditTo.text()) + '; ' + str(addressAtCurrentRow)) if listOfSelectedRows == {}: - self.statusBar().showMessage(QtGui.QApplication.translate( + self.statusBar().showMessage(_translate( "MainWindow", "No addresses selected.")) else: self.statusBar().showMessage('') @@ -2630,12 +2639,12 @@ class settingsDialog(QtGui.QDialog): self.ui.checkBoxStartOnLogon.setDisabled(True) self.ui.checkBoxMinimizeToTray.setDisabled(True) self.ui.checkBoxShowTrayNotifications.setDisabled(True) - self.ui.labelSettingsNote.setText(QtGui.QApplication.translate( + self.ui.labelSettingsNote.setText(_translate( "MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system.")) elif 'linux' in sys.platform: self.ui.checkBoxStartOnLogon.setDisabled(True) self.ui.checkBoxMinimizeToTray.setDisabled(True) - self.ui.labelSettingsNote.setText(QtGui.QApplication.translate( + self.ui.labelSettingsNote.setText(_translate( "MainWindow", "Options have been disabled because they either aren\'t applicable or because they haven\'t yet been implimented for your operating system.")) # On the Network settings tab: self.ui.lineEditTCPPort.setText(str( @@ -2753,26 +2762,26 @@ class NewSubscriptionDialog(QtGui.QDialog): def subscriptionAddressChanged(self, QString): status, a, b, c = decodeAddress(str(QString)) if status == 'missingbm': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + self.ui.labelSubscriptionAddressCheck.setText(_translate( "MainWindow", "The address should start with ''BM-''")) elif status == 'checksumfailed': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + self.ui.labelSubscriptionAddressCheck.setText(_translate( "MainWindow", "The address is not typed or copied correctly (the checksum failed).")) elif status == 'versiontoohigh': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + self.ui.labelSubscriptionAddressCheck.setText(_translate( "MainWindow", "The version number of this address is higher than this software can support. Please upgrade Bitmessage.")) elif status == 'invalidcharacters': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + self.ui.labelSubscriptionAddressCheck.setText(_translate( "MainWindow", "The address contains invalid characters.")) elif status == 'ripetooshort': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + self.ui.labelSubscriptionAddressCheck.setText(_translate( "MainWindow", "Some data encoded in the address is too short.")) elif status == 'ripetoolong': - self.ui.labelSubscriptionAddressCheck.setText(QtGui.QApplication.translate( + self.ui.labelSubscriptionAddressCheck.setText(_translate( "MainWindow", "Some data encoded in the address is too long.")) elif status == 'success': self.ui.labelSubscriptionAddressCheck.setText( - QtGui.QApplication.translate("MainWindow", "Address is valid.")) + _translate("MainWindow", "Address is valid.")) class NewAddressDialog(QtGui.QDialog): @@ -2803,7 +2812,7 @@ class iconGlossaryDialog(QtGui.QDialog): self.ui = Ui_iconGlossaryDialog() self.ui.setupUi(self) self.parent = parent - self.ui.labelPortNumber.setText(QtGui.QApplication.translate( + self.ui.labelPortNumber.setText(_translate( "MainWindow", "You are using TCP port %1. (This can be changed in the settings).").arg(str(shared.config.getint('bitmessagesettings', 'port')))) QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) -- 2.45.1 From 242981755f25a7b89cbf5197569bd90933de8b90 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 10:30:30 +0200 Subject: [PATCH 17/42] fixed "libpng warning: iCCP: known incorrect sRGB profile" error === before === (find . -iname '*.png' -type f -exec identify -verbose '{}' +) |& grep 'known incorrect sRGB profile' identify: iCCP: known incorrect sRGB profile `./can-icon-24px-green.png' @ warning/png.c/MagickPNGWarningHandler/1830. identify: iCCP: known incorrect sRGB profile `./greenicon.png' @ warning/png.c/MagickPNGWarningHandler/1830. identify: iCCP: known incorrect sRGB profile `./can-icon-24px-yellow.png' @ warning/png.c/MagickPNGWarningHandler/1830. identify: iCCP: known incorrect sRGB profile `./redicon.png' @ warning/png.c/MagickPNGWarningHandler/1830. identify: iCCP: known incorrect sRGB profile `./can-icon-24px.png' @ warning/png.c/MagickPNGWarningHandler/1830. identify: iCCP: known incorrect sRGB profile `./can-icon-24px-red.png' @ warning/png.c/MagickPNGWarningHandler/1830. identify: iCCP: known incorrect sRGB profile `./can-icon-16px.png' @ warning/png.c/MagickPNGWarningHandler/1830. identify: iCCP: known incorrect sRGB profile `./yellowicon.png' @ warning/png.c/MagickPNGWarningHandler/1830. --- src/images/can-icon-16px.png | Bin 3602 -> 1007 bytes src/images/can-icon-24px-green.png | Bin 4326 -> 1898 bytes src/images/can-icon-24px-red.png | Bin 4325 -> 1893 bytes src/images/can-icon-24px-yellow.png | Bin 4315 -> 1890 bytes src/images/can-icon-24px.png | Bin 4260 -> 1852 bytes src/images/greenicon.png | Bin 3370 -> 820 bytes src/images/redicon.png | Bin 3295 -> 716 bytes src/images/yellowicon.png | Bin 3293 -> 634 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/images/can-icon-16px.png b/src/images/can-icon-16px.png index 0603328e5eddd08277db9b951b625fb2b47adf10..c649919f6b618caafac1b214606e2bedc0af8249 100644 GIT binary patch delta 974 zcmV;<12O!P9PbB^92Ws-^w0MI000JJOGiWi{{a60|De66laV18e*=$6L_t(I%RQ0b zPg`{W#n1PCFSNb4+;)uqfLr8;bIgQ{pACa0E^a=IM6+aOA!=fbx@e{k>XQ#9ix0+s zz(kkDEK^_H;-ko*upc56!EFd_Es#;#OD8|pQtrJ_dcVD29}r$o&N=zy9Lg9&PfyYGtxVw+{_P)d)jQ7+qTV3)2tz>l{5rFKs=u0Cr%tgf6yNQ2gm&f{aA0COcW&eE&GCVv6aNy@#w<4+K)H%a2apQ+;-cVhr zAj|ST!~Y!6wCtOUM`opwyI5V&LIK-rL_3#;E>hQ z@&b-lABAmmf5a2X-o2uALDW{WSX*De(cIJ|Djo$crxTB7XW?`>(A3lr5q3V{YG z>^}|woO1x6gb+>$u}h^=^JMhTIfug``2#iZdcBZclC`_Ld)@7pKcQ5#IJXZA2mlIz zQA)9}u=x3t<6t{v(u>yOgBIaUofaAxG_LEl*2>^gG=AW31{!vlk zIOg-$e?XF)sH&=h?2{3hmbn=Ug&;{z zxFi?cZZ{;S3xp7)(`h6ZmOv?mKj2$e)w&i+>6Vz!X%T} zMs#%c;I}(>pl=%p)vEyE-|M>Guc{%m96t_8l0ZfxV-Q6VvAM*B!NI|s`F!3Z2*SZ8 zC=?3#;KR!}`^uRwOmpWeS(ee%&*~=FQD#ml?BO wEcW~TPfwpd^{L0Jq=JC}{60Ty+ddrrKM`NVyUi9Spa1{>07*qoM6N<$g2C|JSO5S3 literal 3602 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 Y0Ed1?_5j`8Z~y=R07*qoM6N<$g4I6e9smFU diff --git a/src/images/can-icon-24px-green.png b/src/images/can-icon-24px-green.png index 247bebc7ef1b3df4dc2e443ca361139ecb988ef9..652da9c03b56349b5c2d52fbdcb053d8a38b3400 100644 GIT binary patch delta 1872 zcmV-W2e0_%A?gm092WtXa1Cw%000JJOGiWi{{a60|De66laV18e+LRlL_t(Y$5oYU za9m{>$A9lRXZM`5mt-&5mQ6!1P{Ih(GEgm+Vq0|(VFU(L1OdgW3?D>5KpdUXQ3UY< zGC1|ZR0n3XQ!Z9OMxd8839$u~(hIan+FT&X=Cau)+w5ldyyu+94C5N`1oJ{3^ch zmfvHThH?J+tHikffuE^tHcRv3Jd?#DS1kEKxcH@YqC|us2oMpalrn(e?RSoLRVuUV z@=F%cd|ET*f9dIBCX>m9VSvH=p_CHSG=qP=_-_HV?)0V27DLJ)*J z_~0+N>89(^TGO>}A6{M4*qA&~I$2tI!37tfM1;p4fBVDt{{FXZztdWywI&EdDwP?Y z`NwwZ_1Y_UE!uKvk2lD4tsE#3VdpDtc-m7#!@~`4yz$0A-+OOpW9SEb|DHR()x0FX zb@icZrWT5HC~$Je&Cb?ogQ7`Qu>aQ>94Shx@eeA6^}>E&IO`A*r%jI?)Khbylhc8s-+WXGK z>2xaMxKU!U7_Q^u`#$?$e~rGrfkyxgr4&jjW^46J1_$50GnGyekH<;IGg6urGY9cQ<;5|6vYV{t4ie?qNRqo?;cmKou!)-$gJFoIBn1kbj% zo<%yFA{L8bJ2pxwj&>g-3_=o#M7>ZbyZ~TyAMN?>wbxvC&8Cf?s*g5BX ze{4>qJ9oG7lOO+7f*`>2Jhb-lbe-F7yOql>zmy+3f1G{2cEl}*6=o*O*BKIq+;i_e zv1BqyGMOZuPLWAx_{-KOsMTtJezkVM9q}iaIa!7`t6w$<70E=rzWLjm)rL(QHfM89 zej=IV-1E+@Mk0}0i+y9avVR6%n5r_Nf3II~+EDI`wcqpTAonD8u{+Kz&feToqdDf8@S> zuf1CLyj9t37B}V)kH@fW8^>{o$6`dR2qJ>#d5n&YF)%ntwK7}$%%+VOx~}u?hutH9 zD5bD0i&E+2WiP$Fvus+{s+N`(QmGWlWCF)^h{xk3Vlg77g@{nCR_Pn)r>}p2zz<0# zlTF>-J>LYd0LI40KSYt}yMsf|e~*n#e7>cng?KEE?L>(>5uB)v>$pUtQB1=i5TRTy z)7yKTN~KB=1lV?zWy_ZiEy?G%E&z%XlXFJ0tTlzv(JrlZbj9*z*shJ^M2SYD*p7p1 z+eEAghGF0b0maE8-QB%t?IR*IHa3z@r#fsqx?!?ZV)3Fya{$M2ICiY(f4=ti_6LJ7 zWZBZwu_7jG)?7$KvH=N0MCKNsp$xRv438G*?e0Yc9LFV{PEkHJ{ZL_a{ry~mDo;zZv*;&5+ zjT^b@sw?Nd|5O7Y?65n2IglLRJQ+;qPWol0!tzwXFWx&F)V3-SVb|_9P>S|F?Z0i? zv-hqb3@}ZTFbo$UVHhHzFk71?-<;=>M}I>kVtK`4@w0d4w{#Bbe-S2w={d3M5GH(> z4z|y&k)3UG3JQg(sVVyU`@eeR$dO--jgFn}`#z>=qLf-NWVJfWHD9{w)a6%P_Ng!o z-(Fq2p^hg}lmaaGDhv1Oc^LjZ&#Zz3#0sP2+N9(3)yY zO`Un>8GlWs8~-!O8~h&&1IPtgWjjIu0000< KMNUMnLSTabQ=3Qt literal 4326 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 JPDHLkV1ge!T~`1A diff --git a/src/images/can-icon-24px.png b/src/images/can-icon-24px.png index 45e397e3a7456235c333cc25dd567113215975b9..30f7313eb378b69c4e2f6cb66264c2ae678059e1 100644 GIT binary patch delta 1825 zcmV++2j2LkA-oQd92WtXa1Cw%000JJOGiWi{{a60|De66laV18e+Jx1L_t(Y$5oYC zY*g17$N%Rpb9c{fd&Ul6FcYx^5(kx(kQ&-bNmDgcv{IUev`y*q)F^F36{#;#lYr7J zC{h)vjcAp;L~R;T(nd|#jP1BUX-nAc8L-D-du%fv%)pFi?z!iDeHd)Wc|5xR@AobL z?;b`(2!a4LzrGeke}vCYouO)NjzC1{=*ZBiGp7lhbM*HQyuvvLtJmweS*_5i&(1)3 zVEsd68YbG>(+szwg{Q9;yN7aF@_nEFb?g`^0MOglKN|>sWa*L)96WRgx~6SZ0HEhk z-|xTs`1kPOhE0e>BWzt)*8qYbKoA5FLg3`dQ||{s0M0oOe*^*Joa1m$FBPUHiE~aw z1cfn1{rv-1mvk&bA{IygzyQX^CbqL|E(h0j$#q>2Nt`@+8i{0#vGrfrNVBuE@B<%j zz4bdNs-oO`?;28G+W8w6kH?X2Nnxf~L?qHg$#?>ch#-Uj5i!P?0zjNQe_^0fncI+R zYeu>?jq>&Df5liVmXuOJ!L7p>BUM$!KR)^=0c^uvi_%EOlh8E{U`QP5IYOhOSDt1> zgtO-c5eWWf`Fi=8bUFpE$wkBqL(?@3WwRI`FCdj}#od_%#>bmZoH+5fD_6!g$w1(jJD&Yfx-GS5)rys1j5Ug# zpWXb-IOmw2o?hS6(|2SfpMOr0oWEy8bh}FcG{zVdMbZCv^7OGpGT!ZY?yDjYR4SFe z34j4ue-JnT0##M<@h1l>^PMt6At;K1WHPz;;-%qd?i5rS?LGfSG#b%OD+JrNVVM?! zAi%MIAII=;em4Lpj4?3AFjuQTG&*|u=aFaxj^n^{9H@$diNXY`l^U9xla0L3U&w+n zhFmV&cXuWO$Fbnp4m3?ityV)ecM+PZV|ixTe`5fk2+08wA7nDi5sgP++cpf-0Aman zh6W*pgzLKXLZR??08oZ5WPkRpt&eZryy>gh_T91mv5z)Wcd<6{NHVsTuXompHg z76Aat)Z}ziEEYpDnM6LHM_YRb-h1!QxHLSBSUip(;C+m#Q!7`lXb4uUUhy(x46fs% zf64WbYH7s_FT9B3M^7M;h$0ZY+b}c;AsYgc5<7mi!}dH6p64MNjUX0{;g5UXL9JH% zgRbkiZ|!|Z#NrJBB!lNV_3c02&bl{uZ;vMvf$Mo#bC9*F3+`GgP) z{ve`xqcOVmm8z;J7H7V8`t+F(ZdNK*e>@&TJQ0WMI#3m5PE)nFEz8<%+jbrRq$B_Y zUDrPkAR-MwD`TtxK+Fdp9?8FSVKDpaNVo~E>%wttgbW>)Wx=%_7={5wQBW?I>Bfy4 zZ=_PG=NJe~Q9lP@w~J_0!8!Mi9zFhP-S^kT<8fHF3CFQv7zRw!gk#&#H626*f8X~p zIW>j+=qRd{x#E{MZ@S;I%*%If4*?*?7&J{osdVj;k3Tt3RyA!+dwV+~kqA7`g=v{^ z90#s#LsvBr5vtWHhVvsB9?3%l5}xNJhK8~~1ON>HrlzOwpit=Y=-7u-Q&%5uZ*PZV zJ21=;LZ%KgWWX{lghC;xiUL7|e{#8uT<#(&l`4b~FpLluFIhC!mP+ke02HszG!{wI z))giv2RP@UjwOp>SO!cpgit61!!%(T26Rn_q9_Q2Kyjvsp`jc&4?si+hr@_QBYlPu z>Ygc;(9+!80GOtU!NKhFy}iA=gp^pk=q_lwigoMmN0ZkCk`hFXhfiS&e>mqDpDZ9Z zlmii9niitb2+B9Ezfzc-cz&WV4$HD`1K$73Uq9Ttci%S{W2n_?@VO74b5tr7)a!L@ z-1s1N?tBqz*W3dlLT>OPE?pX42yEFVipAnjf`Gpr3WdI`_8-n z86Tf$nTH4=AcTOF5(GlcfA>+Fo5S~iunk+bJl6RAN16Z-N~LQLgR%WmN-SO4fpAk3 zq?Bk*BpZN(hk5|U(0jP|^`65=ej%iQs;ZDuERYRt8IdolzloEFyMN#m7V1#L9NYDBd P00000NkvXXu0mjfdAC_< literal 4260 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 P0000<2SrXqu0mjfRs~tJ literal 3295 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 delta 2779 zcmV<13MBRV1l<{sB!3BTNLh0L01FcU01FcV0GgZ_000V4X+uL$P-t&-Z*ypGa3D!T zLm+T+Z)Rz1WdHzp+MQEpR8#2|J@?-9LQ9B%luK_?6$l_wLW_VDktQl32@pz%A)(n7 zQNa;KMFbnjpojyGj)066Q7jCK3fKqaA)=0hqlk*i`{8?|Yk$_f_vX$1wbwr9tn;0- z&j-K=43f59&ghTmgWD0l;*TI7}*0BAb^tj|`8MF3bZ02F3R#5n-i zEdVe{S7t~6u(trf&JYW-00;~KFj0twDF6g}0AR=?BX|IWnE(_<@>e|ZE3OddDgXd@ znX){&BsoQaTL>+22Uk}v9w^R97b_GtVFF>AKrX_0nSU8Ffiw@`^UMGMppg|3;Dhu1 zc+L*4&dxTDwhmt{>c0m6B4T3W{^ifBa6kY6;dFk{{wy!E8h|?nfNlPwCGG@hUJIag z_lst-4?wj5py}FI^KkfnJUm6Akh$5}<>chpO2k52Vaiv1{%68pz*qfj`F=e7_x0eu z;v|7GU4MZ`1o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcqjPo+3 zB8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S1Au6Q z;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO0Dk~Ppn)o|K^yeJ7%adB9Ki+L!3+Fg zHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_vKpix|QD}yfa1JiQRk#j4a1Z)n2%fLC6RbVIkUx0b+_+BaR3cnT7Zv!AJxWizFb)h!jyGOOZ85F;a?DAXP{m@;!0_ zIe&*-M!JzZ$N(~e{D!NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWw%BIv?Wdily+ylO`+*KY$4Vz$Cr4+G&IO(4Q`uA9rwXSQO+7mGt}d!;r5mBU zM0dY#r|y`ZzFvTyOmC;&dA;ZQ9DOhSRQ+xGr}ak+SO&8UBnI0I&KNw!HF0k|9WTe* z@liuv!$3o&VU=N*;e?U7(SJOn)kcj*4~%KXT;n9;ZN_cJqb3F>Atp;r>P_yNQcbz0 zDW*G2J50yT%*~?B)|oY%Ju%lZ=bPu7*PGwBU|M)uEVih&xMfMQu79>|wtZn|Vi#w( z#jeBdlf9FDx_yoPJqHbk*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!h;8Eq#KMS9gFl*neeosSBfoHYnBQIkwkyowPu(zdm zs`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMeBmZRodjHV?r+_5^X9J0W zL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0?0=B0A@}E)&XLY(4uw#D z=+@8&Vdi0r!+s1Wg@=V#hChyQh*%oYF_$%W(cD9G-$eREmPFp0XE9GXuPsV7Dn6<% zYCPIEx-_~!#x7=A%+*+(SV?S4962s3t~PFLzTf=q^M~S{;tS(@7nm=|U2u7!&cgJC zrxvL$5-d8FKz~e#PB@hCK@cja7K|nG6L%$!3VFgE!e=5c(KgYD*h5?@9!~N|DouKl z?2)`Rc_hU%r7Y#SgeR$xyi5&D-J3d|7MgY-Z8AMNy)lE5k&tmhsv%92wrA>R=4N)w ztYw9={>5&Kw=W)*2gz%*kgNq+Eef_mrsz~!DAy_nvVUh~S7yJ>iOM;atDY;(?aZ^v z+mJV$@1Ote62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~p zu715HdQEGAUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$ z+<4_1hktL%znR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX4c}I@?e+FW+b@^R zDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&_B8C(+grT%{XWUQ z+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?SIDu(gXbmBM!FLxzyDi(mhmCkJc;e zM-ImyzW$x>cP$Mz4ONYt#^NJzM0w=t_X*$k9t}F$c8q(h;Rn+nb{%IOFKR-X@|s4Q zQ=0o*Vq3aT%s$c9>fU<%N829{oHRUHc}nwC$!Xf@g42^{^3RN&m7RTlF8SPG+oHC6 z=YM0)-)awU@466l;nGF_i|0GMJI-A4xODQe+vO8ixL2C5I$v$-bm~0*lhaSfyPUh4 zuDM)mx$b(swR>jw=^LIm&fWCAdGQwi*43UlJ>9+YdT;l|_x0Zv-F|W>{m#p~*>@-I zt-MdXU-UrjLD@syht)q@{@mE_+<$7ocYmPs(cDM(28Dyq{*m>M4?_iynUBkc4TkHU zI6gT!;y-fz>HMcd&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M z!p0uH$#^p{Ui4P`?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GdV5W z0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}0006ANkle-vB%yY?L9Yl~e!#002ovPDHLkV1jZ_GkO33 -- 2.45.1 From 04c3857c68909836608b5dc2c857e1b4be7525d4 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 10:48:16 +0200 Subject: [PATCH 18/42] updated icons file pyrcc4 bitmessage_icons.qrc -o bitmessage_icons_rc.py --- src/bitmessage_icons_rc.py | 2633 ++++++++++-------------------------- 1 file changed, 689 insertions(+), 1944 deletions(-) diff --git a/src/bitmessage_icons_rc.py b/src/bitmessage_icons_rc.py index 6e0f0391..377ce101 100644 --- a/src/bitmessage_icons_rc.py +++ b/src/bitmessage_icons_rc.py @@ -2,286 +2,135 @@ # Resource object code # -# Created: Sat May 25 13:22:59 2013 -# by: The Resource Compiler for PyQt (Qt v4.8.3) +# Created: jeu. juin 13 10:47:41 2013 +# by: The Resource Compiler for PyQt (Qt v4.8.4) # # WARNING! All changes made in this file will be lost! from PyQt4 import QtCore qt_resource_data = "\ -\x00\x00\x10\xdb\ +\x00\x00\x07\x62\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\ -\x01\x00\x9a\x9c\x18\x00\x00\x0a\x4d\x69\x43\x43\x50\x50\x68\x6f\ -\x74\x6f\x73\x68\x6f\x70\x20\x49\x43\x43\x20\x70\x72\x6f\x66\x69\ -\x6c\x65\x00\x00\x78\xda\x9d\x53\x77\x58\x93\xf7\x16\x3e\xdf\xf7\ -\x65\x0f\x56\x42\xd8\xf0\xb1\x97\x6c\x81\x00\x22\x23\xac\x08\xc8\ -\x10\x59\xa2\x10\x92\x00\x61\x84\x10\x12\x40\xc5\x85\x88\x0a\x56\ -\x14\x15\x11\x9c\x48\x55\xc4\x82\xd5\x0a\x48\x9d\x88\xe2\xa0\x28\ -\xb8\x67\x41\x8a\x88\x5a\x8b\x55\x5c\x38\xee\x1f\xdc\xa7\xb5\x7d\ -\x7a\xef\xed\xed\xfb\xd7\xfb\xbc\xe7\x9c\xe7\xfc\xce\x79\xcf\x0f\ -\x80\x11\x12\x26\x91\xe6\xa2\x6a\x00\x39\x52\x85\x3c\x3a\xd8\x1f\ -\x8f\x4f\x48\xc4\xc9\xbd\x80\x02\x15\x48\xe0\x04\x20\x10\xe6\xcb\ -\xc2\x67\x05\xc5\x00\x00\xf0\x03\x79\x78\x7e\x74\xb0\x3f\xfc\x01\ -\xaf\x6f\x00\x02\x00\x70\xd5\x2e\x24\x12\xc7\xe1\xff\x83\xba\x50\ -\x26\x57\x00\x20\x91\x00\xe0\x22\x12\xe7\x0b\x01\x90\x52\x00\xc8\ -\x2e\x54\xc8\x14\x00\xc8\x18\x00\xb0\x53\xb3\x64\x0a\x00\x94\x00\ -\x00\x6c\x79\x7c\x42\x22\x00\xaa\x0d\x00\xec\xf4\x49\x3e\x05\x00\ -\xd8\xa9\x93\xdc\x17\x00\xd8\xa2\x1c\xa9\x08\x00\x8d\x01\x00\x99\ -\x28\x47\x24\x02\x40\xbb\x00\x60\x55\x81\x52\x2c\x02\xc0\xc2\x00\ -\xa0\xac\x40\x22\x2e\x04\xc0\xae\x01\x80\x59\xb6\x32\x47\x02\x80\ -\xbd\x05\x00\x76\x8e\x58\x90\x0f\x40\x60\x00\x80\x99\x42\x2c\xcc\ -\x00\x20\x38\x02\x00\x43\x1e\x13\xcd\x03\x20\x4c\x03\xa0\x30\xd2\ -\xbf\xe0\xa9\x5f\x70\x85\xb8\x48\x01\x00\xc0\xcb\x95\xcd\x97\x4b\ -\xd2\x33\x14\xb8\x95\xd0\x1a\x77\xf2\xf0\xe0\xe2\x21\xe2\xc2\x6c\ -\xb1\x42\x61\x17\x29\x10\x66\x09\xe4\x22\x9c\x97\x9b\x23\x13\x48\ -\xe7\x03\x4c\xce\x0c\x00\x00\x1a\xf9\xd1\xc1\xfe\x38\x3f\x90\xe7\ -\xe6\xe4\xe1\xe6\x66\xe7\x6c\xef\xf4\xc5\xa2\xfe\x6b\xf0\x6f\x22\ -\x3e\x21\xf1\xdf\xfe\xbc\x8c\x02\x04\x00\x10\x4e\xcf\xef\xda\x5f\ -\xe5\xe5\xd6\x03\x70\xc7\x01\xb0\x75\xbf\x6b\xa9\x5b\x00\xda\x56\ -\x00\x68\xdf\xf9\x5d\x33\xdb\x09\xa0\x5a\x0a\xd0\x7a\xf9\x8b\x79\ -\x38\xfc\x40\x1e\x9e\xa1\x50\xc8\x3c\x1d\x1c\x0a\x0b\x0b\xed\x25\ -\x62\xa1\xbd\x30\xe3\x8b\x3e\xff\x33\xe1\x6f\xe0\x8b\x7e\xf6\xfc\ -\x40\x1e\xfe\xdb\x7a\xf0\x00\x71\x9a\x40\x99\xad\xc0\xa3\x83\xfd\ -\x71\x61\x6e\x76\xae\x52\x8e\xe7\xcb\x04\x42\x31\x6e\xf7\xe7\x23\ -\xfe\xc7\x85\x7f\xfd\x8e\x29\xd1\xe2\x34\xb1\x5c\x2c\x15\x8a\xf1\ -\x58\x89\xb8\x50\x22\x4d\xc7\x79\xb9\x52\x91\x44\x21\xc9\x95\xe2\ -\x12\xe9\x7f\x32\xf1\x1f\x96\xfd\x09\x93\x77\x0d\x00\xac\x86\x4f\ -\xc0\x4e\xb6\x07\xb5\xcb\x6c\xc0\x7e\xee\x01\x02\x8b\x0e\x58\xd2\ -\x76\x00\x40\x7e\xf3\x2d\x8c\x1a\x0b\x91\x00\x10\x67\x34\x32\x79\ -\xf7\x00\x00\x93\xbf\xf9\x8f\x40\x2b\x01\x00\xcd\x97\xa4\xe3\x00\ -\x00\xbc\xe8\x18\x5c\xa8\x94\x17\x4c\xc6\x08\x00\x00\x44\xa0\x81\ -\x2a\xb0\x41\x07\x0c\xc1\x14\xac\xc0\x0e\x9c\xc1\x1d\xbc\xc0\x17\ -\x02\x61\x06\x44\x40\x0c\x24\xc0\x3c\x10\x42\x06\xe4\x80\x1c\x0a\ -\xa1\x18\x96\x41\x19\x54\xc0\x3a\xd8\x04\xb5\xb0\x03\x1a\xa0\x11\ -\x9a\xe1\x10\xb4\xc1\x31\x38\x0d\xe7\xe0\x12\x5c\x81\xeb\x70\x17\ -\x06\x60\x18\x9e\xc2\x18\xbc\x86\x09\x04\x41\xc8\x08\x13\x61\x21\ -\x3a\x88\x11\x62\x8e\xd8\x22\xce\x08\x17\x99\x8e\x04\x22\x61\x48\ -\x34\x92\x80\xa4\x20\xe9\x88\x14\x51\x22\xc5\xc8\x72\xa4\x02\xa9\ -\x42\x6a\x91\x5d\x48\x23\xf2\x2d\x72\x14\x39\x8d\x5c\x40\xfa\x90\ -\xdb\xc8\x20\x32\x8a\xfc\x8a\xbc\x47\x31\x94\x81\xb2\x51\x03\xd4\ -\x02\x75\x40\xb9\xa8\x1f\x1a\x8a\xc6\xa0\x73\xd1\x74\x34\x0f\x5d\ -\x80\x96\xa2\x6b\xd1\x1a\xb4\x1e\x3d\x80\xb6\xa2\xa7\xd1\x4b\xe8\ -\x75\x74\x00\x7d\x8a\x8e\x63\x80\xd1\x31\x0e\x66\x8c\xd9\x61\x5c\ -\x8c\x87\x45\x60\x89\x58\x1a\x26\xc7\x16\x63\xe5\x58\x35\x56\x8f\ -\x35\x63\x1d\x58\x37\x76\x15\x1b\xc0\x9e\x61\xef\x08\x24\x02\x8b\ -\x80\x13\xec\x08\x5e\x84\x10\xc2\x6c\x82\x90\x90\x47\x58\x4c\x58\ -\x43\xa8\x25\xec\x23\xb4\x12\xba\x08\x57\x09\x83\x84\x31\xc2\x27\ -\x22\x93\xa8\x4f\xb4\x25\x7a\x12\xf9\xc4\x78\x62\x3a\xb1\x90\x58\ -\x46\xac\x26\xee\x21\x1e\x21\x9e\x25\x5e\x27\x0e\x13\x5f\x93\x48\ -\x24\x0e\xc9\x92\xe4\x4e\x0a\x21\x25\x90\x32\x49\x0b\x49\x6b\x48\ -\xdb\x48\x2d\xa4\x53\xa4\x3e\xd2\x10\x69\x9c\x4c\x26\xeb\x90\x6d\ -\xc9\xde\xe4\x08\xb2\x80\xac\x20\x97\x91\xb7\x90\x0f\x90\x4f\x92\ -\xfb\xc9\xc3\xe4\xb7\x14\x3a\xc5\x88\xe2\x4c\x09\xa2\x24\x52\xa4\ -\x94\x12\x4a\x35\x65\x3f\xe5\x04\xa5\x9f\x32\x42\x99\xa0\xaa\x51\ -\xcd\xa9\x9e\xd4\x08\xaa\x88\x3a\x9f\x5a\x49\x6d\xa0\x76\x50\x2f\ -\x53\x87\xa9\x13\x34\x75\x9a\x25\xcd\x9b\x16\x43\xcb\xa4\x2d\xa3\ -\xd5\xd0\x9a\x69\x67\x69\xf7\x68\x2f\xe9\x74\xba\x09\xdd\x83\x1e\ -\x45\x97\xd0\x97\xd2\x6b\xe8\x07\xe9\xe7\xe9\x83\xf4\x77\x0c\x0d\ -\x86\x0d\x83\xc7\x48\x62\x28\x19\x6b\x19\x7b\x19\xa7\x18\xb7\x19\ -\x2f\x99\x4c\xa6\x05\xd3\x97\x99\xc8\x54\x30\xd7\x32\x1b\x99\x67\ -\x98\x0f\x98\x6f\x55\x58\x2a\xf6\x2a\x7c\x15\x91\xca\x12\x95\x3a\ -\x95\x56\x95\x7e\x95\xe7\xaa\x54\x55\x73\x55\x3f\xd5\x79\xaa\x0b\ -\x54\xab\x55\x0f\xab\x5e\x56\x7d\xa6\x46\x55\xb3\x50\xe3\xa9\x09\ -\xd4\x16\xab\xd5\xa9\x1d\x55\xbb\xa9\x36\xae\xce\x52\x77\x52\x8f\ -\x50\xcf\x51\x5f\xa3\xbe\x5f\xfd\x82\xfa\x63\x0d\xb2\x86\x85\x46\ -\xa0\x86\x48\xa3\x54\x63\xb7\xc6\x19\x8d\x21\x16\xc6\x32\x65\xf1\ -\x58\x42\xd6\x72\x56\x03\xeb\x2c\x6b\x98\x4d\x62\x5b\xb2\xf9\xec\ -\x4c\x76\x05\xfb\x1b\x76\x2f\x7b\x4c\x53\x43\x73\xaa\x66\xac\x66\ -\x91\x66\x9d\xe6\x71\xcd\x01\x0e\xc6\xb1\xe0\xf0\x39\xd9\x9c\x4a\ -\xce\x21\xce\x0d\xce\x7b\x2d\x03\x2d\x3f\x2d\xb1\xd6\x6a\xad\x66\ -\xad\x7e\xad\x37\xda\x7a\xda\xbe\xda\x62\xed\x72\xed\x16\xed\xeb\ -\xda\xef\x75\x70\x9d\x40\x9d\x2c\x9d\xf5\x3a\x6d\x3a\xf7\x75\x09\ -\xba\x36\xba\x51\xba\x85\xba\xdb\x75\xcf\xea\x3e\xd3\x63\xeb\x79\ -\xe9\x09\xf5\xca\xf5\x0e\xe9\xdd\xd1\x47\xf5\x6d\xf4\xa3\xf5\x17\ -\xea\xef\xd6\xef\xd1\x1f\x37\x30\x34\x08\x36\x90\x19\x6c\x31\x38\ -\x63\xf0\xcc\x90\x63\xe8\x6b\x98\x69\xb8\xd1\xf0\x84\xe1\xa8\x11\ -\xcb\x68\xba\x91\xc4\x68\xa3\xd1\x49\xa3\x27\xb8\x26\xee\x87\x67\ -\xe3\x35\x78\x17\x3e\x66\xac\x6f\x1c\x62\xac\x34\xde\x65\xdc\x6b\ -\x3c\x61\x62\x69\x32\xdb\xa4\xc4\xa4\xc5\xe4\xbe\x29\xcd\x94\x6b\ -\x9a\x66\xba\xd1\xb4\xd3\x74\xcc\xcc\xc8\x2c\xdc\xac\xd8\xac\xc9\ -\xec\x8e\x39\xd5\x9c\x6b\x9e\x61\xbe\xd9\xbc\xdb\xfc\x8d\x85\xa5\ -\x45\x9c\xc5\x4a\x8b\x36\x8b\xc7\x96\xda\x96\x7c\xcb\x05\x96\x4d\ -\x96\xf7\xac\x98\x56\x3e\x56\x79\x56\xf5\x56\xd7\xac\x49\xd6\x5c\ -\xeb\x2c\xeb\x6d\xd6\x57\x6c\x50\x1b\x57\x9b\x0c\x9b\x3a\x9b\xcb\ -\xb6\xa8\xad\x9b\xad\xc4\x76\x9b\x6d\xdf\x14\xe2\x14\x8f\x29\xd2\ -\x29\xf5\x53\x6e\xda\x31\xec\xfc\xec\x0a\xec\x9a\xec\x06\xed\x39\ -\xf6\x61\xf6\x25\xf6\x6d\xf6\xcf\x1d\xcc\x1c\x12\x1d\xd6\x3b\x74\ -\x3b\x7c\x72\x74\x75\xcc\x76\x6c\x70\xbc\xeb\xa4\xe1\x34\xc3\xa9\ -\xc4\xa9\xc3\xe9\x57\x67\x1b\x67\xa1\x73\x9d\xf3\x35\x17\xa6\x4b\ -\x90\xcb\x12\x97\x76\x97\x17\x53\x6d\xa7\x8a\xa7\x6e\x9f\x7a\xcb\ -\x95\xe5\x1a\xee\xba\xd2\xb5\xd3\xf5\xa3\x9b\xbb\x9b\xdc\xad\xd9\ -\x6d\xd4\xdd\xcc\x3d\xc5\x7d\xab\xfb\x4d\x2e\x9b\x1b\xc9\x5d\xc3\ -\x3d\xef\x41\xf4\xf0\xf7\x58\xe2\x71\xcc\xe3\x9d\xa7\x9b\xa7\xc2\ -\xf3\x90\xe7\x2f\x5e\x76\x5e\x59\x5e\xfb\xbd\x1e\x4f\xb3\x9c\x26\ -\x9e\xd6\x30\x6d\xc8\xdb\xc4\x5b\xe0\xbd\xcb\x7b\x60\x3a\x3e\x3d\ -\x65\xfa\xce\xe9\x03\x3e\xc6\x3e\x02\x9f\x7a\x9f\x87\xbe\xa6\xbe\ -\x22\xdf\x3d\xbe\x23\x7e\xd6\x7e\x99\x7e\x07\xfc\x9e\xfb\x3b\xfa\ -\xcb\xfd\x8f\xf8\xbf\xe1\x79\xf2\x16\xf1\x4e\x05\x60\x01\xc1\x01\ -\xe5\x01\xbd\x81\x1a\x81\xb3\x03\x6b\x03\x1f\x04\x99\x04\xa5\x07\ -\x35\x05\x8d\x05\xbb\x06\x2f\x0c\x3e\x15\x42\x0c\x09\x0d\x59\x1f\ -\x72\x93\x6f\xc0\x17\xf2\x1b\xf9\x63\x33\xdc\x67\x2c\x9a\xd1\x15\ -\xca\x08\x9d\x15\x5a\x1b\xfa\x30\xcc\x26\x4c\x1e\xd6\x11\x8e\x86\ -\xcf\x08\xdf\x10\x7e\x6f\xa6\xf9\x4c\xe9\xcc\xb6\x08\x88\xe0\x47\ -\x6c\x88\xb8\x1f\x69\x19\x99\x17\xf9\x7d\x14\x29\x2a\x32\xaa\x2e\ -\xea\x51\xb4\x53\x74\x71\x74\xf7\x2c\xd6\xac\xe4\x59\xfb\x67\xbd\ -\x8e\xf1\x8f\xa9\x8c\xb9\x3b\xdb\x6a\xb6\x72\x76\x67\xac\x6a\x6c\ -\x52\x6c\x63\xec\x9b\xb8\x80\xb8\xaa\xb8\x81\x78\x87\xf8\x45\xf1\ -\x97\x12\x74\x13\x24\x09\xed\x89\xe4\xc4\xd8\xc4\x3d\x89\xe3\x73\ -\x02\xe7\x6c\x9a\x33\x9c\xe4\x9a\x54\x96\x74\x63\xae\xe5\xdc\xa2\ -\xb9\x17\xe6\xe9\xce\xcb\x9e\x77\x3c\x59\x35\x59\x90\x7c\x38\x85\ -\x98\x12\x97\xb2\x3f\xe5\x83\x20\x42\x50\x2f\x18\x4f\xe5\xa7\x6e\ -\x4d\x1d\x13\xf2\x84\x9b\x85\x4f\x45\xbe\xa2\x8d\xa2\x51\xb1\xb7\ -\xb8\x4a\x3c\x92\xe6\x9d\x56\x95\xf6\x38\xdd\x3b\x7d\x43\xfa\x68\ -\x86\x4f\x46\x75\xc6\x33\x09\x4f\x52\x2b\x79\x91\x19\x92\xb9\x23\ -\xf3\x4d\x56\x44\xd6\xde\xac\xcf\xd9\x71\xd9\x2d\x39\x94\x9c\x94\ -\x9c\xa3\x52\x0d\x69\x96\xb4\x2b\xd7\x30\xb7\x28\xb7\x4f\x66\x2b\ -\x2b\x93\x0d\xe4\x79\xe6\x6d\xca\x1b\x93\x87\xca\xf7\xe4\x23\xf9\ -\x73\xf3\xdb\x15\x6c\x85\x4c\xd1\xa3\xb4\x52\xae\x50\x0e\x16\x4c\ -\x2f\xa8\x2b\x78\x5b\x18\x5b\x78\xb8\x48\xbd\x48\x5a\xd4\x33\xdf\ -\x66\xfe\xea\xf9\x23\x0b\x82\x16\x7c\xbd\x90\xb0\x50\xb8\xb0\xb3\ -\xd8\xb8\x78\x59\xf1\xe0\x22\xbf\x45\xbb\x16\x23\x8b\x53\x17\x77\ -\x2e\x31\x5d\x52\xba\x64\x78\x69\xf0\xd2\x7d\xcb\x68\xcb\xb2\x96\ -\xfd\x50\xe2\x58\x52\x55\xf2\x6a\x79\xdc\xf2\x8e\x52\x83\xd2\xa5\ -\xa5\x43\x2b\x82\x57\x34\x95\xa9\x94\xc9\xcb\x6e\xae\xf4\x5a\xb9\ -\x63\x15\x61\x95\x64\x55\xef\x6a\x97\xd5\x5b\x56\x7f\x2a\x17\x95\ -\x5f\xac\x70\xac\xa8\xae\xf8\xb0\x46\xb8\xe6\xe2\x57\x4e\x5f\xd5\ -\x7c\xf5\x79\x6d\xda\xda\xde\x4a\xb7\xca\xed\xeb\x48\xeb\xa4\xeb\ -\x6e\xac\xf7\x59\xbf\xaf\x4a\xbd\x6a\x41\xd5\xd0\x86\xf0\x0d\xad\ -\x1b\xf1\x8d\xe5\x1b\x5f\x6d\x4a\xde\x74\xa1\x7a\x6a\xf5\x8e\xcd\ -\xb4\xcd\xca\xcd\x03\x35\x61\x35\xed\x5b\xcc\xb6\xac\xdb\xf2\xa1\ -\x36\xa3\xf6\x7a\x9d\x7f\x5d\xcb\x56\xfd\xad\xab\xb7\xbe\xd9\x26\ -\xda\xd6\xbf\xdd\x77\x7b\xf3\x0e\x83\x1d\x15\x3b\xde\xef\x94\xec\ -\xbc\xb5\x2b\x78\x57\x6b\xbd\x45\x7d\xf5\x6e\xd2\xee\x82\xdd\x8f\ -\x1a\x62\x1b\xba\xbf\xe6\x7e\xdd\xb8\x47\x77\x4f\xc5\x9e\x8f\x7b\ -\xa5\x7b\x07\xf6\x45\xef\xeb\x6a\x74\x6f\x6c\xdc\xaf\xbf\xbf\xb2\ -\x09\x6d\x52\x36\x8d\x1e\x48\x3a\x70\xe5\x9b\x80\x6f\xda\x9b\xed\ -\x9a\x77\xb5\x70\x5a\x2a\x0e\xc2\x41\xe5\xc1\x27\xdf\xa6\x7c\x7b\ -\xe3\x50\xe8\xa1\xce\xc3\xdc\xc3\xcd\xdf\x99\x7f\xb7\xf5\x08\xeb\ -\x48\x79\x2b\xd2\x3a\xbf\x75\xac\x2d\xa3\x6d\xa0\x3d\xa1\xbd\xef\ -\xe8\x8c\xa3\x9d\x1d\x5e\x1d\x47\xbe\xb7\xff\x7e\xef\x31\xe3\x63\ -\x75\xc7\x35\x8f\x57\x9e\xa0\x9d\x28\x3d\xf1\xf9\xe4\x82\x93\xe3\ -\xa7\x64\xa7\x9e\x9d\x4e\x3f\x3d\xd4\x99\xdc\x79\xf7\x4c\xfc\x99\ -\x6b\x5d\x51\x5d\xbd\x67\x43\xcf\x9e\x3f\x17\x74\xee\x4c\xb7\x5f\ -\xf7\xc9\xf3\xde\xe7\x8f\x5d\xf0\xbc\x70\xf4\x22\xf7\x62\xdb\x25\ -\xb7\x4b\xad\x3d\xae\x3d\x47\x7e\x70\xfd\xe1\x48\xaf\x5b\x6f\xeb\ -\x65\xf7\xcb\xed\x57\x3c\xae\x74\xf4\x4d\xeb\x3b\xd1\xef\xd3\x7f\ -\xfa\x6a\xc0\xd5\x73\xd7\xf8\xd7\x2e\x5d\x9f\x79\xbd\xef\xc6\xec\ -\x1b\xb7\x6e\x26\xdd\x1c\xb8\x25\xba\xf5\xf8\x76\xf6\xed\x17\x77\ -\x0a\xee\x4c\xdc\x5d\x7a\x8f\x78\xaf\xfc\xbe\xda\xfd\xea\x07\xfa\ -\x0f\xea\x7f\xb4\xfe\xb1\x65\xc0\x6d\xe0\xf8\x60\xc0\x60\xcf\xc3\ -\x59\x0f\xef\x0e\x09\x87\x9e\xfe\x94\xff\xd3\x87\xe1\xd2\x47\xcc\ -\x47\xd5\x23\x46\x23\x8d\x8f\x9d\x1f\x1f\x1b\x0d\x1a\xbd\xf2\x64\ -\xce\x93\xe1\xa7\xb2\xa7\x13\xcf\xca\x7e\x56\xff\x79\xeb\x73\xab\ -\xe7\xdf\xfd\xe2\xfb\x4b\xcf\x58\xfc\xd8\xf0\x0b\xf9\x8b\xcf\xbf\ -\xae\x79\xa9\xf3\x72\xef\xab\xa9\xaf\x3a\xc7\x23\xc7\x1f\xbc\xce\ -\x79\x3d\xf1\xa6\xfc\xad\xce\xdb\x7d\xef\xb8\xef\xba\xdf\xc7\xbd\ -\x1f\x99\x28\xfc\x40\xfe\x50\xf3\xd1\xfa\x63\xc7\xa7\xd0\x4f\xf7\ -\x3e\xe7\x7c\xfe\xfc\x2f\xf7\x84\xf3\xfb\x25\xd2\x9f\x33\x00\x00\ -\x00\x20\x63\x48\x52\x4d\x00\x00\x7a\x25\x00\x00\x80\x83\x00\x00\ -\xf9\xff\x00\x00\x80\xe9\x00\x00\x75\x30\x00\x00\xea\x60\x00\x00\ -\x3a\x98\x00\x00\x17\x6f\x92\x5f\xc5\x46\x00\x00\x06\x08\x49\x44\ -\x41\x54\x78\xda\x7c\x95\x4b\x6c\x5c\x57\x1d\xc6\x7f\xe7\x75\x9f\ -\xf3\xf2\x78\xe2\x44\x4d\x62\xd7\x89\x84\x1a\xd2\xa4\x45\xb5\x54\ -\x09\x81\xe8\x43\x08\xca\x82\xd2\xa4\xca\x02\x29\xb0\xa4\x42\xa4\ -\x22\x20\x9e\xad\x40\x88\x45\xc5\xa3\x2d\xed\x02\x16\x20\x0a\x62\ -\xd1\x96\xd7\xa2\x20\x55\x2a\x05\x91\x8a\xaa\x09\x11\x28\x71\x5c\ -\xda\x38\x49\x15\xc7\xf6\x78\xc6\xf6\x4c\x6c\x8f\x67\xe6\xce\xe3\ -\xdc\xc3\x62\xec\x49\x4a\x24\x8e\x74\x74\xcf\xe2\x1e\x7d\xff\xff\ -\xf7\x9d\xef\xfb\x0b\xe7\x1c\xd6\x5a\xb6\x97\x73\x0e\x21\xc4\xf0\ -\xbc\xbd\xa4\x94\xd4\x6a\xb5\x7b\x2f\x5e\xbc\x74\xa4\xdf\xb7\xf7\ -\x16\x0a\xf9\x95\xc2\x48\xfe\x4c\x69\x47\xe9\x2f\x71\x14\x9d\x4f\ -\x6d\x7a\xf3\xff\x02\x70\x5a\x6b\xc4\xff\x01\x10\x6e\xeb\x86\x52\ -\x8a\xd5\xd5\xda\x43\xd3\xd3\x17\xfe\xb0\xd9\x6c\x86\xa3\xa3\x45\ -\x46\x4b\xa3\x64\x32\x31\x4a\xca\xb6\x56\xfa\xe7\x61\x18\x3e\x1b\ -\x45\xd1\x55\x80\x34\x75\x80\xc3\x18\x83\xe4\xd6\x25\x00\x0d\x48\ -\x21\x04\x42\x08\x9c\x73\x66\xa9\x52\x79\xb2\x6f\xd3\x70\x6c\x6c\ -\x27\x85\x42\x81\x30\x0a\x08\xc2\x90\x52\x69\x47\x58\x2c\x16\x1f\ -\xef\x74\x3a\x67\x6b\xb5\xda\x67\x06\x77\x90\x5b\x24\xbc\x1f\xc0\ -\x39\xa7\x81\xdd\x80\x03\xec\x76\xf5\x57\xe7\xae\x7d\x77\x7e\xa1\ -\xfc\xe1\x4c\x26\x26\x8a\x42\x82\x20\x40\x0a\x09\xce\x61\xfb\x7d\ -\xa4\x94\x94\x4a\xa5\x52\x10\x04\x7f\x5c\x5a\x5a\xfa\xb1\x94\x32\ -\x55\x52\xde\x02\x20\x84\x10\xbe\x10\xa2\x01\x58\xe7\x1c\x4a\x29\ -\x56\x56\x6b\x1f\x7b\xf7\xdd\xd9\xaf\x47\x61\x40\x2e\x97\x23\x8c\ -\x7c\x8c\xa7\xf1\x3c\x0f\xdf\xf7\xd1\x5a\x03\xd0\xef\xf7\xc9\x66\ -\xb3\xe2\xda\xc2\xc2\x57\x67\x2f\x5d\xfe\xb2\x90\xea\xd6\x0e\x80\ -\x16\xb0\xbe\xad\x43\x92\x24\xd9\x99\x0b\x33\xcf\x4b\x29\x4c\x26\ -\x93\x41\x48\x30\xc6\x60\x8c\x19\x00\x78\x1e\x4a\x29\x9c\x73\xf4\ -\x7a\x3d\xae\xce\xcd\x91\x24\x09\x57\xae\xbc\xf7\x44\xbb\x9d\x8c\ -\xff\x2f\x80\xdb\xda\x6c\x53\x73\xf9\xca\x7b\xdf\xdb\x68\x34\x0e\ -\xe7\xf3\x79\x7c\xdf\xc7\xf7\xbd\x21\x80\xef\xf9\x48\xa9\x10\x42\ -\x60\xad\xa5\xd9\x6a\x52\xa9\x56\xe8\xf7\x2d\x42\xc8\x52\xb9\x5c\ -\x7e\x90\x2d\x31\xdf\xaf\xb0\x10\x03\x6a\x56\x56\x3f\x79\xf9\xf2\ -\x95\x93\xc5\x62\x91\x6c\x36\x8b\xef\xfb\x78\x9e\x46\x69\x85\xe7\ -\x79\x18\xad\x50\x42\x90\xa6\x29\x9d\x4e\x87\xea\xf2\x32\xad\x56\ -\x82\x40\x90\xc9\xc4\x34\x1a\x9b\x13\x43\x80\xed\x77\xbf\xcd\x65\ -\xa7\xdb\xfb\xe8\xcc\xcc\xdb\xbf\x31\xc6\x90\xcf\xe7\x51\x5a\xa1\ -\x8d\x1c\x56\xee\x1b\x83\x94\x0a\x84\xa0\xdb\xeb\x52\xab\xd7\x58\ -\x5e\x5e\x01\x37\xe8\x3c\x8a\x22\x4a\xa5\xd2\xfc\x10\xa0\x52\xad\ -\xde\xc4\x93\xf3\xae\xcd\x2d\x3c\xb1\xbe\xb1\x59\xda\xb3\xe7\x36\ -\x3c\x33\xe0\xda\x78\x06\xcf\x18\x7c\xe3\xa1\x94\x46\x0a\x81\x4d\ -\x53\x5a\xcd\x16\x95\xca\x32\xa9\x1d\xf8\x49\x6b\xc5\x8e\xb1\xd2\ -\xc2\xae\x5d\x63\xaf\x0d\x01\xea\xf5\xf5\x21\x3d\xbd\x7e\xf7\x47\ -\xd5\x6a\xf5\x13\xc5\x62\x91\x38\x8a\x30\x9e\x46\x1b\x85\xd1\x06\ -\x63\x3c\xb4\xd2\x03\x6f\x00\xbd\x6e\x97\x6a\xb5\xca\x46\x63\x03\ -\x81\x44\x6b\xcd\x68\x69\x94\x42\x21\xff\x45\x07\xf3\x43\x91\x53\ -\xdb\x27\xb5\x7d\x04\x6e\xaa\xb6\x5a\x7b\x2c\x08\x02\xf2\xb9\x3c\ -\x42\x49\xb4\x51\x68\xad\xd1\xc6\x60\x8c\x46\x2a\x39\x14\x76\x6d\ -\x7d\x8d\x6a\x75\x19\xdc\x40\x8b\x28\x8a\x30\xda\xbc\xd1\x6e\xb7\ -\xff\x54\xaf\xd7\x19\x76\xe0\x84\x23\x0a\x43\xba\x9d\xee\xb7\x84\ -\xc0\x1b\x1f\xdf\xcb\xc8\x48\x01\x21\x05\xce\x0d\x2c\xef\x69\x83\ -\x54\x6a\xa8\x57\xd2\x49\x58\xaa\x54\x48\x92\x36\x42\x48\xc2\x30\ -\x42\x4a\xd9\x69\x34\x36\xbe\xed\x48\xb1\xd6\xb2\x73\x6c\x6c\x00\ -\x10\xfa\x21\xef\xfc\x67\xf6\x9b\xa7\x4e\x9d\x3a\x62\xd3\x94\x89\ -\xf1\xbd\x1c\xba\xeb\x4e\xa6\xa6\xee\x21\x97\xcd\xe1\xd2\x41\x90\ -\x39\xe7\x10\x08\x7a\xbd\x1e\x2b\xb5\x1a\x2b\xcb\xab\x80\xc4\xf7\ -\x43\xf2\xf9\x3c\x1b\x8d\xf5\x9f\xa4\xa9\x7d\xb3\xb1\xd9\x20\x0c\ -\xc3\x1b\x1d\x9c\x3b\x77\xfe\xc4\x33\x4f\x3f\xf7\xd4\xda\xda\x75\ -\xda\x49\x9b\x24\x49\x30\xc6\xe3\x8e\x03\x77\xf0\xf9\xcf\x1d\xe7\ -\xd8\xb1\xa3\xf8\xbe\x07\x40\xaf\xd7\x63\xa3\xb1\xc1\xfc\xb5\x79\ -\xba\xdd\x1e\x41\x10\x10\xc7\x11\x9d\x4e\xfb\x4a\xbb\xdd\x7a\x36\ -\x4d\x53\xb2\xd9\x2c\x93\x93\x93\x37\x9c\x7c\x69\xf6\xd2\xc7\xfb\ -\xfd\x1e\xd9\x6c\x96\x5c\x36\x47\xa1\x50\xc0\x78\x86\xe9\xe9\x69\ -\xbe\x74\xe2\x71\x8e\x1c\x3d\xc6\xf9\xe9\x0b\x83\x8a\xb4\xa6\x5a\ -\x5d\x66\xed\xfa\x1a\x9e\xe7\x91\xcb\xe5\xf0\x03\x8f\xcd\x66\xf3\ -\x07\x40\x35\x08\x02\x26\x26\x26\x50\xea\xa6\xa8\xc8\xe5\xf2\x67\ -\xb4\xd6\x43\x97\x9a\xad\xe7\x98\xcb\xe5\x18\x2d\x16\x39\x73\xe6\ -\x2c\x8f\x3c\xf2\x28\x2f\xbe\xf8\x32\xed\x24\x61\xb3\xb9\x49\x10\ -\x84\x64\xb2\x59\xa2\x38\xa0\xb9\xd9\x7c\xc3\xda\xf4\x17\x42\x28\ -\x76\xef\xde\x43\x1c\x47\xa4\x69\x7a\x83\xa2\xf1\x89\xf1\x5f\xef\ -\xde\x7d\xdb\x89\xc5\xc5\xf2\x4e\xdf\xf7\x71\xce\x21\x85\x44\x59\ -\x4b\xaa\x52\x4a\xa3\x1e\x49\xb7\xcb\xc9\xaf\x7c\x8d\x73\xd3\xe7\ -\x79\xf8\xe1\x4f\x6f\x51\x13\x62\xad\x65\xd7\xae\xb7\x7e\xb7\x6f\ -\x72\xfa\xdf\xb0\x7e\x37\xd4\x81\xeb\xab\x50\xfe\x8e\x73\x9b\x3f\ -\x93\x00\x71\x36\x5e\xb8\xef\xfe\xfb\x9e\xda\x6e\x6b\x10\x0b\xde\ -\xf0\x6b\xb4\x47\x26\x8a\xc9\xe7\x72\xfc\xf6\xa5\xdf\xf3\xcf\xd3\ -\x67\xc9\xe6\x32\x84\x61\x40\xbb\xdd\x7e\x6d\xdf\xe4\x9b\x27\x61\ -\xee\x6e\x38\x0f\xbc\x03\xcc\x97\xac\x5d\xff\xe9\xda\x5a\xf2\x90\ -\xdc\x1a\x04\x1c\x38\x78\xe0\xb9\x07\x1e\xb8\xff\x19\xb5\x15\x60\ -\x41\x10\xdc\xb4\x7d\x7c\xcf\x23\x0e\x63\x02\x3f\xe0\x95\x57\xfe\ -\x8c\xd6\x9a\x34\x4d\xbb\xfd\x7e\xff\xfb\xb0\xb8\x0f\x2e\x02\x57\ -\x81\x65\xd2\xf4\x3a\xab\xab\x3d\x16\x17\xf9\xac\x1e\x8e\x49\xe0\ -\x9e\xa9\xa9\x27\x41\xc4\xa7\x4f\x9f\xfe\x42\xab\xd5\x1a\x68\xe1\ -\xfb\x58\x6b\x49\xad\xc5\xa6\x29\xc6\x33\xac\xae\xd4\x98\x99\x9e\ -\xe1\xe0\xa1\x0f\xfe\xca\x18\xf3\x0f\x98\x03\xae\x03\x03\xde\x93\ -\x04\x96\x96\x60\x61\x81\xcc\x20\x4d\x9d\xc0\x39\x88\xc2\xb0\x7d\ -\xe8\xd0\x9d\x8f\xc5\x99\xf8\xef\x33\x33\x33\x3f\xac\x56\xaa\x7b\ -\xfb\xfd\x3e\x9e\xe7\x0d\xdd\x3b\x88\x14\xc9\x62\xb9\xdc\xb8\xeb\ -\x43\x87\x9f\x8f\xe3\x98\x4e\xa7\xd2\xee\x76\x5d\x28\x04\x58\x0b\ -\x0b\x0b\x30\x3b\x0b\xcd\x26\x7f\xd5\xc3\x49\x00\x28\x25\x65\x9c\ -\x89\xdd\xed\x93\xb7\xbf\x34\x52\x1c\x79\x75\x71\x71\xf1\x68\xb9\ -\x5c\x3e\x5e\xab\xd5\x3f\xd2\x6a\xb5\x34\x42\x80\x73\x4c\xee\x9f\ -\x6c\x1d\x3e\x7c\xe8\xa4\x10\xe2\x6d\x80\x4a\xc5\x7d\xa3\x56\xe3\ -\xe9\x24\xc1\x34\x1a\x03\x80\xf5\x75\x5e\x8e\x22\x5e\x10\xce\x39\ -\x5e\x7f\xfd\x6f\xc3\x39\xe3\x9c\x63\x7d\x63\xd3\x5a\x6b\x49\x92\ -\x84\x7a\xbd\x4e\xa7\xd3\x9d\x52\x4a\x7e\x4a\x48\x3e\x50\xc8\x17\ -\xd6\xf6\xef\xdf\xf7\x42\x61\x24\xff\x2f\xa9\x04\x5a\x69\x7c\x73\ -\x90\xb9\x39\x1e\x2c\x97\x39\x5e\xaf\x93\x6f\xb7\x79\xd5\x18\x7e\ -\x19\x45\xf4\xff\x3b\x00\x34\xc0\xa8\x5e\x05\x6f\x81\xc4\x00\x00\ -\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x01\x97\x70\x0d\x6e\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\ +\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x07\x02\x49\x44\x41\x54\x48\ +\xc7\x55\x95\x6b\x70\x5d\x55\x15\xc7\x7f\xfb\x3c\xee\x3d\xe7\x9e\ +\x7b\x93\xfb\x68\x4a\x93\x86\xb6\x69\x4b\xaa\x38\x16\x06\x3a\x16\ +\x4b\x81\x22\x4c\xad\x55\xa9\x83\xce\xe0\xa3\x55\xa1\x0a\xc3\x07\ +\xf0\x05\x0c\x33\x38\xea\x28\xc2\xe0\x03\x44\x1c\x18\x64\x8a\x03\ +\xa3\x32\x08\x88\xa0\x0c\x8f\x3e\xd2\x34\x84\x16\xab\x96\x3e\xd2\ +\x34\x49\x9b\x26\x6d\x92\x9b\xc7\xcd\x4d\x9a\xe6\xde\xdc\x7b\xf6\ +\x39\x67\xf9\x21\x24\xc0\xfa\xb8\x67\xd6\xfa\xed\xb5\xd6\xff\xbf\ +\xb7\x12\x11\x82\x20\xa0\xe2\x57\x2f\x41\x44\x78\xef\xf0\x51\x29\ +\x57\x66\x04\x11\xa1\xa9\xa9\x59\x0e\x1f\x3d\x22\x68\xad\x69\x6b\ +\x6b\x7f\x48\x6b\x8d\xaa\x56\xab\x4c\x97\x4b\x72\xf8\xbd\xa3\x18\ +\x57\xac\xbd\x4a\x9c\xb8\xc3\xe2\xc6\x06\xc5\xfb\xd5\x6a\x47\xc7\ +\x0a\xd7\x74\xf5\x74\x8b\xef\xfb\xf2\xce\x81\x03\x62\x00\xb4\xee\ +\x6b\x9b\x0c\x42\xbd\x77\xf9\xb2\x26\x76\xed\xde\x8d\x6d\x59\xeb\ +\x0d\x80\x96\xdd\xfb\x9e\xfc\xfa\x4d\xdf\xe4\xca\x75\x1b\x48\x67\ +\xd2\x6a\xcd\xe5\x6b\xde\x26\x08\x02\x82\x20\x20\x0c\x43\x0e\x1d\ +\x3a\xfc\x42\x10\x04\x68\xad\x21\x08\x02\xa5\xb5\x66\x4f\x4b\xab\ +\xe4\x47\x86\x45\x6b\x2d\x22\x82\xa1\x94\x92\xb6\xb6\xf6\xb1\x65\ +\x4d\x4b\x58\x90\xcd\xd1\xd6\xde\xce\xc0\xc0\xd0\x76\xd5\xdd\xd3\ +\x43\x32\x99\x94\x64\x32\x89\x48\xc4\xa1\x43\x47\x58\x50\x97\x55\ +\x6a\xed\xa7\xd6\xcb\xe4\xe4\x24\x7e\xe0\xf3\xf8\xe3\x7f\xc0\x30\ +\x0d\xe3\xd2\x4b\x57\x8b\x71\xff\x03\x3f\x57\xb9\x5c\x8e\x86\x0b\ +\xea\x19\x2f\x14\xd8\x78\xfd\x17\xa2\xa1\x81\x85\xa2\x44\x84\x30\ +\x0c\x11\x11\xa5\x94\x32\x80\xb0\xe3\x78\x67\x7b\xa9\x34\xb3\xae\ +\x7e\xf1\x42\x1a\x16\x35\x30\x75\xee\x5c\x21\x9b\xcd\xd6\x45\x51\ +\x88\xc1\xfb\xa1\x94\x12\xd3\x34\xc3\x7f\xbd\xf6\xba\x80\x5a\x77\ +\xe1\x92\x06\xea\x72\x75\xd8\x96\x05\x8a\x05\xbb\x5b\xf6\x4a\x7f\ +\xff\xd9\x9b\x95\x88\x70\xac\xe3\x04\x41\xa8\x1f\x9d\x3a\x37\x75\ +\x67\x43\x43\x3d\xa9\x9a\x24\xe9\x54\x2d\x96\x6d\xd1\xd5\xdd\xcd\ +\xe0\x60\x9e\xfa\x86\x45\xac\x6a\x6e\x56\x4a\x44\xb8\x62\xed\xd5\ +\x92\x1f\x1e\x22\x0c\x23\x1e\x7c\xf0\x97\x6c\xdb\xf6\x35\xb4\xd6\ +\xb4\xef\xdf\x8f\x5f\xd5\xd4\xd6\xa6\x4e\x15\x27\x8a\x2b\x2f\xbb\ +\xec\x32\x94\x88\xf0\xd8\x63\x4f\x7c\xef\xaf\x7f\x79\xee\x77\x5a\ +\x6b\xb4\xd6\x84\x51\x44\xa9\x34\xcd\x8b\x7f\x7f\x9e\x6a\xb5\xf2\ +\xd6\xba\x2b\xee\xdb\x08\x1d\x84\xe1\xc4\x6c\xc2\xce\xb7\x5a\xf0\ +\xb5\xaf\x06\x06\x07\x6b\x0e\x1e\x3c\xf8\x8f\xb3\x67\x07\x36\x44\ +\x41\xc8\x8f\xee\xfe\xfe\x77\x1a\x16\xd7\xef\x08\xfc\xd5\xfe\xd8\ +\x18\x76\x47\x07\xcf\xcf\xef\x6e\x6e\x67\x5a\x6b\x46\x47\x47\xd7\ +\xb6\xb4\xec\xdb\x7b\xba\xaf\xef\xae\x48\xa2\xb9\x73\x25\x22\x1f\ +\x4c\x09\xb0\x94\x52\x18\x86\x61\xff\xef\xd0\x91\x03\x0b\xea\x72\ +\xd7\x78\xa9\xe4\xaf\xc3\x20\x94\x62\xb1\xf8\x25\x40\x01\xf3\x09\ +\x1e\x10\x98\xa6\xc9\x1b\x6f\xee\x2a\xcd\x4d\x2a\x1e\x8b\x61\x18\ +\x06\x75\x75\x75\x2f\x9f\x3c\xd5\x7b\xe7\x87\x13\x4a\xb3\xe3\x3d\ +\xfe\x70\x26\x93\xb6\x1d\x37\x46\x22\x91\xc0\x75\x5c\x82\x20\xe0\ +\xc0\xbf\xdf\xa5\xb7\xb7\xef\x11\x00\x43\x29\x85\x52\x8a\x99\x4a\ +\xf5\xaa\xfe\xfe\x33\x3f\x48\x67\xd2\x78\x9e\x47\xca\xf3\x30\x0d\ +\x83\xa1\xfc\x10\xe5\x52\x85\x85\x0b\xeb\x66\xef\x7d\xbc\xb3\x1b\ +\xa5\x14\x3d\x3d\xdd\xfb\x56\x35\x37\xe3\x79\x2e\x5e\xc2\xc3\xb2\ +\x6c\x2a\x95\x0a\xdd\x3d\x27\xb1\x4c\x9b\x8b\x9a\x57\xdc\x00\x60\ +\x84\x91\x06\x09\x5f\x6a\x6e\xbe\x88\x4c\x2e\x4d\x22\x91\x20\xee\ +\xc4\x51\x4a\xd1\xd9\x75\x82\x28\x8c\x48\x26\x93\xd5\x7c\x3e\xff\ +\x4f\x00\xa3\xab\xb3\xfb\x8e\x2f\xdf\x78\xd3\x8d\xd7\x6e\xb8\x9e\ +\xad\xdf\xb8\x99\x94\x97\xc2\x89\xc5\x19\x2f\x8e\x33\x38\x90\x27\ +\x9b\xcd\x31\x31\x39\xbe\xb4\x50\x28\x00\x60\x8c\x0c\x8f\xd6\x64\ +\xb3\x59\xea\xea\xea\xe8\xeb\xeb\x63\x71\x63\x13\xcf\x3d\xf7\x3c\ +\xa7\x7a\x7b\xc9\xe6\x72\x04\x81\xde\xa7\x94\x39\x72\xf1\xc5\x1f\ +\x9f\x15\xe9\xce\xdd\x2d\xfc\xf4\xc7\x3f\x93\x30\x0c\xf1\x7d\x1f\ +\xad\x03\x7c\x5d\xe5\xf6\xdb\x6f\x63\xd3\xe6\x8d\x7c\xac\xf9\xbe\ +\x5e\x38\xb4\x1c\x26\x98\x98\x98\xd8\x6c\x48\x14\x71\xf7\x3d\x77\ +\x27\x52\xa9\x14\xa9\x54\x8a\x4c\x26\x4d\x36\x93\xe5\xe9\x1d\xcf\ +\x50\xa9\x54\xfe\x08\xef\x2c\x87\x5e\xca\xe5\x09\xda\xdb\xb9\xd5\ +\x22\x52\xa4\x92\x5e\x75\xfb\x77\xb7\xab\xe3\xc7\x8f\xdf\x72\xf4\ +\xe8\xb1\x27\xa7\xcf\x4f\x5b\xcb\x96\x37\x95\x6d\xdb\xbe\xad\xbf\ +\x3f\x7f\x6c\x70\x90\xdf\x77\x76\x82\xd6\x6c\x9d\x77\xdc\x5c\x88\ +\x08\x4a\x29\x00\x25\x22\x02\x60\x9a\x26\x85\xc2\xf8\xe7\x8e\x1c\ +\x39\xfa\xd2\x74\xa9\xe4\xe6\x72\x59\x72\x0b\x72\x24\x93\x1e\xa6\ +\x61\xcc\x58\xa6\xf5\x94\xeb\xba\x8f\x24\x12\x89\x3e\x80\x28\x12\ +\x40\xb0\x6d\x9b\x8f\x00\x44\xc4\x02\x16\x29\xa5\xf2\x40\x38\x57\ +\xbc\xf7\x74\xdf\xfd\x9d\x27\xba\xef\x4b\xd7\xd6\x90\x4c\x26\xf1\ +\xbc\x04\xb1\xb8\x8d\xeb\xba\x24\x13\x1e\xf1\x78\x1c\xc3\x30\x98\ +\x9a\x9a\x92\xf3\xe7\xcf\x3f\x5c\x5f\x5f\x7f\x97\x42\x50\x86\xf9\ +\x11\x80\xfa\xa0\x89\xd9\x2e\xb4\xd6\xa9\xfd\xfb\xdf\x7d\xbb\xea\ +\xfb\xab\x73\xb9\x1c\x6e\xc2\xc1\xf3\x12\xc4\xe3\x71\x1c\xc7\xc1\ +\x4b\x24\xb0\x2d\x1b\x11\xc1\xf7\x7d\x86\x47\x46\xe8\xeb\xef\xa7\ +\x5c\x9a\x29\x7c\xe6\xda\x0d\x97\xbb\xae\x73\xe6\xc3\xee\x11\x40\ +\x94\x52\x58\x96\x45\xb1\x38\xb1\xe9\x8d\x37\x77\x4e\x99\x96\xb5\ +\xba\xb1\xb1\x91\x74\x3a\x4d\x2a\x95\xc4\x71\x1d\x3c\xcf\x23\x99\ +\x48\x60\x9b\x16\x22\x42\xb9\x5c\xa6\xb7\xef\x34\xbd\xa7\xfb\x08\ +\x83\x88\x54\x2a\xb5\xa0\xab\xab\xfb\x16\x00\x0b\x60\x64\x74\xf4\ +\x43\x14\x89\x9d\xe9\x1f\x78\x75\x64\x64\xec\xb3\x8d\x8d\x8d\x78\ +\x09\x8f\xb8\x13\x23\xe6\xd8\x38\xb1\x38\xae\xe3\x12\x8b\xc5\x30\ +\x0d\x83\x50\x84\xa9\xa9\x29\x7a\x7a\x4e\x52\x2a\x95\x09\xc3\x90\ +\x78\x3c\xc6\xd2\x65\x4b\x06\x16\xd7\xd7\xef\x98\x07\x14\xc6\xc6\ +\x67\x8d\x64\x59\x6b\xf2\xc3\xc3\xed\x5a\xeb\x58\xd3\xb2\xa5\xc4\ +\xdd\x38\x8e\x13\x23\x16\x8b\x11\x77\x1c\xdc\x78\x1c\xdb\xb2\x31\ +\x0c\x83\x20\x0c\x29\x8c\x17\xe8\xea\xea\x41\xeb\x00\x11\xa1\xb6\ +\xb6\x96\x4c\x26\xbd\x2f\x1e\x8f\x5d\x33\x5e\x2c\x72\xc1\xc2\x85\ +\xb3\x00\xc7\x71\x38\x71\xa2\xfb\xde\xd6\xd6\xd6\x07\xc3\x28\x62\ +\xe9\x92\x0b\xb1\x6c\x93\x35\x6b\x2e\xa7\x26\x55\x83\x44\x11\x22\ +\xb3\x1f\x9f\xa1\x0c\xb4\xd6\x0c\x0e\xe7\xe9\xe9\xea\x41\x04\x1c\ +\xc7\x25\x93\x49\x33\x75\xfe\xdc\x43\xf9\xe1\xa1\x7b\x87\xf2\x83\ +\xb8\xae\xfb\x01\xe0\x85\xbf\xbd\xf8\xea\xcb\x2f\xbf\xf2\x45\xa5\ +\x14\x95\x4a\x05\x5f\xfb\xf8\x5a\x53\x2a\x95\xa8\x56\xab\xac\x5f\ +\x7f\x25\x0f\x3c\xf0\x0b\x2e\x59\xfd\x49\x44\x84\x9e\x13\x27\x39\ +\x75\xaa\x77\xbe\xb0\x9b\x70\x28\x14\x0a\xb7\x06\x81\x7e\x2a\x16\ +\x8b\xb1\x72\xe5\x4a\x5c\xd7\x65\x4e\xeb\xbc\xf2\xca\x6b\x8d\xcf\ +\x3e\xf3\xec\x7f\x06\x07\x87\x2e\x98\x83\x84\x61\x48\x18\x86\x44\ +\x51\x84\x20\x54\x7c\x9f\xca\xcc\x0c\xdf\xfa\xf6\x56\xb6\x6c\xb9\ +\x61\xf6\xf9\x4f\xd7\x00\x42\x6d\x4d\xcb\x1d\xcb\x9b\x8e\x6c\x87\ +\x73\x97\x42\x11\x98\x28\xc0\xd0\x4f\x44\xa6\x9f\x50\x22\xc2\xae\ +\xdd\x2d\xa0\x14\xad\x7b\x5a\x7f\xdb\xb2\x67\xef\x0f\xc3\x28\xc4\ +\x34\x4d\xa2\x28\x9a\x87\x44\x51\x84\x44\xc2\x4c\x65\x86\xfa\x86\ +\x7a\x1e\x79\xf4\x37\xd8\xb6\xe5\x17\x0a\x85\xeb\xae\x5e\x7f\x4f\ +\x1b\x9c\x01\x86\x81\x88\x28\x82\xb1\x31\x18\x1b\xe3\xcf\xb3\xdf\ +\xc8\xce\x96\x59\x05\x45\xc2\xe4\xe4\x24\xbd\xa7\x4f\x7f\xf5\xd8\ +\xb1\x63\xbf\x1a\x19\x1e\xb9\x30\x08\x02\x4c\xd3\x44\x29\x35\x6f\ +\xc8\x72\x79\x86\x1b\xbf\xb2\xe5\xfc\xe6\xcf\x6f\xfa\x74\x14\x45\ +\x1d\xab\x2e\xba\xa4\xec\xfb\xe2\x2a\x05\x61\x08\x03\x03\xd0\xd1\ +\x01\xa5\x12\x77\xcc\x76\xb0\x6b\xcf\x9c\x4a\x4d\x11\xe1\xdc\xd4\ +\x74\x18\x86\x21\x95\x4a\x85\x62\xb1\x48\xb5\xea\xaf\x31\x4d\x63\ +\xb3\x32\x68\x4e\xd7\xa6\x27\x57\xac\x58\xfe\xa7\x74\xa6\xf6\xbf\ +\x86\xa9\xb0\x4c\x8b\xb8\xfd\x09\xfa\xfb\xb9\x6e\x68\x88\x6d\xc5\ +\x22\xb5\x33\x33\xbc\x6e\xdb\x3c\x9d\x48\x10\xfc\x1f\x86\x93\xb9\ +\x1a\xfd\x43\x9a\xa3\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\ +\x82\ \x00\x00\x02\x24\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -319,214 +168,48 @@ qt_resource_data = "\ \xeb\x57\xff\x7d\xcb\x0f\xef\x28\xb0\x8e\xa2\xf8\x2d\xc0\x00\x14\ \x2c\x1a\x71\xde\xeb\xd2\x54\x00\x00\x00\x00\x49\x45\x4e\x44\xae\ \x42\x60\x82\ -\x00\x00\x0c\xdd\ +\x00\x00\x02\x7a\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ \x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\ -\x01\x00\x9a\x9c\x18\x00\x00\x0a\x4f\x69\x43\x43\x50\x50\x68\x6f\ -\x74\x6f\x73\x68\x6f\x70\x20\x49\x43\x43\x20\x70\x72\x6f\x66\x69\ -\x6c\x65\x00\x00\x78\xda\x9d\x53\x67\x54\x53\xe9\x16\x3d\xf7\xde\ -\xf4\x42\x4b\x88\x80\x94\x4b\x6f\x52\x15\x08\x20\x52\x42\x8b\x80\ -\x14\x91\x26\x2a\x21\x09\x10\x4a\x88\x21\xa1\xd9\x15\x51\xc1\x11\ -\x45\x45\x04\x1b\xc8\xa0\x88\x03\x8e\x8e\x80\x8c\x15\x51\x2c\x0c\ -\x8a\x0a\xd8\x07\xe4\x21\xa2\x8e\x83\xa3\x88\x8a\xca\xfb\xe1\x7b\ -\xa3\x6b\xd6\xbc\xf7\xe6\xcd\xfe\xb5\xd7\x3e\xe7\xac\xf3\x9d\xb3\ -\xcf\x07\xc0\x08\x0c\x96\x48\x33\x51\x35\x80\x0c\xa9\x42\x1e\x11\ -\xe0\x83\xc7\xc4\xc6\xe1\xe4\x2e\x40\x81\x0a\x24\x70\x00\x10\x08\ -\xb3\x64\x21\x73\xfd\x23\x01\x00\xf8\x7e\x3c\x3c\x2b\x22\xc0\x07\ -\xbe\x00\x01\x78\xd3\x0b\x08\x00\xc0\x4d\x9b\xc0\x30\x1c\x87\xff\ -\x0f\xea\x42\x99\x5c\x01\x80\x84\x01\xc0\x74\x91\x38\x4b\x08\x80\ -\x14\x00\x40\x7a\x8e\x42\xa6\x00\x40\x46\x01\x80\x9d\x98\x26\x53\ -\x00\xa0\x04\x00\x60\xcb\x63\x62\xe3\x00\x50\x2d\x00\x60\x27\x7f\ -\xe6\xd3\x00\x80\x9d\xf8\x99\x7b\x01\x00\x5b\x94\x21\x15\x01\xa0\ -\x91\x00\x20\x13\x65\x88\x44\x00\x68\x3b\x00\xac\xcf\x56\x8a\x45\ -\x00\x58\x30\x00\x14\x66\x4b\xc4\x39\x00\xd8\x2d\x00\x30\x49\x57\ -\x66\x48\x00\xb0\xb7\x00\xc0\xce\x10\x0b\xb2\x00\x08\x0c\x00\x30\ -\x51\x88\x85\x29\x00\x04\x7b\x00\x60\xc8\x23\x23\x78\x00\x84\x99\ -\x00\x14\x46\xf2\x57\x3c\xf1\x2b\xae\x10\xe7\x2a\x00\x00\x78\x99\ -\xb2\x3c\xb9\x24\x39\x45\x81\x5b\x08\x2d\x71\x07\x57\x57\x2e\x1e\ -\x28\xce\x49\x17\x2b\x14\x36\x61\x02\x61\x9a\x40\x2e\xc2\x79\x99\ -\x19\x32\x81\x34\x0f\xe0\xf3\xcc\x00\x00\xa0\x91\x15\x11\xe0\x83\ -\xf3\xfd\x78\xce\x0e\xae\xce\xce\x36\x8e\xb6\x0e\x5f\x2d\xea\xbf\ -\x06\xff\x22\x62\x62\xe3\xfe\xe5\xcf\xab\x70\x40\x00\x00\xe1\x74\ -\x7e\xd1\xfe\x2c\x2f\xb3\x1a\x80\x3b\x06\x80\x6d\xfe\xa2\x25\xee\ -\x04\x68\x5e\x0b\xa0\x75\xf7\x8b\x66\xb2\x0f\x40\xb5\x00\xa0\xe9\ -\xda\x57\xf3\x70\xf8\x7e\x3c\x3c\x45\xa1\x90\xb9\xd9\xd9\xe5\xe4\ -\xe4\xd8\x4a\xc4\x42\x5b\x61\xca\x57\x7d\xfe\x67\xc2\x5f\xc0\x57\ -\xfd\x6c\xf9\x7e\x3c\xfc\xf7\xf5\xe0\xbe\xe2\x24\x81\x32\x5d\x81\ -\x47\x04\xf8\xe0\xc2\xcc\xf4\x4c\xa5\x1c\xcf\x92\x09\x84\x62\xdc\ -\xe6\x8f\x47\xfc\xb7\x0b\xff\xfc\x1d\xd3\x22\xc4\x49\x62\xb9\x58\ -\x2a\x14\xe3\x51\x12\x71\x8e\x44\x9a\x8c\xf3\x32\xa5\x22\x89\x42\ -\x92\x29\xc5\x25\xd2\xff\x64\xe2\xdf\x2c\xfb\x03\x3e\xdf\x35\x00\ -\xb0\x6a\x3e\x01\x7b\x91\x2d\xa8\x5d\x63\x03\xf6\x4b\x27\x10\x58\ -\x74\xc0\xe2\xf7\x00\x00\xf2\xbb\x6f\xc1\xd4\x28\x08\x03\x80\x68\ -\x83\xe1\xcf\x77\xff\xef\x3f\xfd\x47\xa0\x25\x00\x80\x66\x49\x92\ -\x71\x00\x00\x5e\x44\x24\x2e\x54\xca\xb3\x3f\xc7\x08\x00\x00\x44\ -\xa0\x81\x2a\xb0\x41\x1b\xf4\xc1\x18\x2c\xc0\x06\x1c\xc1\x05\xdc\ -\xc1\x0b\xfc\x60\x36\x84\x42\x24\xc4\xc2\x42\x10\x42\x0a\x64\x80\ -\x1c\x72\x60\x29\xac\x82\x42\x28\x86\xcd\xb0\x1d\x2a\x60\x2f\xd4\ -\x40\x1d\x34\xc0\x51\x68\x86\x93\x70\x0e\x2e\xc2\x55\xb8\x0e\x3d\ -\x70\x0f\xfa\x61\x08\x9e\xc1\x28\xbc\x81\x09\x04\x41\xc8\x08\x13\ -\x61\x21\xda\x88\x01\x62\x8a\x58\x23\x8e\x08\x17\x99\x85\xf8\x21\ -\xc1\x48\x04\x12\x8b\x24\x20\xc9\x88\x14\x51\x22\x4b\x91\x35\x48\ -\x31\x52\x8a\x54\x20\x55\x48\x1d\xf2\x3d\x72\x02\x39\x87\x5c\x46\ -\xba\x91\x3b\xc8\x00\x32\x82\xfc\x86\xbc\x47\x31\x94\x81\xb2\x51\ -\x3d\xd4\x0c\xb5\x43\xb9\xa8\x37\x1a\x84\x46\xa2\x0b\xd0\x64\x74\ -\x31\x9a\x8f\x16\xa0\x9b\xd0\x72\xb4\x1a\x3d\x8c\x36\xa1\xe7\xd0\ -\xab\x68\x0f\xda\x8f\x3e\x43\xc7\x30\xc0\xe8\x18\x07\x33\xc4\x6c\ -\x30\x2e\xc6\xc3\x42\xb1\x38\x2c\x09\x93\x63\xcb\xb1\x22\xac\x0c\ -\xab\xc6\x1a\xb0\x56\xac\x03\xbb\x89\xf5\x63\xcf\xb1\x77\x04\x12\ -\x81\x45\xc0\x09\x36\x04\x77\x42\x20\x61\x1e\x41\x48\x58\x4c\x58\ -\x4e\xd8\x48\xa8\x20\x1c\x24\x34\x11\xda\x09\x37\x09\x03\x84\x51\ -\xc2\x27\x22\x93\xa8\x4b\xb4\x26\xba\x11\xf9\xc4\x18\x62\x32\x31\ -\x87\x58\x48\x2c\x23\xd6\x12\x8f\x13\x2f\x10\x7b\x88\x43\xc4\x37\ -\x24\x12\x89\x43\x32\x27\xb9\x90\x02\x49\xb1\xa4\x54\xd2\x12\xd2\ -\x46\xd2\x6e\x52\x23\xe9\x2c\xa9\x9b\x34\x48\x1a\x23\x93\xc9\xda\ -\x64\x6b\xb2\x07\x39\x94\x2c\x20\x2b\xc8\x85\xe4\x9d\xe4\xc3\xe4\ -\x33\xe4\x1b\xe4\x21\xf2\x5b\x0a\x9d\x62\x40\x71\xa4\xf8\x53\xe2\ -\x28\x52\xca\x6a\x4a\x19\xe5\x10\xe5\x34\xe5\x06\x65\x98\x32\x41\ -\x55\xa3\x9a\x52\xdd\xa8\xa1\x54\x11\x35\x8f\x5a\x42\xad\xa1\xb6\ -\x52\xaf\x51\x87\xa8\x13\x34\x75\x9a\x39\xcd\x83\x16\x49\x4b\xa5\ -\xad\xa2\x95\xd3\x1a\x68\x17\x68\xf7\x69\xaf\xe8\x74\xba\x11\xdd\ -\x95\x1e\x4e\x97\xd0\x57\xd2\xcb\xe9\x47\xe8\x97\xe8\x03\xf4\x77\ -\x0c\x0d\x86\x15\x83\xc7\x88\x67\x28\x19\x9b\x18\x07\x18\x67\x19\ -\x77\x18\xaf\x98\x4c\xa6\x19\xd3\x8b\x19\xc7\x54\x30\x37\x31\xeb\ -\x98\xe7\x99\x0f\x99\x6f\x55\x58\x2a\xb6\x2a\x7c\x15\x91\xca\x0a\ -\x95\x4a\x95\x26\x95\x1b\x2a\x2f\x54\xa9\xaa\xa6\xaa\xde\xaa\x0b\ -\x55\xf3\x55\xcb\x54\x8f\xa9\x5e\x53\x7d\xae\x46\x55\x33\x53\xe3\ -\xa9\x09\xd4\x96\xab\x55\xaa\x9d\x50\xeb\x53\x1b\x53\x67\xa9\x3b\ -\xa8\x87\xaa\x67\xa8\x6f\x54\x3f\xa4\x7e\x59\xfd\x89\x06\x59\xc3\ -\x4c\xc3\x4f\x43\xa4\x51\xa0\xb1\x5f\xe3\xbc\xc6\x20\x0b\x63\x19\ -\xb3\x78\x2c\x21\x6b\x0d\xab\x86\x75\x81\x35\xc4\x26\xb1\xcd\xd9\ -\x7c\x76\x2a\xbb\x98\xfd\x1d\xbb\x8b\x3d\xaa\xa9\xa1\x39\x43\x33\ -\x4a\x33\x57\xb3\x52\xf3\x94\x66\x3f\x07\xe3\x98\x71\xf8\x9c\x74\ -\x4e\x09\xe7\x28\xa7\x97\xf3\x7e\x8a\xde\x14\xef\x29\xe2\x29\x1b\ -\xa6\x34\x4c\xb9\x31\x65\x5c\x6b\xaa\x96\x97\x96\x58\xab\x48\xab\ -\x51\xab\x47\xeb\xbd\x36\xae\xed\xa7\x9d\xa6\xbd\x45\xbb\x59\xfb\ -\x81\x0e\x41\xc7\x4a\x27\x5c\x27\x47\x67\x8f\xce\x05\x9d\xe7\x53\ -\xd9\x53\xdd\xa7\x0a\xa7\x16\x4d\x3d\x3a\xf5\xae\x2e\xaa\x6b\xa5\ -\x1b\xa1\xbb\x44\x77\xbf\x6e\xa7\xee\x98\x9e\xbe\x5e\x80\x9e\x4c\ -\x6f\xa7\xde\x79\xbd\xe7\xfa\x1c\x7d\x2f\xfd\x54\xfd\x6d\xfa\xa7\ -\xf5\x47\x0c\x58\x06\xb3\x0c\x24\x06\xdb\x0c\xce\x18\x3c\xc5\x35\ -\x71\x6f\x3c\x1d\x2f\xc7\xdb\xf1\x51\x43\x5d\xc3\x40\x43\xa5\x61\ -\x95\x61\x97\xe1\x84\x91\xb9\xd1\x3c\xa3\xd5\x46\x8d\x46\x0f\x8c\ -\x69\xc6\x5c\xe3\x24\xe3\x6d\xc6\x6d\xc6\xa3\x26\x06\x26\x21\x26\ -\x4b\x4d\xea\x4d\xee\x9a\x52\x4d\xb9\xa6\x29\xa6\x3b\x4c\x3b\x4c\ -\xc7\xcd\xcc\xcd\xa2\xcd\xd6\x99\x35\x9b\x3d\x31\xd7\x32\xe7\x9b\ -\xe7\x9b\xd7\x9b\xdf\xb7\x60\x5a\x78\x5a\x2c\xb6\xa8\xb6\xb8\x65\ -\x49\xb2\xe4\x5a\xa6\x59\xee\xb6\xbc\x6e\x85\x5a\x39\x59\xa5\x58\ -\x55\x5a\x5d\xb3\x46\xad\x9d\xad\x25\xd6\xbb\xad\xbb\xa7\x11\xa7\ -\xb9\x4e\x93\x4e\xab\x9e\xd6\x67\xc3\xb0\xf1\xb6\xc9\xb6\xa9\xb7\ -\x19\xb0\xe5\xd8\x06\xdb\xae\xb6\x6d\xb6\x7d\x61\x67\x62\x17\x67\ -\xb7\xc5\xae\xc3\xee\x93\xbd\x93\x7d\xba\x7d\x8d\xfd\x3d\x07\x0d\ -\x87\xd9\x0e\xab\x1d\x5a\x1d\x7e\x73\xb4\x72\x14\x3a\x56\x3a\xde\ -\x9a\xce\x9c\xee\x3f\x7d\xc5\xf4\x96\xe9\x2f\x67\x58\xcf\x10\xcf\ -\xd8\x33\xe3\xb6\x13\xcb\x29\xc4\x69\x9d\x53\x9b\xd3\x47\x67\x17\ -\x67\xb9\x73\x83\xf3\x88\x8b\x89\x4b\x82\xcb\x2e\x97\x3e\x2e\x9b\ -\x1b\xc6\xdd\xc8\xbd\xe4\x4a\x74\xf5\x71\x5d\xe1\x7a\xd2\xf5\x9d\ -\x9b\xb3\x9b\xc2\xed\xa8\xdb\xaf\xee\x36\xee\x69\xee\x87\xdc\x9f\ -\xcc\x34\x9f\x29\x9e\x59\x33\x73\xd0\xc3\xc8\x43\xe0\x51\xe5\xd1\ -\x3f\x0b\x9f\x95\x30\x6b\xdf\xac\x7e\x4f\x43\x4f\x81\x67\xb5\xe7\ -\x23\x2f\x63\x2f\x91\x57\xad\xd7\xb0\xb7\xa5\x77\xaa\xf7\x61\xef\ -\x17\x3e\xf6\x3e\x72\x9f\xe3\x3e\xe3\x3c\x37\xde\x32\xde\x59\x5f\ -\xcc\x37\xc0\xb7\xc8\xb7\xcb\x4f\xc3\x6f\x9e\x5f\x85\xdf\x43\x7f\ -\x23\xff\x64\xff\x7a\xff\xd1\x00\xa7\x80\x25\x01\x67\x03\x89\x81\ -\x41\x81\x5b\x02\xfb\xf8\x7a\x7c\x21\xbf\x8e\x3f\x3a\xdb\x65\xf6\ -\xb2\xd9\xed\x41\x8c\xa0\xb9\x41\x15\x41\x8f\x82\xad\x82\xe5\xc1\ -\xad\x21\x68\xc8\xec\x90\xad\x21\xf7\xe7\x98\xce\x91\xce\x69\x0e\ -\x85\x50\x7e\xe8\xd6\xd0\x07\x61\xe6\x61\x8b\xc3\x7e\x0c\x27\x85\ -\x87\x85\x57\x86\x3f\x8e\x70\x88\x58\x1a\xd1\x31\x97\x35\x77\xd1\ -\xdc\x43\x73\xdf\x44\xfa\x44\x96\x44\xde\x9b\x67\x31\x4f\x39\xaf\ -\x2d\x4a\x35\x2a\x3e\xaa\x2e\x6a\x3c\xda\x37\xba\x34\xba\x3f\xc6\ -\x2e\x66\x59\xcc\xd5\x58\x9d\x58\x49\x6c\x4b\x1c\x39\x2e\x2a\xae\ -\x36\x6e\x6c\xbe\xdf\xfc\xed\xf3\x87\xe2\x9d\xe2\x0b\xe3\x7b\x17\ -\x98\x2f\xc8\x5d\x70\x79\xa1\xce\xc2\xf4\x85\xa7\x16\xa9\x2e\x12\ -\x2c\x3a\x96\x40\x4c\x88\x4e\x38\x94\xf0\x41\x10\x2a\xa8\x16\x8c\ -\x25\xf2\x13\x77\x25\x8e\x0a\x79\xc2\x1d\xc2\x67\x22\x2f\xd1\x36\ -\xd1\x88\xd8\x43\x5c\x2a\x1e\x4e\xf2\x48\x2a\x4d\x7a\x92\xec\x91\ -\xbc\x35\x79\x24\xc5\x33\xa5\x2c\xe5\xb9\x84\x27\xa9\x90\xbc\x4c\ -\x0d\x4c\xdd\x9b\x3a\x9e\x16\x9a\x76\x20\x6d\x32\x3d\x3a\xbd\x31\ -\x83\x92\x91\x90\x71\x42\xaa\x21\x4d\x93\xb6\x67\xea\x67\xe6\x66\ -\x76\xcb\xac\x65\x85\xb2\xfe\xc5\x6e\x8b\xb7\x2f\x1e\x95\x07\xc9\ -\x6b\xb3\x90\xac\x05\x59\x2d\x0a\xb6\x42\xa6\xe8\x54\x5a\x28\xd7\ -\x2a\x07\xb2\x67\x65\x57\x66\xbf\xcd\x89\xca\x39\x96\xab\x9e\x2b\ -\xcd\xed\xcc\xb3\xca\xdb\x90\x37\x9c\xef\x9f\xff\xed\x12\xc2\x12\ -\xe1\x92\xb6\xa5\x86\x4b\x57\x2d\x1d\x58\xe6\xbd\xac\x6a\x39\xb2\ -\x3c\x71\x79\xdb\x0a\xe3\x15\x05\x2b\x86\x56\x06\xac\x3c\xb8\x8a\ -\xb6\x2a\x6d\xd5\x4f\xab\xed\x57\x97\xae\x7e\xbd\x26\x7a\x4d\x6b\ -\x81\x5e\xc1\xca\x82\xc1\xb5\x01\x6b\xeb\x0b\x55\x0a\xe5\x85\x7d\ -\xeb\xdc\xd7\xed\x5d\x4f\x58\x2f\x59\xdf\xb5\x61\xfa\x86\x9d\x1b\ -\x3e\x15\x89\x8a\xae\x14\xdb\x17\x97\x15\x7f\xd8\x28\xdc\x78\xe5\ -\x1b\x87\x6f\xca\xbf\x99\xdc\x94\xb4\xa9\xab\xc4\xb9\x64\xcf\x66\ -\xd2\x66\xe9\xe6\xde\x2d\x9e\x5b\x0e\x96\xaa\x97\xe6\x97\x0e\x6e\ -\x0d\xd9\xda\xb4\x0d\xdf\x56\xb4\xed\xf5\xf6\x45\xdb\x2f\x97\xcd\ -\x28\xdb\xbb\x83\xb6\x43\xb9\xa3\xbf\x3c\xb8\xbc\x65\xa7\xc9\xce\ -\xcd\x3b\x3f\x54\xa4\x54\xf4\x54\xfa\x54\x36\xee\xd2\xdd\xb5\x61\ -\xd7\xf8\x6e\xd1\xee\x1b\x7b\xbc\xf6\x34\xec\xd5\xdb\x5b\xbc\xf7\ -\xfd\x3e\xc9\xbe\xdb\x55\x01\x55\x4d\xd5\x66\xd5\x65\xfb\x49\xfb\ -\xb3\xf7\x3f\xae\x89\xaa\xe9\xf8\x96\xfb\x6d\x5d\xad\x4e\x6d\x71\ -\xed\xc7\x03\xd2\x03\xfd\x07\x23\x0e\xb6\xd7\xb9\xd4\xd5\x1d\xd2\ -\x3d\x54\x52\x8f\xd6\x2b\xeb\x47\x0e\xc7\x1f\xbe\xfe\x9d\xef\x77\ -\x2d\x0d\x36\x0d\x55\x8d\x9c\xc6\xe2\x23\x70\x44\x79\xe4\xe9\xf7\ -\x09\xdf\xf7\x1e\x0d\x3a\xda\x76\x8c\x7b\xac\xe1\x07\xd3\x1f\x76\ -\x1d\x67\x1d\x2f\x6a\x42\x9a\xf2\x9a\x46\x9b\x53\x9a\xfb\x5b\x62\ -\x5b\xba\x4f\xcc\x3e\xd1\xd6\xea\xde\x7a\xfc\x47\xdb\x1f\x0f\x9c\ -\x34\x3c\x59\x79\x4a\xf3\x54\xc9\x69\xda\xe9\x82\xd3\x93\x67\xf2\ -\xcf\x8c\x9d\x95\x9d\x7d\x7e\x2e\xf9\xdc\x60\xdb\xa2\xb6\x7b\xe7\ -\x63\xce\xdf\x6a\x0f\x6f\xef\xba\x10\x74\xe1\xd2\x45\xff\x8b\xe7\ -\x3b\xbc\x3b\xce\x5c\xf2\xb8\x74\xf2\xb2\xdb\xe5\x13\x57\xb8\x57\ -\x9a\xaf\x3a\x5f\x6d\xea\x74\xea\x3c\xfe\x93\xd3\x4f\xc7\xbb\x9c\ -\xbb\x9a\xae\xb9\x5c\x6b\xb9\xee\x7a\xbd\xb5\x7b\x66\xf7\xe9\x1b\ -\x9e\x37\xce\xdd\xf4\xbd\x79\xf1\x16\xff\xd6\xd5\x9e\x39\x3d\xdd\ -\xbd\xf3\x7a\x6f\xf7\xc5\xf7\xf5\xdf\x16\xdd\x7e\x72\x27\xfd\xce\ -\xcb\xbb\xd9\x77\x27\xee\xad\xbc\x4f\xbc\x5f\xf4\x40\xed\x41\xd9\ -\x43\xdd\x87\xd5\x3f\x5b\xfe\xdc\xd8\xef\xdc\x7f\x6a\xc0\x77\xa0\ -\xf3\xd1\xdc\x47\xf7\x06\x85\x83\xcf\xfe\x91\xf5\x8f\x0f\x43\x05\ -\x8f\x99\x8f\xcb\x86\x0d\x86\xeb\x9e\x38\x3e\x39\x39\xe2\x3f\x72\ -\xfd\xe9\xfc\xa7\x43\xcf\x64\xcf\x26\x9e\x17\xfe\xa2\xfe\xcb\xae\ -\x17\x16\x2f\x7e\xf8\xd5\xeb\xd7\xce\xd1\x98\xd1\xa1\x97\xf2\x97\ -\x93\xbf\x6d\x7c\xa5\xfd\xea\xc0\xeb\x19\xaf\xdb\xc6\xc2\xc6\x1e\ -\xbe\xc9\x78\x33\x31\x5e\xf4\x56\xfb\xed\xc1\x77\xdc\x77\x1d\xef\ -\xa3\xdf\x0f\x4f\xe4\x7c\x20\x7f\x28\xff\x68\xf9\xb1\xf5\x53\xd0\ -\xa7\xfb\x93\x19\x93\x93\xff\x04\x03\x98\xf3\xfc\x63\x33\x2d\xdb\ -\x00\x00\x00\x20\x63\x48\x52\x4d\x00\x00\x7a\x25\x00\x00\x80\x83\ -\x00\x00\xf9\xff\x00\x00\x80\xe9\x00\x00\x75\x30\x00\x00\xea\x60\ -\x00\x00\x3a\x98\x00\x00\x17\x6f\x92\x5f\xc5\x46\x00\x00\x02\x08\ -\x49\x44\x41\x54\x78\xda\x64\x91\x3d\x6b\x14\x41\x18\xc7\x7f\x73\ -\xb7\x2c\x6c\x0c\xb9\x20\xa6\x0d\x58\x45\x90\x88\x1f\x40\xb1\x12\ -\x2e\x8d\x82\x5f\x41\x08\x58\x05\xb4\xb5\x0c\xd8\x09\xa2\x20\x08\ -\x7e\x88\x58\x05\xac\x04\xfb\x08\x56\x42\x40\x48\x9d\xdc\xe5\xf6\ -\x66\xe7\x75\x67\xc7\xe2\x19\x72\x07\x0e\xfc\x18\x06\xe6\xff\x32\ -\xcf\xa8\x9c\x1f\x00\xb7\x81\x09\x70\x0b\xa8\xf7\x40\x1d\x42\x7a\ -\x02\xe1\x21\x78\xc0\xfe\x82\xee\x07\x74\x9f\x41\x9f\x83\x41\xf0\ -\xa8\x9c\x1f\x17\x83\x4d\xa0\x7e\x0d\xea\x18\xfa\x46\x84\xae\xe0\ -\x01\x0b\x18\x0b\xe6\x2d\x98\xf7\x72\x0e\xa8\x9c\x0f\x80\x49\x0d\ -\xf5\x09\xa8\x29\xf4\xe5\x72\x57\x76\x0f\x44\x20\xac\x19\x9a\x53\ -\x70\xcf\x21\x84\x11\xd4\x00\x1f\xa1\x9f\x4a\xad\x05\x70\x05\x5c\ -\x96\x7d\x06\x5c\x03\xcb\x62\xda\x01\x66\x9a\xb3\x79\x17\x42\x8f\ -\xca\xf9\xd9\x3e\x54\x67\x90\xc6\x92\xb8\x28\xe8\x92\x9e\x80\x5c\ -\x48\x80\x23\xa5\x88\x31\xa4\x10\xb8\x5f\x41\x38\x84\x38\x96\x6a\ -\x4b\x60\x5e\x12\x6d\xa9\x9e\x91\xa5\x80\x9e\x10\x32\xd6\x82\x31\ -\x8c\xbd\xe7\x55\x05\x66\x2a\xce\xb6\x18\x2c\xcb\x84\x03\x30\xb0\ -\xbe\x62\x14\x71\xd7\x09\xd6\xf2\xa8\x02\xbd\xfb\xff\xe0\x62\x11\ -\xe7\x1b\x71\xce\x10\x23\x78\x0f\xc6\xc0\x72\x09\xc6\xb0\x5b\x49\ -\x62\xcf\xea\xdb\xe2\xda\xbb\x57\xe2\x94\xa0\xef\xb9\x69\x50\x0c\ -\x18\xc1\xf2\x02\xda\x32\x34\x49\xcf\x39\x93\x33\x37\x0c\x83\xa4\ -\x5b\x0b\x5a\x43\xdb\x0a\x5d\xc7\xc5\x08\xda\x53\x99\x7a\x4b\x4a\ -\x96\x18\x13\x21\x48\x5a\x4a\xab\xda\x5a\xc3\xf5\x35\xcc\x66\x42\ -\xdb\x82\xb5\xfc\x54\x29\xb1\xef\x1c\x67\x31\x32\xee\x7b\x49\x04\ -\x50\x4a\xf6\x94\xc0\x39\xa9\x7c\x79\x09\x57\x57\xb0\x58\x40\x08\ -\xa4\xba\xe6\x5e\x65\x0c\xbf\xad\xe5\x93\x73\x1c\xc5\x28\xc9\xc3\ -\xb0\x12\xf7\xbd\xbc\xb5\x6d\x61\x3e\x17\xb1\xf7\x30\x1a\xf1\xa1\ -\x69\x38\x57\xb3\x19\x68\x4d\xdd\x75\x9c\x58\xcb\x34\x04\x11\xae\ -\xd7\xb7\x56\x0c\xb4\x96\x33\xf0\x6d\x63\x83\x17\x77\xee\x90\xaa\ -\x61\x80\x61\x20\xc4\xc8\x81\x73\x1c\x19\xc3\xb1\x73\x6c\x7a\x0f\ -\x21\x48\x7d\x6b\x85\x18\xd1\x4a\xf1\xa6\x69\xf8\xb2\xb5\x05\xdb\ -\xdb\xa0\xe6\x73\xf9\x96\xb6\x95\x7a\x6d\xcb\x5d\xad\x79\xa9\x35\ -\x4f\xad\x65\xcf\x7b\x88\x91\x3f\x29\xf1\x7d\x3c\xe6\x6b\xd3\xf0\ -\x77\x32\x81\x9d\x1d\xe1\xdf\x00\x3c\x20\x6c\x94\x21\xaa\x95\x54\ -\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\ +\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\x07\ +\xdd\x06\x0d\x08\x1d\x33\x51\xf1\xd4\x9e\x00\x00\x02\x07\x49\x44\ +\x41\x54\x38\xcb\x65\x91\x3d\x6b\x14\x41\x18\xc7\x7f\x73\xb7\x2c\ +\x6c\x0c\xb9\x20\xa6\x0d\x58\x45\x90\x88\x1f\x40\xb1\x12\x2e\x8d\ +\x82\x5f\x41\x08\x58\x05\xb4\xb5\x0c\xd8\x09\xa2\x20\x08\x7e\x88\ +\x58\x05\xac\x04\xfb\x08\x56\x42\x40\x48\x9d\xdc\xe5\xf6\x66\xe7\ +\x75\x67\xc7\xe2\x19\x72\x07\x0e\xfc\x18\x06\xe6\xff\x32\xcf\xa8\ +\x9c\x1f\x00\xb7\x81\x09\x70\x0b\xa8\xf7\x40\x1d\x42\x7a\x02\xe1\ +\x21\x78\xc0\xfe\x82\xee\x07\x74\x9f\x41\x9f\x83\x41\xf0\xa8\x9c\ +\x1f\x17\x83\x4d\xa0\x7e\x0d\xea\x18\xfa\x46\x84\xae\xe0\x01\x0b\ +\x18\x0b\xe6\x2d\x98\xf7\x72\x0e\xa8\x9c\x0f\x80\x49\x0d\xf5\x09\ +\xa8\x29\xf4\xe5\x72\x57\x76\x0f\x44\x20\xac\x19\x9a\x53\x70\xcf\ +\x21\x84\x11\xd4\x00\x1f\xa1\x9f\x4a\xad\x05\x70\x05\x5c\x96\x7d\ +\x06\x5c\x03\xcb\x62\xda\x01\x66\x9a\xb3\x79\x17\x42\x8f\xca\xf9\ +\xd9\x3e\x54\x67\x90\xc6\x92\xb8\x28\xe8\x92\x9e\x80\x5c\x48\x80\ +\x23\xa5\x88\x31\xa4\x10\xb8\x5f\x41\x38\x84\x38\x96\x6a\x4b\x60\ +\x5e\x12\x6d\xa9\x9e\x91\xa5\x80\x9e\x10\x32\xd6\x82\x31\x8c\xbd\ +\xe7\x55\x05\x66\x2a\xce\xb6\x18\x2c\xcb\x84\x03\x30\xb0\xbe\x62\ +\x14\x71\xd7\x09\xd6\xf2\xa8\x02\xbd\xfb\xff\xe0\x62\x11\xe7\x1b\ +\x71\xce\x10\x23\x78\x0f\xc6\xc0\x72\x09\xc6\xb0\x5b\x49\x62\xcf\ +\xea\xdb\xe2\xda\xbb\x57\xe2\x94\xa0\xef\xb9\x69\x50\x0c\x18\xc1\ +\xf2\x02\xda\x32\x34\x49\xcf\x39\x93\x33\x37\x0c\x83\xa4\x5b\x0b\ +\x5a\x43\xdb\x0a\x5d\xc7\xc5\x08\xda\x53\x99\x7a\x4b\x4a\x96\x18\ +\x13\x21\x48\x5a\x4a\xab\xda\x5a\xc3\xf5\x35\xcc\x66\x42\xdb\x82\ +\xb5\xfc\x54\x29\xb1\xef\x1c\x67\x31\x32\xee\x7b\x49\x04\x50\x4a\ +\xf6\x94\xc0\x39\xa9\x7c\x79\x09\x57\x57\xb0\x58\x40\x08\xa4\xba\ +\xe6\x5e\x65\x0c\xbf\xad\xe5\x93\x73\x1c\xc5\x28\xc9\xc3\xb0\x12\ +\xf7\xbd\xbc\xb5\x6d\x61\x3e\x17\xb1\xf7\x30\x1a\xf1\xa1\x69\x38\ +\x57\xb3\x19\x68\x4d\xdd\x75\x9c\x58\xcb\x34\x04\x11\xae\xd7\xb7\ +\x56\x0c\xb4\x96\x33\xf0\x6d\x63\x83\x17\x77\xee\x90\xaa\x61\x80\ +\x61\x20\xc4\xc8\x81\x73\x1c\x19\xc3\xb1\x73\x6c\x7a\x0f\x21\x48\ +\x7d\x6b\x85\x18\xd1\x4a\xf1\xa6\x69\xf8\xb2\xb5\x05\xdb\xdb\xa0\ +\xe6\x73\xf9\x96\xb6\x95\x7a\x6d\xcb\x5d\xad\x79\xa9\x35\x4f\xad\ +\x65\xcf\x7b\x88\x91\x3f\x29\xf1\x7d\x3c\xe6\x6b\xd3\xf0\x77\x32\ +\x81\x9d\x1d\xe1\x1f\x3c\x20\x6c\x94\x65\x65\x77\x27\x00\x00\x00\ +\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x03\x37\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -626,234 +309,71 @@ qt_resource_data = "\ \xe3\xf6\x5a\x27\x1b\x9e\x98\xc0\x6f\x01\x06\x00\x48\xae\x45\x78\ \x60\x4e\x1f\xe2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \ -\x00\x00\x0e\x12\ +\x00\x00\x03\xef\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\ -\x01\x00\x9a\x9c\x18\x00\x00\x0a\x4d\x69\x43\x43\x50\x50\x68\x6f\ -\x74\x6f\x73\x68\x6f\x70\x20\x49\x43\x43\x20\x70\x72\x6f\x66\x69\ -\x6c\x65\x00\x00\x78\xda\x9d\x53\x77\x58\x93\xf7\x16\x3e\xdf\xf7\ -\x65\x0f\x56\x42\xd8\xf0\xb1\x97\x6c\x81\x00\x22\x23\xac\x08\xc8\ -\x10\x59\xa2\x10\x92\x00\x61\x84\x10\x12\x40\xc5\x85\x88\x0a\x56\ -\x14\x15\x11\x9c\x48\x55\xc4\x82\xd5\x0a\x48\x9d\x88\xe2\xa0\x28\ -\xb8\x67\x41\x8a\x88\x5a\x8b\x55\x5c\x38\xee\x1f\xdc\xa7\xb5\x7d\ -\x7a\xef\xed\xed\xfb\xd7\xfb\xbc\xe7\x9c\xe7\xfc\xce\x79\xcf\x0f\ -\x80\x11\x12\x26\x91\xe6\xa2\x6a\x00\x39\x52\x85\x3c\x3a\xd8\x1f\ -\x8f\x4f\x48\xc4\xc9\xbd\x80\x02\x15\x48\xe0\x04\x20\x10\xe6\xcb\ -\xc2\x67\x05\xc5\x00\x00\xf0\x03\x79\x78\x7e\x74\xb0\x3f\xfc\x01\ -\xaf\x6f\x00\x02\x00\x70\xd5\x2e\x24\x12\xc7\xe1\xff\x83\xba\x50\ -\x26\x57\x00\x20\x91\x00\xe0\x22\x12\xe7\x0b\x01\x90\x52\x00\xc8\ -\x2e\x54\xc8\x14\x00\xc8\x18\x00\xb0\x53\xb3\x64\x0a\x00\x94\x00\ -\x00\x6c\x79\x7c\x42\x22\x00\xaa\x0d\x00\xec\xf4\x49\x3e\x05\x00\ -\xd8\xa9\x93\xdc\x17\x00\xd8\xa2\x1c\xa9\x08\x00\x8d\x01\x00\x99\ -\x28\x47\x24\x02\x40\xbb\x00\x60\x55\x81\x52\x2c\x02\xc0\xc2\x00\ -\xa0\xac\x40\x22\x2e\x04\xc0\xae\x01\x80\x59\xb6\x32\x47\x02\x80\ -\xbd\x05\x00\x76\x8e\x58\x90\x0f\x40\x60\x00\x80\x99\x42\x2c\xcc\ -\x00\x20\x38\x02\x00\x43\x1e\x13\xcd\x03\x20\x4c\x03\xa0\x30\xd2\ -\xbf\xe0\xa9\x5f\x70\x85\xb8\x48\x01\x00\xc0\xcb\x95\xcd\x97\x4b\ -\xd2\x33\x14\xb8\x95\xd0\x1a\x77\xf2\xf0\xe0\xe2\x21\xe2\xc2\x6c\ -\xb1\x42\x61\x17\x29\x10\x66\x09\xe4\x22\x9c\x97\x9b\x23\x13\x48\ -\xe7\x03\x4c\xce\x0c\x00\x00\x1a\xf9\xd1\xc1\xfe\x38\x3f\x90\xe7\ -\xe6\xe4\xe1\xe6\x66\xe7\x6c\xef\xf4\xc5\xa2\xfe\x6b\xf0\x6f\x22\ -\x3e\x21\xf1\xdf\xfe\xbc\x8c\x02\x04\x00\x10\x4e\xcf\xef\xda\x5f\ -\xe5\xe5\xd6\x03\x70\xc7\x01\xb0\x75\xbf\x6b\xa9\x5b\x00\xda\x56\ -\x00\x68\xdf\xf9\x5d\x33\xdb\x09\xa0\x5a\x0a\xd0\x7a\xf9\x8b\x79\ -\x38\xfc\x40\x1e\x9e\xa1\x50\xc8\x3c\x1d\x1c\x0a\x0b\x0b\xed\x25\ -\x62\xa1\xbd\x30\xe3\x8b\x3e\xff\x33\xe1\x6f\xe0\x8b\x7e\xf6\xfc\ -\x40\x1e\xfe\xdb\x7a\xf0\x00\x71\x9a\x40\x99\xad\xc0\xa3\x83\xfd\ -\x71\x61\x6e\x76\xae\x52\x8e\xe7\xcb\x04\x42\x31\x6e\xf7\xe7\x23\ -\xfe\xc7\x85\x7f\xfd\x8e\x29\xd1\xe2\x34\xb1\x5c\x2c\x15\x8a\xf1\ -\x58\x89\xb8\x50\x22\x4d\xc7\x79\xb9\x52\x91\x44\x21\xc9\x95\xe2\ -\x12\xe9\x7f\x32\xf1\x1f\x96\xfd\x09\x93\x77\x0d\x00\xac\x86\x4f\ -\xc0\x4e\xb6\x07\xb5\xcb\x6c\xc0\x7e\xee\x01\x02\x8b\x0e\x58\xd2\ -\x76\x00\x40\x7e\xf3\x2d\x8c\x1a\x0b\x91\x00\x10\x67\x34\x32\x79\ -\xf7\x00\x00\x93\xbf\xf9\x8f\x40\x2b\x01\x00\xcd\x97\xa4\xe3\x00\ -\x00\xbc\xe8\x18\x5c\xa8\x94\x17\x4c\xc6\x08\x00\x00\x44\xa0\x81\ -\x2a\xb0\x41\x07\x0c\xc1\x14\xac\xc0\x0e\x9c\xc1\x1d\xbc\xc0\x17\ -\x02\x61\x06\x44\x40\x0c\x24\xc0\x3c\x10\x42\x06\xe4\x80\x1c\x0a\ -\xa1\x18\x96\x41\x19\x54\xc0\x3a\xd8\x04\xb5\xb0\x03\x1a\xa0\x11\ -\x9a\xe1\x10\xb4\xc1\x31\x38\x0d\xe7\xe0\x12\x5c\x81\xeb\x70\x17\ -\x06\x60\x18\x9e\xc2\x18\xbc\x86\x09\x04\x41\xc8\x08\x13\x61\x21\ -\x3a\x88\x11\x62\x8e\xd8\x22\xce\x08\x17\x99\x8e\x04\x22\x61\x48\ -\x34\x92\x80\xa4\x20\xe9\x88\x14\x51\x22\xc5\xc8\x72\xa4\x02\xa9\ -\x42\x6a\x91\x5d\x48\x23\xf2\x2d\x72\x14\x39\x8d\x5c\x40\xfa\x90\ -\xdb\xc8\x20\x32\x8a\xfc\x8a\xbc\x47\x31\x94\x81\xb2\x51\x03\xd4\ -\x02\x75\x40\xb9\xa8\x1f\x1a\x8a\xc6\xa0\x73\xd1\x74\x34\x0f\x5d\ -\x80\x96\xa2\x6b\xd1\x1a\xb4\x1e\x3d\x80\xb6\xa2\xa7\xd1\x4b\xe8\ -\x75\x74\x00\x7d\x8a\x8e\x63\x80\xd1\x31\x0e\x66\x8c\xd9\x61\x5c\ -\x8c\x87\x45\x60\x89\x58\x1a\x26\xc7\x16\x63\xe5\x58\x35\x56\x8f\ -\x35\x63\x1d\x58\x37\x76\x15\x1b\xc0\x9e\x61\xef\x08\x24\x02\x8b\ -\x80\x13\xec\x08\x5e\x84\x10\xc2\x6c\x82\x90\x90\x47\x58\x4c\x58\ -\x43\xa8\x25\xec\x23\xb4\x12\xba\x08\x57\x09\x83\x84\x31\xc2\x27\ -\x22\x93\xa8\x4f\xb4\x25\x7a\x12\xf9\xc4\x78\x62\x3a\xb1\x90\x58\ -\x46\xac\x26\xee\x21\x1e\x21\x9e\x25\x5e\x27\x0e\x13\x5f\x93\x48\ -\x24\x0e\xc9\x92\xe4\x4e\x0a\x21\x25\x90\x32\x49\x0b\x49\x6b\x48\ -\xdb\x48\x2d\xa4\x53\xa4\x3e\xd2\x10\x69\x9c\x4c\x26\xeb\x90\x6d\ -\xc9\xde\xe4\x08\xb2\x80\xac\x20\x97\x91\xb7\x90\x0f\x90\x4f\x92\ -\xfb\xc9\xc3\xe4\xb7\x14\x3a\xc5\x88\xe2\x4c\x09\xa2\x24\x52\xa4\ -\x94\x12\x4a\x35\x65\x3f\xe5\x04\xa5\x9f\x32\x42\x99\xa0\xaa\x51\ -\xcd\xa9\x9e\xd4\x08\xaa\x88\x3a\x9f\x5a\x49\x6d\xa0\x76\x50\x2f\ -\x53\x87\xa9\x13\x34\x75\x9a\x25\xcd\x9b\x16\x43\xcb\xa4\x2d\xa3\ -\xd5\xd0\x9a\x69\x67\x69\xf7\x68\x2f\xe9\x74\xba\x09\xdd\x83\x1e\ -\x45\x97\xd0\x97\xd2\x6b\xe8\x07\xe9\xe7\xe9\x83\xf4\x77\x0c\x0d\ -\x86\x0d\x83\xc7\x48\x62\x28\x19\x6b\x19\x7b\x19\xa7\x18\xb7\x19\ -\x2f\x99\x4c\xa6\x05\xd3\x97\x99\xc8\x54\x30\xd7\x32\x1b\x99\x67\ -\x98\x0f\x98\x6f\x55\x58\x2a\xf6\x2a\x7c\x15\x91\xca\x12\x95\x3a\ -\x95\x56\x95\x7e\x95\xe7\xaa\x54\x55\x73\x55\x3f\xd5\x79\xaa\x0b\ -\x54\xab\x55\x0f\xab\x5e\x56\x7d\xa6\x46\x55\xb3\x50\xe3\xa9\x09\ -\xd4\x16\xab\xd5\xa9\x1d\x55\xbb\xa9\x36\xae\xce\x52\x77\x52\x8f\ -\x50\xcf\x51\x5f\xa3\xbe\x5f\xfd\x82\xfa\x63\x0d\xb2\x86\x85\x46\ -\xa0\x86\x48\xa3\x54\x63\xb7\xc6\x19\x8d\x21\x16\xc6\x32\x65\xf1\ -\x58\x42\xd6\x72\x56\x03\xeb\x2c\x6b\x98\x4d\x62\x5b\xb2\xf9\xec\ -\x4c\x76\x05\xfb\x1b\x76\x2f\x7b\x4c\x53\x43\x73\xaa\x66\xac\x66\ -\x91\x66\x9d\xe6\x71\xcd\x01\x0e\xc6\xb1\xe0\xf0\x39\xd9\x9c\x4a\ -\xce\x21\xce\x0d\xce\x7b\x2d\x03\x2d\x3f\x2d\xb1\xd6\x6a\xad\x66\ -\xad\x7e\xad\x37\xda\x7a\xda\xbe\xda\x62\xed\x72\xed\x16\xed\xeb\ -\xda\xef\x75\x70\x9d\x40\x9d\x2c\x9d\xf5\x3a\x6d\x3a\xf7\x75\x09\ -\xba\x36\xba\x51\xba\x85\xba\xdb\x75\xcf\xea\x3e\xd3\x63\xeb\x79\ -\xe9\x09\xf5\xca\xf5\x0e\xe9\xdd\xd1\x47\xf5\x6d\xf4\xa3\xf5\x17\ -\xea\xef\xd6\xef\xd1\x1f\x37\x30\x34\x08\x36\x90\x19\x6c\x31\x38\ -\x63\xf0\xcc\x90\x63\xe8\x6b\x98\x69\xb8\xd1\xf0\x84\xe1\xa8\x11\ -\xcb\x68\xba\x91\xc4\x68\xa3\xd1\x49\xa3\x27\xb8\x26\xee\x87\x67\ -\xe3\x35\x78\x17\x3e\x66\xac\x6f\x1c\x62\xac\x34\xde\x65\xdc\x6b\ -\x3c\x61\x62\x69\x32\xdb\xa4\xc4\xa4\xc5\xe4\xbe\x29\xcd\x94\x6b\ -\x9a\x66\xba\xd1\xb4\xd3\x74\xcc\xcc\xc8\x2c\xdc\xac\xd8\xac\xc9\ -\xec\x8e\x39\xd5\x9c\x6b\x9e\x61\xbe\xd9\xbc\xdb\xfc\x8d\x85\xa5\ -\x45\x9c\xc5\x4a\x8b\x36\x8b\xc7\x96\xda\x96\x7c\xcb\x05\x96\x4d\ -\x96\xf7\xac\x98\x56\x3e\x56\x79\x56\xf5\x56\xd7\xac\x49\xd6\x5c\ -\xeb\x2c\xeb\x6d\xd6\x57\x6c\x50\x1b\x57\x9b\x0c\x9b\x3a\x9b\xcb\ -\xb6\xa8\xad\x9b\xad\xc4\x76\x9b\x6d\xdf\x14\xe2\x14\x8f\x29\xd2\ -\x29\xf5\x53\x6e\xda\x31\xec\xfc\xec\x0a\xec\x9a\xec\x06\xed\x39\ -\xf6\x61\xf6\x25\xf6\x6d\xf6\xcf\x1d\xcc\x1c\x12\x1d\xd6\x3b\x74\ -\x3b\x7c\x72\x74\x75\xcc\x76\x6c\x70\xbc\xeb\xa4\xe1\x34\xc3\xa9\ -\xc4\xa9\xc3\xe9\x57\x67\x1b\x67\xa1\x73\x9d\xf3\x35\x17\xa6\x4b\ -\x90\xcb\x12\x97\x76\x97\x17\x53\x6d\xa7\x8a\xa7\x6e\x9f\x7a\xcb\ -\x95\xe5\x1a\xee\xba\xd2\xb5\xd3\xf5\xa3\x9b\xbb\x9b\xdc\xad\xd9\ -\x6d\xd4\xdd\xcc\x3d\xc5\x7d\xab\xfb\x4d\x2e\x9b\x1b\xc9\x5d\xc3\ -\x3d\xef\x41\xf4\xf0\xf7\x58\xe2\x71\xcc\xe3\x9d\xa7\x9b\xa7\xc2\ -\xf3\x90\xe7\x2f\x5e\x76\x5e\x59\x5e\xfb\xbd\x1e\x4f\xb3\x9c\x26\ -\x9e\xd6\x30\x6d\xc8\xdb\xc4\x5b\xe0\xbd\xcb\x7b\x60\x3a\x3e\x3d\ -\x65\xfa\xce\xe9\x03\x3e\xc6\x3e\x02\x9f\x7a\x9f\x87\xbe\xa6\xbe\ -\x22\xdf\x3d\xbe\x23\x7e\xd6\x7e\x99\x7e\x07\xfc\x9e\xfb\x3b\xfa\ -\xcb\xfd\x8f\xf8\xbf\xe1\x79\xf2\x16\xf1\x4e\x05\x60\x01\xc1\x01\ -\xe5\x01\xbd\x81\x1a\x81\xb3\x03\x6b\x03\x1f\x04\x99\x04\xa5\x07\ -\x35\x05\x8d\x05\xbb\x06\x2f\x0c\x3e\x15\x42\x0c\x09\x0d\x59\x1f\ -\x72\x93\x6f\xc0\x17\xf2\x1b\xf9\x63\x33\xdc\x67\x2c\x9a\xd1\x15\ -\xca\x08\x9d\x15\x5a\x1b\xfa\x30\xcc\x26\x4c\x1e\xd6\x11\x8e\x86\ -\xcf\x08\xdf\x10\x7e\x6f\xa6\xf9\x4c\xe9\xcc\xb6\x08\x88\xe0\x47\ -\x6c\x88\xb8\x1f\x69\x19\x99\x17\xf9\x7d\x14\x29\x2a\x32\xaa\x2e\ -\xea\x51\xb4\x53\x74\x71\x74\xf7\x2c\xd6\xac\xe4\x59\xfb\x67\xbd\ -\x8e\xf1\x8f\xa9\x8c\xb9\x3b\xdb\x6a\xb6\x72\x76\x67\xac\x6a\x6c\ -\x52\x6c\x63\xec\x9b\xb8\x80\xb8\xaa\xb8\x81\x78\x87\xf8\x45\xf1\ -\x97\x12\x74\x13\x24\x09\xed\x89\xe4\xc4\xd8\xc4\x3d\x89\xe3\x73\ -\x02\xe7\x6c\x9a\x33\x9c\xe4\x9a\x54\x96\x74\x63\xae\xe5\xdc\xa2\ -\xb9\x17\xe6\xe9\xce\xcb\x9e\x77\x3c\x59\x35\x59\x90\x7c\x38\x85\ -\x98\x12\x97\xb2\x3f\xe5\x83\x20\x42\x50\x2f\x18\x4f\xe5\xa7\x6e\ -\x4d\x1d\x13\xf2\x84\x9b\x85\x4f\x45\xbe\xa2\x8d\xa2\x51\xb1\xb7\ -\xb8\x4a\x3c\x92\xe6\x9d\x56\x95\xf6\x38\xdd\x3b\x7d\x43\xfa\x68\ -\x86\x4f\x46\x75\xc6\x33\x09\x4f\x52\x2b\x79\x91\x19\x92\xb9\x23\ -\xf3\x4d\x56\x44\xd6\xde\xac\xcf\xd9\x71\xd9\x2d\x39\x94\x9c\x94\ -\x9c\xa3\x52\x0d\x69\x96\xb4\x2b\xd7\x30\xb7\x28\xb7\x4f\x66\x2b\ -\x2b\x93\x0d\xe4\x79\xe6\x6d\xca\x1b\x93\x87\xca\xf7\xe4\x23\xf9\ -\x73\xf3\xdb\x15\x6c\x85\x4c\xd1\xa3\xb4\x52\xae\x50\x0e\x16\x4c\ -\x2f\xa8\x2b\x78\x5b\x18\x5b\x78\xb8\x48\xbd\x48\x5a\xd4\x33\xdf\ -\x66\xfe\xea\xf9\x23\x0b\x82\x16\x7c\xbd\x90\xb0\x50\xb8\xb0\xb3\ -\xd8\xb8\x78\x59\xf1\xe0\x22\xbf\x45\xbb\x16\x23\x8b\x53\x17\x77\ -\x2e\x31\x5d\x52\xba\x64\x78\x69\xf0\xd2\x7d\xcb\x68\xcb\xb2\x96\ -\xfd\x50\xe2\x58\x52\x55\xf2\x6a\x79\xdc\xf2\x8e\x52\x83\xd2\xa5\ -\xa5\x43\x2b\x82\x57\x34\x95\xa9\x94\xc9\xcb\x6e\xae\xf4\x5a\xb9\ -\x63\x15\x61\x95\x64\x55\xef\x6a\x97\xd5\x5b\x56\x7f\x2a\x17\x95\ -\x5f\xac\x70\xac\xa8\xae\xf8\xb0\x46\xb8\xe6\xe2\x57\x4e\x5f\xd5\ -\x7c\xf5\x79\x6d\xda\xda\xde\x4a\xb7\xca\xed\xeb\x48\xeb\xa4\xeb\ -\x6e\xac\xf7\x59\xbf\xaf\x4a\xbd\x6a\x41\xd5\xd0\x86\xf0\x0d\xad\ -\x1b\xf1\x8d\xe5\x1b\x5f\x6d\x4a\xde\x74\xa1\x7a\x6a\xf5\x8e\xcd\ -\xb4\xcd\xca\xcd\x03\x35\x61\x35\xed\x5b\xcc\xb6\xac\xdb\xf2\xa1\ -\x36\xa3\xf6\x7a\x9d\x7f\x5d\xcb\x56\xfd\xad\xab\xb7\xbe\xd9\x26\ -\xda\xd6\xbf\xdd\x77\x7b\xf3\x0e\x83\x1d\x15\x3b\xde\xef\x94\xec\ -\xbc\xb5\x2b\x78\x57\x6b\xbd\x45\x7d\xf5\x6e\xd2\xee\x82\xdd\x8f\ -\x1a\x62\x1b\xba\xbf\xe6\x7e\xdd\xb8\x47\x77\x4f\xc5\x9e\x8f\x7b\ -\xa5\x7b\x07\xf6\x45\xef\xeb\x6a\x74\x6f\x6c\xdc\xaf\xbf\xbf\xb2\ -\x09\x6d\x52\x36\x8d\x1e\x48\x3a\x70\xe5\x9b\x80\x6f\xda\x9b\xed\ -\x9a\x77\xb5\x70\x5a\x2a\x0e\xc2\x41\xe5\xc1\x27\xdf\xa6\x7c\x7b\ -\xe3\x50\xe8\xa1\xce\xc3\xdc\xc3\xcd\xdf\x99\x7f\xb7\xf5\x08\xeb\ -\x48\x79\x2b\xd2\x3a\xbf\x75\xac\x2d\xa3\x6d\xa0\x3d\xa1\xbd\xef\ -\xe8\x8c\xa3\x9d\x1d\x5e\x1d\x47\xbe\xb7\xff\x7e\xef\x31\xe3\x63\ -\x75\xc7\x35\x8f\x57\x9e\xa0\x9d\x28\x3d\xf1\xf9\xe4\x82\x93\xe3\ -\xa7\x64\xa7\x9e\x9d\x4e\x3f\x3d\xd4\x99\xdc\x79\xf7\x4c\xfc\x99\ -\x6b\x5d\x51\x5d\xbd\x67\x43\xcf\x9e\x3f\x17\x74\xee\x4c\xb7\x5f\ -\xf7\xc9\xf3\xde\xe7\x8f\x5d\xf0\xbc\x70\xf4\x22\xf7\x62\xdb\x25\ -\xb7\x4b\xad\x3d\xae\x3d\x47\x7e\x70\xfd\xe1\x48\xaf\x5b\x6f\xeb\ -\x65\xf7\xcb\xed\x57\x3c\xae\x74\xf4\x4d\xeb\x3b\xd1\xef\xd3\x7f\ -\xfa\x6a\xc0\xd5\x73\xd7\xf8\xd7\x2e\x5d\x9f\x79\xbd\xef\xc6\xec\ -\x1b\xb7\x6e\x26\xdd\x1c\xb8\x25\xba\xf5\xf8\x76\xf6\xed\x17\x77\ -\x0a\xee\x4c\xdc\x5d\x7a\x8f\x78\xaf\xfc\xbe\xda\xfd\xea\x07\xfa\ -\x0f\xea\x7f\xb4\xfe\xb1\x65\xc0\x6d\xe0\xf8\x60\xc0\x60\xcf\xc3\ -\x59\x0f\xef\x0e\x09\x87\x9e\xfe\x94\xff\xd3\x87\xe1\xd2\x47\xcc\ -\x47\xd5\x23\x46\x23\x8d\x8f\x9d\x1f\x1f\x1b\x0d\x1a\xbd\xf2\x64\ -\xce\x93\xe1\xa7\xb2\xa7\x13\xcf\xca\x7e\x56\xff\x79\xeb\x73\xab\ -\xe7\xdf\xfd\xe2\xfb\x4b\xcf\x58\xfc\xd8\xf0\x0b\xf9\x8b\xcf\xbf\ -\xae\x79\xa9\xf3\x72\xef\xab\xa9\xaf\x3a\xc7\x23\xc7\x1f\xbc\xce\ -\x79\x3d\xf1\xa6\xfc\xad\xce\xdb\x7d\xef\xb8\xef\xba\xdf\xc7\xbd\ -\x1f\x99\x28\xfc\x40\xfe\x50\xf3\xd1\xfa\x63\xc7\xa7\xd0\x4f\xf7\ -\x3e\xe7\x7c\xfe\xfc\x2f\xf7\x84\xf3\xfb\x25\xd2\x9f\x33\x00\x00\ -\x00\x20\x63\x48\x52\x4d\x00\x00\x7a\x25\x00\x00\x80\x83\x00\x00\ -\xf9\xff\x00\x00\x80\xe9\x00\x00\x75\x30\x00\x00\xea\x60\x00\x00\ -\x3a\x98\x00\x00\x17\x6f\x92\x5f\xc5\x46\x00\x00\x03\x3f\x49\x44\ -\x41\x54\x78\xda\x4c\x92\x4b\x68\x5c\x75\x18\xc5\xcf\xff\x75\xdf\ -\x33\xf7\xde\xb9\x33\xf7\xde\x98\xa1\x8c\x21\xf8\x00\xd1\x85\x9b\ -\xd6\xae\xdc\x58\x17\x6e\xa2\xa4\xc1\xfa\x44\x70\x63\x45\xea\x2e\ -\xfb\x62\xa5\xa0\xae\xc4\x8d\xe0\x42\x17\x2e\x4a\xc1\x95\x88\xa5\ -\x14\xc1\xd2\xa6\x55\x92\x51\x5a\xd3\x26\xa9\xe9\xb4\x99\x99\x66\ -\x26\xce\x4c\xe7\x79\x1f\xf3\xbf\x2e\x94\x34\x67\x75\x16\x87\x1f\ -\xe7\xfb\x38\x24\x4d\x53\x00\x40\x96\x65\x20\x84\x20\xcb\x32\x00\ -\x00\xa5\x14\x8d\xc6\x83\x57\xaa\xd5\x3f\x4e\xfb\x81\x2f\xc2\xd0\ -\x5f\x73\x5d\xf7\x73\x55\x51\x56\x0f\xe6\xc8\x41\x00\x00\x46\x08\ -\xc9\x08\x21\x32\x8e\xe3\xb9\x2b\x57\xaf\xfd\xa9\xaa\xaa\xe1\x07\ -\x45\x38\x8e\x03\x53\x37\x92\xf1\x78\xfc\xb5\x65\x99\xa7\x18\xe3\ -\x49\x96\x49\x50\x3c\x52\x9e\x10\x22\x00\x48\x42\x29\x6e\xdc\x5c\ -\xff\x0a\x80\x51\xf0\x5c\x28\x8a\x02\xce\x39\x54\x55\x15\xae\xeb\ -\x7e\xd0\x6a\xb7\x7f\x89\xa2\xa8\xc8\xb9\xd8\x07\x10\x42\xc8\x08\ -\xc0\x84\x31\x86\x8d\xdb\x1b\xcb\xad\x56\xeb\x98\xe7\x15\xa0\x69\ -\x2a\x74\x43\x87\xae\xe9\x20\x20\x88\xa2\x09\xea\x8d\xe6\x91\x1b\ -\x37\xff\xfa\x22\x4d\x13\x8b\xff\x0f\xc8\x00\xa4\x8c\x31\x74\x3a\ -\xdd\x23\x1b\x9b\x5b\xa7\x83\x20\x80\x61\xe8\x50\x55\x15\x86\x66\ -\x40\x70\x8e\xa9\x94\xb8\xb7\xb3\x83\x6e\xb7\x07\x02\xf2\x5a\xad\ -\xb6\x73\xfe\xe0\x09\x88\xa2\xc8\x5f\xab\x56\xbf\xb5\x6d\x87\xe7\ -\xf2\x39\xa8\x9a\x0a\x5d\xd7\xa1\x08\x01\x00\xe8\xf6\x3a\xa8\xd7\ -\x9b\x20\x20\xb0\x6d\x1b\x42\x08\xc2\xef\xef\xd4\x1f\x7d\xbd\xd9\ -\x3c\x1b\xc7\xd3\xf9\x30\x70\xa1\xa9\x0a\x54\x55\x85\xae\x68\x60\ -\x8c\x21\x8e\x63\xd4\x6a\xf7\x30\x19\x4f\x60\x18\x3a\x2a\x95\x43\ -\xdf\x15\x3d\xef\x02\xef\x76\x7b\xa0\x84\x82\x10\xf2\xf6\x5e\x7b\ -\xef\xdd\x72\xb9\x0c\x45\x15\x10\x8a\x80\xa6\x69\x60\x9c\x21\xcb\ -\x32\x34\x9b\x4d\xb4\x5a\x7b\x60\x8c\xc1\x76\xec\x5d\xca\xe8\x72\ -\xaf\xff\x70\xc8\x85\xe0\x20\x40\x71\x6b\xeb\xce\x19\xc3\x34\x10\ -\x84\x25\xe4\x72\x39\xa4\x69\x0a\xc1\x05\x08\x21\x18\x0c\x06\xd8\ -\xbe\x7b\x17\x52\x4a\x38\x8e\x83\xf1\x68\x7c\xaa\x56\xab\x75\x01\ -\x80\xef\x3e\xd8\x3d\x7c\xee\xdc\xf9\x2f\x57\x56\xae\xcf\x52\x4a\ -\x30\x33\x3b\x83\xd7\x97\x96\xb0\xb8\xf8\xea\x7e\xf5\x3b\xdb\xdb\ -\xe8\xf7\x87\x28\x14\x0a\x98\xca\xf4\xa7\x5e\xaf\xfb\xbd\xe3\x38\ -\x08\xc3\x10\xf4\xd6\xfa\xed\x17\xd6\x56\xab\xcf\x4f\xd3\x14\x9d\ -\x4e\x17\x2b\x57\xaf\xe1\xe4\x87\x1f\xe1\xf8\xd2\x1b\xd8\xdc\xdc\ -\x42\x1c\xc7\x68\xd4\x1b\x30\x2d\x13\xba\xae\x65\xc3\xc1\x70\xd9\ -\x34\x4d\x54\x2a\x15\xd8\xb6\x0d\xea\x07\xc1\x8f\xf3\xf3\xf3\xab\ -\x9c\x73\xe4\x2c\x0b\x9e\x5b\x40\xd1\xf3\x70\xf9\xd7\xcb\x58\x3c\ -\x7e\x02\x17\x2f\x5d\x82\x65\xe5\xe0\xba\x0e\xc6\x93\xf1\x37\x32\ -\x93\x55\xc7\x71\xa1\x2a\x0a\x92\x24\x01\xcd\xdb\xf9\xf5\x63\x2f\ -\xbf\x74\xd2\xb6\xed\x11\xe7\x1c\xa6\x69\xc2\x34\x4c\x84\x41\x88\ -\xc1\xc3\x3e\xce\x7e\xfa\x19\x28\x25\x10\x82\x8f\xa4\x9c\x7e\x62\ -\x18\x3a\xa2\x68\x02\x99\x65\x10\x42\x80\x66\x99\xc4\x63\xb3\x33\ -\x57\x16\x16\x16\x4e\x94\x4a\xa5\x1e\xe7\x1c\x86\x61\xc0\xb2\x2c\ -\x78\x9e\x87\xce\x3f\x1d\xfc\x76\xfd\x77\x48\x39\x3d\xc3\x39\xff\ -\xdb\xb6\x6d\x3c\xf5\xc4\x93\x70\x6d\x07\xae\xed\x80\xbd\xf5\xe6\ -\x3b\x90\x53\x09\xcf\xf3\x6e\xf9\x81\xff\x43\x92\x24\x4f\x27\x69\ -\x32\x4b\x40\x38\xa5\x14\x9c\x0b\x94\x0f\x95\xb7\x9f\x7d\xee\x99\ -\xf7\x28\x65\xd1\x5c\xe5\x71\xe4\x72\xb9\xfd\xf1\x91\x0b\x3f\x5f\ -\xfc\xcf\x50\xc2\x06\xc3\xd1\xb4\xdf\x1f\xa0\x5e\xaf\xcf\xb5\xdb\ -\x7b\xef\xa7\x69\xf2\xa2\xef\xfb\x8d\xa3\x47\x0f\x7f\x6c\x3b\xf9\ -\xed\x30\x08\xe0\x97\x7c\x48\x29\xf7\x01\xff\x0e\x00\x87\x7e\x46\ -\xf6\x00\xdd\xdd\x70\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\ -\x82\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x01\x68\xf4\xcf\xf7\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\ +\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x03\x8f\x49\x44\x41\x54\x38\ +\xcb\x3d\x91\xdf\x4f\x5b\x75\x00\xc5\xcf\xf7\x7e\x2f\xb4\xbd\xb7\ +\xdc\x76\x8c\xfe\x80\x5b\xe4\x87\x73\xcc\x84\x8c\x9f\x0d\x83\x25\ +\x2e\x6e\x3e\x8c\x44\xb3\x64\x66\x21\x6a\x62\x8c\xba\x68\xa6\x0f\ +\xea\x93\x0f\x26\x8b\x0f\xc6\x7f\xc0\x44\x97\xc5\x2c\x53\x5f\xdc\ +\xe2\xa3\xc8\xa0\xb0\x1f\x22\x14\xc1\x6d\x08\x6d\x2d\x90\x51\xda\ +\x4b\x27\x3f\xd6\x52\xee\xbd\x50\x7a\xbf\xbd\x5f\x1f\x10\x5e\x4f\ +\xce\x39\xf9\xe4\x1c\xca\x18\x43\x4f\x4f\xdf\x23\xc4\xe2\x09\x30\ +\xc6\x38\xb1\x2c\x0b\x00\x20\xe6\xb6\xf2\x7c\xf9\xc9\x0a\x08\x63\ +\x0c\xdb\xdb\x7a\x6f\xb1\x54\x9c\x30\x0c\x03\x88\x8c\xde\x43\xb8\ +\xbb\x8f\xf7\xf6\xbe\xc4\x1f\x8c\xff\x0e\x58\x96\x85\x72\xb9\x8c\ +\x8c\xa6\xfd\x64\x59\x16\xc0\x18\xc3\xf4\xcc\x43\x5e\x2e\x97\xf9\ +\x48\x64\xcc\xa4\xe1\x70\x8f\xd6\x15\xee\x54\xa2\xd1\x28\x8e\x54\ +\x7b\x2b\x71\xee\xec\x79\xb3\xed\x64\x37\x9f\x8b\xcd\x9b\x1b\xcf\ +\x36\xf7\x23\x96\x65\x29\x8c\x31\xcc\xfc\xf5\x68\x28\x91\x4c\xf2\ +\x7c\x61\x8b\xdb\xb6\xcd\x4d\xd3\xac\x21\xa9\x95\x34\x04\x41\x40\ +\x3c\x9e\xe4\x27\x4e\x1c\x43\xd0\x1f\x00\x07\xc7\xfd\x07\xe3\xe8\ +\xec\x6c\xbf\x86\xef\xbe\xbd\xfe\x59\x7b\x5b\x98\x07\x82\xf5\xfc\ +\xe2\xeb\x03\x5c\xd7\x75\x3e\x7a\xf7\x1e\x1f\x1e\x89\xb4\x65\xff\ +\x7d\x0a\x32\x3c\x3c\x06\x70\xe0\xe7\x5b\xb7\x22\xa9\xe5\xd4\x39\ +\xc3\x30\x71\xe3\x87\x6b\xde\x50\x5d\xa8\x20\xcb\xf2\x3e\xc3\xff\ +\x1c\xd0\xb4\xec\xab\xd3\x33\x0f\xe7\x0d\xd3\xec\x38\xd0\x0e\x0c\ +\x4e\x9b\x73\x8c\xdd\xbd\xcf\x57\x32\x69\x5e\x2e\x97\xb9\xb6\xaa\ +\x4d\x70\xce\x21\x02\x00\xa5\xb4\xf8\xeb\xe0\x90\xd5\xd2\xf2\x02\ +\x8e\x56\x1f\x85\x6d\x73\xc4\x13\xc9\xde\xbd\xa2\x75\x41\xd4\x56\ +\xb3\x58\x5b\x5f\xbf\xd1\xdc\xd4\x24\x2a\x1e\x05\x2e\xa7\x13\x8f\ +\x67\x67\xe1\x74\x38\xd0\xd4\xd4\x10\x11\x76\x4c\xb3\xc6\xd0\xf5\ +\x77\x1a\x9b\x1b\xa0\x54\x29\xd0\x75\x1d\x6b\x6b\x1b\xa8\xac\xac\ +\x7c\xf3\xf1\xdf\xb3\x26\xe9\xeb\x3d\xc3\xd7\x37\x36\x90\xcb\xe7\ +\x30\x15\x1d\xc7\xc2\xe2\x22\x82\xc1\x20\x37\x4c\x5d\x68\x6d\x6d\ +\x85\xf0\xd1\xc7\x57\xfa\x8e\x78\xbd\x68\xa8\x7f\x0e\xfd\xe7\x5f\ +\x83\xa2\x28\x30\x77\x8c\xe7\x5d\x2e\x17\x00\x40\xf0\xf9\x7c\x93\ +\xef\xbd\xff\xee\x8b\xb5\x75\xb5\x7b\xaa\xaa\x22\x12\x19\x4b\x29\ +\x8a\xb2\x1c\xee\xea\x86\x57\xf1\xec\x3f\x0e\x00\x9c\x73\x00\xa0\ +\x84\x10\x4e\x08\xb1\x4b\xa5\x52\xf3\x64\xf4\xcf\x39\x87\xc3\x21\ +\xf9\x03\x35\xf0\x7a\xbd\x90\x5d\x92\xb5\xbb\xbb\x7b\xdd\xed\x96\ +\x3f\xa1\x54\xb4\x38\xb7\x0f\x0b\x08\x00\x0a\x80\x51\x4a\xb1\xb0\ +\xb0\xf8\xf9\x93\xe5\xd4\xd7\x75\x75\xb5\x50\x3c\x55\x90\xdd\x32\ +\x14\xb7\x82\x4a\xb1\x02\x7b\xa5\x22\xe6\x62\x71\x80\xe3\xc7\x8e\ +\xf6\x93\x57\x0e\x09\x00\x80\x31\xe6\x9f\x98\x8c\xfe\x51\x51\xe1\ +\x38\xe6\xf3\xd7\x40\x92\x9c\xa8\xaa\xaa\x82\xec\x92\x40\x29\x45\ +\x2e\x9f\x43\x2c\xfe\x0f\xac\x92\x05\x8f\xc7\xb3\x13\x0c\x04\xde\ +\x12\xe7\x63\x09\x08\x44\x00\x21\xe4\xed\x8c\x96\xb9\x19\x0a\x85\ +\x20\x49\x4e\xb8\x24\x17\xdc\x6e\x37\x24\xa7\x0b\x84\x10\xa4\xd3\ +\x69\x24\x17\x96\x40\x29\x85\x3f\xe0\x5b\x57\xd5\xba\x16\x4a\xe9\ +\x96\x98\xcf\xe5\x4e\xdd\xbe\xfd\xcb\x37\x53\x53\xd3\x5d\x82\x40\ +\x50\xab\xd6\xe2\x8d\x81\x01\x5c\xba\x74\x11\x94\x52\x94\x4a\x25\ +\xc4\x12\x09\x68\x99\x55\x54\x57\x57\x83\x08\x18\x5a\x5d\xd5\xfa\ +\x4d\xd3\x40\x30\x18\x84\x90\xcf\x17\xb6\x0c\xdd\x14\x08\x00\x66\ +\x31\x2c\x25\x97\x70\xf5\xea\x97\x50\xd5\x46\x74\x74\xf6\xe0\xb7\ +\x3b\x77\xa0\x6f\x1b\x08\xd5\xab\x00\xe1\xdf\xeb\xba\xde\xaf\xaa\ +\x21\xb4\x1c\x3f\x0e\x49\x92\x40\x46\x22\x63\x10\x45\x11\xb1\xb9\ +\xc4\x85\xc1\xc1\xc1\x9b\xf9\x7c\xde\x23\x08\xc2\xc1\x26\x28\x14\ +\x0a\xf8\xe0\xc3\xcb\x38\xfb\xca\x99\x2f\x4c\x73\xe7\x2b\x59\x96\ +\xd1\xd4\xd0\x08\x49\x92\x20\x08\x02\xc8\xc8\xf0\x28\x00\x80\x08\ +\x84\x1a\xe6\x4e\x59\xd7\x0d\x64\xb3\xd9\xe6\xcd\xcd\x67\x97\x19\ +\xb3\x5e\xf6\xfb\xfd\x4f\x4f\x9f\x3e\xf5\xa9\xc7\xab\xa4\x82\x81\ +\x00\xfc\x3e\x3f\x6c\xdb\x3e\x1c\xfe\x3f\x11\x5f\xc4\xbb\xcd\x16\ +\x27\xa0\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x02\xaf\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -941,548 +461,245 @@ qt_resource_data = "\ \x12\xe3\x03\xfa\xf1\xc0\xf9\xeb\x4d\xf9\x37\x2f\x04\xe0\x8f\x00\ \x03\x00\xe7\xe3\x7a\x6e\x30\xbb\xf3\xb7\x00\x00\x00\x00\x49\x45\ \x4e\x44\xae\x42\x60\x82\ -\x00\x00\x10\xe5\ +\x00\x00\x07\x65\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\ -\x01\x00\x9a\x9c\x18\x00\x00\x0a\x4d\x69\x43\x43\x50\x50\x68\x6f\ -\x74\x6f\x73\x68\x6f\x70\x20\x49\x43\x43\x20\x70\x72\x6f\x66\x69\ -\x6c\x65\x00\x00\x78\xda\x9d\x53\x77\x58\x93\xf7\x16\x3e\xdf\xf7\ -\x65\x0f\x56\x42\xd8\xf0\xb1\x97\x6c\x81\x00\x22\x23\xac\x08\xc8\ -\x10\x59\xa2\x10\x92\x00\x61\x84\x10\x12\x40\xc5\x85\x88\x0a\x56\ -\x14\x15\x11\x9c\x48\x55\xc4\x82\xd5\x0a\x48\x9d\x88\xe2\xa0\x28\ -\xb8\x67\x41\x8a\x88\x5a\x8b\x55\x5c\x38\xee\x1f\xdc\xa7\xb5\x7d\ -\x7a\xef\xed\xed\xfb\xd7\xfb\xbc\xe7\x9c\xe7\xfc\xce\x79\xcf\x0f\ -\x80\x11\x12\x26\x91\xe6\xa2\x6a\x00\x39\x52\x85\x3c\x3a\xd8\x1f\ -\x8f\x4f\x48\xc4\xc9\xbd\x80\x02\x15\x48\xe0\x04\x20\x10\xe6\xcb\ -\xc2\x67\x05\xc5\x00\x00\xf0\x03\x79\x78\x7e\x74\xb0\x3f\xfc\x01\ -\xaf\x6f\x00\x02\x00\x70\xd5\x2e\x24\x12\xc7\xe1\xff\x83\xba\x50\ -\x26\x57\x00\x20\x91\x00\xe0\x22\x12\xe7\x0b\x01\x90\x52\x00\xc8\ -\x2e\x54\xc8\x14\x00\xc8\x18\x00\xb0\x53\xb3\x64\x0a\x00\x94\x00\ -\x00\x6c\x79\x7c\x42\x22\x00\xaa\x0d\x00\xec\xf4\x49\x3e\x05\x00\ -\xd8\xa9\x93\xdc\x17\x00\xd8\xa2\x1c\xa9\x08\x00\x8d\x01\x00\x99\ -\x28\x47\x24\x02\x40\xbb\x00\x60\x55\x81\x52\x2c\x02\xc0\xc2\x00\ -\xa0\xac\x40\x22\x2e\x04\xc0\xae\x01\x80\x59\xb6\x32\x47\x02\x80\ -\xbd\x05\x00\x76\x8e\x58\x90\x0f\x40\x60\x00\x80\x99\x42\x2c\xcc\ -\x00\x20\x38\x02\x00\x43\x1e\x13\xcd\x03\x20\x4c\x03\xa0\x30\xd2\ -\xbf\xe0\xa9\x5f\x70\x85\xb8\x48\x01\x00\xc0\xcb\x95\xcd\x97\x4b\ -\xd2\x33\x14\xb8\x95\xd0\x1a\x77\xf2\xf0\xe0\xe2\x21\xe2\xc2\x6c\ -\xb1\x42\x61\x17\x29\x10\x66\x09\xe4\x22\x9c\x97\x9b\x23\x13\x48\ -\xe7\x03\x4c\xce\x0c\x00\x00\x1a\xf9\xd1\xc1\xfe\x38\x3f\x90\xe7\ -\xe6\xe4\xe1\xe6\x66\xe7\x6c\xef\xf4\xc5\xa2\xfe\x6b\xf0\x6f\x22\ -\x3e\x21\xf1\xdf\xfe\xbc\x8c\x02\x04\x00\x10\x4e\xcf\xef\xda\x5f\ -\xe5\xe5\xd6\x03\x70\xc7\x01\xb0\x75\xbf\x6b\xa9\x5b\x00\xda\x56\ -\x00\x68\xdf\xf9\x5d\x33\xdb\x09\xa0\x5a\x0a\xd0\x7a\xf9\x8b\x79\ -\x38\xfc\x40\x1e\x9e\xa1\x50\xc8\x3c\x1d\x1c\x0a\x0b\x0b\xed\x25\ -\x62\xa1\xbd\x30\xe3\x8b\x3e\xff\x33\xe1\x6f\xe0\x8b\x7e\xf6\xfc\ -\x40\x1e\xfe\xdb\x7a\xf0\x00\x71\x9a\x40\x99\xad\xc0\xa3\x83\xfd\ -\x71\x61\x6e\x76\xae\x52\x8e\xe7\xcb\x04\x42\x31\x6e\xf7\xe7\x23\ -\xfe\xc7\x85\x7f\xfd\x8e\x29\xd1\xe2\x34\xb1\x5c\x2c\x15\x8a\xf1\ -\x58\x89\xb8\x50\x22\x4d\xc7\x79\xb9\x52\x91\x44\x21\xc9\x95\xe2\ -\x12\xe9\x7f\x32\xf1\x1f\x96\xfd\x09\x93\x77\x0d\x00\xac\x86\x4f\ -\xc0\x4e\xb6\x07\xb5\xcb\x6c\xc0\x7e\xee\x01\x02\x8b\x0e\x58\xd2\ -\x76\x00\x40\x7e\xf3\x2d\x8c\x1a\x0b\x91\x00\x10\x67\x34\x32\x79\ -\xf7\x00\x00\x93\xbf\xf9\x8f\x40\x2b\x01\x00\xcd\x97\xa4\xe3\x00\ -\x00\xbc\xe8\x18\x5c\xa8\x94\x17\x4c\xc6\x08\x00\x00\x44\xa0\x81\ -\x2a\xb0\x41\x07\x0c\xc1\x14\xac\xc0\x0e\x9c\xc1\x1d\xbc\xc0\x17\ -\x02\x61\x06\x44\x40\x0c\x24\xc0\x3c\x10\x42\x06\xe4\x80\x1c\x0a\ -\xa1\x18\x96\x41\x19\x54\xc0\x3a\xd8\x04\xb5\xb0\x03\x1a\xa0\x11\ -\x9a\xe1\x10\xb4\xc1\x31\x38\x0d\xe7\xe0\x12\x5c\x81\xeb\x70\x17\ -\x06\x60\x18\x9e\xc2\x18\xbc\x86\x09\x04\x41\xc8\x08\x13\x61\x21\ -\x3a\x88\x11\x62\x8e\xd8\x22\xce\x08\x17\x99\x8e\x04\x22\x61\x48\ -\x34\x92\x80\xa4\x20\xe9\x88\x14\x51\x22\xc5\xc8\x72\xa4\x02\xa9\ -\x42\x6a\x91\x5d\x48\x23\xf2\x2d\x72\x14\x39\x8d\x5c\x40\xfa\x90\ -\xdb\xc8\x20\x32\x8a\xfc\x8a\xbc\x47\x31\x94\x81\xb2\x51\x03\xd4\ -\x02\x75\x40\xb9\xa8\x1f\x1a\x8a\xc6\xa0\x73\xd1\x74\x34\x0f\x5d\ -\x80\x96\xa2\x6b\xd1\x1a\xb4\x1e\x3d\x80\xb6\xa2\xa7\xd1\x4b\xe8\ -\x75\x74\x00\x7d\x8a\x8e\x63\x80\xd1\x31\x0e\x66\x8c\xd9\x61\x5c\ -\x8c\x87\x45\x60\x89\x58\x1a\x26\xc7\x16\x63\xe5\x58\x35\x56\x8f\ -\x35\x63\x1d\x58\x37\x76\x15\x1b\xc0\x9e\x61\xef\x08\x24\x02\x8b\ -\x80\x13\xec\x08\x5e\x84\x10\xc2\x6c\x82\x90\x90\x47\x58\x4c\x58\ -\x43\xa8\x25\xec\x23\xb4\x12\xba\x08\x57\x09\x83\x84\x31\xc2\x27\ -\x22\x93\xa8\x4f\xb4\x25\x7a\x12\xf9\xc4\x78\x62\x3a\xb1\x90\x58\ -\x46\xac\x26\xee\x21\x1e\x21\x9e\x25\x5e\x27\x0e\x13\x5f\x93\x48\ -\x24\x0e\xc9\x92\xe4\x4e\x0a\x21\x25\x90\x32\x49\x0b\x49\x6b\x48\ -\xdb\x48\x2d\xa4\x53\xa4\x3e\xd2\x10\x69\x9c\x4c\x26\xeb\x90\x6d\ -\xc9\xde\xe4\x08\xb2\x80\xac\x20\x97\x91\xb7\x90\x0f\x90\x4f\x92\ -\xfb\xc9\xc3\xe4\xb7\x14\x3a\xc5\x88\xe2\x4c\x09\xa2\x24\x52\xa4\ -\x94\x12\x4a\x35\x65\x3f\xe5\x04\xa5\x9f\x32\x42\x99\xa0\xaa\x51\ -\xcd\xa9\x9e\xd4\x08\xaa\x88\x3a\x9f\x5a\x49\x6d\xa0\x76\x50\x2f\ -\x53\x87\xa9\x13\x34\x75\x9a\x25\xcd\x9b\x16\x43\xcb\xa4\x2d\xa3\ -\xd5\xd0\x9a\x69\x67\x69\xf7\x68\x2f\xe9\x74\xba\x09\xdd\x83\x1e\ -\x45\x97\xd0\x97\xd2\x6b\xe8\x07\xe9\xe7\xe9\x83\xf4\x77\x0c\x0d\ -\x86\x0d\x83\xc7\x48\x62\x28\x19\x6b\x19\x7b\x19\xa7\x18\xb7\x19\ -\x2f\x99\x4c\xa6\x05\xd3\x97\x99\xc8\x54\x30\xd7\x32\x1b\x99\x67\ -\x98\x0f\x98\x6f\x55\x58\x2a\xf6\x2a\x7c\x15\x91\xca\x12\x95\x3a\ -\x95\x56\x95\x7e\x95\xe7\xaa\x54\x55\x73\x55\x3f\xd5\x79\xaa\x0b\ -\x54\xab\x55\x0f\xab\x5e\x56\x7d\xa6\x46\x55\xb3\x50\xe3\xa9\x09\ -\xd4\x16\xab\xd5\xa9\x1d\x55\xbb\xa9\x36\xae\xce\x52\x77\x52\x8f\ -\x50\xcf\x51\x5f\xa3\xbe\x5f\xfd\x82\xfa\x63\x0d\xb2\x86\x85\x46\ -\xa0\x86\x48\xa3\x54\x63\xb7\xc6\x19\x8d\x21\x16\xc6\x32\x65\xf1\ -\x58\x42\xd6\x72\x56\x03\xeb\x2c\x6b\x98\x4d\x62\x5b\xb2\xf9\xec\ -\x4c\x76\x05\xfb\x1b\x76\x2f\x7b\x4c\x53\x43\x73\xaa\x66\xac\x66\ -\x91\x66\x9d\xe6\x71\xcd\x01\x0e\xc6\xb1\xe0\xf0\x39\xd9\x9c\x4a\ -\xce\x21\xce\x0d\xce\x7b\x2d\x03\x2d\x3f\x2d\xb1\xd6\x6a\xad\x66\ -\xad\x7e\xad\x37\xda\x7a\xda\xbe\xda\x62\xed\x72\xed\x16\xed\xeb\ -\xda\xef\x75\x70\x9d\x40\x9d\x2c\x9d\xf5\x3a\x6d\x3a\xf7\x75\x09\ -\xba\x36\xba\x51\xba\x85\xba\xdb\x75\xcf\xea\x3e\xd3\x63\xeb\x79\ -\xe9\x09\xf5\xca\xf5\x0e\xe9\xdd\xd1\x47\xf5\x6d\xf4\xa3\xf5\x17\ -\xea\xef\xd6\xef\xd1\x1f\x37\x30\x34\x08\x36\x90\x19\x6c\x31\x38\ -\x63\xf0\xcc\x90\x63\xe8\x6b\x98\x69\xb8\xd1\xf0\x84\xe1\xa8\x11\ -\xcb\x68\xba\x91\xc4\x68\xa3\xd1\x49\xa3\x27\xb8\x26\xee\x87\x67\ -\xe3\x35\x78\x17\x3e\x66\xac\x6f\x1c\x62\xac\x34\xde\x65\xdc\x6b\ -\x3c\x61\x62\x69\x32\xdb\xa4\xc4\xa4\xc5\xe4\xbe\x29\xcd\x94\x6b\ -\x9a\x66\xba\xd1\xb4\xd3\x74\xcc\xcc\xc8\x2c\xdc\xac\xd8\xac\xc9\ -\xec\x8e\x39\xd5\x9c\x6b\x9e\x61\xbe\xd9\xbc\xdb\xfc\x8d\x85\xa5\ -\x45\x9c\xc5\x4a\x8b\x36\x8b\xc7\x96\xda\x96\x7c\xcb\x05\x96\x4d\ -\x96\xf7\xac\x98\x56\x3e\x56\x79\x56\xf5\x56\xd7\xac\x49\xd6\x5c\ -\xeb\x2c\xeb\x6d\xd6\x57\x6c\x50\x1b\x57\x9b\x0c\x9b\x3a\x9b\xcb\ -\xb6\xa8\xad\x9b\xad\xc4\x76\x9b\x6d\xdf\x14\xe2\x14\x8f\x29\xd2\ -\x29\xf5\x53\x6e\xda\x31\xec\xfc\xec\x0a\xec\x9a\xec\x06\xed\x39\ -\xf6\x61\xf6\x25\xf6\x6d\xf6\xcf\x1d\xcc\x1c\x12\x1d\xd6\x3b\x74\ -\x3b\x7c\x72\x74\x75\xcc\x76\x6c\x70\xbc\xeb\xa4\xe1\x34\xc3\xa9\ -\xc4\xa9\xc3\xe9\x57\x67\x1b\x67\xa1\x73\x9d\xf3\x35\x17\xa6\x4b\ -\x90\xcb\x12\x97\x76\x97\x17\x53\x6d\xa7\x8a\xa7\x6e\x9f\x7a\xcb\ -\x95\xe5\x1a\xee\xba\xd2\xb5\xd3\xf5\xa3\x9b\xbb\x9b\xdc\xad\xd9\ -\x6d\xd4\xdd\xcc\x3d\xc5\x7d\xab\xfb\x4d\x2e\x9b\x1b\xc9\x5d\xc3\ -\x3d\xef\x41\xf4\xf0\xf7\x58\xe2\x71\xcc\xe3\x9d\xa7\x9b\xa7\xc2\ -\xf3\x90\xe7\x2f\x5e\x76\x5e\x59\x5e\xfb\xbd\x1e\x4f\xb3\x9c\x26\ -\x9e\xd6\x30\x6d\xc8\xdb\xc4\x5b\xe0\xbd\xcb\x7b\x60\x3a\x3e\x3d\ -\x65\xfa\xce\xe9\x03\x3e\xc6\x3e\x02\x9f\x7a\x9f\x87\xbe\xa6\xbe\ -\x22\xdf\x3d\xbe\x23\x7e\xd6\x7e\x99\x7e\x07\xfc\x9e\xfb\x3b\xfa\ -\xcb\xfd\x8f\xf8\xbf\xe1\x79\xf2\x16\xf1\x4e\x05\x60\x01\xc1\x01\ -\xe5\x01\xbd\x81\x1a\x81\xb3\x03\x6b\x03\x1f\x04\x99\x04\xa5\x07\ -\x35\x05\x8d\x05\xbb\x06\x2f\x0c\x3e\x15\x42\x0c\x09\x0d\x59\x1f\ -\x72\x93\x6f\xc0\x17\xf2\x1b\xf9\x63\x33\xdc\x67\x2c\x9a\xd1\x15\ -\xca\x08\x9d\x15\x5a\x1b\xfa\x30\xcc\x26\x4c\x1e\xd6\x11\x8e\x86\ -\xcf\x08\xdf\x10\x7e\x6f\xa6\xf9\x4c\xe9\xcc\xb6\x08\x88\xe0\x47\ -\x6c\x88\xb8\x1f\x69\x19\x99\x17\xf9\x7d\x14\x29\x2a\x32\xaa\x2e\ -\xea\x51\xb4\x53\x74\x71\x74\xf7\x2c\xd6\xac\xe4\x59\xfb\x67\xbd\ -\x8e\xf1\x8f\xa9\x8c\xb9\x3b\xdb\x6a\xb6\x72\x76\x67\xac\x6a\x6c\ -\x52\x6c\x63\xec\x9b\xb8\x80\xb8\xaa\xb8\x81\x78\x87\xf8\x45\xf1\ -\x97\x12\x74\x13\x24\x09\xed\x89\xe4\xc4\xd8\xc4\x3d\x89\xe3\x73\ -\x02\xe7\x6c\x9a\x33\x9c\xe4\x9a\x54\x96\x74\x63\xae\xe5\xdc\xa2\ -\xb9\x17\xe6\xe9\xce\xcb\x9e\x77\x3c\x59\x35\x59\x90\x7c\x38\x85\ -\x98\x12\x97\xb2\x3f\xe5\x83\x20\x42\x50\x2f\x18\x4f\xe5\xa7\x6e\ -\x4d\x1d\x13\xf2\x84\x9b\x85\x4f\x45\xbe\xa2\x8d\xa2\x51\xb1\xb7\ -\xb8\x4a\x3c\x92\xe6\x9d\x56\x95\xf6\x38\xdd\x3b\x7d\x43\xfa\x68\ -\x86\x4f\x46\x75\xc6\x33\x09\x4f\x52\x2b\x79\x91\x19\x92\xb9\x23\ -\xf3\x4d\x56\x44\xd6\xde\xac\xcf\xd9\x71\xd9\x2d\x39\x94\x9c\x94\ -\x9c\xa3\x52\x0d\x69\x96\xb4\x2b\xd7\x30\xb7\x28\xb7\x4f\x66\x2b\ -\x2b\x93\x0d\xe4\x79\xe6\x6d\xca\x1b\x93\x87\xca\xf7\xe4\x23\xf9\ -\x73\xf3\xdb\x15\x6c\x85\x4c\xd1\xa3\xb4\x52\xae\x50\x0e\x16\x4c\ -\x2f\xa8\x2b\x78\x5b\x18\x5b\x78\xb8\x48\xbd\x48\x5a\xd4\x33\xdf\ -\x66\xfe\xea\xf9\x23\x0b\x82\x16\x7c\xbd\x90\xb0\x50\xb8\xb0\xb3\ -\xd8\xb8\x78\x59\xf1\xe0\x22\xbf\x45\xbb\x16\x23\x8b\x53\x17\x77\ -\x2e\x31\x5d\x52\xba\x64\x78\x69\xf0\xd2\x7d\xcb\x68\xcb\xb2\x96\ -\xfd\x50\xe2\x58\x52\x55\xf2\x6a\x79\xdc\xf2\x8e\x52\x83\xd2\xa5\ -\xa5\x43\x2b\x82\x57\x34\x95\xa9\x94\xc9\xcb\x6e\xae\xf4\x5a\xb9\ -\x63\x15\x61\x95\x64\x55\xef\x6a\x97\xd5\x5b\x56\x7f\x2a\x17\x95\ -\x5f\xac\x70\xac\xa8\xae\xf8\xb0\x46\xb8\xe6\xe2\x57\x4e\x5f\xd5\ -\x7c\xf5\x79\x6d\xda\xda\xde\x4a\xb7\xca\xed\xeb\x48\xeb\xa4\xeb\ -\x6e\xac\xf7\x59\xbf\xaf\x4a\xbd\x6a\x41\xd5\xd0\x86\xf0\x0d\xad\ -\x1b\xf1\x8d\xe5\x1b\x5f\x6d\x4a\xde\x74\xa1\x7a\x6a\xf5\x8e\xcd\ -\xb4\xcd\xca\xcd\x03\x35\x61\x35\xed\x5b\xcc\xb6\xac\xdb\xf2\xa1\ -\x36\xa3\xf6\x7a\x9d\x7f\x5d\xcb\x56\xfd\xad\xab\xb7\xbe\xd9\x26\ -\xda\xd6\xbf\xdd\x77\x7b\xf3\x0e\x83\x1d\x15\x3b\xde\xef\x94\xec\ -\xbc\xb5\x2b\x78\x57\x6b\xbd\x45\x7d\xf5\x6e\xd2\xee\x82\xdd\x8f\ -\x1a\x62\x1b\xba\xbf\xe6\x7e\xdd\xb8\x47\x77\x4f\xc5\x9e\x8f\x7b\ -\xa5\x7b\x07\xf6\x45\xef\xeb\x6a\x74\x6f\x6c\xdc\xaf\xbf\xbf\xb2\ -\x09\x6d\x52\x36\x8d\x1e\x48\x3a\x70\xe5\x9b\x80\x6f\xda\x9b\xed\ -\x9a\x77\xb5\x70\x5a\x2a\x0e\xc2\x41\xe5\xc1\x27\xdf\xa6\x7c\x7b\ -\xe3\x50\xe8\xa1\xce\xc3\xdc\xc3\xcd\xdf\x99\x7f\xb7\xf5\x08\xeb\ -\x48\x79\x2b\xd2\x3a\xbf\x75\xac\x2d\xa3\x6d\xa0\x3d\xa1\xbd\xef\ -\xe8\x8c\xa3\x9d\x1d\x5e\x1d\x47\xbe\xb7\xff\x7e\xef\x31\xe3\x63\ -\x75\xc7\x35\x8f\x57\x9e\xa0\x9d\x28\x3d\xf1\xf9\xe4\x82\x93\xe3\ -\xa7\x64\xa7\x9e\x9d\x4e\x3f\x3d\xd4\x99\xdc\x79\xf7\x4c\xfc\x99\ -\x6b\x5d\x51\x5d\xbd\x67\x43\xcf\x9e\x3f\x17\x74\xee\x4c\xb7\x5f\ -\xf7\xc9\xf3\xde\xe7\x8f\x5d\xf0\xbc\x70\xf4\x22\xf7\x62\xdb\x25\ -\xb7\x4b\xad\x3d\xae\x3d\x47\x7e\x70\xfd\xe1\x48\xaf\x5b\x6f\xeb\ -\x65\xf7\xcb\xed\x57\x3c\xae\x74\xf4\x4d\xeb\x3b\xd1\xef\xd3\x7f\ -\xfa\x6a\xc0\xd5\x73\xd7\xf8\xd7\x2e\x5d\x9f\x79\xbd\xef\xc6\xec\ -\x1b\xb7\x6e\x26\xdd\x1c\xb8\x25\xba\xf5\xf8\x76\xf6\xed\x17\x77\ -\x0a\xee\x4c\xdc\x5d\x7a\x8f\x78\xaf\xfc\xbe\xda\xfd\xea\x07\xfa\ -\x0f\xea\x7f\xb4\xfe\xb1\x65\xc0\x6d\xe0\xf8\x60\xc0\x60\xcf\xc3\ -\x59\x0f\xef\x0e\x09\x87\x9e\xfe\x94\xff\xd3\x87\xe1\xd2\x47\xcc\ -\x47\xd5\x23\x46\x23\x8d\x8f\x9d\x1f\x1f\x1b\x0d\x1a\xbd\xf2\x64\ -\xce\x93\xe1\xa7\xb2\xa7\x13\xcf\xca\x7e\x56\xff\x79\xeb\x73\xab\ -\xe7\xdf\xfd\xe2\xfb\x4b\xcf\x58\xfc\xd8\xf0\x0b\xf9\x8b\xcf\xbf\ -\xae\x79\xa9\xf3\x72\xef\xab\xa9\xaf\x3a\xc7\x23\xc7\x1f\xbc\xce\ -\x79\x3d\xf1\xa6\xfc\xad\xce\xdb\x7d\xef\xb8\xef\xba\xdf\xc7\xbd\ -\x1f\x99\x28\xfc\x40\xfe\x50\xf3\xd1\xfa\x63\xc7\xa7\xd0\x4f\xf7\ -\x3e\xe7\x7c\xfe\xfc\x2f\xf7\x84\xf3\xfb\x25\xd2\x9f\x33\x00\x00\ -\x00\x20\x63\x48\x52\x4d\x00\x00\x7a\x25\x00\x00\x80\x83\x00\x00\ -\xf9\xff\x00\x00\x80\xe9\x00\x00\x75\x30\x00\x00\xea\x60\x00\x00\ -\x3a\x98\x00\x00\x17\x6f\x92\x5f\xc5\x46\x00\x00\x06\x12\x49\x44\ -\x41\x54\x78\xda\x7c\x95\x5b\x88\x9c\x67\x1d\xc6\x7f\xef\xe9\x3b\ -\xce\x69\x67\x27\x9b\x60\x36\x49\x37\xd1\xda\x1c\xbd\xe8\x42\x41\ -\x94\x62\xa3\xb4\xf5\xc2\xda\xa4\x04\x04\x6b\xbd\xb2\x45\x6c\xb0\ -\x08\x52\x4d\xc1\x88\x17\x45\xd4\xd6\x96\x5e\xa9\x45\xad\x85\xea\ -\x85\x42\xab\x22\xc4\xa2\xa6\x34\x90\x50\x85\x66\xb3\x49\x9a\xc3\ -\xe6\xb0\x87\xc9\xcc\xec\xce\xec\xee\xcc\xce\xcc\x37\x87\xef\x7b\ -\xbd\x98\xdd\x69\x6a\xc0\x17\x5e\xf8\x2e\xbe\x97\xe7\xff\x7f\x9e\ -\xff\xf3\xfc\x85\xb5\x96\x38\x8e\xd9\x38\xd6\x5a\x84\x10\xc3\xef\ -\x8d\x23\xa5\xa4\x5a\xad\xde\x77\xe9\xd2\x95\x43\xfd\x7e\x7c\x5f\ -\x2e\x97\x5d\xcc\x8d\x64\xcf\x14\x36\x15\xfe\x1e\x06\xc1\xd9\x24\ -\x4e\x6e\xff\x5f\x00\x56\x6b\x8d\xf8\x3f\x00\xc2\xae\xbf\x50\x4a\ -\xb1\xb4\x54\x7d\x78\x6a\xea\xdc\x1f\xd7\x9a\x4d\x7f\x74\x34\xcf\ -\x68\x61\x94\x54\x2a\x44\x49\xd9\xd6\x4a\xff\xd2\xf7\xfd\x17\x83\ -\x20\xb8\x01\x90\x24\x16\xb0\x18\x63\x90\xdc\x79\x04\xa0\x01\x29\ -\x84\x40\x08\x81\xb5\xd6\xdc\x2a\x95\x9e\xeb\xc7\x89\x3f\x36\xb6\ -\x99\x5c\x2e\x87\x1f\x78\x78\xbe\x4f\xa1\xb0\xc9\xcf\xe7\xf3\x47\ -\x3b\x9d\xce\x7b\xd5\x6a\xf5\xcb\x83\x37\xc8\x75\x12\x3e\x0a\x60\ -\xad\xd5\xc0\x56\xc0\x02\xf1\x46\xf5\x37\x6e\xce\xfe\x60\x6e\xbe\ -\xf8\xe9\x54\x2a\x24\x08\x7c\x3c\xcf\x43\x0a\x09\xd6\x12\xf7\xfb\ -\x48\x29\x29\x14\x0a\x05\xcf\xf3\xfe\x74\xeb\xd6\xad\x9f\x4a\x29\ -\x13\x25\xe5\x1d\x00\x42\x08\xe1\x0a\x21\x1a\x40\x6c\xad\x45\x29\ -\xc5\xe2\x52\xf5\xfe\x0f\x3e\xb8\xfc\xdd\xc0\xf7\xc8\x64\x32\xf8\ -\x81\x8b\x71\x34\x8e\xe3\xe0\xba\x2e\x5a\x6b\x00\xfa\xfd\x3e\xe9\ -\x74\x5a\xcc\xce\xcf\x7f\xe7\xf2\x95\xab\xdf\x16\x52\xdd\xd9\x01\ -\xd0\x02\x56\x37\x74\x88\xa2\x28\x3d\x7d\x6e\xfa\x65\x29\x85\x49\ -\xa5\x52\x08\x09\xc6\x18\x8c\x31\x03\x00\xc7\x41\x29\x85\xb5\x96\ -\x5e\xaf\xc7\x8d\x9b\x37\x89\xa2\x88\x99\x99\x6b\xc7\xda\xed\x68\ -\xfb\xff\x02\xd8\xf5\xcb\x06\x35\x57\x67\xae\xfd\xb0\xde\x68\x1c\ -\xc8\x66\xb3\xb8\xae\x8b\xeb\x3a\x43\x00\xd7\x71\x91\x52\x21\x84\ -\x20\x8e\x63\x9a\xad\x26\xa5\x72\x89\x7e\x3f\x46\x08\x59\x28\x16\ -\x8b\x07\x59\x17\xf3\xa3\x0a\x0b\x31\xa0\x66\x71\xe9\xa1\xab\x57\ -\x67\x9e\xc9\xe7\xf3\xa4\xd3\x69\x5c\xd7\xc5\x71\x34\x4a\x2b\x1c\ -\xc7\xc1\x68\x85\x12\x82\x24\x49\xe8\x74\x3a\x94\x2b\x15\x5a\xad\ -\x08\x81\x20\x95\x0a\x69\x34\xd6\x76\x0c\x01\x36\xe6\x7e\x83\xcb\ -\x4e\xb7\xf7\xd9\xe9\xe9\xf3\xbf\x33\xc6\x90\xcd\x66\x51\x5a\xa1\ -\x8d\x1c\x56\xee\x1a\x83\x94\x0a\x84\xa0\xdb\xeb\x52\xad\x55\xa9\ -\x54\x16\xc1\x0e\x3a\x0f\x82\x80\x42\xa1\x30\x37\x04\x28\x95\xcb\ -\xb7\xf1\x64\x9d\xd9\x9b\xf3\xc7\x56\xeb\x6b\x85\xf1\xf1\x8f\xe1\ -\x98\x01\xd7\xc6\x31\x38\xc6\xe0\x1a\x07\xa5\x34\x52\x08\xe2\x24\ -\xa1\xd5\x6c\x51\x2a\x55\x48\xe2\x81\x9f\xb4\x56\x6c\x1a\x2b\xcc\ -\x6f\xd9\x32\x76\x62\x08\x50\xab\xad\x0e\xe9\xe9\xf5\xbb\x3f\x29\ -\x97\xcb\x0f\xe6\xf3\x79\xc2\x20\xc0\x38\x1a\x6d\x14\x46\x1b\x8c\ -\x71\xd0\x4a\x0f\xbc\x01\xf4\xba\x5d\xca\xe5\x32\xf5\x46\x1d\x81\ -\x44\x6b\xcd\x68\x61\x94\x5c\x2e\xfb\x4d\x0b\x73\x43\x91\x93\xb8\ -\x4f\x12\xf7\x11\xd8\xc9\xea\x52\xf5\x29\xcf\xf3\xc8\x66\xb2\x08\ -\x25\xd1\x46\xa1\xb5\x46\x1b\x83\x31\x1a\xa9\xe4\x50\xd8\x95\xd5\ -\x15\xca\xe5\x0a\xd8\x81\x16\x41\x10\x60\xb4\x79\xa7\xdd\x6e\xff\ -\xb9\x56\xab\x31\xec\xc0\x0a\x4b\xe0\xfb\x74\x3b\xdd\xef\x09\x81\ -\xb3\x7d\xfb\x36\x46\x46\x72\x08\x29\xb0\x76\x60\x79\x47\x1b\xa4\ -\x52\x43\xbd\xa2\x4e\xc4\xad\x52\x89\x28\x6a\x23\x84\xc4\xf7\x03\ -\xa4\x94\x9d\x46\xa3\xfe\x7d\x4b\x42\x1c\xc7\x6c\x1e\x1b\x1b\x00\ -\xf8\xae\xcf\xc5\x0b\x97\x9f\x3d\x79\xf2\xe4\xa1\x38\x49\xd8\xb1\ -\x7d\x1b\xfb\x3f\xb5\x8f\xc9\xc9\x7b\xc9\xa4\x33\xd8\x64\x10\x64\ -\xd6\x5a\x04\x82\x5e\xaf\xc7\x62\xb5\xca\x62\x65\x09\x90\xb8\xae\ -\x4f\x36\x9b\xa5\xde\x58\xfd\x79\x92\xc4\xa7\x1a\x6b\x0d\x7c\xdf\ -\xff\xb0\x83\xf7\xdf\x3f\xfb\xf4\x0b\x3f\x7b\xe9\xf9\x95\x95\x65\ -\xda\x51\x9b\x28\x8a\x30\xc6\xe1\x9e\xdd\xf7\xf0\xc4\xd7\x1e\xe7\ -\xc8\x91\xc3\xb8\xae\x03\x40\xaf\xd7\xa3\xde\xa8\x33\x37\x3b\x47\ -\xb7\xdb\xc3\xf3\x3c\xc2\x30\xa0\xd3\x69\xcf\xb4\xdb\xad\x17\x93\ -\x24\x21\x9d\x4e\x33\x31\x31\xf1\xa1\x93\xaf\x5c\xbe\xf2\x85\x7e\ -\xbf\x47\x3a\x9d\x26\x93\xce\x90\xcb\xe5\x30\x8e\x61\x6a\x6a\x8a\ -\x6f\x3d\x7d\x94\x43\x87\x8f\x70\x76\xea\xdc\xa0\x22\xad\x29\x97\ -\x2b\xac\x2c\xaf\xe0\x38\x0e\x99\x4c\x06\xd7\x73\x58\x6b\x36\x7f\ -\x0c\x94\x3d\xcf\x63\xc7\x8e\x1d\x28\x75\x5b\x54\x64\x32\xd9\x33\ -\x5a\xeb\xa1\x4b\xcd\xfa\x38\x66\x32\x19\x46\xf3\x79\xce\x9c\x79\ -\x8f\x47\x1f\x7d\x8c\x37\xde\xf8\x03\xed\x28\x62\xad\xb9\x86\xe7\ -\xf9\xa4\xd2\x69\x82\xd0\xa3\xb9\xd6\x7c\x27\x8e\x93\x5f\x09\xa1\ -\xd8\xba\x75\x9c\x30\x0c\x48\x92\x84\x8d\xcc\xe7\xcd\x37\xff\x3a\ -\xfe\xda\x6f\x5f\xfb\xf7\xc2\x42\x71\xf3\x7a\x06\x11\xc7\x31\x71\ -\x1c\x93\x24\x09\x16\x4b\xd4\xed\x12\xb5\xdb\x3c\xf1\xf5\xaf\xf2\ -\xc8\x23\x5f\xa2\xdb\xe9\x91\xcd\x65\x00\x4b\xad\xb6\xfc\xe0\xc1\ -\xd7\x5f\xdf\x4a\xb7\x7b\x94\xe5\xe5\x2d\x94\xcb\xff\xe2\xc6\x8d\ -\x63\x34\x9b\xd7\xd4\xf1\xe3\xc7\x99\x2f\x16\xeb\xa9\x30\xd5\xbb\ -\x70\xfe\xc2\x43\x1b\x29\xba\x11\x19\x52\x4a\xa4\x50\x38\xeb\x63\ -\x3a\x75\xf6\x1c\xdb\xc6\xc7\xf9\xc4\x27\x3f\x4e\x10\xf8\x34\x1a\ -\x8d\x13\xf7\xbf\xf2\x4a\x85\x56\xeb\x17\xcc\xcc\x6c\x61\x6e\x2e\ -\x45\xad\xb6\xcf\xd6\xeb\x0f\xb7\xba\xdd\x53\x72\x7d\x11\xb0\x7b\ -\xef\xee\x97\x1e\x78\xe0\x73\x2f\xa8\xf5\x00\xf3\x3c\xef\xb6\xeb\ -\xe2\x3a\x0e\xa1\x1f\xe2\xb9\x1e\x6f\xbd\xf5\x17\xb4\xd6\x24\x49\ -\xd2\xed\xf7\xfb\x3f\x62\x69\xe9\x28\x17\x2f\xc2\xf4\x34\x5c\xbf\ -\x8e\x2d\x95\x58\x8a\xa2\xbb\x17\x92\xe4\x1b\x7a\xb8\x26\x81\x7b\ -\x27\x27\x9f\x03\x11\x9e\x3e\x7d\xfa\xc9\x56\xab\x35\xd0\xc2\x75\ -\x07\x54\xc5\x31\x71\x92\x60\x1c\xc3\xd2\x62\x95\xe9\xa9\x69\xf6\ -\xee\xdf\xf3\x1b\x63\xcc\xbb\x5c\xbf\x3e\x4a\xb5\x0a\x51\x34\xf0\ -\x08\x03\x1b\x97\x61\x6c\xbd\x03\x81\x4d\x20\xf0\xfd\xf6\xfe\xfd\ -\xfb\x9e\x3a\xf8\xf9\x83\x5f\x99\xd8\x39\x31\xe7\x38\x83\xd1\x74\ -\x1c\x07\x3f\x08\xf0\x7d\x9f\x30\x0c\x09\x82\x80\x85\x62\xb1\xa1\ -\xb5\x7e\x39\x0c\x43\xfa\xb3\xb3\xa7\xd6\xea\x75\x1a\x40\x1d\x98\ -\x01\x2e\x01\x25\xf8\xa7\x1e\x6e\x02\x40\x29\x29\xc3\x54\x68\xef\ -\x9a\xb8\xeb\xf7\x23\xf9\x91\xbf\x2d\x2c\x2c\x1c\x2e\x16\x8b\x8f\ -\x57\xab\xb5\xcf\xb4\x5a\x2d\x8d\x10\x60\x2d\x13\xbb\x26\x5a\x07\ -\x0e\xec\x7f\x46\x08\x71\x1e\xa0\x12\xc7\xcf\x56\x60\x67\x03\x0e\ -\xd4\x81\x79\x88\x5b\xf0\xbc\x07\xaf\x0a\x6b\x2d\x6f\xbf\xfd\x8f\ -\xe1\x9e\xb1\xd6\xb2\x5a\x5f\x8b\xe3\x38\x26\x8a\x22\x6a\xb5\x1a\ -\x9d\x4e\x77\x52\x29\xf9\x45\x21\xb9\x3b\x97\xcd\xad\xec\xda\xb5\ -\xf3\xd7\xb9\x91\xec\x7f\xa4\x12\x68\xa5\x49\xed\xd9\xcb\x02\xec\ -\x99\x85\x27\x17\x61\xbc\x09\x27\x1c\x78\xd5\x87\xfe\x7f\x07\x00\ -\x06\x52\xb7\xcc\xfb\x20\x61\xb3\x00\x00\x00\x00\x49\x45\x4e\x44\ +\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x01\x97\x70\x0d\x6e\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\ +\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x07\x05\x49\x44\x41\x54\x48\ +\xc7\x55\x95\x6b\x70\x54\xe5\x19\xc7\x7f\xef\x39\x67\x77\xcf\xd9\ +\x73\x36\xd9\x4b\x16\xd8\x10\xb9\x08\xc6\x82\x8a\x8a\x99\x62\x11\ +\x05\x6a\x47\xad\x9d\x8a\x83\x9d\xb1\x17\x6c\x6b\x69\xeb\x27\xed\ +\x4d\x3a\x76\xec\x4c\x6d\x55\x1c\xab\x15\x1d\x3b\xf6\xc2\xd0\x8e\ +\x8e\x2d\xb5\x6a\x29\xb6\x4e\xbd\x00\x21\x89\x29\x58\x6c\xb9\x5f\ +\xb2\x81\x64\x03\x49\x36\x09\x9b\x4d\x08\x6c\xb2\xbb\xe7\xf2\xf4\ +\x43\x48\xd0\xe7\xe3\x3b\xf3\x3c\xbf\xf7\x79\x9e\xff\xff\x7d\x95\ +\x88\xe0\x79\x1e\xe5\x6a\xe5\x5a\x44\x84\x03\x07\x0f\xcb\x78\x79\ +\x42\x10\x11\xe6\xcf\x6f\x94\x83\x87\x0f\x09\xae\xeb\xd2\xd6\xd6\ +\xfe\xb4\xeb\xba\xa8\x4a\xa5\xc2\x85\xf1\x92\x1c\x3c\x70\x18\xed\ +\xc6\x65\x37\x8b\x19\x31\x99\xdd\x50\xaf\xb8\x58\xad\x76\xe8\x6c\ +\x61\x65\x47\x67\x56\xaa\xd5\xaa\xfc\x7b\xef\x5e\xd1\x00\x5a\x5a\ +\xdb\x46\x3d\xdf\xdd\x7d\xf9\xbc\xf9\xec\xd8\xb9\x93\x90\x61\xac\ +\xd0\x00\x9a\x77\xb6\xfe\xee\xab\xf7\x7e\x9d\x9b\x96\xaf\x22\x9e\ +\x88\xab\xa6\xa6\xa6\x0f\xf0\x3c\x0f\xcf\xf3\xf0\x7d\x9f\xfd\xfb\ +\x0f\xbe\xee\x79\x1e\xae\xeb\x82\xe7\x79\xca\x75\x5d\x76\x35\xb7\ +\x48\x7e\x70\x40\x5c\xd7\x15\x11\x41\x53\x4a\x49\x5b\x5b\xfb\xd9\ +\x79\xf3\xe7\x50\x97\x4c\xd1\xd6\xde\x4e\x6f\x6f\xff\x7a\x95\xed\ +\xec\xc4\x71\x1c\x71\x1c\x07\x91\x80\xfd\xfb\x0f\x51\x97\x4e\x2a\ +\xb5\xec\xd3\x2b\x64\x74\x74\x94\xaa\x57\xe5\xa5\x97\x7e\x8d\xa6\ +\x6b\xda\x75\xd7\x2d\x11\xed\x89\x8d\xbf\x50\xa9\x54\x8a\xfa\x99\ +\x19\x86\x0b\x05\x6e\xbb\x67\x6d\xd0\x9b\x9e\x21\x4a\x44\xf0\x7d\ +\x1f\x11\x51\x4a\x29\x0d\xf0\x8f\x1e\x3b\xde\x5e\x2a\x4d\x2c\xcf\ +\xcc\x9e\x41\xfd\xac\x7a\xc6\xce\x9d\x2b\x24\x93\xc9\x74\x10\xf8\ +\x68\x5c\x0c\xa5\x94\xe8\xba\xee\xff\xf3\xed\x7f\x09\xa8\xe5\x97\ +\xcd\xa9\x27\x9d\x4a\x13\x32\x0c\x50\xd4\xed\x6c\xde\x2d\x3d\x3d\ +\x67\xee\x57\x22\xc2\x91\xa3\x27\xf0\x7c\xf7\x85\xb1\x73\x63\x0f\ +\xd5\xd7\x67\x88\xd5\x38\xc4\x63\xb5\x18\x21\x83\x8e\x6c\x96\xbe\ +\xbe\x3c\x99\xfa\x59\x5c\xd9\xd8\xa8\x94\x88\x70\xe3\xb2\x5b\x24\ +\x3f\xd0\x8f\xef\x07\x3c\xf5\xd4\x93\xdc\x77\xdf\x57\x70\x5d\x97\ +\xf6\x3d\x7b\xa8\x56\x5c\x6a\x6b\x63\xa7\x8a\x23\xc5\x85\x4b\x97\ +\x2e\x45\x89\x08\x2f\xbe\xf8\x9b\xef\xfd\xf9\x4f\x5b\x9f\x77\x5d\ +\x17\xd7\x75\xf1\x83\x80\x52\xe9\x02\x6f\xfc\xed\x35\x2a\x95\xf2\ +\x7b\xcb\x9f\x79\xf6\x36\x0e\x1c\x40\xfa\xfb\xb3\x4a\x44\x78\xff\ +\xbd\x66\xaa\x6e\x55\xf5\xf6\xf5\xd5\xec\xdb\xb7\xef\xef\x67\xce\ +\xf4\xae\x0a\x3c\x9f\x1f\x6d\xf8\xfe\xb7\xeb\x67\x67\xb6\x04\xd7\ +\x2c\x39\xd8\x07\x4b\xb2\xf0\xc4\xf4\xee\xa6\x76\xe6\xba\x2e\x43\ +\x43\x43\xcb\x9a\x9b\x5b\x77\x77\xe7\x72\x0f\x07\x12\x4c\x9d\x2b\ +\x11\xb9\x34\x25\xc0\x50\x4a\xa1\x69\x5a\xe8\x7f\xfb\x0f\xed\xad\ +\x4b\xa7\x56\xda\x31\xe7\x19\xdf\xf3\xa5\x58\x2c\xde\x0d\x28\x60\ +\x3a\xc1\x06\x3c\x5d\xd7\x79\xe7\xdd\x1d\xa5\xa9\x49\x45\xc2\x61\ +\x34\x4d\x23\x9d\x4e\x6f\x3b\x79\xaa\xeb\xa1\x8f\x27\x94\x26\xc7\ +\x7b\xec\xb9\x44\x22\x1e\x32\xad\x30\xd1\x68\x14\xcb\xb4\xf0\x3c\ +\x8f\xbd\xff\xf9\x90\xae\xae\xdc\x26\x00\x4d\x29\x85\x52\x8a\x89\ +\x72\xe5\xe6\x9e\x9e\xd3\x3f\x88\x27\xe2\xd8\xb6\x4d\xcc\xb6\xd1\ +\x35\x8d\xfe\x7c\x3f\xe3\xa5\x32\x33\x66\xa4\x27\xef\x7d\xec\x78\ +\x16\xa5\x14\x9d\x9d\xd9\xd6\x2b\x1b\x1b\xb1\x6d\x0b\x3b\x6a\x63\ +\x18\x21\xca\xe5\x32\xd9\xce\x93\x18\x7a\x88\x2b\x1a\x17\xdc\x05\ +\xa0\xf9\x81\x0b\xe2\xbf\xd9\xd8\x78\x05\x89\x54\x9c\x68\x34\x4a\ +\xc4\x8c\xa0\x94\xe2\x78\xc7\x09\x02\x3f\xc0\x71\x9c\x4a\x3e\x9f\ +\xff\x07\x80\xd6\x71\x3c\xfb\xe0\x3d\x6b\xef\x5d\xbb\x7a\xd5\xe7\ +\x58\xf7\xb5\xfb\x89\xd9\x31\xcc\x70\x84\xe1\xe2\x30\x7d\xbd\x79\ +\x92\xc9\x14\x23\xa3\xc3\x73\x0b\x85\x02\x00\xda\xe0\xc0\x50\x4d\ +\x32\x99\x24\x9d\x4e\x93\xcb\xe5\x98\xdd\x30\x9f\xad\x5b\x5f\xe3\ +\x54\x57\x17\xc9\x54\x0a\xcf\x73\x5b\x95\xd2\x07\x17\x2f\x5e\x34\ +\x99\xb0\xe8\xea\x45\x4f\x2a\xa5\x70\x6c\x87\x1a\x27\x46\x66\xe6\ +\x2c\x1e\x7b\xec\x71\x3e\xdc\xb3\x8f\xba\xba\x04\xcb\x9f\xdf\xf4\ +\x97\xdb\x7e\xf2\x88\x24\x17\x5f\x2d\x25\x5d\xbf\x5e\x93\x20\x60\ +\xc3\x8f\x37\x44\x63\xb1\x18\xb1\x58\x8c\x44\x22\x4e\x32\x91\xe4\ +\x0f\x5b\x5e\xa6\x5c\x2e\xff\x9e\x7d\xfb\x7e\xce\x47\x1f\x31\x91\ +\xcf\xd3\x1a\x04\x3f\xd5\x08\x14\x31\xc7\xae\xac\xff\xce\x7a\xb5\ +\x72\xf5\xca\xf5\xa9\x74\x9d\xe7\xc4\x62\x5c\x75\xcd\x55\xe3\xa1\ +\x50\xe8\x81\xfe\xee\xee\x9b\xdb\x80\x57\xc0\xcf\xc1\xba\x69\xc7\ +\x4d\x85\x88\xa0\x94\x02\x50\x22\x22\x00\xba\xae\x53\x28\x0c\x7f\ +\xfe\xd0\xa1\xc3\x6f\x5e\x28\x95\xac\x54\x2a\x49\xaa\x2e\x85\xe3\ +\xd8\xe8\x9a\x36\x61\xe8\xc6\x66\xcb\xb2\x36\x45\xa3\xd1\x1c\x40\ +\x10\x08\x20\x84\x42\x21\x3e\x01\x10\x11\x03\x98\xa5\x94\xca\x03\ +\xfe\x54\xf1\xae\xee\xdc\x13\xc7\x4f\x64\x1f\x8d\xd7\xd6\xe0\x38\ +\x0e\xb6\x1d\x25\x1c\x09\x61\x59\x16\x4e\xd4\x26\x12\x89\xa0\x69\ +\x1a\x63\x63\x63\x72\xfe\xfc\xf9\xe7\x32\x99\xcc\xc3\x0a\x41\x69\ +\xfa\x27\x00\xea\x52\x13\x93\x5d\xb8\xae\x1b\xdb\xb3\xe7\xc3\x0f\ +\x2a\xd5\xea\x92\x54\x2a\x85\x15\x35\xb1\xed\x28\x91\x48\x04\xd3\ +\x34\xb1\xa3\x51\x42\x46\x08\x11\xa1\x5a\xad\x32\x30\x38\x48\xae\ +\xa7\x87\xf1\xd2\x44\xe1\xb3\xab\x57\xdd\x60\x59\xe6\xe9\x8f\xbb\ +\x47\x00\x51\x4a\x61\x18\x06\xc5\xe2\xc8\x1d\xef\xbc\xfb\xfe\x98\ +\x6e\x18\x4b\x1a\x1a\x1a\x88\xc7\xe3\xc4\x62\x0e\xa6\x65\x62\xdb\ +\x36\x4e\x34\x4a\x48\x37\x10\x11\xc6\xc7\xc7\xe9\xca\x75\xd3\xd5\ +\x9d\xc3\xf7\x02\x62\xb1\x58\x5d\x47\x47\xf6\x5b\x00\x06\xc0\xe0\ +\xd0\xd0\xc7\x28\x12\x3e\xdd\xd3\xfb\xd6\xe0\xe0\xd9\xdb\x1b\x1a\ +\x1a\xb0\xa3\x36\x11\x33\x4c\xd8\x0c\x61\x86\x23\x58\xa6\x45\x38\ +\x1c\x46\xd7\x34\x7c\x11\xc6\xc6\xc6\xe8\xec\x3c\x49\xa9\x34\x8e\ +\xef\xfb\x44\x22\x61\xe6\xce\x9b\xd3\x3b\x3b\x93\xd9\x32\x0d\x28\ +\x9c\x1d\x9e\x34\x92\x61\x34\xe5\x07\x06\xda\x5d\xd7\x0d\xcf\x9f\ +\x37\x97\x88\x15\xc1\x34\xc3\x84\xc3\x61\x22\xa6\x89\x15\x89\x10\ +\x32\x42\x68\x9a\x86\xe7\xfb\x14\x86\x0b\x74\x74\x74\xe2\xba\x1e\ +\x22\x42\x6d\x6d\x2d\x89\x44\xbc\x35\x12\x09\xaf\x1c\x2e\x16\x99\ +\x39\x63\xc6\x24\xc0\x34\x4d\x4e\x9c\xc8\x3e\xd2\xd2\xd2\xf2\x94\ +\x1f\x04\xcc\x9d\x73\x19\x46\x48\xa7\xa9\xe9\x06\x6a\x62\x35\x48\ +\x10\x20\x32\xf9\xf1\x69\x4a\xc3\x75\x5d\xfa\x06\xf2\x74\x76\x74\ +\x22\x02\xa6\x69\x91\x48\xc4\x19\x3b\x7f\xee\xe9\xfc\x40\xff\x23\ +\xfd\xf9\x3e\x2c\xcb\xba\x04\x78\xfd\xaf\x6f\xbc\xb5\x6d\xdb\xf6\ +\x2f\x2a\xa5\x28\x97\xcb\x54\xdd\x2a\x55\xd7\xa5\x54\x2a\x51\xa9\ +\x54\x58\xb1\xe2\x26\x36\x6e\x7c\x9c\x6b\x97\x5c\x83\x88\xd0\x79\ +\xe2\x24\xa7\x4e\x75\x4d\x17\xb6\xa2\x26\x85\x42\xe1\xbb\x9e\xe7\ +\x6e\x0e\x87\xc3\x2c\x5c\xb8\x10\xcb\xb2\x98\xd2\x3a\xdb\xb7\xbf\ +\xdd\xf0\xca\xcb\xaf\x7c\xd4\xd7\xd7\x3f\x73\x0a\xe2\xfb\x3e\xbe\ +\xef\x13\x04\x01\x82\x50\xae\x56\x29\x4f\x4c\xf0\x8d\x6f\xae\x63\ +\xcd\x9a\xbb\x26\x9f\xff\x78\x0d\x20\x14\x8b\x23\xb7\xdf\xfa\xea\ +\xab\xb3\xa9\x56\x1f\x62\x64\x64\x16\x83\x83\xbb\xc9\xe5\x1e\xa5\ +\x54\xea\x52\x22\xc2\x8e\x9d\xcd\xa0\x14\x2d\xbb\x5a\x7e\xd5\xbc\ +\x6b\xf7\x0f\xfd\xc0\x47\xd7\x75\x82\x20\x98\x86\x04\x41\x80\x04\ +\xc2\x44\x79\x82\x4c\x7d\x86\x4d\x2f\x3c\x4b\x28\x64\x54\x0b\x85\ +\xc2\xad\xb7\xfc\xec\xb1\xcd\xe4\xf3\x9f\xa2\xbb\x1b\x2a\x15\x04\ +\x28\x88\x30\x02\xbf\x9d\xfc\x46\xde\x6f\x9e\x54\x50\x20\x8c\x8e\ +\x8e\xd2\xd5\xdd\xfd\xe5\x23\x47\x8e\xfc\x72\x70\x60\xf0\x32\xcf\ +\xf3\xd0\x75\x1d\xa5\xd4\xb4\x21\xc7\xc7\x27\x58\xfb\xa5\x35\xe7\ +\xef\xfc\xc2\x1d\x9f\x09\x82\xe0\xe8\xe2\xeb\xae\xdf\x56\xf6\xfd\ +\xbb\xe5\xa2\xd6\x4f\x03\x87\x81\x32\x3c\x38\xd9\xc1\x8e\x5d\x53\ +\x2a\xd5\x45\x84\x73\x63\x17\x7c\xdf\xf7\x29\x97\xcb\x14\x8b\x45\ +\x2a\x95\x6a\x93\xae\x6b\x77\x2a\x8d\xc6\x78\x6d\x7c\x74\xc1\x82\ +\xcb\xff\x18\x4f\xd4\xfe\x57\xd3\x15\x86\x6e\xe0\x2c\xbe\x8a\x3e\ +\x58\x7c\x1a\x1e\x38\x0b\x0d\x25\x78\x2f\x0c\x5b\x2c\xf0\xfe\x0f\ +\xa4\xa4\xa5\x79\xe8\x4b\xcf\x5e\x00\x00\x00\x00\x49\x45\x4e\x44\ \xae\x42\x60\x82\ -\x00\x00\x10\xa4\ +\x00\x00\x07\x3c\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\ -\x01\x00\x9a\x9c\x18\x00\x00\x0a\x4d\x69\x43\x43\x50\x50\x68\x6f\ -\x74\x6f\x73\x68\x6f\x70\x20\x49\x43\x43\x20\x70\x72\x6f\x66\x69\ -\x6c\x65\x00\x00\x78\xda\x9d\x53\x77\x58\x93\xf7\x16\x3e\xdf\xf7\ -\x65\x0f\x56\x42\xd8\xf0\xb1\x97\x6c\x81\x00\x22\x23\xac\x08\xc8\ -\x10\x59\xa2\x10\x92\x00\x61\x84\x10\x12\x40\xc5\x85\x88\x0a\x56\ -\x14\x15\x11\x9c\x48\x55\xc4\x82\xd5\x0a\x48\x9d\x88\xe2\xa0\x28\ -\xb8\x67\x41\x8a\x88\x5a\x8b\x55\x5c\x38\xee\x1f\xdc\xa7\xb5\x7d\ -\x7a\xef\xed\xed\xfb\xd7\xfb\xbc\xe7\x9c\xe7\xfc\xce\x79\xcf\x0f\ -\x80\x11\x12\x26\x91\xe6\xa2\x6a\x00\x39\x52\x85\x3c\x3a\xd8\x1f\ -\x8f\x4f\x48\xc4\xc9\xbd\x80\x02\x15\x48\xe0\x04\x20\x10\xe6\xcb\ -\xc2\x67\x05\xc5\x00\x00\xf0\x03\x79\x78\x7e\x74\xb0\x3f\xfc\x01\ -\xaf\x6f\x00\x02\x00\x70\xd5\x2e\x24\x12\xc7\xe1\xff\x83\xba\x50\ -\x26\x57\x00\x20\x91\x00\xe0\x22\x12\xe7\x0b\x01\x90\x52\x00\xc8\ -\x2e\x54\xc8\x14\x00\xc8\x18\x00\xb0\x53\xb3\x64\x0a\x00\x94\x00\ -\x00\x6c\x79\x7c\x42\x22\x00\xaa\x0d\x00\xec\xf4\x49\x3e\x05\x00\ -\xd8\xa9\x93\xdc\x17\x00\xd8\xa2\x1c\xa9\x08\x00\x8d\x01\x00\x99\ -\x28\x47\x24\x02\x40\xbb\x00\x60\x55\x81\x52\x2c\x02\xc0\xc2\x00\ -\xa0\xac\x40\x22\x2e\x04\xc0\xae\x01\x80\x59\xb6\x32\x47\x02\x80\ -\xbd\x05\x00\x76\x8e\x58\x90\x0f\x40\x60\x00\x80\x99\x42\x2c\xcc\ -\x00\x20\x38\x02\x00\x43\x1e\x13\xcd\x03\x20\x4c\x03\xa0\x30\xd2\ -\xbf\xe0\xa9\x5f\x70\x85\xb8\x48\x01\x00\xc0\xcb\x95\xcd\x97\x4b\ -\xd2\x33\x14\xb8\x95\xd0\x1a\x77\xf2\xf0\xe0\xe2\x21\xe2\xc2\x6c\ -\xb1\x42\x61\x17\x29\x10\x66\x09\xe4\x22\x9c\x97\x9b\x23\x13\x48\ -\xe7\x03\x4c\xce\x0c\x00\x00\x1a\xf9\xd1\xc1\xfe\x38\x3f\x90\xe7\ -\xe6\xe4\xe1\xe6\x66\xe7\x6c\xef\xf4\xc5\xa2\xfe\x6b\xf0\x6f\x22\ -\x3e\x21\xf1\xdf\xfe\xbc\x8c\x02\x04\x00\x10\x4e\xcf\xef\xda\x5f\ -\xe5\xe5\xd6\x03\x70\xc7\x01\xb0\x75\xbf\x6b\xa9\x5b\x00\xda\x56\ -\x00\x68\xdf\xf9\x5d\x33\xdb\x09\xa0\x5a\x0a\xd0\x7a\xf9\x8b\x79\ -\x38\xfc\x40\x1e\x9e\xa1\x50\xc8\x3c\x1d\x1c\x0a\x0b\x0b\xed\x25\ -\x62\xa1\xbd\x30\xe3\x8b\x3e\xff\x33\xe1\x6f\xe0\x8b\x7e\xf6\xfc\ -\x40\x1e\xfe\xdb\x7a\xf0\x00\x71\x9a\x40\x99\xad\xc0\xa3\x83\xfd\ -\x71\x61\x6e\x76\xae\x52\x8e\xe7\xcb\x04\x42\x31\x6e\xf7\xe7\x23\ -\xfe\xc7\x85\x7f\xfd\x8e\x29\xd1\xe2\x34\xb1\x5c\x2c\x15\x8a\xf1\ -\x58\x89\xb8\x50\x22\x4d\xc7\x79\xb9\x52\x91\x44\x21\xc9\x95\xe2\ -\x12\xe9\x7f\x32\xf1\x1f\x96\xfd\x09\x93\x77\x0d\x00\xac\x86\x4f\ -\xc0\x4e\xb6\x07\xb5\xcb\x6c\xc0\x7e\xee\x01\x02\x8b\x0e\x58\xd2\ -\x76\x00\x40\x7e\xf3\x2d\x8c\x1a\x0b\x91\x00\x10\x67\x34\x32\x79\ -\xf7\x00\x00\x93\xbf\xf9\x8f\x40\x2b\x01\x00\xcd\x97\xa4\xe3\x00\ -\x00\xbc\xe8\x18\x5c\xa8\x94\x17\x4c\xc6\x08\x00\x00\x44\xa0\x81\ -\x2a\xb0\x41\x07\x0c\xc1\x14\xac\xc0\x0e\x9c\xc1\x1d\xbc\xc0\x17\ -\x02\x61\x06\x44\x40\x0c\x24\xc0\x3c\x10\x42\x06\xe4\x80\x1c\x0a\ -\xa1\x18\x96\x41\x19\x54\xc0\x3a\xd8\x04\xb5\xb0\x03\x1a\xa0\x11\ -\x9a\xe1\x10\xb4\xc1\x31\x38\x0d\xe7\xe0\x12\x5c\x81\xeb\x70\x17\ -\x06\x60\x18\x9e\xc2\x18\xbc\x86\x09\x04\x41\xc8\x08\x13\x61\x21\ -\x3a\x88\x11\x62\x8e\xd8\x22\xce\x08\x17\x99\x8e\x04\x22\x61\x48\ -\x34\x92\x80\xa4\x20\xe9\x88\x14\x51\x22\xc5\xc8\x72\xa4\x02\xa9\ -\x42\x6a\x91\x5d\x48\x23\xf2\x2d\x72\x14\x39\x8d\x5c\x40\xfa\x90\ -\xdb\xc8\x20\x32\x8a\xfc\x8a\xbc\x47\x31\x94\x81\xb2\x51\x03\xd4\ -\x02\x75\x40\xb9\xa8\x1f\x1a\x8a\xc6\xa0\x73\xd1\x74\x34\x0f\x5d\ -\x80\x96\xa2\x6b\xd1\x1a\xb4\x1e\x3d\x80\xb6\xa2\xa7\xd1\x4b\xe8\ -\x75\x74\x00\x7d\x8a\x8e\x63\x80\xd1\x31\x0e\x66\x8c\xd9\x61\x5c\ -\x8c\x87\x45\x60\x89\x58\x1a\x26\xc7\x16\x63\xe5\x58\x35\x56\x8f\ -\x35\x63\x1d\x58\x37\x76\x15\x1b\xc0\x9e\x61\xef\x08\x24\x02\x8b\ -\x80\x13\xec\x08\x5e\x84\x10\xc2\x6c\x82\x90\x90\x47\x58\x4c\x58\ -\x43\xa8\x25\xec\x23\xb4\x12\xba\x08\x57\x09\x83\x84\x31\xc2\x27\ -\x22\x93\xa8\x4f\xb4\x25\x7a\x12\xf9\xc4\x78\x62\x3a\xb1\x90\x58\ -\x46\xac\x26\xee\x21\x1e\x21\x9e\x25\x5e\x27\x0e\x13\x5f\x93\x48\ -\x24\x0e\xc9\x92\xe4\x4e\x0a\x21\x25\x90\x32\x49\x0b\x49\x6b\x48\ -\xdb\x48\x2d\xa4\x53\xa4\x3e\xd2\x10\x69\x9c\x4c\x26\xeb\x90\x6d\ -\xc9\xde\xe4\x08\xb2\x80\xac\x20\x97\x91\xb7\x90\x0f\x90\x4f\x92\ -\xfb\xc9\xc3\xe4\xb7\x14\x3a\xc5\x88\xe2\x4c\x09\xa2\x24\x52\xa4\ -\x94\x12\x4a\x35\x65\x3f\xe5\x04\xa5\x9f\x32\x42\x99\xa0\xaa\x51\ -\xcd\xa9\x9e\xd4\x08\xaa\x88\x3a\x9f\x5a\x49\x6d\xa0\x76\x50\x2f\ -\x53\x87\xa9\x13\x34\x75\x9a\x25\xcd\x9b\x16\x43\xcb\xa4\x2d\xa3\ -\xd5\xd0\x9a\x69\x67\x69\xf7\x68\x2f\xe9\x74\xba\x09\xdd\x83\x1e\ -\x45\x97\xd0\x97\xd2\x6b\xe8\x07\xe9\xe7\xe9\x83\xf4\x77\x0c\x0d\ -\x86\x0d\x83\xc7\x48\x62\x28\x19\x6b\x19\x7b\x19\xa7\x18\xb7\x19\ -\x2f\x99\x4c\xa6\x05\xd3\x97\x99\xc8\x54\x30\xd7\x32\x1b\x99\x67\ -\x98\x0f\x98\x6f\x55\x58\x2a\xf6\x2a\x7c\x15\x91\xca\x12\x95\x3a\ -\x95\x56\x95\x7e\x95\xe7\xaa\x54\x55\x73\x55\x3f\xd5\x79\xaa\x0b\ -\x54\xab\x55\x0f\xab\x5e\x56\x7d\xa6\x46\x55\xb3\x50\xe3\xa9\x09\ -\xd4\x16\xab\xd5\xa9\x1d\x55\xbb\xa9\x36\xae\xce\x52\x77\x52\x8f\ -\x50\xcf\x51\x5f\xa3\xbe\x5f\xfd\x82\xfa\x63\x0d\xb2\x86\x85\x46\ -\xa0\x86\x48\xa3\x54\x63\xb7\xc6\x19\x8d\x21\x16\xc6\x32\x65\xf1\ -\x58\x42\xd6\x72\x56\x03\xeb\x2c\x6b\x98\x4d\x62\x5b\xb2\xf9\xec\ -\x4c\x76\x05\xfb\x1b\x76\x2f\x7b\x4c\x53\x43\x73\xaa\x66\xac\x66\ -\x91\x66\x9d\xe6\x71\xcd\x01\x0e\xc6\xb1\xe0\xf0\x39\xd9\x9c\x4a\ -\xce\x21\xce\x0d\xce\x7b\x2d\x03\x2d\x3f\x2d\xb1\xd6\x6a\xad\x66\ -\xad\x7e\xad\x37\xda\x7a\xda\xbe\xda\x62\xed\x72\xed\x16\xed\xeb\ -\xda\xef\x75\x70\x9d\x40\x9d\x2c\x9d\xf5\x3a\x6d\x3a\xf7\x75\x09\ -\xba\x36\xba\x51\xba\x85\xba\xdb\x75\xcf\xea\x3e\xd3\x63\xeb\x79\ -\xe9\x09\xf5\xca\xf5\x0e\xe9\xdd\xd1\x47\xf5\x6d\xf4\xa3\xf5\x17\ -\xea\xef\xd6\xef\xd1\x1f\x37\x30\x34\x08\x36\x90\x19\x6c\x31\x38\ -\x63\xf0\xcc\x90\x63\xe8\x6b\x98\x69\xb8\xd1\xf0\x84\xe1\xa8\x11\ -\xcb\x68\xba\x91\xc4\x68\xa3\xd1\x49\xa3\x27\xb8\x26\xee\x87\x67\ -\xe3\x35\x78\x17\x3e\x66\xac\x6f\x1c\x62\xac\x34\xde\x65\xdc\x6b\ -\x3c\x61\x62\x69\x32\xdb\xa4\xc4\xa4\xc5\xe4\xbe\x29\xcd\x94\x6b\ -\x9a\x66\xba\xd1\xb4\xd3\x74\xcc\xcc\xc8\x2c\xdc\xac\xd8\xac\xc9\ -\xec\x8e\x39\xd5\x9c\x6b\x9e\x61\xbe\xd9\xbc\xdb\xfc\x8d\x85\xa5\ -\x45\x9c\xc5\x4a\x8b\x36\x8b\xc7\x96\xda\x96\x7c\xcb\x05\x96\x4d\ -\x96\xf7\xac\x98\x56\x3e\x56\x79\x56\xf5\x56\xd7\xac\x49\xd6\x5c\ -\xeb\x2c\xeb\x6d\xd6\x57\x6c\x50\x1b\x57\x9b\x0c\x9b\x3a\x9b\xcb\ -\xb6\xa8\xad\x9b\xad\xc4\x76\x9b\x6d\xdf\x14\xe2\x14\x8f\x29\xd2\ -\x29\xf5\x53\x6e\xda\x31\xec\xfc\xec\x0a\xec\x9a\xec\x06\xed\x39\ -\xf6\x61\xf6\x25\xf6\x6d\xf6\xcf\x1d\xcc\x1c\x12\x1d\xd6\x3b\x74\ -\x3b\x7c\x72\x74\x75\xcc\x76\x6c\x70\xbc\xeb\xa4\xe1\x34\xc3\xa9\ -\xc4\xa9\xc3\xe9\x57\x67\x1b\x67\xa1\x73\x9d\xf3\x35\x17\xa6\x4b\ -\x90\xcb\x12\x97\x76\x97\x17\x53\x6d\xa7\x8a\xa7\x6e\x9f\x7a\xcb\ -\x95\xe5\x1a\xee\xba\xd2\xb5\xd3\xf5\xa3\x9b\xbb\x9b\xdc\xad\xd9\ -\x6d\xd4\xdd\xcc\x3d\xc5\x7d\xab\xfb\x4d\x2e\x9b\x1b\xc9\x5d\xc3\ -\x3d\xef\x41\xf4\xf0\xf7\x58\xe2\x71\xcc\xe3\x9d\xa7\x9b\xa7\xc2\ -\xf3\x90\xe7\x2f\x5e\x76\x5e\x59\x5e\xfb\xbd\x1e\x4f\xb3\x9c\x26\ -\x9e\xd6\x30\x6d\xc8\xdb\xc4\x5b\xe0\xbd\xcb\x7b\x60\x3a\x3e\x3d\ -\x65\xfa\xce\xe9\x03\x3e\xc6\x3e\x02\x9f\x7a\x9f\x87\xbe\xa6\xbe\ -\x22\xdf\x3d\xbe\x23\x7e\xd6\x7e\x99\x7e\x07\xfc\x9e\xfb\x3b\xfa\ -\xcb\xfd\x8f\xf8\xbf\xe1\x79\xf2\x16\xf1\x4e\x05\x60\x01\xc1\x01\ -\xe5\x01\xbd\x81\x1a\x81\xb3\x03\x6b\x03\x1f\x04\x99\x04\xa5\x07\ -\x35\x05\x8d\x05\xbb\x06\x2f\x0c\x3e\x15\x42\x0c\x09\x0d\x59\x1f\ -\x72\x93\x6f\xc0\x17\xf2\x1b\xf9\x63\x33\xdc\x67\x2c\x9a\xd1\x15\ -\xca\x08\x9d\x15\x5a\x1b\xfa\x30\xcc\x26\x4c\x1e\xd6\x11\x8e\x86\ -\xcf\x08\xdf\x10\x7e\x6f\xa6\xf9\x4c\xe9\xcc\xb6\x08\x88\xe0\x47\ -\x6c\x88\xb8\x1f\x69\x19\x99\x17\xf9\x7d\x14\x29\x2a\x32\xaa\x2e\ -\xea\x51\xb4\x53\x74\x71\x74\xf7\x2c\xd6\xac\xe4\x59\xfb\x67\xbd\ -\x8e\xf1\x8f\xa9\x8c\xb9\x3b\xdb\x6a\xb6\x72\x76\x67\xac\x6a\x6c\ -\x52\x6c\x63\xec\x9b\xb8\x80\xb8\xaa\xb8\x81\x78\x87\xf8\x45\xf1\ -\x97\x12\x74\x13\x24\x09\xed\x89\xe4\xc4\xd8\xc4\x3d\x89\xe3\x73\ -\x02\xe7\x6c\x9a\x33\x9c\xe4\x9a\x54\x96\x74\x63\xae\xe5\xdc\xa2\ -\xb9\x17\xe6\xe9\xce\xcb\x9e\x77\x3c\x59\x35\x59\x90\x7c\x38\x85\ -\x98\x12\x97\xb2\x3f\xe5\x83\x20\x42\x50\x2f\x18\x4f\xe5\xa7\x6e\ -\x4d\x1d\x13\xf2\x84\x9b\x85\x4f\x45\xbe\xa2\x8d\xa2\x51\xb1\xb7\ -\xb8\x4a\x3c\x92\xe6\x9d\x56\x95\xf6\x38\xdd\x3b\x7d\x43\xfa\x68\ -\x86\x4f\x46\x75\xc6\x33\x09\x4f\x52\x2b\x79\x91\x19\x92\xb9\x23\ -\xf3\x4d\x56\x44\xd6\xde\xac\xcf\xd9\x71\xd9\x2d\x39\x94\x9c\x94\ -\x9c\xa3\x52\x0d\x69\x96\xb4\x2b\xd7\x30\xb7\x28\xb7\x4f\x66\x2b\ -\x2b\x93\x0d\xe4\x79\xe6\x6d\xca\x1b\x93\x87\xca\xf7\xe4\x23\xf9\ -\x73\xf3\xdb\x15\x6c\x85\x4c\xd1\xa3\xb4\x52\xae\x50\x0e\x16\x4c\ -\x2f\xa8\x2b\x78\x5b\x18\x5b\x78\xb8\x48\xbd\x48\x5a\xd4\x33\xdf\ -\x66\xfe\xea\xf9\x23\x0b\x82\x16\x7c\xbd\x90\xb0\x50\xb8\xb0\xb3\ -\xd8\xb8\x78\x59\xf1\xe0\x22\xbf\x45\xbb\x16\x23\x8b\x53\x17\x77\ -\x2e\x31\x5d\x52\xba\x64\x78\x69\xf0\xd2\x7d\xcb\x68\xcb\xb2\x96\ -\xfd\x50\xe2\x58\x52\x55\xf2\x6a\x79\xdc\xf2\x8e\x52\x83\xd2\xa5\ -\xa5\x43\x2b\x82\x57\x34\x95\xa9\x94\xc9\xcb\x6e\xae\xf4\x5a\xb9\ -\x63\x15\x61\x95\x64\x55\xef\x6a\x97\xd5\x5b\x56\x7f\x2a\x17\x95\ -\x5f\xac\x70\xac\xa8\xae\xf8\xb0\x46\xb8\xe6\xe2\x57\x4e\x5f\xd5\ -\x7c\xf5\x79\x6d\xda\xda\xde\x4a\xb7\xca\xed\xeb\x48\xeb\xa4\xeb\ -\x6e\xac\xf7\x59\xbf\xaf\x4a\xbd\x6a\x41\xd5\xd0\x86\xf0\x0d\xad\ -\x1b\xf1\x8d\xe5\x1b\x5f\x6d\x4a\xde\x74\xa1\x7a\x6a\xf5\x8e\xcd\ -\xb4\xcd\xca\xcd\x03\x35\x61\x35\xed\x5b\xcc\xb6\xac\xdb\xf2\xa1\ -\x36\xa3\xf6\x7a\x9d\x7f\x5d\xcb\x56\xfd\xad\xab\xb7\xbe\xd9\x26\ -\xda\xd6\xbf\xdd\x77\x7b\xf3\x0e\x83\x1d\x15\x3b\xde\xef\x94\xec\ -\xbc\xb5\x2b\x78\x57\x6b\xbd\x45\x7d\xf5\x6e\xd2\xee\x82\xdd\x8f\ -\x1a\x62\x1b\xba\xbf\xe6\x7e\xdd\xb8\x47\x77\x4f\xc5\x9e\x8f\x7b\ -\xa5\x7b\x07\xf6\x45\xef\xeb\x6a\x74\x6f\x6c\xdc\xaf\xbf\xbf\xb2\ -\x09\x6d\x52\x36\x8d\x1e\x48\x3a\x70\xe5\x9b\x80\x6f\xda\x9b\xed\ -\x9a\x77\xb5\x70\x5a\x2a\x0e\xc2\x41\xe5\xc1\x27\xdf\xa6\x7c\x7b\ -\xe3\x50\xe8\xa1\xce\xc3\xdc\xc3\xcd\xdf\x99\x7f\xb7\xf5\x08\xeb\ -\x48\x79\x2b\xd2\x3a\xbf\x75\xac\x2d\xa3\x6d\xa0\x3d\xa1\xbd\xef\ -\xe8\x8c\xa3\x9d\x1d\x5e\x1d\x47\xbe\xb7\xff\x7e\xef\x31\xe3\x63\ -\x75\xc7\x35\x8f\x57\x9e\xa0\x9d\x28\x3d\xf1\xf9\xe4\x82\x93\xe3\ -\xa7\x64\xa7\x9e\x9d\x4e\x3f\x3d\xd4\x99\xdc\x79\xf7\x4c\xfc\x99\ -\x6b\x5d\x51\x5d\xbd\x67\x43\xcf\x9e\x3f\x17\x74\xee\x4c\xb7\x5f\ -\xf7\xc9\xf3\xde\xe7\x8f\x5d\xf0\xbc\x70\xf4\x22\xf7\x62\xdb\x25\ -\xb7\x4b\xad\x3d\xae\x3d\x47\x7e\x70\xfd\xe1\x48\xaf\x5b\x6f\xeb\ -\x65\xf7\xcb\xed\x57\x3c\xae\x74\xf4\x4d\xeb\x3b\xd1\xef\xd3\x7f\ -\xfa\x6a\xc0\xd5\x73\xd7\xf8\xd7\x2e\x5d\x9f\x79\xbd\xef\xc6\xec\ -\x1b\xb7\x6e\x26\xdd\x1c\xb8\x25\xba\xf5\xf8\x76\xf6\xed\x17\x77\ -\x0a\xee\x4c\xdc\x5d\x7a\x8f\x78\xaf\xfc\xbe\xda\xfd\xea\x07\xfa\ -\x0f\xea\x7f\xb4\xfe\xb1\x65\xc0\x6d\xe0\xf8\x60\xc0\x60\xcf\xc3\ -\x59\x0f\xef\x0e\x09\x87\x9e\xfe\x94\xff\xd3\x87\xe1\xd2\x47\xcc\ -\x47\xd5\x23\x46\x23\x8d\x8f\x9d\x1f\x1f\x1b\x0d\x1a\xbd\xf2\x64\ -\xce\x93\xe1\xa7\xb2\xa7\x13\xcf\xca\x7e\x56\xff\x79\xeb\x73\xab\ -\xe7\xdf\xfd\xe2\xfb\x4b\xcf\x58\xfc\xd8\xf0\x0b\xf9\x8b\xcf\xbf\ -\xae\x79\xa9\xf3\x72\xef\xab\xa9\xaf\x3a\xc7\x23\xc7\x1f\xbc\xce\ -\x79\x3d\xf1\xa6\xfc\xad\xce\xdb\x7d\xef\xb8\xef\xba\xdf\xc7\xbd\ -\x1f\x99\x28\xfc\x40\xfe\x50\xf3\xd1\xfa\x63\xc7\xa7\xd0\x4f\xf7\ -\x3e\xe7\x7c\xfe\xfc\x2f\xf7\x84\xf3\xfb\x25\xd2\x9f\x33\x00\x00\ -\x00\x20\x63\x48\x52\x4d\x00\x00\x7a\x25\x00\x00\x80\x83\x00\x00\ -\xf9\xff\x00\x00\x80\xe9\x00\x00\x75\x30\x00\x00\xea\x60\x00\x00\ -\x3a\x98\x00\x00\x17\x6f\x92\x5f\xc5\x46\x00\x00\x05\xd1\x49\x44\ -\x41\x54\x78\xda\x7c\x95\x4d\x6c\x5c\x57\x1d\xc5\x7f\xf7\xf3\x7d\ -\xcd\x7b\x33\x1e\x4f\x9c\xc8\x4e\xed\xba\x81\xaa\xa1\x75\x58\xd4\ -\x52\x25\x04\xa2\x6d\x40\x7c\xac\x68\x82\x22\xb1\x28\x2c\xa9\x10\ -\xad\x08\x08\x04\xb4\x12\x2a\x15\xaa\x10\xd0\xd2\x6e\x41\x05\xc4\ -\xa2\x05\x01\x8b\x82\x84\x14\x56\xa9\x40\x4a\x88\x90\x1a\xc7\x85\ -\x36\x89\xab\x24\x76\x6c\x8f\xed\x71\x6d\x8f\xe7\xfb\xbd\x77\x59\ -\x8c\x67\xec\x10\x89\xbf\x74\xf5\xde\xe2\xdd\x77\xee\xff\x9c\xff\ -\x39\x57\x38\xe7\xc8\xb2\x8c\x41\x39\xe7\x10\x42\x0c\xdf\x07\x25\ -\xa5\xa4\x56\xab\x3d\xf2\xde\x7b\xd7\x4e\xa5\x69\xf6\x48\xa9\x54\ -\x5c\x2f\x8d\x14\x2f\x56\x0e\x55\xfe\x16\x85\xe1\xe5\x3c\xcb\x0f\ -\x7e\x2f\x00\xa7\xb5\x46\xfc\x1f\x00\xe1\xf6\x76\x28\xa5\xd8\xd8\ -\xa8\x7d\x6e\x6e\xee\xca\x1f\x77\x1b\x8d\x60\x74\xb4\xcc\x68\x65\ -\x94\x42\x21\x42\x49\xd9\xd2\x4a\xff\x22\x08\x82\x97\xc3\x30\xbc\ -\x01\x90\xe7\x0e\x70\x18\x63\x90\xdc\x5d\x02\xd0\x80\x14\x42\x20\ -\x84\xc0\x39\x67\x56\x56\x57\x9f\x4b\xb3\x3c\x18\x1b\x3b\x4c\xa9\ -\x54\x22\x08\x7d\xfc\x20\xa0\x52\x39\x14\x94\xcb\xe5\x67\x3a\x9d\ -\xce\xa5\x5a\xad\xf6\x85\xfe\x1e\xe4\x1e\x09\x77\x02\x38\xe7\x34\ -\x30\x01\x38\x20\x1b\x9c\xfe\xc6\xcd\x5b\x3f\x58\x5c\x5a\xfe\x58\ -\xa1\x10\x11\x86\x01\xbe\xef\x23\x85\x04\xe7\xc8\xd2\x14\x29\x25\ -\x95\x4a\xa5\xe2\xfb\xfe\x9f\x56\x56\x56\x7e\x2a\xa5\xcc\x95\x94\ -\x77\x01\x08\x21\x84\x27\x84\xa8\x03\x99\x73\x0e\xa5\x14\xeb\x1b\ -\xb5\x4f\xbe\xfb\xee\xd5\xef\x84\x81\x4f\x92\x24\x04\xa1\x87\xb1\ -\x1a\x6b\x2d\x9e\xe7\xa1\xb5\x06\x20\x4d\x53\xe2\x38\x16\xb7\x96\ -\x96\xbe\x75\xf5\xda\xf5\x6f\x08\xa9\xee\xee\x00\x68\x02\xdb\x03\ -\x1d\xda\xed\x76\x3c\x7f\x65\xfe\x55\x29\x85\x29\x14\x0a\x08\x09\ -\xc6\x18\x8c\x31\x7d\x00\x6b\x51\x4a\xe1\x9c\xa3\xd7\xeb\x71\xe3\ -\xe6\x4d\xda\xed\x36\x0b\x0b\xef\x3f\xdb\x6a\xb5\x27\xff\x17\xc0\ -\xed\x2d\x06\xd4\x5c\x5f\x78\xff\xf9\x9d\x7a\xfd\x44\xb1\x58\xc4\ -\xf3\x3c\x3c\xcf\x0e\x01\x3c\xeb\x21\xa5\x42\x08\x41\x96\x65\x34\ -\x9a\x0d\x56\xab\xab\xa4\x69\x86\x10\xb2\xb2\xbc\xbc\x7c\x92\x3d\ -\x31\xef\x54\x58\x88\x3e\x35\xeb\x1b\x9f\xbd\x7e\x7d\xe1\x6c\xb9\ -\x5c\x26\x8e\x63\x3c\xcf\xc3\x5a\x8d\xd2\x0a\x6b\x2d\x46\x2b\x94\ -\x10\xe4\x79\x4e\xa7\xd3\xa1\xba\xb6\x46\xb3\xd9\x46\x20\x28\x14\ -\x22\xea\xf5\xdd\xa9\x21\xc0\x60\xee\x07\x5c\x76\xba\xbd\x4f\xcc\ -\xcf\xbf\xf3\x5b\x63\x0c\xc5\x62\x11\xa5\x15\xda\xc8\xe1\xc9\x3d\ -\x63\x90\x52\x81\x10\x74\x7b\x5d\x6a\x9b\x35\xd6\xd6\xd6\xc1\xf5\ -\x3b\x0f\xc3\x90\x4a\xa5\xb2\x38\x04\x58\xad\x56\x0f\xf0\xe4\xec\ -\xad\x9b\x4b\xcf\x6e\xef\xec\x56\x8e\x1e\x1d\xc7\x9a\x3e\xd7\xc6\ -\x1a\xac\x31\x78\xc6\xa2\x94\x46\x0a\x41\x96\xe7\x34\x1b\x4d\x56\ -\x57\xd7\xc8\xb3\xbe\x9f\xb4\x56\x1c\x1a\xab\x2c\x1d\x39\x32\x76\ -\x6e\x08\xb0\xb9\xb9\x3d\xa4\xa7\x97\x76\x7f\x52\xad\x56\x3f\x53\ -\x2e\x97\x89\xc2\x10\x63\x35\xda\x28\x8c\x36\x18\x63\xd1\x4a\xf7\ -\xbd\x01\xf4\xba\x5d\xaa\xd5\x2a\x3b\xf5\x1d\x04\x12\xad\x35\xa3\ -\x95\x51\x4a\xa5\xe2\xd7\x1c\x2c\x0e\x45\xce\xb3\x94\x3c\x4b\x11\ -\xb8\xd9\xda\x46\xed\x29\xdf\xf7\x29\x26\x45\x84\x92\x68\xa3\xd0\ -\x5a\xa3\x8d\xc1\x18\x8d\x54\x72\x28\xec\xd6\xf6\x16\xd5\xea\x1a\ -\xb8\xbe\x16\x61\x18\x62\xb4\x79\xab\xd5\x6a\xfd\x79\x73\x73\x93\ -\x61\x07\x4e\x38\xc2\x20\xa0\xdb\xe9\x7e\x4f\x08\xec\xe4\xe4\x3d\ -\x8c\x8c\x94\x10\x52\xe0\x5c\xdf\xf2\x56\x1b\xa4\x52\x43\xbd\xda\ -\x9d\x36\x2b\xab\xab\xb4\xdb\x2d\x84\x90\x04\x41\x88\x94\xb2\x53\ -\xaf\xef\x7c\xdf\x91\x93\x65\x19\x87\xc7\xc6\xfa\x00\x81\x17\xf0\ -\x9f\x7f\x5f\xfd\xee\xf9\xf3\xe7\x4f\x65\x79\xce\xd4\xe4\x3d\xcc\ -\x7c\xf4\x21\x66\x67\x1f\x26\x89\x13\x5c\xde\x0f\x32\xe7\x1c\x02\ -\x41\xaf\xd7\x63\xbd\x56\x63\x7d\x6d\x03\x90\x78\x5e\x40\xb1\x58\ -\x64\xa7\xbe\xfd\xf3\x3c\xcf\xfe\x51\xdf\xad\x13\x04\xc1\x7e\x07\ -\x6f\xbf\x7d\xf9\xe9\x97\x7e\xf6\xca\x8b\x5b\x5b\x1f\xd0\x6a\xb7\ -\x68\xb7\xdb\x18\x63\x79\xe0\xf8\x03\x7c\xe5\xcb\x4f\x72\xe6\xcc\ -\x69\x3c\xcf\x02\xd0\xeb\xf5\xd8\xa9\xef\xb0\x78\x6b\x91\x6e\xb7\ -\x87\xef\xfb\x44\x51\x48\xa7\xd3\x5a\x68\xb5\x9a\x2f\xe7\x79\x4e\ -\x1c\xc7\x4c\x4f\x4f\xef\x3b\xf9\xda\xd5\x6b\x9f\x4e\xd3\x1e\x71\ -\x1c\x93\xc4\x09\xa5\x52\x09\x63\x0d\x73\x73\x73\x7c\xfd\xe9\x67\ -\x38\x75\xfa\x0c\x97\xe7\xae\xf4\x4f\xa4\x35\xd5\xea\x1a\x5b\x1f\ -\x6c\x61\xad\x25\x49\x12\x3c\xdf\xb2\xdb\x68\xfc\x18\xa8\xfa\xbe\ -\xcf\xd4\xd4\x14\x4a\x1d\x88\x8a\x24\x29\x5e\xd4\x5a\x0f\x5d\x6a\ -\xf6\xc6\x31\x49\x12\x46\xcb\x65\x2e\x5e\xbc\xc4\x13\x4f\x7c\x91\ -\xd7\x5f\xff\x1d\xad\x76\x9b\xdd\xc6\x2e\xbe\x1f\x50\x88\x63\xc2\ -\xc8\xa7\xb1\xdb\x78\x2b\xcb\xf2\x5f\x0a\xa1\x98\x98\x38\x4a\x14\ -\x85\xe4\x79\xbe\x0f\x30\x39\x35\xf9\x9b\x89\x89\xf1\x6a\x9e\xe7\ -\x78\x9e\x87\xd1\x7b\x59\x63\x2c\x9e\xf5\xa8\x8c\x96\xc9\x1d\x9c\ -\xfd\xe6\xb7\x79\xfe\x87\x2f\xe0\x1c\x7b\xd4\x04\x64\x59\x46\xab\ -\xdd\xfa\x91\xd2\xca\x09\x29\x50\x5a\xed\xdd\x07\x07\xe2\x3a\x8a\ -\xa3\xa5\x47\x1f\x7b\xf4\xc5\x41\x5b\xfd\x58\xb0\xc3\xa7\xd1\x96\ -\x42\x18\x51\x4c\x12\x7e\xff\xc6\x1f\xf8\xe7\x85\x4b\xc4\x49\x81\ -\x20\xf0\x69\xb5\x5a\xe7\x8c\xd1\xe7\xac\xd1\x58\xa3\xd8\xad\xd7\ -\x87\x03\xb1\x1f\x76\xce\x71\xfc\xc1\xe3\xaf\x3c\xfe\xf8\x63\x2f\ -\xa9\xbd\x00\xf3\x7d\xff\xc0\xf2\xf0\xac\x25\x0a\x22\x7c\xcf\xe7\ -\xcd\x37\xff\x82\xd6\x9a\x3c\xcf\xbb\x69\x9a\xbe\xe0\xfb\x3e\xd6\ -\x5a\xa2\xa8\x80\xef\xf9\xf8\x9e\x4f\x5c\x88\x0f\xf8\xc0\x39\x04\ -\xf0\xf0\xec\xec\x73\x20\xa2\x0b\x17\x2e\x7c\xb5\xd9\x6c\xf6\xb5\ -\xf0\x3c\xb2\x2c\x23\xcf\x32\xb2\x3c\xc7\x58\xc3\xc6\x7a\x8d\xf9\ -\xb9\x79\x1e\x9c\xf9\xc8\xaf\x8d\x31\x7f\xcf\xb2\x0c\xa5\x14\xf7\ -\x7f\xe8\xc3\x24\x71\xbc\x1f\xc9\xfb\x1d\x08\x5c\x0e\x61\x10\xb4\ -\x66\x66\x1e\x7a\xea\xe4\xa7\x4e\x7e\x69\xfa\xbe\xe9\x45\x6b\xfb\ -\xa3\x69\xad\x25\x08\x43\x82\x20\x20\x8a\x22\xc2\x30\xe4\xf6\xf2\ -\x72\x5d\x6b\xfd\x6a\x14\x45\x58\x6b\x99\x18\x9f\x20\x49\x92\x7e\ -\xe6\x1f\xa0\x48\x0f\x6f\x02\x40\x29\x29\xa3\x42\xe4\xee\x9d\xbe\ -\xf7\x8d\x91\xf2\xc8\x5f\x6f\xdf\xbe\x7d\x7a\x79\x79\xf9\xc9\x5a\ -\x6d\xf3\xe3\xcd\x66\x53\x23\x04\x38\xc7\xf4\xb1\xe9\xe6\x89\x13\ -\x33\x67\x85\x10\xef\x00\x8c\x96\x47\x39\x72\xf8\xf0\x1d\x3f\x1e\ -\x54\x3f\xae\xa5\x1b\x24\xa9\xb0\x56\x0b\xad\x75\x56\x2a\x95\xb6\ -\x7d\xdf\x7f\x6d\x64\x64\xe4\xb5\x4e\xa7\x3b\xab\x94\xfc\xbc\x90\ -\xdc\x5f\x2a\x96\xb6\x8e\x1d\xbb\xef\x57\xa5\x91\xe2\xbf\xd2\x2c\ -\x45\x2b\xcd\xc4\xf8\x38\x4a\xa9\xe1\x68\x1e\xac\xff\x0e\x00\x68\ -\xf0\x5f\xd8\xaf\x76\x9c\x4c\x00\x00\x00\x00\x49\x45\x4e\x44\xae\ -\x42\x60\x82\ +\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x01\x97\x70\x0d\x6e\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\ +\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x06\xdc\x49\x44\x41\x54\x48\ +\xc7\x55\x95\x59\x6c\x54\xd7\x19\xc7\xff\xe7\x2e\x73\x77\xcf\x6e\ +\x7b\xc6\x0e\x60\x30\x13\xb1\x04\x12\x07\x95\x94\x90\x1a\xda\x4a\ +\x49\x53\x35\x54\xb4\x52\x9a\x86\xb4\x4d\xe9\xf2\xd4\x28\x6d\x43\ +\x15\xa9\x2f\x51\x93\x80\xd2\x2c\x28\x52\x15\xa9\x8d\x68\x95\xbc\ +\x44\x6d\x1a\x51\xd2\x46\x4d\xd8\x8c\xed\xb8\x40\x69\x4b\xd8\xed\ +\x19\xb0\xc7\x60\x7b\x6c\x33\x1e\xcc\xc0\x8c\x67\xee\xb9\xe7\x7c\ +\x7d\x18\x6c\xc8\x79\x3c\xba\xff\xef\xf7\x2d\xff\xef\x1e\x46\x44\ +\x08\x82\x00\x35\xbf\xbe\x16\x44\x84\xcf\x4e\x9d\xa1\x6a\x6d\x8e\ +\x40\x44\xe8\xe8\xc8\xd0\xa9\x33\xa7\x09\x9c\x73\xf4\xf7\x0f\xbc\ +\xc2\x39\x07\xab\xd7\xeb\xb8\x59\xad\xd0\xa9\xcf\xce\x40\x79\x60\ +\xfd\x43\x64\x1a\x26\xda\xda\xd3\x0c\xb7\xa2\x85\xa7\xaf\x16\xbb\ +\x87\x72\x59\xf2\x7d\x9f\xfe\x75\xec\x18\x29\x00\xd0\xdb\xd7\x3f\ +\x1b\x08\x7e\x64\xe9\x92\x0e\x1c\x3c\x74\x08\xba\xa6\x6d\x54\x00\ +\xa0\xe7\x50\xdf\xef\xbf\xfb\xf8\xf7\xf0\xe0\x86\x4d\x88\x44\x23\ +\x6c\x5d\x57\xd7\x00\x82\x20\x40\x10\x04\x10\x42\xe0\xe4\xc9\x53\ +\xef\x07\x41\x00\xce\x39\x10\x04\x01\xe3\x9c\xe3\x70\x4f\x2f\x15\ +\xa6\x26\x89\x73\x4e\x44\x04\x85\x31\x46\xfd\xfd\x03\x57\x97\x74\ +\x2c\x42\x22\x16\x47\xff\xc0\x00\xc6\xc6\x26\xb6\xb3\x6c\x2e\x07\ +\xd7\x75\xc9\x75\x5d\x10\x49\x9c\x3c\x79\x1a\x89\x64\x8c\xb1\xf5\ +\x5f\xd8\x48\xb3\xb3\xb3\xf0\x03\x1f\x6f\xbd\xf5\x3b\x28\xaa\xa2\ +\xdc\x7b\xef\x1a\x52\x5e\xda\xf9\x1b\x16\x8f\xc7\x91\x6e\x49\x61\ +\xa6\x58\x44\x24\xd2\x44\xc9\x78\x02\x8c\x88\x20\x84\x00\x11\x31\ +\xc6\x98\x02\x40\x9c\x3b\x7f\x61\xa0\x52\x99\xdb\x90\x6a\x6b\x46\ +\xba\x35\x8d\xf2\xf5\xeb\xc5\x58\x2c\x96\x94\x52\x40\xc1\xad\xc3\ +\x18\x23\x55\x55\xc5\x3f\x3e\xfa\x27\x01\x6c\xc3\x5d\x8b\xd2\x48\ +\xc6\x93\xd0\x35\x0d\x60\x48\x1c\xea\x39\x42\xa3\xa3\x57\x9e\x66\ +\x44\x84\xb3\xe7\x06\x11\x08\xfe\x66\xf9\x7a\xf9\x99\x74\x3a\x05\ +\xaf\xc9\x45\xc4\x0b\x43\xd3\x35\x0c\x65\xb3\x18\x1f\x2f\x20\x95\ +\x6e\xc5\xdd\x99\x0c\x63\x44\x84\x07\xd6\x7f\x89\x0a\x93\x13\x10\ +\x42\x62\xd7\xae\x97\xf1\xd4\x53\x4f\x80\x73\x8e\x81\xa3\x47\xe1\ +\xd7\x39\xc2\x61\xef\x52\xe9\x5a\xa9\xb3\xab\xab\xab\x91\xd2\x93\ +\xdb\x9e\x78\x36\x9d\x4a\xa3\xb5\xa5\x05\xaf\xbd\xfa\x3a\x56\xaf\ +\xee\x42\x26\xb3\x0a\x9e\xe7\xc1\xf5\xec\xfd\x3e\xf7\x3b\xd3\xe9\ +\x74\x23\x75\x22\xc2\x81\xfd\x3d\xf0\xb9\xcf\xc6\xc6\xc7\x9b\x4e\ +\x9c\x38\xf1\xb7\x2b\x57\xc6\x36\xc9\x40\xe0\x97\x3b\x9e\xfd\x51\ +\xba\x2d\xb5\x67\xd5\x8a\x95\x60\x8c\x35\x8a\x9d\x9f\xdd\xfc\xcc\ +\x38\xe7\x98\x9e\x9e\x5e\xdf\xd3\xd3\x77\x64\x24\x9f\x7f\x4e\x92\ +\x9c\xbf\x67\x44\x74\xbb\x4b\x00\x34\xc6\x18\x14\x45\xd1\xff\x77\ +\xf2\xf4\xb1\x44\x32\xde\xed\x78\xee\xab\x22\x10\x54\x2a\x95\xbe\ +\x09\x80\x01\x58\x10\x38\x00\x02\x55\x55\xf1\xf1\x27\x07\x2b\xf3\ +\x9d\x32\x42\x21\x28\x8a\x82\x64\x32\xb9\xf7\xe2\xa5\xe1\x67\xee\ +\x14\x54\x1a\xed\x3d\xff\x46\x34\x1a\xd1\x4d\x2b\x04\xdb\xb6\x61\ +\x99\x16\x82\x20\xc0\xb1\x7f\x1f\xc7\xf0\x70\x7e\x37\x00\x28\x8c\ +\x31\x30\xc6\x30\x57\xab\x3f\x34\x3a\x7a\xf9\xe7\x91\x68\x04\x8e\ +\xe3\xc0\x73\x1c\xa8\x8a\x82\x89\xc2\x04\xaa\x95\x1a\x9a\x9b\x93\ +\x8d\xbc\xcf\x5f\xc8\x82\x31\x86\x5c\x2e\xdb\x77\x77\x26\x03\xc7\ +\xb1\xe0\xd8\x0e\x34\x4d\x47\xad\x56\x43\x36\x77\x11\x9a\xaa\x63\ +\x79\x66\xd9\x63\x00\xa0\x08\xc9\x01\x12\x1f\x64\x32\xcb\x11\x8d\ +\x47\x60\xdb\x36\x0c\xd3\x00\x63\x0c\x17\x86\x06\x21\x85\x84\xeb\ +\xba\xf5\x42\xa1\xf0\x77\x00\x50\x86\x2e\x64\x7f\xf6\xad\xad\x8f\ +\x6f\xdd\xbc\xe9\xab\xd8\xf6\xe4\xd3\xf0\x1c\x0f\x66\xc8\xc0\x4c\ +\x69\x06\xe3\x63\x05\xc4\x62\x71\x5c\x9b\x9d\x59\x5c\x2c\x16\x01\ +\x00\xca\xd4\xe4\x74\x53\x2c\x16\x43\x32\x99\x44\x3e\x9f\x47\x5b\ +\x7b\x07\xde\x7b\xef\xcf\xb8\x34\x3c\x8c\x58\x3c\x8e\x20\xe0\x7d\ +\x8c\xa9\x53\x2b\x57\xae\x68\x08\x56\xac\x5e\xf1\x32\x63\x0c\xae\ +\xe3\xa2\xc9\xf5\x90\x6a\x69\xc5\x0b\x2f\xbc\x88\xe3\x47\x4f\x20\ +\x91\x88\x22\x10\xbc\xdb\x30\x34\x08\x21\x1b\x02\x92\x12\x3b\x7e\ +\xb5\xc3\xf6\x3c\x0f\x9e\xe7\x21\x1a\x8d\x20\x16\x8d\xe1\x8f\x7b\ +\xde\x41\xad\x56\xfb\x83\xae\xeb\xb8\x6f\xed\x7d\x48\xc4\xe2\x0d\ +\x01\x24\x83\xe7\x3a\xf5\xed\x3f\xde\xce\xba\x37\x77\x6f\x8f\x27\ +\x13\x81\xeb\x79\x58\x75\xcf\xaa\xaa\xae\xeb\x3f\x4d\xb5\xa6\xe0\ +\x79\x1e\x88\xe8\xb6\xf9\x84\x10\x0b\xfe\x20\xa2\x79\xa3\x31\xba\ +\xf5\x95\xaa\xaa\x28\x16\x67\xbe\x76\xfa\xf4\x99\x0f\x6e\x56\x2a\ +\x56\x3c\x1e\x43\x3c\x11\x87\xeb\x3a\x50\x15\x65\x4e\x53\xb5\xb7\ +\x2d\xcb\xda\x6d\xdb\x76\x1e\x00\xa4\x24\x00\x04\x5d\xd7\x3f\x0f\ +\x20\x22\x0d\x40\x2b\x63\xac\x00\x40\xcc\x07\x1f\x1e\xc9\xbf\x74\ +\x61\x30\xfb\xeb\x48\xb8\x09\xae\xeb\xc2\x71\x6c\x84\x0c\x1d\x96\ +\x65\xc1\xb5\x1d\x18\x86\x01\x45\x51\x50\x2e\x97\xe9\xc6\x8d\x1b\ +\x6f\xa4\x52\xa9\xe7\x18\x08\x4c\x51\x3f\x07\x60\xb7\x8b\x68\x54\ +\xc1\x39\xf7\x8e\x1e\x3d\xfe\x69\xdd\xf7\xd7\xc4\xe3\x71\x58\xb6\ +\x09\xc7\xb1\x61\x18\x06\x4c\xd3\x84\x63\xdb\xd0\x35\x1d\x44\x04\ +\xdf\xf7\x31\x39\x35\x85\xfc\xe8\x28\xaa\x95\xb9\xe2\x97\x37\x6f\ +\xba\xdf\xb2\xcc\xcb\x77\x6e\x0f\x01\x20\xc6\x18\x34\x4d\x43\xa9\ +\x74\xed\x91\x8f\x3f\x39\x50\x56\x35\x6d\x4d\x7b\x7b\x3b\x22\x91\ +\x08\x3c\xcf\x85\x69\x99\x70\x1c\x07\xae\x6d\x43\x57\x35\x10\x11\ +\xaa\xd5\x2a\x86\xf3\x23\x18\x1e\xc9\x43\x04\x12\x9e\xe7\x25\x86\ +\x86\xb2\x3f\x04\x00\x0d\x00\xa6\xa6\xa7\xef\xa0\x50\xe8\xf2\xe8\ +\xd8\x87\x53\x53\x57\x1f\x6e\x6f\x6f\x87\x63\x3b\x30\xcc\x10\x42\ +\xa6\x0e\x33\x64\xc0\x32\x2d\x84\x42\x21\xa8\x8a\x02\x41\x84\x72\ +\xb9\x8c\x5c\xee\x22\x2a\x95\x2a\x84\x10\x30\x8c\x10\x16\x2f\x59\ +\x34\xd6\x96\x4a\xed\x59\x00\x14\xaf\xce\x34\x16\x49\xd3\xd6\x15\ +\x26\x27\x07\x38\xe7\xa1\x8e\x25\x8b\x61\x58\x06\x4c\x33\x84\x50\ +\x28\x04\xc3\x34\x61\x19\x06\x74\x4d\x87\xa2\x28\x08\x84\x40\x71\ +\xa6\x88\xa1\xa1\x1c\x38\x0f\x40\x44\x08\x87\xc3\x88\x46\x23\x7d\ +\x86\x11\xea\x9e\x29\x95\xd0\xd2\xdc\xdc\x00\x98\xa6\x89\xc1\xc1\ +\xec\xf3\xbd\xbd\xbd\xbb\x84\x94\x58\xbc\xe8\x2e\x68\xba\x8a\x75\ +\xeb\xee\x47\x93\xd7\x04\x92\x12\x44\x8d\x87\x4f\x61\x0a\x38\xe7\ +\x18\x9f\x2c\x20\x37\x94\x03\x11\x60\x9a\x16\xa2\xd1\x08\xca\x37\ +\xae\xbf\x52\x98\x9c\x78\x7e\xa2\x30\x0e\xcb\xb2\x6e\x03\xde\xff\ +\xcb\x5f\x3f\xdc\xbb\x77\xdf\x37\x18\x63\xa8\xd5\x6a\xf0\xb9\x0f\ +\x9f\x73\x54\x2a\x15\xd4\xeb\x75\x6c\xdc\xf8\x20\x76\xee\x7c\x11\ +\x6b\xd7\xdc\x03\x22\x42\x6e\xf0\x22\x2e\x5d\x1a\x5e\x08\x6c\xd9\ +\x26\x8a\xc5\xe2\x4f\x82\x80\xbf\x1d\x0a\x85\xd0\xd9\xd9\x09\xcb\ +\xb2\x6e\xef\xc1\xbe\x7d\x1f\xb5\xbf\xfb\xce\xbb\xff\x19\x1f\x9f\ +\x68\x99\x87\x08\x21\x20\x84\x80\x94\x12\x04\x42\xcd\xf7\x51\x9b\ +\x9b\xc3\xf7\x7f\xb0\x0d\x5b\xb6\x3c\xd6\xf8\xfd\x47\x9a\x00\x10\ +\x4a\xa5\x6b\x0f\x83\xb1\xfd\x52\x4a\x2c\x5d\xda\x81\x70\x53\x13\ +\xa4\x94\x68\x4e\x24\x1b\x80\x83\x87\x7a\x00\xc6\xd0\x7b\xb8\xf7\ +\xf5\x9e\xc3\x47\x7e\x21\xa4\x80\xaa\xaa\x90\x52\x2e\x40\xa4\x94\ +\x20\x49\x98\xab\xcd\x21\x95\x4e\x61\xf7\x9b\xaf\x41\xd7\x35\xbf\ +\x58\x2c\x7e\xc5\x34\xcd\x4f\x89\x08\xaa\xaa\xc2\x73\x3d\xa4\xd3\ +\x69\xa8\xaa\x0a\xdb\xb2\x6e\x3d\x23\x07\x7a\x1a\x0e\x92\x84\xd9\ +\xd9\x59\x0c\x8f\x8c\x7c\xe7\xec\xd9\xb3\xbf\x9d\x9a\x9c\xba\x2b\ +\x08\x02\xa8\xaa\x0a\xc6\xd8\xc2\x42\x56\xab\x73\xd8\xfa\xed\x2d\ +\x37\x1e\xfd\xfa\x23\x5f\x94\x52\x9e\xe3\x9c\xa3\xb5\xa5\x15\x6d\ +\xe9\xf4\xc2\xac\x00\x40\x51\x94\x5b\x15\x1c\x3c\x3c\xef\x52\x95\ +\x88\x70\xbd\x7c\x53\x08\x21\x50\xab\xd5\x50\x2a\x95\x50\xaf\xfb\ +\xeb\x54\x55\x79\x94\x29\xc8\x44\xc2\x91\xd9\x65\xcb\x96\xfe\x29\ +\x12\x0d\xff\x57\x51\x19\x34\x55\x43\xa6\x73\x39\x74\x5d\x87\x94\ +\x12\x77\x1e\x45\x51\xf0\x7f\x60\x84\x69\x65\x48\xcf\xfa\x14\x00\ +\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x03\x66\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -1540,214 +757,53 @@ qt_resource_data = "\ \xb6\x40\xfe\x0c\x85\x05\xff\x87\xac\xfd\x71\xf9\xc7\x5f\x02\x0c\ \x00\x00\x31\x44\x70\x94\xe4\x6d\xa8\x00\x00\x00\x00\x49\x45\x4e\ \x44\xae\x42\x60\x82\ -\x00\x00\x0c\xdf\ +\x00\x00\x02\xcc\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\ -\x01\x00\x9a\x9c\x18\x00\x00\x0a\x4f\x69\x43\x43\x50\x50\x68\x6f\ -\x74\x6f\x73\x68\x6f\x70\x20\x49\x43\x43\x20\x70\x72\x6f\x66\x69\ -\x6c\x65\x00\x00\x78\xda\x9d\x53\x67\x54\x53\xe9\x16\x3d\xf7\xde\ -\xf4\x42\x4b\x88\x80\x94\x4b\x6f\x52\x15\x08\x20\x52\x42\x8b\x80\ -\x14\x91\x26\x2a\x21\x09\x10\x4a\x88\x21\xa1\xd9\x15\x51\xc1\x11\ -\x45\x45\x04\x1b\xc8\xa0\x88\x03\x8e\x8e\x80\x8c\x15\x51\x2c\x0c\ -\x8a\x0a\xd8\x07\xe4\x21\xa2\x8e\x83\xa3\x88\x8a\xca\xfb\xe1\x7b\ -\xa3\x6b\xd6\xbc\xf7\xe6\xcd\xfe\xb5\xd7\x3e\xe7\xac\xf3\x9d\xb3\ -\xcf\x07\xc0\x08\x0c\x96\x48\x33\x51\x35\x80\x0c\xa9\x42\x1e\x11\ -\xe0\x83\xc7\xc4\xc6\xe1\xe4\x2e\x40\x81\x0a\x24\x70\x00\x10\x08\ -\xb3\x64\x21\x73\xfd\x23\x01\x00\xf8\x7e\x3c\x3c\x2b\x22\xc0\x07\ -\xbe\x00\x01\x78\xd3\x0b\x08\x00\xc0\x4d\x9b\xc0\x30\x1c\x87\xff\ -\x0f\xea\x42\x99\x5c\x01\x80\x84\x01\xc0\x74\x91\x38\x4b\x08\x80\ -\x14\x00\x40\x7a\x8e\x42\xa6\x00\x40\x46\x01\x80\x9d\x98\x26\x53\ -\x00\xa0\x04\x00\x60\xcb\x63\x62\xe3\x00\x50\x2d\x00\x60\x27\x7f\ -\xe6\xd3\x00\x80\x9d\xf8\x99\x7b\x01\x00\x5b\x94\x21\x15\x01\xa0\ -\x91\x00\x20\x13\x65\x88\x44\x00\x68\x3b\x00\xac\xcf\x56\x8a\x45\ -\x00\x58\x30\x00\x14\x66\x4b\xc4\x39\x00\xd8\x2d\x00\x30\x49\x57\ -\x66\x48\x00\xb0\xb7\x00\xc0\xce\x10\x0b\xb2\x00\x08\x0c\x00\x30\ -\x51\x88\x85\x29\x00\x04\x7b\x00\x60\xc8\x23\x23\x78\x00\x84\x99\ -\x00\x14\x46\xf2\x57\x3c\xf1\x2b\xae\x10\xe7\x2a\x00\x00\x78\x99\ -\xb2\x3c\xb9\x24\x39\x45\x81\x5b\x08\x2d\x71\x07\x57\x57\x2e\x1e\ -\x28\xce\x49\x17\x2b\x14\x36\x61\x02\x61\x9a\x40\x2e\xc2\x79\x99\ -\x19\x32\x81\x34\x0f\xe0\xf3\xcc\x00\x00\xa0\x91\x15\x11\xe0\x83\ -\xf3\xfd\x78\xce\x0e\xae\xce\xce\x36\x8e\xb6\x0e\x5f\x2d\xea\xbf\ -\x06\xff\x22\x62\x62\xe3\xfe\xe5\xcf\xab\x70\x40\x00\x00\xe1\x74\ -\x7e\xd1\xfe\x2c\x2f\xb3\x1a\x80\x3b\x06\x80\x6d\xfe\xa2\x25\xee\ -\x04\x68\x5e\x0b\xa0\x75\xf7\x8b\x66\xb2\x0f\x40\xb5\x00\xa0\xe9\ -\xda\x57\xf3\x70\xf8\x7e\x3c\x3c\x45\xa1\x90\xb9\xd9\xd9\xe5\xe4\ -\xe4\xd8\x4a\xc4\x42\x5b\x61\xca\x57\x7d\xfe\x67\xc2\x5f\xc0\x57\ -\xfd\x6c\xf9\x7e\x3c\xfc\xf7\xf5\xe0\xbe\xe2\x24\x81\x32\x5d\x81\ -\x47\x04\xf8\xe0\xc2\xcc\xf4\x4c\xa5\x1c\xcf\x92\x09\x84\x62\xdc\ -\xe6\x8f\x47\xfc\xb7\x0b\xff\xfc\x1d\xd3\x22\xc4\x49\x62\xb9\x58\ -\x2a\x14\xe3\x51\x12\x71\x8e\x44\x9a\x8c\xf3\x32\xa5\x22\x89\x42\ -\x92\x29\xc5\x25\xd2\xff\x64\xe2\xdf\x2c\xfb\x03\x3e\xdf\x35\x00\ -\xb0\x6a\x3e\x01\x7b\x91\x2d\xa8\x5d\x63\x03\xf6\x4b\x27\x10\x58\ -\x74\xc0\xe2\xf7\x00\x00\xf2\xbb\x6f\xc1\xd4\x28\x08\x03\x80\x68\ -\x83\xe1\xcf\x77\xff\xef\x3f\xfd\x47\xa0\x25\x00\x80\x66\x49\x92\ -\x71\x00\x00\x5e\x44\x24\x2e\x54\xca\xb3\x3f\xc7\x08\x00\x00\x44\ -\xa0\x81\x2a\xb0\x41\x1b\xf4\xc1\x18\x2c\xc0\x06\x1c\xc1\x05\xdc\ -\xc1\x0b\xfc\x60\x36\x84\x42\x24\xc4\xc2\x42\x10\x42\x0a\x64\x80\ -\x1c\x72\x60\x29\xac\x82\x42\x28\x86\xcd\xb0\x1d\x2a\x60\x2f\xd4\ -\x40\x1d\x34\xc0\x51\x68\x86\x93\x70\x0e\x2e\xc2\x55\xb8\x0e\x3d\ -\x70\x0f\xfa\x61\x08\x9e\xc1\x28\xbc\x81\x09\x04\x41\xc8\x08\x13\ -\x61\x21\xda\x88\x01\x62\x8a\x58\x23\x8e\x08\x17\x99\x85\xf8\x21\ -\xc1\x48\x04\x12\x8b\x24\x20\xc9\x88\x14\x51\x22\x4b\x91\x35\x48\ -\x31\x52\x8a\x54\x20\x55\x48\x1d\xf2\x3d\x72\x02\x39\x87\x5c\x46\ -\xba\x91\x3b\xc8\x00\x32\x82\xfc\x86\xbc\x47\x31\x94\x81\xb2\x51\ -\x3d\xd4\x0c\xb5\x43\xb9\xa8\x37\x1a\x84\x46\xa2\x0b\xd0\x64\x74\ -\x31\x9a\x8f\x16\xa0\x9b\xd0\x72\xb4\x1a\x3d\x8c\x36\xa1\xe7\xd0\ -\xab\x68\x0f\xda\x8f\x3e\x43\xc7\x30\xc0\xe8\x18\x07\x33\xc4\x6c\ -\x30\x2e\xc6\xc3\x42\xb1\x38\x2c\x09\x93\x63\xcb\xb1\x22\xac\x0c\ -\xab\xc6\x1a\xb0\x56\xac\x03\xbb\x89\xf5\x63\xcf\xb1\x77\x04\x12\ -\x81\x45\xc0\x09\x36\x04\x77\x42\x20\x61\x1e\x41\x48\x58\x4c\x58\ -\x4e\xd8\x48\xa8\x20\x1c\x24\x34\x11\xda\x09\x37\x09\x03\x84\x51\ -\xc2\x27\x22\x93\xa8\x4b\xb4\x26\xba\x11\xf9\xc4\x18\x62\x32\x31\ -\x87\x58\x48\x2c\x23\xd6\x12\x8f\x13\x2f\x10\x7b\x88\x43\xc4\x37\ -\x24\x12\x89\x43\x32\x27\xb9\x90\x02\x49\xb1\xa4\x54\xd2\x12\xd2\ -\x46\xd2\x6e\x52\x23\xe9\x2c\xa9\x9b\x34\x48\x1a\x23\x93\xc9\xda\ -\x64\x6b\xb2\x07\x39\x94\x2c\x20\x2b\xc8\x85\xe4\x9d\xe4\xc3\xe4\ -\x33\xe4\x1b\xe4\x21\xf2\x5b\x0a\x9d\x62\x40\x71\xa4\xf8\x53\xe2\ -\x28\x52\xca\x6a\x4a\x19\xe5\x10\xe5\x34\xe5\x06\x65\x98\x32\x41\ -\x55\xa3\x9a\x52\xdd\xa8\xa1\x54\x11\x35\x8f\x5a\x42\xad\xa1\xb6\ -\x52\xaf\x51\x87\xa8\x13\x34\x75\x9a\x39\xcd\x83\x16\x49\x4b\xa5\ -\xad\xa2\x95\xd3\x1a\x68\x17\x68\xf7\x69\xaf\xe8\x74\xba\x11\xdd\ -\x95\x1e\x4e\x97\xd0\x57\xd2\xcb\xe9\x47\xe8\x97\xe8\x03\xf4\x77\ -\x0c\x0d\x86\x15\x83\xc7\x88\x67\x28\x19\x9b\x18\x07\x18\x67\x19\ -\x77\x18\xaf\x98\x4c\xa6\x19\xd3\x8b\x19\xc7\x54\x30\x37\x31\xeb\ -\x98\xe7\x99\x0f\x99\x6f\x55\x58\x2a\xb6\x2a\x7c\x15\x91\xca\x0a\ -\x95\x4a\x95\x26\x95\x1b\x2a\x2f\x54\xa9\xaa\xa6\xaa\xde\xaa\x0b\ -\x55\xf3\x55\xcb\x54\x8f\xa9\x5e\x53\x7d\xae\x46\x55\x33\x53\xe3\ -\xa9\x09\xd4\x96\xab\x55\xaa\x9d\x50\xeb\x53\x1b\x53\x67\xa9\x3b\ -\xa8\x87\xaa\x67\xa8\x6f\x54\x3f\xa4\x7e\x59\xfd\x89\x06\x59\xc3\ -\x4c\xc3\x4f\x43\xa4\x51\xa0\xb1\x5f\xe3\xbc\xc6\x20\x0b\x63\x19\ -\xb3\x78\x2c\x21\x6b\x0d\xab\x86\x75\x81\x35\xc4\x26\xb1\xcd\xd9\ -\x7c\x76\x2a\xbb\x98\xfd\x1d\xbb\x8b\x3d\xaa\xa9\xa1\x39\x43\x33\ -\x4a\x33\x57\xb3\x52\xf3\x94\x66\x3f\x07\xe3\x98\x71\xf8\x9c\x74\ -\x4e\x09\xe7\x28\xa7\x97\xf3\x7e\x8a\xde\x14\xef\x29\xe2\x29\x1b\ -\xa6\x34\x4c\xb9\x31\x65\x5c\x6b\xaa\x96\x97\x96\x58\xab\x48\xab\ -\x51\xab\x47\xeb\xbd\x36\xae\xed\xa7\x9d\xa6\xbd\x45\xbb\x59\xfb\ -\x81\x0e\x41\xc7\x4a\x27\x5c\x27\x47\x67\x8f\xce\x05\x9d\xe7\x53\ -\xd9\x53\xdd\xa7\x0a\xa7\x16\x4d\x3d\x3a\xf5\xae\x2e\xaa\x6b\xa5\ -\x1b\xa1\xbb\x44\x77\xbf\x6e\xa7\xee\x98\x9e\xbe\x5e\x80\x9e\x4c\ -\x6f\xa7\xde\x79\xbd\xe7\xfa\x1c\x7d\x2f\xfd\x54\xfd\x6d\xfa\xa7\ -\xf5\x47\x0c\x58\x06\xb3\x0c\x24\x06\xdb\x0c\xce\x18\x3c\xc5\x35\ -\x71\x6f\x3c\x1d\x2f\xc7\xdb\xf1\x51\x43\x5d\xc3\x40\x43\xa5\x61\ -\x95\x61\x97\xe1\x84\x91\xb9\xd1\x3c\xa3\xd5\x46\x8d\x46\x0f\x8c\ -\x69\xc6\x5c\xe3\x24\xe3\x6d\xc6\x6d\xc6\xa3\x26\x06\x26\x21\x26\ -\x4b\x4d\xea\x4d\xee\x9a\x52\x4d\xb9\xa6\x29\xa6\x3b\x4c\x3b\x4c\ -\xc7\xcd\xcc\xcd\xa2\xcd\xd6\x99\x35\x9b\x3d\x31\xd7\x32\xe7\x9b\ -\xe7\x9b\xd7\x9b\xdf\xb7\x60\x5a\x78\x5a\x2c\xb6\xa8\xb6\xb8\x65\ -\x49\xb2\xe4\x5a\xa6\x59\xee\xb6\xbc\x6e\x85\x5a\x39\x59\xa5\x58\ -\x55\x5a\x5d\xb3\x46\xad\x9d\xad\x25\xd6\xbb\xad\xbb\xa7\x11\xa7\ -\xb9\x4e\x93\x4e\xab\x9e\xd6\x67\xc3\xb0\xf1\xb6\xc9\xb6\xa9\xb7\ -\x19\xb0\xe5\xd8\x06\xdb\xae\xb6\x6d\xb6\x7d\x61\x67\x62\x17\x67\ -\xb7\xc5\xae\xc3\xee\x93\xbd\x93\x7d\xba\x7d\x8d\xfd\x3d\x07\x0d\ -\x87\xd9\x0e\xab\x1d\x5a\x1d\x7e\x73\xb4\x72\x14\x3a\x56\x3a\xde\ -\x9a\xce\x9c\xee\x3f\x7d\xc5\xf4\x96\xe9\x2f\x67\x58\xcf\x10\xcf\ -\xd8\x33\xe3\xb6\x13\xcb\x29\xc4\x69\x9d\x53\x9b\xd3\x47\x67\x17\ -\x67\xb9\x73\x83\xf3\x88\x8b\x89\x4b\x82\xcb\x2e\x97\x3e\x2e\x9b\ -\x1b\xc6\xdd\xc8\xbd\xe4\x4a\x74\xf5\x71\x5d\xe1\x7a\xd2\xf5\x9d\ -\x9b\xb3\x9b\xc2\xed\xa8\xdb\xaf\xee\x36\xee\x69\xee\x87\xdc\x9f\ -\xcc\x34\x9f\x29\x9e\x59\x33\x73\xd0\xc3\xc8\x43\xe0\x51\xe5\xd1\ -\x3f\x0b\x9f\x95\x30\x6b\xdf\xac\x7e\x4f\x43\x4f\x81\x67\xb5\xe7\ -\x23\x2f\x63\x2f\x91\x57\xad\xd7\xb0\xb7\xa5\x77\xaa\xf7\x61\xef\ -\x17\x3e\xf6\x3e\x72\x9f\xe3\x3e\xe3\x3c\x37\xde\x32\xde\x59\x5f\ -\xcc\x37\xc0\xb7\xc8\xb7\xcb\x4f\xc3\x6f\x9e\x5f\x85\xdf\x43\x7f\ -\x23\xff\x64\xff\x7a\xff\xd1\x00\xa7\x80\x25\x01\x67\x03\x89\x81\ -\x41\x81\x5b\x02\xfb\xf8\x7a\x7c\x21\xbf\x8e\x3f\x3a\xdb\x65\xf6\ -\xb2\xd9\xed\x41\x8c\xa0\xb9\x41\x15\x41\x8f\x82\xad\x82\xe5\xc1\ -\xad\x21\x68\xc8\xec\x90\xad\x21\xf7\xe7\x98\xce\x91\xce\x69\x0e\ -\x85\x50\x7e\xe8\xd6\xd0\x07\x61\xe6\x61\x8b\xc3\x7e\x0c\x27\x85\ -\x87\x85\x57\x86\x3f\x8e\x70\x88\x58\x1a\xd1\x31\x97\x35\x77\xd1\ -\xdc\x43\x73\xdf\x44\xfa\x44\x96\x44\xde\x9b\x67\x31\x4f\x39\xaf\ -\x2d\x4a\x35\x2a\x3e\xaa\x2e\x6a\x3c\xda\x37\xba\x34\xba\x3f\xc6\ -\x2e\x66\x59\xcc\xd5\x58\x9d\x58\x49\x6c\x4b\x1c\x39\x2e\x2a\xae\ -\x36\x6e\x6c\xbe\xdf\xfc\xed\xf3\x87\xe2\x9d\xe2\x0b\xe3\x7b\x17\ -\x98\x2f\xc8\x5d\x70\x79\xa1\xce\xc2\xf4\x85\xa7\x16\xa9\x2e\x12\ -\x2c\x3a\x96\x40\x4c\x88\x4e\x38\x94\xf0\x41\x10\x2a\xa8\x16\x8c\ -\x25\xf2\x13\x77\x25\x8e\x0a\x79\xc2\x1d\xc2\x67\x22\x2f\xd1\x36\ -\xd1\x88\xd8\x43\x5c\x2a\x1e\x4e\xf2\x48\x2a\x4d\x7a\x92\xec\x91\ -\xbc\x35\x79\x24\xc5\x33\xa5\x2c\xe5\xb9\x84\x27\xa9\x90\xbc\x4c\ -\x0d\x4c\xdd\x9b\x3a\x9e\x16\x9a\x76\x20\x6d\x32\x3d\x3a\xbd\x31\ -\x83\x92\x91\x90\x71\x42\xaa\x21\x4d\x93\xb6\x67\xea\x67\xe6\x66\ -\x76\xcb\xac\x65\x85\xb2\xfe\xc5\x6e\x8b\xb7\x2f\x1e\x95\x07\xc9\ -\x6b\xb3\x90\xac\x05\x59\x2d\x0a\xb6\x42\xa6\xe8\x54\x5a\x28\xd7\ -\x2a\x07\xb2\x67\x65\x57\x66\xbf\xcd\x89\xca\x39\x96\xab\x9e\x2b\ -\xcd\xed\xcc\xb3\xca\xdb\x90\x37\x9c\xef\x9f\xff\xed\x12\xc2\x12\ -\xe1\x92\xb6\xa5\x86\x4b\x57\x2d\x1d\x58\xe6\xbd\xac\x6a\x39\xb2\ -\x3c\x71\x79\xdb\x0a\xe3\x15\x05\x2b\x86\x56\x06\xac\x3c\xb8\x8a\ -\xb6\x2a\x6d\xd5\x4f\xab\xed\x57\x97\xae\x7e\xbd\x26\x7a\x4d\x6b\ -\x81\x5e\xc1\xca\x82\xc1\xb5\x01\x6b\xeb\x0b\x55\x0a\xe5\x85\x7d\ -\xeb\xdc\xd7\xed\x5d\x4f\x58\x2f\x59\xdf\xb5\x61\xfa\x86\x9d\x1b\ -\x3e\x15\x89\x8a\xae\x14\xdb\x17\x97\x15\x7f\xd8\x28\xdc\x78\xe5\ -\x1b\x87\x6f\xca\xbf\x99\xdc\x94\xb4\xa9\xab\xc4\xb9\x64\xcf\x66\ -\xd2\x66\xe9\xe6\xde\x2d\x9e\x5b\x0e\x96\xaa\x97\xe6\x97\x0e\x6e\ -\x0d\xd9\xda\xb4\x0d\xdf\x56\xb4\xed\xf5\xf6\x45\xdb\x2f\x97\xcd\ -\x28\xdb\xbb\x83\xb6\x43\xb9\xa3\xbf\x3c\xb8\xbc\x65\xa7\xc9\xce\ -\xcd\x3b\x3f\x54\xa4\x54\xf4\x54\xfa\x54\x36\xee\xd2\xdd\xb5\x61\ -\xd7\xf8\x6e\xd1\xee\x1b\x7b\xbc\xf6\x34\xec\xd5\xdb\x5b\xbc\xf7\ -\xfd\x3e\xc9\xbe\xdb\x55\x01\x55\x4d\xd5\x66\xd5\x65\xfb\x49\xfb\ -\xb3\xf7\x3f\xae\x89\xaa\xe9\xf8\x96\xfb\x6d\x5d\xad\x4e\x6d\x71\ -\xed\xc7\x03\xd2\x03\xfd\x07\x23\x0e\xb6\xd7\xb9\xd4\xd5\x1d\xd2\ -\x3d\x54\x52\x8f\xd6\x2b\xeb\x47\x0e\xc7\x1f\xbe\xfe\x9d\xef\x77\ -\x2d\x0d\x36\x0d\x55\x8d\x9c\xc6\xe2\x23\x70\x44\x79\xe4\xe9\xf7\ -\x09\xdf\xf7\x1e\x0d\x3a\xda\x76\x8c\x7b\xac\xe1\x07\xd3\x1f\x76\ -\x1d\x67\x1d\x2f\x6a\x42\x9a\xf2\x9a\x46\x9b\x53\x9a\xfb\x5b\x62\ -\x5b\xba\x4f\xcc\x3e\xd1\xd6\xea\xde\x7a\xfc\x47\xdb\x1f\x0f\x9c\ -\x34\x3c\x59\x79\x4a\xf3\x54\xc9\x69\xda\xe9\x82\xd3\x93\x67\xf2\ -\xcf\x8c\x9d\x95\x9d\x7d\x7e\x2e\xf9\xdc\x60\xdb\xa2\xb6\x7b\xe7\ -\x63\xce\xdf\x6a\x0f\x6f\xef\xba\x10\x74\xe1\xd2\x45\xff\x8b\xe7\ -\x3b\xbc\x3b\xce\x5c\xf2\xb8\x74\xf2\xb2\xdb\xe5\x13\x57\xb8\x57\ -\x9a\xaf\x3a\x5f\x6d\xea\x74\xea\x3c\xfe\x93\xd3\x4f\xc7\xbb\x9c\ -\xbb\x9a\xae\xb9\x5c\x6b\xb9\xee\x7a\xbd\xb5\x7b\x66\xf7\xe9\x1b\ -\x9e\x37\xce\xdd\xf4\xbd\x79\xf1\x16\xff\xd6\xd5\x9e\x39\x3d\xdd\ -\xbd\xf3\x7a\x6f\xf7\xc5\xf7\xf5\xdf\x16\xdd\x7e\x72\x27\xfd\xce\ -\xcb\xbb\xd9\x77\x27\xee\xad\xbc\x4f\xbc\x5f\xf4\x40\xed\x41\xd9\ -\x43\xdd\x87\xd5\x3f\x5b\xfe\xdc\xd8\xef\xdc\x7f\x6a\xc0\x77\xa0\ -\xf3\xd1\xdc\x47\xf7\x06\x85\x83\xcf\xfe\x91\xf5\x8f\x0f\x43\x05\ -\x8f\x99\x8f\xcb\x86\x0d\x86\xeb\x9e\x38\x3e\x39\x39\xe2\x3f\x72\ -\xfd\xe9\xfc\xa7\x43\xcf\x64\xcf\x26\x9e\x17\xfe\xa2\xfe\xcb\xae\ -\x17\x16\x2f\x7e\xf8\xd5\xeb\xd7\xce\xd1\x98\xd1\xa1\x97\xf2\x97\ -\x93\xbf\x6d\x7c\xa5\xfd\xea\xc0\xeb\x19\xaf\xdb\xc6\xc2\xc6\x1e\ -\xbe\xc9\x78\x33\x31\x5e\xf4\x56\xfb\xed\xc1\x77\xdc\x77\x1d\xef\ -\xa3\xdf\x0f\x4f\xe4\x7c\x20\x7f\x28\xff\x68\xf9\xb1\xf5\x53\xd0\ -\xa7\xfb\x93\x19\x93\x93\xff\x04\x03\x98\xf3\xfc\x63\x33\x2d\xdb\ -\x00\x00\x00\x20\x63\x48\x52\x4d\x00\x00\x7a\x25\x00\x00\x80\x83\ -\x00\x00\xf9\xff\x00\x00\x80\xe9\x00\x00\x75\x30\x00\x00\xea\x60\ -\x00\x00\x3a\x98\x00\x00\x17\x6f\x92\x5f\xc5\x46\x00\x00\x02\x0a\ -\x49\x44\x41\x54\x78\xda\x64\xd1\x4d\xab\x1c\x45\x18\xc5\xf1\x5f\ -\xdf\x69\x1a\xc6\x5c\xbc\x12\x74\x1b\x10\x84\x08\x92\xe0\x07\x30\ -\xb8\x0a\x8c\x9b\x04\xfc\x0a\x42\xc4\x95\xa2\x5b\x97\x82\x2b\x05\ -\x51\x70\xe5\x87\x88\x2b\xc1\x95\xe0\x3e\x82\x2b\x21\x20\x64\xe7\ -\xdb\x9d\x3b\xd3\x3d\xfd\x52\xd5\x35\xed\xa2\x2a\xde\x01\x1b\x0e\ -\x0f\x05\x7d\xce\xff\xd4\x53\xd5\x72\xf7\x2e\x37\x6f\x72\x71\xc1\ -\x8d\x1b\x34\xcd\x6d\x55\xf5\x48\x4a\x6f\x0b\xe1\x4d\xd3\xc4\x30\ -\xfc\xe2\x70\xf8\xc9\xe1\xf0\xad\xae\x7b\xaa\xef\xe9\x7b\xa6\x49\ -\xb5\xdc\xbb\x97\x03\xce\xcf\x69\x9a\x8f\x55\xd5\x67\xe6\x79\x6d\ -\x9a\x18\xc7\xac\x1c\x42\xdf\x0f\xfa\xfe\x53\x7d\xff\xa5\x61\x20\ -\x04\xb5\xf3\x73\xd6\xeb\xc6\x6a\xf5\xd8\xf1\xb8\x31\xcf\xf9\xe7\ -\xc3\x21\xcf\x69\x22\x46\x42\x60\x1c\xd7\xa6\xe9\x0b\xd3\x74\x5f\ -\x08\x0f\x85\x10\x6a\x4d\x03\x5f\x9b\xe7\x8d\x18\xb3\xa9\x6d\xe9\ -\xba\x4c\x0f\x81\x94\xb2\x72\x08\xc3\xb0\x59\xc6\xf1\xf3\xc8\x27\ -\xd5\xf2\xe0\xc1\x1d\x75\xfd\x44\x4a\x2b\xc3\xc0\x6e\x97\xd5\x75\ -\x99\x9e\x12\xcb\x92\x95\x12\xe3\x28\xc5\xa8\x27\x05\xde\xa8\x85\ -\xf0\x48\x8c\x2b\xe3\x98\xc9\xdb\x2d\x57\x57\xb9\x49\x8c\xd9\x08\ -\x55\xc5\x3c\x0b\xcb\x62\x40\xcf\x6a\xe2\x83\x5a\xdf\x6f\xa4\x74\ -\x5d\xbd\x6d\xf3\x86\x43\xe0\x78\x74\xfa\xc5\x62\x3e\x14\x0d\xbc\ -\x55\xeb\xba\x5b\xff\x5b\x5c\x8c\xd9\xfc\x9c\x8e\x05\x11\x53\xa6\ -\x6b\xf3\xbc\x55\x6b\x5b\xe6\xd9\x7f\xcf\x16\xe3\xf5\xbd\x4f\xcc\ -\x09\x73\xa6\x3a\x5c\x07\xa8\xb5\xed\x33\x31\xbe\x26\x46\xcf\xb5\ -\x9c\x98\xe1\x58\xe8\x03\x3a\xec\x8b\x26\x9e\x9d\xd9\xef\x7f\xb0\ -\xdb\xb1\xdf\x4b\xc3\x20\xa6\x24\x14\x5a\x3a\xa9\xdd\xe1\x0a\x97\ -\x45\xfb\x1c\xf8\x73\x95\xb8\x33\xf2\x24\xb2\x9a\x4b\x5d\xa8\xca\ -\x4c\x18\x4b\xe5\xbf\xf1\x0f\x76\x08\xa4\x86\xd7\xeb\x9e\x5f\x07\ -\xbe\x19\xf9\x30\x16\xf2\xf1\xc4\x3c\x97\xbb\xee\xb1\x2d\xe6\x09\ -\x67\x7c\xb5\xe6\x69\x75\x99\xeb\x35\x07\x1e\x0f\x6c\x42\x31\x9e\ -\xd6\x1f\x4a\x40\x57\xce\xf8\xfe\x05\xde\x7d\x99\x74\x76\xcc\xc4\ -\x10\x79\x67\xe4\xa3\x8e\x6e\x8b\xbf\xf0\x27\xfe\x28\xba\xcc\xdb\ -\xef\x12\xef\x37\x3c\x7c\x91\xf4\x12\xaa\x6d\x79\x96\x7d\xa9\xb7\ -\xe7\xd5\x8e\xf7\x3a\xee\x0f\xdc\x9e\x72\x93\xdf\x12\x3f\xae\xf8\ -\x6e\xcd\xef\x17\x78\xa5\xe8\xdf\x01\x00\xd9\x09\x61\x5f\xc2\xb1\ -\xaf\xf3\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x01\x68\xf4\xcf\xf7\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\ +\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x02\x6c\x49\x44\x41\x54\x38\ +\xcb\x4d\xd2\xbd\x6b\xdd\x65\x14\x07\xf0\xcf\xaf\xb9\x49\x9a\x10\ +\x69\x08\x06\x6a\x2c\x82\xf4\x25\x2e\xed\x50\x87\x4e\x85\x2e\x42\ +\xb2\x34\xe0\xe4\x58\x10\xea\x58\x69\x57\x47\x57\x83\xd2\x49\xc1\ +\xad\xfe\x01\xba\x28\xb8\xa8\x93\x83\xa0\x4b\x41\x89\x10\x1b\x43\ +\x20\x37\x37\xf7\xe6\xbe\xfe\xee\xef\x2d\xc7\xe1\xb9\x6a\x1f\x38\ +\x1c\x9e\xf3\x7c\xbf\xe7\x7c\x9f\x73\x4e\x16\xb7\x6e\x71\xf5\x6a\ +\x2d\xae\x5f\x2f\x82\x10\x0f\x1e\x6c\xc6\x8d\x1b\xc4\xc5\x8b\xf1\ +\x17\x21\xee\xdf\xbf\x19\x77\xee\x44\xac\xad\x45\xcc\xcf\x47\x36\ +\xc4\x11\x91\xe3\x67\x64\xb1\xb3\xc3\xa5\x4b\xbf\xd8\xdf\xff\xd1\ +\xf3\xe7\x4f\xc4\xce\x4e\xc4\x95\x2b\x11\xab\xab\x31\xa0\x16\x1b\ +\x1b\x11\x44\x45\xfc\x40\x64\x07\xc4\x18\x2f\xb0\xc7\x6e\x16\xdb\ +\xdb\xac\xaf\x7f\xab\x69\xb6\x74\x3a\x9c\x9d\x31\x1e\x27\xdf\xed\ +\x2e\xb6\x8c\xc7\x7b\x8e\x8f\xaf\x39\x3c\xe4\xf4\x94\xf3\x73\xd0\ +\x8f\xd0\xa6\x10\xcb\xcb\x4f\x83\x28\x67\x56\x10\x6d\xe2\x27\xe2\ +\x19\x91\x75\x92\x6e\x6d\x86\x7d\x56\x06\xe8\xa2\xe6\x83\xd7\xf9\ +\x22\x8b\x7b\xf7\xd8\xd8\x60\x71\xf1\x13\x79\xfe\xc8\xd9\xd9\x6f\ +\xda\xed\xf7\xb4\xdb\x7f\xea\xf5\xb4\x5c\xbe\xbc\x60\x7e\xbe\xd0\ +\xef\xd3\xe9\x30\x1a\xbd\x6d\x30\xd8\x33\x99\x7c\xa7\x28\xb6\x5b\ +\xca\x72\xa2\xdb\xe5\xe0\x20\x89\xac\x6b\xea\x5a\x33\x1c\x6e\x9d\ +\xb1\xd9\x72\x7c\x3c\xa7\xdd\xe6\xf0\x90\xe9\x14\x54\x11\x4e\xd0\ +\xe1\xab\x96\xa3\x23\xfa\xfd\xf4\x18\x21\x90\xe3\x24\x89\x7f\x23\ +\x8b\x56\x2b\x9a\xba\x56\x63\x0e\x25\xfe\xc6\xef\x18\xf0\x59\xd6\ +\xe6\xd3\x21\x8f\x4a\x34\x29\xe8\x45\xfa\xb6\x55\xb2\xd6\x84\x0f\ +\x8f\xd9\xef\x26\xa0\x5e\x02\x8d\x96\x79\xe5\x35\x64\x71\xf7\x2e\ +\x6b\x6b\xac\xac\xb0\xb0\xf0\x58\x96\x7d\xac\xae\x97\x14\x45\xd2\ +\x35\x9d\x52\x14\xe4\x39\x93\x49\x6e\x32\xf9\xc8\x64\xb2\x2b\xcf\ +\x29\xcb\xd9\x42\x2c\x2d\x7d\xee\xc2\x85\x87\xaa\x2a\x01\x87\x43\ +\x46\xa3\x44\x2e\x4b\x9a\x26\x59\x59\xa6\x58\x9e\x8b\xe9\x74\xb7\ +\xe2\x49\x4b\x51\x3c\x55\x96\x0f\x4d\xa7\x89\xd8\xeb\xa5\x4d\xc8\ +\x73\xaa\x8a\x08\x20\xcb\xa8\x6b\x65\x84\x1c\x13\x1e\x17\xcc\x65\ +\x71\xfb\x76\xa1\xae\x17\xe4\x79\x5a\xa3\xe1\x30\x91\x9b\xe6\x7f\ +\x32\xff\xb5\x77\x34\x6b\xd4\x20\x25\x39\x69\x39\x3a\x3a\x50\x55\ +\xd7\x54\x55\xaa\x58\x96\xa2\x69\xbc\x7c\xce\x67\xed\x1f\xa6\xe1\ +\xe9\xe2\x0c\x05\x07\x59\xc3\xcd\x29\xbf\x56\xcc\xd5\xb3\x4a\x90\ +\xcd\x7c\x83\xe9\x4b\xe4\x53\xf4\x53\xc2\x66\x81\xb7\xb2\x6e\x92\ +\xb5\x30\xe6\xeb\x9c\xad\x7f\xe7\xd9\xa0\x4a\x55\xe4\x33\xc9\xa3\ +\xd9\x1d\xdf\x2c\xf3\xee\xab\x34\x59\x0f\xe3\x19\xa0\x9f\xfc\x9b\ +\x23\xde\x1f\xf1\x4e\xce\x66\x91\x12\xfd\xd1\xf0\xfd\x1c\x5f\x2e\ +\xb1\x7f\x09\xeb\x33\xfb\x07\x6a\x4f\x76\xe7\x35\x05\x41\x4b\x00\ +\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x02\xf0\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -1839,492 +895,181 @@ qt_resource_data = "\ \x64\x43\xd7\x38\x7a\xa6\x48\xf1\x9f\xe6\x7f\xd6\x77\x01\x06\x00\ \xf9\x1f\x11\xa0\x42\x25\x9c\x34\x00\x00\x00\x00\x49\x45\x4e\x44\ \xae\x42\x60\x82\ -\x00\x00\x10\xe6\ +\x00\x00\x07\x6a\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\ -\x01\x00\x9a\x9c\x18\x00\x00\x0a\x4d\x69\x43\x43\x50\x50\x68\x6f\ -\x74\x6f\x73\x68\x6f\x70\x20\x49\x43\x43\x20\x70\x72\x6f\x66\x69\ -\x6c\x65\x00\x00\x78\xda\x9d\x53\x77\x58\x93\xf7\x16\x3e\xdf\xf7\ -\x65\x0f\x56\x42\xd8\xf0\xb1\x97\x6c\x81\x00\x22\x23\xac\x08\xc8\ -\x10\x59\xa2\x10\x92\x00\x61\x84\x10\x12\x40\xc5\x85\x88\x0a\x56\ -\x14\x15\x11\x9c\x48\x55\xc4\x82\xd5\x0a\x48\x9d\x88\xe2\xa0\x28\ -\xb8\x67\x41\x8a\x88\x5a\x8b\x55\x5c\x38\xee\x1f\xdc\xa7\xb5\x7d\ -\x7a\xef\xed\xed\xfb\xd7\xfb\xbc\xe7\x9c\xe7\xfc\xce\x79\xcf\x0f\ -\x80\x11\x12\x26\x91\xe6\xa2\x6a\x00\x39\x52\x85\x3c\x3a\xd8\x1f\ -\x8f\x4f\x48\xc4\xc9\xbd\x80\x02\x15\x48\xe0\x04\x20\x10\xe6\xcb\ -\xc2\x67\x05\xc5\x00\x00\xf0\x03\x79\x78\x7e\x74\xb0\x3f\xfc\x01\ -\xaf\x6f\x00\x02\x00\x70\xd5\x2e\x24\x12\xc7\xe1\xff\x83\xba\x50\ -\x26\x57\x00\x20\x91\x00\xe0\x22\x12\xe7\x0b\x01\x90\x52\x00\xc8\ -\x2e\x54\xc8\x14\x00\xc8\x18\x00\xb0\x53\xb3\x64\x0a\x00\x94\x00\ -\x00\x6c\x79\x7c\x42\x22\x00\xaa\x0d\x00\xec\xf4\x49\x3e\x05\x00\ -\xd8\xa9\x93\xdc\x17\x00\xd8\xa2\x1c\xa9\x08\x00\x8d\x01\x00\x99\ -\x28\x47\x24\x02\x40\xbb\x00\x60\x55\x81\x52\x2c\x02\xc0\xc2\x00\ -\xa0\xac\x40\x22\x2e\x04\xc0\xae\x01\x80\x59\xb6\x32\x47\x02\x80\ -\xbd\x05\x00\x76\x8e\x58\x90\x0f\x40\x60\x00\x80\x99\x42\x2c\xcc\ -\x00\x20\x38\x02\x00\x43\x1e\x13\xcd\x03\x20\x4c\x03\xa0\x30\xd2\ -\xbf\xe0\xa9\x5f\x70\x85\xb8\x48\x01\x00\xc0\xcb\x95\xcd\x97\x4b\ -\xd2\x33\x14\xb8\x95\xd0\x1a\x77\xf2\xf0\xe0\xe2\x21\xe2\xc2\x6c\ -\xb1\x42\x61\x17\x29\x10\x66\x09\xe4\x22\x9c\x97\x9b\x23\x13\x48\ -\xe7\x03\x4c\xce\x0c\x00\x00\x1a\xf9\xd1\xc1\xfe\x38\x3f\x90\xe7\ -\xe6\xe4\xe1\xe6\x66\xe7\x6c\xef\xf4\xc5\xa2\xfe\x6b\xf0\x6f\x22\ -\x3e\x21\xf1\xdf\xfe\xbc\x8c\x02\x04\x00\x10\x4e\xcf\xef\xda\x5f\ -\xe5\xe5\xd6\x03\x70\xc7\x01\xb0\x75\xbf\x6b\xa9\x5b\x00\xda\x56\ -\x00\x68\xdf\xf9\x5d\x33\xdb\x09\xa0\x5a\x0a\xd0\x7a\xf9\x8b\x79\ -\x38\xfc\x40\x1e\x9e\xa1\x50\xc8\x3c\x1d\x1c\x0a\x0b\x0b\xed\x25\ -\x62\xa1\xbd\x30\xe3\x8b\x3e\xff\x33\xe1\x6f\xe0\x8b\x7e\xf6\xfc\ -\x40\x1e\xfe\xdb\x7a\xf0\x00\x71\x9a\x40\x99\xad\xc0\xa3\x83\xfd\ -\x71\x61\x6e\x76\xae\x52\x8e\xe7\xcb\x04\x42\x31\x6e\xf7\xe7\x23\ -\xfe\xc7\x85\x7f\xfd\x8e\x29\xd1\xe2\x34\xb1\x5c\x2c\x15\x8a\xf1\ -\x58\x89\xb8\x50\x22\x4d\xc7\x79\xb9\x52\x91\x44\x21\xc9\x95\xe2\ -\x12\xe9\x7f\x32\xf1\x1f\x96\xfd\x09\x93\x77\x0d\x00\xac\x86\x4f\ -\xc0\x4e\xb6\x07\xb5\xcb\x6c\xc0\x7e\xee\x01\x02\x8b\x0e\x58\xd2\ -\x76\x00\x40\x7e\xf3\x2d\x8c\x1a\x0b\x91\x00\x10\x67\x34\x32\x79\ -\xf7\x00\x00\x93\xbf\xf9\x8f\x40\x2b\x01\x00\xcd\x97\xa4\xe3\x00\ -\x00\xbc\xe8\x18\x5c\xa8\x94\x17\x4c\xc6\x08\x00\x00\x44\xa0\x81\ -\x2a\xb0\x41\x07\x0c\xc1\x14\xac\xc0\x0e\x9c\xc1\x1d\xbc\xc0\x17\ -\x02\x61\x06\x44\x40\x0c\x24\xc0\x3c\x10\x42\x06\xe4\x80\x1c\x0a\ -\xa1\x18\x96\x41\x19\x54\xc0\x3a\xd8\x04\xb5\xb0\x03\x1a\xa0\x11\ -\x9a\xe1\x10\xb4\xc1\x31\x38\x0d\xe7\xe0\x12\x5c\x81\xeb\x70\x17\ -\x06\x60\x18\x9e\xc2\x18\xbc\x86\x09\x04\x41\xc8\x08\x13\x61\x21\ -\x3a\x88\x11\x62\x8e\xd8\x22\xce\x08\x17\x99\x8e\x04\x22\x61\x48\ -\x34\x92\x80\xa4\x20\xe9\x88\x14\x51\x22\xc5\xc8\x72\xa4\x02\xa9\ -\x42\x6a\x91\x5d\x48\x23\xf2\x2d\x72\x14\x39\x8d\x5c\x40\xfa\x90\ -\xdb\xc8\x20\x32\x8a\xfc\x8a\xbc\x47\x31\x94\x81\xb2\x51\x03\xd4\ -\x02\x75\x40\xb9\xa8\x1f\x1a\x8a\xc6\xa0\x73\xd1\x74\x34\x0f\x5d\ -\x80\x96\xa2\x6b\xd1\x1a\xb4\x1e\x3d\x80\xb6\xa2\xa7\xd1\x4b\xe8\ -\x75\x74\x00\x7d\x8a\x8e\x63\x80\xd1\x31\x0e\x66\x8c\xd9\x61\x5c\ -\x8c\x87\x45\x60\x89\x58\x1a\x26\xc7\x16\x63\xe5\x58\x35\x56\x8f\ -\x35\x63\x1d\x58\x37\x76\x15\x1b\xc0\x9e\x61\xef\x08\x24\x02\x8b\ -\x80\x13\xec\x08\x5e\x84\x10\xc2\x6c\x82\x90\x90\x47\x58\x4c\x58\ -\x43\xa8\x25\xec\x23\xb4\x12\xba\x08\x57\x09\x83\x84\x31\xc2\x27\ -\x22\x93\xa8\x4f\xb4\x25\x7a\x12\xf9\xc4\x78\x62\x3a\xb1\x90\x58\ -\x46\xac\x26\xee\x21\x1e\x21\x9e\x25\x5e\x27\x0e\x13\x5f\x93\x48\ -\x24\x0e\xc9\x92\xe4\x4e\x0a\x21\x25\x90\x32\x49\x0b\x49\x6b\x48\ -\xdb\x48\x2d\xa4\x53\xa4\x3e\xd2\x10\x69\x9c\x4c\x26\xeb\x90\x6d\ -\xc9\xde\xe4\x08\xb2\x80\xac\x20\x97\x91\xb7\x90\x0f\x90\x4f\x92\ -\xfb\xc9\xc3\xe4\xb7\x14\x3a\xc5\x88\xe2\x4c\x09\xa2\x24\x52\xa4\ -\x94\x12\x4a\x35\x65\x3f\xe5\x04\xa5\x9f\x32\x42\x99\xa0\xaa\x51\ -\xcd\xa9\x9e\xd4\x08\xaa\x88\x3a\x9f\x5a\x49\x6d\xa0\x76\x50\x2f\ -\x53\x87\xa9\x13\x34\x75\x9a\x25\xcd\x9b\x16\x43\xcb\xa4\x2d\xa3\ -\xd5\xd0\x9a\x69\x67\x69\xf7\x68\x2f\xe9\x74\xba\x09\xdd\x83\x1e\ -\x45\x97\xd0\x97\xd2\x6b\xe8\x07\xe9\xe7\xe9\x83\xf4\x77\x0c\x0d\ -\x86\x0d\x83\xc7\x48\x62\x28\x19\x6b\x19\x7b\x19\xa7\x18\xb7\x19\ -\x2f\x99\x4c\xa6\x05\xd3\x97\x99\xc8\x54\x30\xd7\x32\x1b\x99\x67\ -\x98\x0f\x98\x6f\x55\x58\x2a\xf6\x2a\x7c\x15\x91\xca\x12\x95\x3a\ -\x95\x56\x95\x7e\x95\xe7\xaa\x54\x55\x73\x55\x3f\xd5\x79\xaa\x0b\ -\x54\xab\x55\x0f\xab\x5e\x56\x7d\xa6\x46\x55\xb3\x50\xe3\xa9\x09\ -\xd4\x16\xab\xd5\xa9\x1d\x55\xbb\xa9\x36\xae\xce\x52\x77\x52\x8f\ -\x50\xcf\x51\x5f\xa3\xbe\x5f\xfd\x82\xfa\x63\x0d\xb2\x86\x85\x46\ -\xa0\x86\x48\xa3\x54\x63\xb7\xc6\x19\x8d\x21\x16\xc6\x32\x65\xf1\ -\x58\x42\xd6\x72\x56\x03\xeb\x2c\x6b\x98\x4d\x62\x5b\xb2\xf9\xec\ -\x4c\x76\x05\xfb\x1b\x76\x2f\x7b\x4c\x53\x43\x73\xaa\x66\xac\x66\ -\x91\x66\x9d\xe6\x71\xcd\x01\x0e\xc6\xb1\xe0\xf0\x39\xd9\x9c\x4a\ -\xce\x21\xce\x0d\xce\x7b\x2d\x03\x2d\x3f\x2d\xb1\xd6\x6a\xad\x66\ -\xad\x7e\xad\x37\xda\x7a\xda\xbe\xda\x62\xed\x72\xed\x16\xed\xeb\ -\xda\xef\x75\x70\x9d\x40\x9d\x2c\x9d\xf5\x3a\x6d\x3a\xf7\x75\x09\ -\xba\x36\xba\x51\xba\x85\xba\xdb\x75\xcf\xea\x3e\xd3\x63\xeb\x79\ -\xe9\x09\xf5\xca\xf5\x0e\xe9\xdd\xd1\x47\xf5\x6d\xf4\xa3\xf5\x17\ -\xea\xef\xd6\xef\xd1\x1f\x37\x30\x34\x08\x36\x90\x19\x6c\x31\x38\ -\x63\xf0\xcc\x90\x63\xe8\x6b\x98\x69\xb8\xd1\xf0\x84\xe1\xa8\x11\ -\xcb\x68\xba\x91\xc4\x68\xa3\xd1\x49\xa3\x27\xb8\x26\xee\x87\x67\ -\xe3\x35\x78\x17\x3e\x66\xac\x6f\x1c\x62\xac\x34\xde\x65\xdc\x6b\ -\x3c\x61\x62\x69\x32\xdb\xa4\xc4\xa4\xc5\xe4\xbe\x29\xcd\x94\x6b\ -\x9a\x66\xba\xd1\xb4\xd3\x74\xcc\xcc\xc8\x2c\xdc\xac\xd8\xac\xc9\ -\xec\x8e\x39\xd5\x9c\x6b\x9e\x61\xbe\xd9\xbc\xdb\xfc\x8d\x85\xa5\ -\x45\x9c\xc5\x4a\x8b\x36\x8b\xc7\x96\xda\x96\x7c\xcb\x05\x96\x4d\ -\x96\xf7\xac\x98\x56\x3e\x56\x79\x56\xf5\x56\xd7\xac\x49\xd6\x5c\ -\xeb\x2c\xeb\x6d\xd6\x57\x6c\x50\x1b\x57\x9b\x0c\x9b\x3a\x9b\xcb\ -\xb6\xa8\xad\x9b\xad\xc4\x76\x9b\x6d\xdf\x14\xe2\x14\x8f\x29\xd2\ -\x29\xf5\x53\x6e\xda\x31\xec\xfc\xec\x0a\xec\x9a\xec\x06\xed\x39\ -\xf6\x61\xf6\x25\xf6\x6d\xf6\xcf\x1d\xcc\x1c\x12\x1d\xd6\x3b\x74\ -\x3b\x7c\x72\x74\x75\xcc\x76\x6c\x70\xbc\xeb\xa4\xe1\x34\xc3\xa9\ -\xc4\xa9\xc3\xe9\x57\x67\x1b\x67\xa1\x73\x9d\xf3\x35\x17\xa6\x4b\ -\x90\xcb\x12\x97\x76\x97\x17\x53\x6d\xa7\x8a\xa7\x6e\x9f\x7a\xcb\ -\x95\xe5\x1a\xee\xba\xd2\xb5\xd3\xf5\xa3\x9b\xbb\x9b\xdc\xad\xd9\ -\x6d\xd4\xdd\xcc\x3d\xc5\x7d\xab\xfb\x4d\x2e\x9b\x1b\xc9\x5d\xc3\ -\x3d\xef\x41\xf4\xf0\xf7\x58\xe2\x71\xcc\xe3\x9d\xa7\x9b\xa7\xc2\ -\xf3\x90\xe7\x2f\x5e\x76\x5e\x59\x5e\xfb\xbd\x1e\x4f\xb3\x9c\x26\ -\x9e\xd6\x30\x6d\xc8\xdb\xc4\x5b\xe0\xbd\xcb\x7b\x60\x3a\x3e\x3d\ -\x65\xfa\xce\xe9\x03\x3e\xc6\x3e\x02\x9f\x7a\x9f\x87\xbe\xa6\xbe\ -\x22\xdf\x3d\xbe\x23\x7e\xd6\x7e\x99\x7e\x07\xfc\x9e\xfb\x3b\xfa\ -\xcb\xfd\x8f\xf8\xbf\xe1\x79\xf2\x16\xf1\x4e\x05\x60\x01\xc1\x01\ -\xe5\x01\xbd\x81\x1a\x81\xb3\x03\x6b\x03\x1f\x04\x99\x04\xa5\x07\ -\x35\x05\x8d\x05\xbb\x06\x2f\x0c\x3e\x15\x42\x0c\x09\x0d\x59\x1f\ -\x72\x93\x6f\xc0\x17\xf2\x1b\xf9\x63\x33\xdc\x67\x2c\x9a\xd1\x15\ -\xca\x08\x9d\x15\x5a\x1b\xfa\x30\xcc\x26\x4c\x1e\xd6\x11\x8e\x86\ -\xcf\x08\xdf\x10\x7e\x6f\xa6\xf9\x4c\xe9\xcc\xb6\x08\x88\xe0\x47\ -\x6c\x88\xb8\x1f\x69\x19\x99\x17\xf9\x7d\x14\x29\x2a\x32\xaa\x2e\ -\xea\x51\xb4\x53\x74\x71\x74\xf7\x2c\xd6\xac\xe4\x59\xfb\x67\xbd\ -\x8e\xf1\x8f\xa9\x8c\xb9\x3b\xdb\x6a\xb6\x72\x76\x67\xac\x6a\x6c\ -\x52\x6c\x63\xec\x9b\xb8\x80\xb8\xaa\xb8\x81\x78\x87\xf8\x45\xf1\ -\x97\x12\x74\x13\x24\x09\xed\x89\xe4\xc4\xd8\xc4\x3d\x89\xe3\x73\ -\x02\xe7\x6c\x9a\x33\x9c\xe4\x9a\x54\x96\x74\x63\xae\xe5\xdc\xa2\ -\xb9\x17\xe6\xe9\xce\xcb\x9e\x77\x3c\x59\x35\x59\x90\x7c\x38\x85\ -\x98\x12\x97\xb2\x3f\xe5\x83\x20\x42\x50\x2f\x18\x4f\xe5\xa7\x6e\ -\x4d\x1d\x13\xf2\x84\x9b\x85\x4f\x45\xbe\xa2\x8d\xa2\x51\xb1\xb7\ -\xb8\x4a\x3c\x92\xe6\x9d\x56\x95\xf6\x38\xdd\x3b\x7d\x43\xfa\x68\ -\x86\x4f\x46\x75\xc6\x33\x09\x4f\x52\x2b\x79\x91\x19\x92\xb9\x23\ -\xf3\x4d\x56\x44\xd6\xde\xac\xcf\xd9\x71\xd9\x2d\x39\x94\x9c\x94\ -\x9c\xa3\x52\x0d\x69\x96\xb4\x2b\xd7\x30\xb7\x28\xb7\x4f\x66\x2b\ -\x2b\x93\x0d\xe4\x79\xe6\x6d\xca\x1b\x93\x87\xca\xf7\xe4\x23\xf9\ -\x73\xf3\xdb\x15\x6c\x85\x4c\xd1\xa3\xb4\x52\xae\x50\x0e\x16\x4c\ -\x2f\xa8\x2b\x78\x5b\x18\x5b\x78\xb8\x48\xbd\x48\x5a\xd4\x33\xdf\ -\x66\xfe\xea\xf9\x23\x0b\x82\x16\x7c\xbd\x90\xb0\x50\xb8\xb0\xb3\ -\xd8\xb8\x78\x59\xf1\xe0\x22\xbf\x45\xbb\x16\x23\x8b\x53\x17\x77\ -\x2e\x31\x5d\x52\xba\x64\x78\x69\xf0\xd2\x7d\xcb\x68\xcb\xb2\x96\ -\xfd\x50\xe2\x58\x52\x55\xf2\x6a\x79\xdc\xf2\x8e\x52\x83\xd2\xa5\ -\xa5\x43\x2b\x82\x57\x34\x95\xa9\x94\xc9\xcb\x6e\xae\xf4\x5a\xb9\ -\x63\x15\x61\x95\x64\x55\xef\x6a\x97\xd5\x5b\x56\x7f\x2a\x17\x95\ -\x5f\xac\x70\xac\xa8\xae\xf8\xb0\x46\xb8\xe6\xe2\x57\x4e\x5f\xd5\ -\x7c\xf5\x79\x6d\xda\xda\xde\x4a\xb7\xca\xed\xeb\x48\xeb\xa4\xeb\ -\x6e\xac\xf7\x59\xbf\xaf\x4a\xbd\x6a\x41\xd5\xd0\x86\xf0\x0d\xad\ -\x1b\xf1\x8d\xe5\x1b\x5f\x6d\x4a\xde\x74\xa1\x7a\x6a\xf5\x8e\xcd\ -\xb4\xcd\xca\xcd\x03\x35\x61\x35\xed\x5b\xcc\xb6\xac\xdb\xf2\xa1\ -\x36\xa3\xf6\x7a\x9d\x7f\x5d\xcb\x56\xfd\xad\xab\xb7\xbe\xd9\x26\ -\xda\xd6\xbf\xdd\x77\x7b\xf3\x0e\x83\x1d\x15\x3b\xde\xef\x94\xec\ -\xbc\xb5\x2b\x78\x57\x6b\xbd\x45\x7d\xf5\x6e\xd2\xee\x82\xdd\x8f\ -\x1a\x62\x1b\xba\xbf\xe6\x7e\xdd\xb8\x47\x77\x4f\xc5\x9e\x8f\x7b\ -\xa5\x7b\x07\xf6\x45\xef\xeb\x6a\x74\x6f\x6c\xdc\xaf\xbf\xbf\xb2\ -\x09\x6d\x52\x36\x8d\x1e\x48\x3a\x70\xe5\x9b\x80\x6f\xda\x9b\xed\ -\x9a\x77\xb5\x70\x5a\x2a\x0e\xc2\x41\xe5\xc1\x27\xdf\xa6\x7c\x7b\ -\xe3\x50\xe8\xa1\xce\xc3\xdc\xc3\xcd\xdf\x99\x7f\xb7\xf5\x08\xeb\ -\x48\x79\x2b\xd2\x3a\xbf\x75\xac\x2d\xa3\x6d\xa0\x3d\xa1\xbd\xef\ -\xe8\x8c\xa3\x9d\x1d\x5e\x1d\x47\xbe\xb7\xff\x7e\xef\x31\xe3\x63\ -\x75\xc7\x35\x8f\x57\x9e\xa0\x9d\x28\x3d\xf1\xf9\xe4\x82\x93\xe3\ -\xa7\x64\xa7\x9e\x9d\x4e\x3f\x3d\xd4\x99\xdc\x79\xf7\x4c\xfc\x99\ -\x6b\x5d\x51\x5d\xbd\x67\x43\xcf\x9e\x3f\x17\x74\xee\x4c\xb7\x5f\ -\xf7\xc9\xf3\xde\xe7\x8f\x5d\xf0\xbc\x70\xf4\x22\xf7\x62\xdb\x25\ -\xb7\x4b\xad\x3d\xae\x3d\x47\x7e\x70\xfd\xe1\x48\xaf\x5b\x6f\xeb\ -\x65\xf7\xcb\xed\x57\x3c\xae\x74\xf4\x4d\xeb\x3b\xd1\xef\xd3\x7f\ -\xfa\x6a\xc0\xd5\x73\xd7\xf8\xd7\x2e\x5d\x9f\x79\xbd\xef\xc6\xec\ -\x1b\xb7\x6e\x26\xdd\x1c\xb8\x25\xba\xf5\xf8\x76\xf6\xed\x17\x77\ -\x0a\xee\x4c\xdc\x5d\x7a\x8f\x78\xaf\xfc\xbe\xda\xfd\xea\x07\xfa\ -\x0f\xea\x7f\xb4\xfe\xb1\x65\xc0\x6d\xe0\xf8\x60\xc0\x60\xcf\xc3\ -\x59\x0f\xef\x0e\x09\x87\x9e\xfe\x94\xff\xd3\x87\xe1\xd2\x47\xcc\ -\x47\xd5\x23\x46\x23\x8d\x8f\x9d\x1f\x1f\x1b\x0d\x1a\xbd\xf2\x64\ -\xce\x93\xe1\xa7\xb2\xa7\x13\xcf\xca\x7e\x56\xff\x79\xeb\x73\xab\ -\xe7\xdf\xfd\xe2\xfb\x4b\xcf\x58\xfc\xd8\xf0\x0b\xf9\x8b\xcf\xbf\ -\xae\x79\xa9\xf3\x72\xef\xab\xa9\xaf\x3a\xc7\x23\xc7\x1f\xbc\xce\ -\x79\x3d\xf1\xa6\xfc\xad\xce\xdb\x7d\xef\xb8\xef\xba\xdf\xc7\xbd\ -\x1f\x99\x28\xfc\x40\xfe\x50\xf3\xd1\xfa\x63\xc7\xa7\xd0\x4f\xf7\ -\x3e\xe7\x7c\xfe\xfc\x2f\xf7\x84\xf3\xfb\x25\xd2\x9f\x33\x00\x00\ -\x00\x20\x63\x48\x52\x4d\x00\x00\x7a\x25\x00\x00\x80\x83\x00\x00\ -\xf9\xff\x00\x00\x80\xe9\x00\x00\x75\x30\x00\x00\xea\x60\x00\x00\ -\x3a\x98\x00\x00\x17\x6f\x92\x5f\xc5\x46\x00\x00\x06\x13\x49\x44\ -\x41\x54\x78\xda\x7c\x95\x5b\x6c\x5c\x57\x19\x85\xbf\x7d\x3b\xb7\ -\xb9\x7a\x3c\x71\xaa\x26\xb1\x6b\xc2\xa5\xa1\x4d\x2a\x54\x4b\x95\ -\x10\x08\x51\x84\x28\x7d\xa0\x34\x41\x7e\x2b\x3c\x52\x21\x52\x11\ -\x10\x15\xb4\x95\x08\xe2\x01\x41\xa1\xa5\x7d\xe4\x52\x40\x3c\x04\ -\x90\x0a\x52\x40\x02\xb5\x2f\xa4\xa2\x28\xa1\x42\x4a\x1c\x27\x6d\ -\x73\xa9\x62\xc7\x1e\xcf\xd8\x33\xbe\xcc\x78\xae\xe7\xec\xb3\x79\ -\x18\x7b\x92\x12\x89\x2d\x6d\xe9\x3c\x9c\xad\xf5\xff\x6b\xfd\x6b\ -\xfd\xc2\x39\x87\xb5\x96\xdd\xe3\x9c\x43\x08\x31\xfa\xde\x3d\x52\ -\x4a\x1a\x8d\xc6\x43\xef\xbe\x7b\xf5\x68\x92\xd8\x87\x8a\xc5\xc2\ -\x5a\x71\xac\x70\xae\xbc\xa7\xfc\x7a\x26\x8a\x2e\xa4\x36\xbd\xfd\ -\x7f\x01\x38\xad\x35\xe2\xff\x00\x08\xb7\xf3\x42\x29\x45\xbd\xde\ -\xf8\xfc\xdc\xdc\xc5\x57\xb7\xdb\xed\x70\x7c\xbc\xc4\x78\x79\x9c\ -\x6c\x36\x83\x92\xb2\xab\x95\xfe\x45\x18\x86\x2f\x46\x51\x74\x03\ -\x20\x4d\x1d\xe0\x30\xc6\x20\xb9\xf3\x08\x40\x03\x52\x08\x81\x10\ -\x02\xe7\x9c\x59\xa9\x56\x9f\x4b\x6c\x1a\x4e\x4c\xec\xa5\x58\x2c\ -\x12\x46\x01\x41\x18\x52\x2e\xef\x09\x4b\xa5\xd2\x53\xfd\x7e\xff\ -\xad\x46\xa3\xf1\xc5\xe1\x1b\xe4\x0e\x09\xef\x07\x70\xce\x69\x60\ -\x1f\xe0\x00\xbb\x5b\xfd\x8d\x85\xc5\xef\xdd\x5c\xaa\x7c\x3c\x9b\ -\xcd\x10\x45\x21\x41\x10\x20\x85\x04\xe7\xb0\x49\x82\x94\x92\x72\ -\xb9\x5c\x0e\x82\xe0\x4f\x2b\x2b\x2b\x3f\x91\x52\xa6\x4a\xca\x3b\ -\x00\x84\x10\xc2\x17\x42\xb4\x00\xeb\x9c\x43\x29\xc5\x5a\xbd\xf1\ -\xa9\x77\xde\xb9\xf2\x74\x14\x06\xe4\xf3\x79\xc2\xc8\xc7\x78\x1a\ -\xcf\xf3\xf0\x7d\x1f\xad\x35\x00\x49\x92\x90\xcb\xe5\xc4\xe2\xd2\ -\xd2\xb7\xae\x5c\xbd\xf6\x0d\x21\xd5\x9d\x1d\x00\x1d\x60\x6b\x57\ -\x87\x5e\xaf\x97\x9b\xbf\x38\xff\xb2\x94\xc2\x64\xb3\x59\x84\x04\ -\x63\x0c\xc6\x98\x21\x80\xe7\xa1\x94\xc2\x39\x47\x1c\xc7\xdc\x58\ -\x58\xa0\xd7\xeb\x71\xfd\xfa\x7b\xcf\x76\xbb\xbd\xc9\xff\x05\x70\ -\x3b\x97\x5d\x6a\xae\x5d\x7f\xef\xfb\xcd\x56\xeb\x48\xa1\x50\xc0\ -\xf7\x7d\x7c\xdf\x1b\x01\xf8\x9e\x8f\x94\x0a\x21\x04\xd6\x5a\xda\ -\x9d\x36\xd5\x5a\x95\x24\xb1\x08\x21\xcb\x95\x4a\xe5\x33\xec\x88\ -\xf9\x7e\x85\x85\x18\x52\xb3\x56\x7f\xe4\xda\xb5\xeb\x27\x4a\xa5\ -\x12\xb9\x5c\x0e\xdf\xf7\xf1\x3c\x8d\xd2\x0a\xcf\xf3\x30\x5a\xa1\ -\x84\x20\x4d\x53\xfa\xfd\x3e\xb5\xd5\x55\x3a\x9d\x1e\x02\x41\x36\ -\x9b\xa1\xd5\xda\x9e\x1a\x01\xec\xce\xfd\x2e\x97\xfd\x41\xfc\xc9\ -\xf9\xf9\x4b\xbf\x33\xc6\x50\x28\x14\x50\x5a\xa1\x8d\x1c\x55\xee\ -\x1b\x83\x94\x0a\x84\x60\x10\x0f\x68\xac\x37\x58\x5d\x5d\x03\x37\ -\xec\x3c\x8a\x22\xca\xe5\xf2\xcd\x11\x40\xb5\x56\xbb\x8d\x27\xe7\ -\x2d\x2e\x2c\x3d\xbb\xd5\xdc\x2e\xef\xdf\x7f\x37\x9e\x19\x72\x6d\ -\x3c\x83\x67\x0c\xbe\xf1\x50\x4a\x23\x85\xc0\xa6\x29\x9d\x76\x87\ -\x6a\x75\x95\xd4\x0e\xfd\xa4\xb5\x62\xcf\x44\x79\xe9\xae\xbb\x26\ -\x5e\x1b\x01\xac\xaf\x6f\x8d\xe8\x89\x93\xc1\xf3\xb5\x5a\xed\x73\ -\xa5\x52\x89\x4c\x14\x61\x3c\x8d\x36\x0a\xa3\x0d\xc6\x78\x68\xa5\ -\x87\xde\x00\xe2\xc1\x80\x5a\xad\x46\xb3\xd5\x44\x20\xd1\x5a\x33\ -\x5e\x1e\xa7\x58\x2c\x7c\xcd\xc1\xcd\x91\xc8\xa9\x4d\x48\x6d\x82\ -\xc0\xcd\x34\xea\x8d\x27\x83\x20\xa0\x90\x2f\x20\x94\x44\x1b\x85\ -\xd6\x1a\x6d\x0c\xc6\x68\xa4\x92\x23\x61\x37\xb7\x36\xa9\xd5\x56\ -\xc1\x0d\xb5\x88\xa2\x08\xa3\xcd\x1b\xdd\x6e\xf7\x2f\xeb\xeb\xeb\ -\x8c\x3a\x70\xc2\x11\x85\x21\x83\xfe\xe0\xbb\x42\xe0\x4d\x4e\x1e\ -\x60\x6c\xac\x88\x90\x02\xe7\x86\x96\xf7\xb4\x41\x2a\x35\xd2\xab\ -\xd7\xef\xb1\x52\xad\xd2\xeb\x75\x11\x42\x12\x86\x11\x52\xca\x7e\ -\xab\xd5\x7c\xc6\x91\x62\xad\x65\xef\xc4\xc4\x10\x20\xf4\x43\xde\ -\xbe\x7c\xe5\x3b\x67\xce\x9c\x39\x6a\xd3\x94\xa9\xc9\x03\x1c\x7e\ -\xe0\x7e\x66\x66\x1e\x24\x9f\xcb\xe3\xd2\x61\x90\x39\xe7\x10\x08\ -\xe2\x38\x66\xad\xd1\x60\x6d\xb5\x0e\x48\x7c\x3f\xa4\x50\x28\xd0\ -\x6c\x6d\xfd\x2c\x4d\xed\x9b\xad\xed\x16\x61\x18\xde\xea\xe0\xfc\ -\xf9\x0b\xc7\x5f\xf8\xe9\x4b\x3f\xdc\xdc\xdc\xa0\xdb\xeb\xd2\xeb\ -\xf5\x30\xc6\xe3\xde\x43\xf7\xf2\x95\x2f\x3f\xc1\xec\xec\x31\x7c\ -\xdf\x03\x20\x8e\x63\x9a\xad\x26\x37\x17\x6f\x32\x18\xc4\x04\x41\ -\x40\x26\x13\xd1\xef\x77\xaf\x77\xbb\x9d\x17\xd3\x34\x25\x97\xcb\ -\x31\x3d\x3d\x7d\xcb\xc9\x57\xaf\x5c\xfd\x6c\x92\xc4\xe4\x72\x39\ -\xf2\xb9\x3c\xc5\x62\x11\xe3\x19\xe6\xe6\xe6\xf8\xfa\xf1\xa7\x38\ -\x7a\x6c\x96\x0b\x73\x17\x87\x15\x69\x4d\xad\xb6\xca\xe6\xc6\x26\ -\x9e\xe7\x91\xcf\xe7\xf1\x03\x8f\xed\x76\xfb\x47\x40\x2d\x08\x02\ -\xa6\xa6\xa6\x50\xea\xb6\xa8\xc8\xe7\x0b\xe7\xb4\xd6\x23\x97\x9a\ -\x9d\x71\xcc\xe7\xf3\x8c\x97\x4a\x9c\x3b\xf7\x16\x8f\x3f\xfe\x25\ -\x4e\x9d\xfa\x03\xdd\x5e\x8f\xed\xf6\x36\x41\x10\x92\xcd\xe5\x88\ -\x32\x01\xed\xed\xf6\x1b\xd6\xa6\xbf\x14\x42\xb1\x6f\xdf\x7e\x32\ -\x99\x88\x34\x4d\x6f\x51\x34\x39\x35\xf9\xdb\x7d\xfb\xee\x3e\xbe\ -\xbc\x5c\xd9\xeb\xfb\x3e\xce\x39\xa4\x90\x28\x6b\x49\x55\x4a\x79\ -\xdc\xa3\x37\x18\x70\xe2\x9b\xdf\xe6\xfc\xdc\x05\x1e\x7b\xec\x0b\ -\x3b\xd4\x84\x58\x6b\xf9\xfb\xd8\xbf\xff\x75\x63\x72\xb5\xd6\xb0\ -\x5b\x7b\x36\x92\x26\x9b\xf5\xe6\xe6\x4a\x52\x7f\xba\x5b\xeb\xfd\ -\x4a\x9d\x3c\x79\x92\xa5\x4a\xa5\x99\xcd\x64\xe3\xcb\x97\x2e\x3f\ -\xb2\x9b\xa2\xbb\x91\x21\xa5\x44\x0a\x85\xb7\x33\xa6\x73\x17\x2e\ -\x72\x60\xff\x7e\x3e\xf4\x91\x0f\x12\x45\x21\xad\x56\xeb\xb5\x3f\ -\x97\xde\x9c\x5d\x88\x57\x0a\x57\x06\x37\xa8\x26\x75\x36\xd2\x56\ -\xb0\xdd\x6b\x3f\x9a\xb4\x06\x6f\xcb\x9d\x45\xc0\xa1\xfb\x0e\xbd\ -\xf4\xf0\xc3\x9f\x7e\x41\xed\x04\x58\x10\x04\xb7\x5d\x1f\xdf\xf3\ -\xc8\x84\x19\x02\x3f\xe0\xf4\xe9\xbf\xa2\xb5\x26\x4d\xd3\x41\x92\ -\x24\x3f\x58\x8c\xab\xe1\xb5\xc1\x22\x95\x78\x8d\x8d\xb4\xc9\x76\ -\x7f\x9b\xb4\x3e\x50\x54\xe3\xa3\x7a\xb4\x26\x81\x07\x67\x66\x9e\ -\x03\x91\x39\x7b\xf6\xec\x57\x3b\x9d\xce\x50\x0b\xdf\xc7\x5a\x4b\ -\x6a\x2d\x36\x4d\x31\x9e\xa1\xbe\xd6\x60\x7e\x6e\x9e\xfb\x0e\x7f\ -\xf4\x37\xc6\x98\x7f\x2e\xda\x15\xb6\x5c\x7b\xb8\x0b\x01\x3a\x29\ -\x54\x63\xd8\xb0\x6a\x98\xa6\x4e\xe0\x1c\x44\x61\xd8\x3d\x7c\xf8\ -\xfe\x27\x33\xd9\xcc\x3f\xe6\xe7\xe7\x7f\x5c\xab\xd6\x0e\x24\x49\ -\x82\xe7\x79\x23\xf7\x0e\x23\x45\xb2\x5c\xa9\xb4\x1e\xf8\xd8\x91\ -\x97\x33\x99\x0c\xf5\x66\x63\xc0\xc0\x79\x08\x01\xb1\x83\xa5\x3e\ -\x2c\xf4\xc1\x72\x5a\x8f\x36\x01\xa0\x94\x94\x99\x6c\xc6\xdd\x33\ -\x7d\xcf\xef\xc7\x4a\x63\x7f\x5b\x5e\x5e\x3e\x56\xa9\x54\x9e\x68\ -\x34\xd6\x3f\xd1\xe9\x74\x34\x42\x80\x73\x4c\x1f\x9c\xee\x1c\x39\ -\x72\xf8\x84\x10\xe2\x12\x00\xf5\xe4\x38\xeb\xf6\x79\x7a\x69\x9e\ -\x96\x85\x5a\xdc\x21\x71\xcf\x10\xc8\x53\xc3\xb8\x96\x6e\x37\x49\ -\x85\xe7\x69\xa1\xb5\xb6\xc5\x62\x71\x2b\x08\x82\x57\xc6\xc6\xc6\ -\x5e\xe9\xf7\x07\x33\x4a\xc9\x47\x85\xe4\xc3\xc5\x42\x71\xf3\xe0\ -\xc1\x0f\xfc\xba\x38\x56\xf8\x4f\x62\x13\xb4\xd2\x60\xf9\x39\x6d\ -\xbb\xca\x5a\x3c\x4b\xd3\x2a\xfa\xee\x55\x3c\xf1\x47\x80\xff\x0e\ -\x00\x69\xa1\xc1\x0e\x0c\xfa\xb2\x23\x00\x00\x00\x00\x49\x45\x4e\ -\x44\xae\x42\x60\x82\ -\x00\x00\x0d\x2a\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\ -\x01\x00\x9a\x9c\x18\x00\x00\x0a\x4f\x69\x43\x43\x50\x50\x68\x6f\ -\x74\x6f\x73\x68\x6f\x70\x20\x49\x43\x43\x20\x70\x72\x6f\x66\x69\ -\x6c\x65\x00\x00\x78\xda\x9d\x53\x67\x54\x53\xe9\x16\x3d\xf7\xde\ -\xf4\x42\x4b\x88\x80\x94\x4b\x6f\x52\x15\x08\x20\x52\x42\x8b\x80\ -\x14\x91\x26\x2a\x21\x09\x10\x4a\x88\x21\xa1\xd9\x15\x51\xc1\x11\ -\x45\x45\x04\x1b\xc8\xa0\x88\x03\x8e\x8e\x80\x8c\x15\x51\x2c\x0c\ -\x8a\x0a\xd8\x07\xe4\x21\xa2\x8e\x83\xa3\x88\x8a\xca\xfb\xe1\x7b\ -\xa3\x6b\xd6\xbc\xf7\xe6\xcd\xfe\xb5\xd7\x3e\xe7\xac\xf3\x9d\xb3\ -\xcf\x07\xc0\x08\x0c\x96\x48\x33\x51\x35\x80\x0c\xa9\x42\x1e\x11\ -\xe0\x83\xc7\xc4\xc6\xe1\xe4\x2e\x40\x81\x0a\x24\x70\x00\x10\x08\ -\xb3\x64\x21\x73\xfd\x23\x01\x00\xf8\x7e\x3c\x3c\x2b\x22\xc0\x07\ -\xbe\x00\x01\x78\xd3\x0b\x08\x00\xc0\x4d\x9b\xc0\x30\x1c\x87\xff\ -\x0f\xea\x42\x99\x5c\x01\x80\x84\x01\xc0\x74\x91\x38\x4b\x08\x80\ -\x14\x00\x40\x7a\x8e\x42\xa6\x00\x40\x46\x01\x80\x9d\x98\x26\x53\ -\x00\xa0\x04\x00\x60\xcb\x63\x62\xe3\x00\x50\x2d\x00\x60\x27\x7f\ -\xe6\xd3\x00\x80\x9d\xf8\x99\x7b\x01\x00\x5b\x94\x21\x15\x01\xa0\ -\x91\x00\x20\x13\x65\x88\x44\x00\x68\x3b\x00\xac\xcf\x56\x8a\x45\ -\x00\x58\x30\x00\x14\x66\x4b\xc4\x39\x00\xd8\x2d\x00\x30\x49\x57\ -\x66\x48\x00\xb0\xb7\x00\xc0\xce\x10\x0b\xb2\x00\x08\x0c\x00\x30\ -\x51\x88\x85\x29\x00\x04\x7b\x00\x60\xc8\x23\x23\x78\x00\x84\x99\ -\x00\x14\x46\xf2\x57\x3c\xf1\x2b\xae\x10\xe7\x2a\x00\x00\x78\x99\ -\xb2\x3c\xb9\x24\x39\x45\x81\x5b\x08\x2d\x71\x07\x57\x57\x2e\x1e\ -\x28\xce\x49\x17\x2b\x14\x36\x61\x02\x61\x9a\x40\x2e\xc2\x79\x99\ -\x19\x32\x81\x34\x0f\xe0\xf3\xcc\x00\x00\xa0\x91\x15\x11\xe0\x83\ -\xf3\xfd\x78\xce\x0e\xae\xce\xce\x36\x8e\xb6\x0e\x5f\x2d\xea\xbf\ -\x06\xff\x22\x62\x62\xe3\xfe\xe5\xcf\xab\x70\x40\x00\x00\xe1\x74\ -\x7e\xd1\xfe\x2c\x2f\xb3\x1a\x80\x3b\x06\x80\x6d\xfe\xa2\x25\xee\ -\x04\x68\x5e\x0b\xa0\x75\xf7\x8b\x66\xb2\x0f\x40\xb5\x00\xa0\xe9\ -\xda\x57\xf3\x70\xf8\x7e\x3c\x3c\x45\xa1\x90\xb9\xd9\xd9\xe5\xe4\ -\xe4\xd8\x4a\xc4\x42\x5b\x61\xca\x57\x7d\xfe\x67\xc2\x5f\xc0\x57\ -\xfd\x6c\xf9\x7e\x3c\xfc\xf7\xf5\xe0\xbe\xe2\x24\x81\x32\x5d\x81\ -\x47\x04\xf8\xe0\xc2\xcc\xf4\x4c\xa5\x1c\xcf\x92\x09\x84\x62\xdc\ -\xe6\x8f\x47\xfc\xb7\x0b\xff\xfc\x1d\xd3\x22\xc4\x49\x62\xb9\x58\ -\x2a\x14\xe3\x51\x12\x71\x8e\x44\x9a\x8c\xf3\x32\xa5\x22\x89\x42\ -\x92\x29\xc5\x25\xd2\xff\x64\xe2\xdf\x2c\xfb\x03\x3e\xdf\x35\x00\ -\xb0\x6a\x3e\x01\x7b\x91\x2d\xa8\x5d\x63\x03\xf6\x4b\x27\x10\x58\ -\x74\xc0\xe2\xf7\x00\x00\xf2\xbb\x6f\xc1\xd4\x28\x08\x03\x80\x68\ -\x83\xe1\xcf\x77\xff\xef\x3f\xfd\x47\xa0\x25\x00\x80\x66\x49\x92\ -\x71\x00\x00\x5e\x44\x24\x2e\x54\xca\xb3\x3f\xc7\x08\x00\x00\x44\ -\xa0\x81\x2a\xb0\x41\x1b\xf4\xc1\x18\x2c\xc0\x06\x1c\xc1\x05\xdc\ -\xc1\x0b\xfc\x60\x36\x84\x42\x24\xc4\xc2\x42\x10\x42\x0a\x64\x80\ -\x1c\x72\x60\x29\xac\x82\x42\x28\x86\xcd\xb0\x1d\x2a\x60\x2f\xd4\ -\x40\x1d\x34\xc0\x51\x68\x86\x93\x70\x0e\x2e\xc2\x55\xb8\x0e\x3d\ -\x70\x0f\xfa\x61\x08\x9e\xc1\x28\xbc\x81\x09\x04\x41\xc8\x08\x13\ -\x61\x21\xda\x88\x01\x62\x8a\x58\x23\x8e\x08\x17\x99\x85\xf8\x21\ -\xc1\x48\x04\x12\x8b\x24\x20\xc9\x88\x14\x51\x22\x4b\x91\x35\x48\ -\x31\x52\x8a\x54\x20\x55\x48\x1d\xf2\x3d\x72\x02\x39\x87\x5c\x46\ -\xba\x91\x3b\xc8\x00\x32\x82\xfc\x86\xbc\x47\x31\x94\x81\xb2\x51\ -\x3d\xd4\x0c\xb5\x43\xb9\xa8\x37\x1a\x84\x46\xa2\x0b\xd0\x64\x74\ -\x31\x9a\x8f\x16\xa0\x9b\xd0\x72\xb4\x1a\x3d\x8c\x36\xa1\xe7\xd0\ -\xab\x68\x0f\xda\x8f\x3e\x43\xc7\x30\xc0\xe8\x18\x07\x33\xc4\x6c\ -\x30\x2e\xc6\xc3\x42\xb1\x38\x2c\x09\x93\x63\xcb\xb1\x22\xac\x0c\ -\xab\xc6\x1a\xb0\x56\xac\x03\xbb\x89\xf5\x63\xcf\xb1\x77\x04\x12\ -\x81\x45\xc0\x09\x36\x04\x77\x42\x20\x61\x1e\x41\x48\x58\x4c\x58\ -\x4e\xd8\x48\xa8\x20\x1c\x24\x34\x11\xda\x09\x37\x09\x03\x84\x51\ -\xc2\x27\x22\x93\xa8\x4b\xb4\x26\xba\x11\xf9\xc4\x18\x62\x32\x31\ -\x87\x58\x48\x2c\x23\xd6\x12\x8f\x13\x2f\x10\x7b\x88\x43\xc4\x37\ -\x24\x12\x89\x43\x32\x27\xb9\x90\x02\x49\xb1\xa4\x54\xd2\x12\xd2\ -\x46\xd2\x6e\x52\x23\xe9\x2c\xa9\x9b\x34\x48\x1a\x23\x93\xc9\xda\ -\x64\x6b\xb2\x07\x39\x94\x2c\x20\x2b\xc8\x85\xe4\x9d\xe4\xc3\xe4\ -\x33\xe4\x1b\xe4\x21\xf2\x5b\x0a\x9d\x62\x40\x71\xa4\xf8\x53\xe2\ -\x28\x52\xca\x6a\x4a\x19\xe5\x10\xe5\x34\xe5\x06\x65\x98\x32\x41\ -\x55\xa3\x9a\x52\xdd\xa8\xa1\x54\x11\x35\x8f\x5a\x42\xad\xa1\xb6\ -\x52\xaf\x51\x87\xa8\x13\x34\x75\x9a\x39\xcd\x83\x16\x49\x4b\xa5\ -\xad\xa2\x95\xd3\x1a\x68\x17\x68\xf7\x69\xaf\xe8\x74\xba\x11\xdd\ -\x95\x1e\x4e\x97\xd0\x57\xd2\xcb\xe9\x47\xe8\x97\xe8\x03\xf4\x77\ -\x0c\x0d\x86\x15\x83\xc7\x88\x67\x28\x19\x9b\x18\x07\x18\x67\x19\ -\x77\x18\xaf\x98\x4c\xa6\x19\xd3\x8b\x19\xc7\x54\x30\x37\x31\xeb\ -\x98\xe7\x99\x0f\x99\x6f\x55\x58\x2a\xb6\x2a\x7c\x15\x91\xca\x0a\ -\x95\x4a\x95\x26\x95\x1b\x2a\x2f\x54\xa9\xaa\xa6\xaa\xde\xaa\x0b\ -\x55\xf3\x55\xcb\x54\x8f\xa9\x5e\x53\x7d\xae\x46\x55\x33\x53\xe3\ -\xa9\x09\xd4\x96\xab\x55\xaa\x9d\x50\xeb\x53\x1b\x53\x67\xa9\x3b\ -\xa8\x87\xaa\x67\xa8\x6f\x54\x3f\xa4\x7e\x59\xfd\x89\x06\x59\xc3\ -\x4c\xc3\x4f\x43\xa4\x51\xa0\xb1\x5f\xe3\xbc\xc6\x20\x0b\x63\x19\ -\xb3\x78\x2c\x21\x6b\x0d\xab\x86\x75\x81\x35\xc4\x26\xb1\xcd\xd9\ -\x7c\x76\x2a\xbb\x98\xfd\x1d\xbb\x8b\x3d\xaa\xa9\xa1\x39\x43\x33\ -\x4a\x33\x57\xb3\x52\xf3\x94\x66\x3f\x07\xe3\x98\x71\xf8\x9c\x74\ -\x4e\x09\xe7\x28\xa7\x97\xf3\x7e\x8a\xde\x14\xef\x29\xe2\x29\x1b\ -\xa6\x34\x4c\xb9\x31\x65\x5c\x6b\xaa\x96\x97\x96\x58\xab\x48\xab\ -\x51\xab\x47\xeb\xbd\x36\xae\xed\xa7\x9d\xa6\xbd\x45\xbb\x59\xfb\ -\x81\x0e\x41\xc7\x4a\x27\x5c\x27\x47\x67\x8f\xce\x05\x9d\xe7\x53\ -\xd9\x53\xdd\xa7\x0a\xa7\x16\x4d\x3d\x3a\xf5\xae\x2e\xaa\x6b\xa5\ -\x1b\xa1\xbb\x44\x77\xbf\x6e\xa7\xee\x98\x9e\xbe\x5e\x80\x9e\x4c\ -\x6f\xa7\xde\x79\xbd\xe7\xfa\x1c\x7d\x2f\xfd\x54\xfd\x6d\xfa\xa7\ -\xf5\x47\x0c\x58\x06\xb3\x0c\x24\x06\xdb\x0c\xce\x18\x3c\xc5\x35\ -\x71\x6f\x3c\x1d\x2f\xc7\xdb\xf1\x51\x43\x5d\xc3\x40\x43\xa5\x61\ -\x95\x61\x97\xe1\x84\x91\xb9\xd1\x3c\xa3\xd5\x46\x8d\x46\x0f\x8c\ -\x69\xc6\x5c\xe3\x24\xe3\x6d\xc6\x6d\xc6\xa3\x26\x06\x26\x21\x26\ -\x4b\x4d\xea\x4d\xee\x9a\x52\x4d\xb9\xa6\x29\xa6\x3b\x4c\x3b\x4c\ -\xc7\xcd\xcc\xcd\xa2\xcd\xd6\x99\x35\x9b\x3d\x31\xd7\x32\xe7\x9b\ -\xe7\x9b\xd7\x9b\xdf\xb7\x60\x5a\x78\x5a\x2c\xb6\xa8\xb6\xb8\x65\ -\x49\xb2\xe4\x5a\xa6\x59\xee\xb6\xbc\x6e\x85\x5a\x39\x59\xa5\x58\ -\x55\x5a\x5d\xb3\x46\xad\x9d\xad\x25\xd6\xbb\xad\xbb\xa7\x11\xa7\ -\xb9\x4e\x93\x4e\xab\x9e\xd6\x67\xc3\xb0\xf1\xb6\xc9\xb6\xa9\xb7\ -\x19\xb0\xe5\xd8\x06\xdb\xae\xb6\x6d\xb6\x7d\x61\x67\x62\x17\x67\ -\xb7\xc5\xae\xc3\xee\x93\xbd\x93\x7d\xba\x7d\x8d\xfd\x3d\x07\x0d\ -\x87\xd9\x0e\xab\x1d\x5a\x1d\x7e\x73\xb4\x72\x14\x3a\x56\x3a\xde\ -\x9a\xce\x9c\xee\x3f\x7d\xc5\xf4\x96\xe9\x2f\x67\x58\xcf\x10\xcf\ -\xd8\x33\xe3\xb6\x13\xcb\x29\xc4\x69\x9d\x53\x9b\xd3\x47\x67\x17\ -\x67\xb9\x73\x83\xf3\x88\x8b\x89\x4b\x82\xcb\x2e\x97\x3e\x2e\x9b\ -\x1b\xc6\xdd\xc8\xbd\xe4\x4a\x74\xf5\x71\x5d\xe1\x7a\xd2\xf5\x9d\ -\x9b\xb3\x9b\xc2\xed\xa8\xdb\xaf\xee\x36\xee\x69\xee\x87\xdc\x9f\ -\xcc\x34\x9f\x29\x9e\x59\x33\x73\xd0\xc3\xc8\x43\xe0\x51\xe5\xd1\ -\x3f\x0b\x9f\x95\x30\x6b\xdf\xac\x7e\x4f\x43\x4f\x81\x67\xb5\xe7\ -\x23\x2f\x63\x2f\x91\x57\xad\xd7\xb0\xb7\xa5\x77\xaa\xf7\x61\xef\ -\x17\x3e\xf6\x3e\x72\x9f\xe3\x3e\xe3\x3c\x37\xde\x32\xde\x59\x5f\ -\xcc\x37\xc0\xb7\xc8\xb7\xcb\x4f\xc3\x6f\x9e\x5f\x85\xdf\x43\x7f\ -\x23\xff\x64\xff\x7a\xff\xd1\x00\xa7\x80\x25\x01\x67\x03\x89\x81\ -\x41\x81\x5b\x02\xfb\xf8\x7a\x7c\x21\xbf\x8e\x3f\x3a\xdb\x65\xf6\ -\xb2\xd9\xed\x41\x8c\xa0\xb9\x41\x15\x41\x8f\x82\xad\x82\xe5\xc1\ -\xad\x21\x68\xc8\xec\x90\xad\x21\xf7\xe7\x98\xce\x91\xce\x69\x0e\ -\x85\x50\x7e\xe8\xd6\xd0\x07\x61\xe6\x61\x8b\xc3\x7e\x0c\x27\x85\ -\x87\x85\x57\x86\x3f\x8e\x70\x88\x58\x1a\xd1\x31\x97\x35\x77\xd1\ -\xdc\x43\x73\xdf\x44\xfa\x44\x96\x44\xde\x9b\x67\x31\x4f\x39\xaf\ -\x2d\x4a\x35\x2a\x3e\xaa\x2e\x6a\x3c\xda\x37\xba\x34\xba\x3f\xc6\ -\x2e\x66\x59\xcc\xd5\x58\x9d\x58\x49\x6c\x4b\x1c\x39\x2e\x2a\xae\ -\x36\x6e\x6c\xbe\xdf\xfc\xed\xf3\x87\xe2\x9d\xe2\x0b\xe3\x7b\x17\ -\x98\x2f\xc8\x5d\x70\x79\xa1\xce\xc2\xf4\x85\xa7\x16\xa9\x2e\x12\ -\x2c\x3a\x96\x40\x4c\x88\x4e\x38\x94\xf0\x41\x10\x2a\xa8\x16\x8c\ -\x25\xf2\x13\x77\x25\x8e\x0a\x79\xc2\x1d\xc2\x67\x22\x2f\xd1\x36\ -\xd1\x88\xd8\x43\x5c\x2a\x1e\x4e\xf2\x48\x2a\x4d\x7a\x92\xec\x91\ -\xbc\x35\x79\x24\xc5\x33\xa5\x2c\xe5\xb9\x84\x27\xa9\x90\xbc\x4c\ -\x0d\x4c\xdd\x9b\x3a\x9e\x16\x9a\x76\x20\x6d\x32\x3d\x3a\xbd\x31\ -\x83\x92\x91\x90\x71\x42\xaa\x21\x4d\x93\xb6\x67\xea\x67\xe6\x66\ -\x76\xcb\xac\x65\x85\xb2\xfe\xc5\x6e\x8b\xb7\x2f\x1e\x95\x07\xc9\ -\x6b\xb3\x90\xac\x05\x59\x2d\x0a\xb6\x42\xa6\xe8\x54\x5a\x28\xd7\ -\x2a\x07\xb2\x67\x65\x57\x66\xbf\xcd\x89\xca\x39\x96\xab\x9e\x2b\ -\xcd\xed\xcc\xb3\xca\xdb\x90\x37\x9c\xef\x9f\xff\xed\x12\xc2\x12\ -\xe1\x92\xb6\xa5\x86\x4b\x57\x2d\x1d\x58\xe6\xbd\xac\x6a\x39\xb2\ -\x3c\x71\x79\xdb\x0a\xe3\x15\x05\x2b\x86\x56\x06\xac\x3c\xb8\x8a\ -\xb6\x2a\x6d\xd5\x4f\xab\xed\x57\x97\xae\x7e\xbd\x26\x7a\x4d\x6b\ -\x81\x5e\xc1\xca\x82\xc1\xb5\x01\x6b\xeb\x0b\x55\x0a\xe5\x85\x7d\ -\xeb\xdc\xd7\xed\x5d\x4f\x58\x2f\x59\xdf\xb5\x61\xfa\x86\x9d\x1b\ -\x3e\x15\x89\x8a\xae\x14\xdb\x17\x97\x15\x7f\xd8\x28\xdc\x78\xe5\ -\x1b\x87\x6f\xca\xbf\x99\xdc\x94\xb4\xa9\xab\xc4\xb9\x64\xcf\x66\ -\xd2\x66\xe9\xe6\xde\x2d\x9e\x5b\x0e\x96\xaa\x97\xe6\x97\x0e\x6e\ -\x0d\xd9\xda\xb4\x0d\xdf\x56\xb4\xed\xf5\xf6\x45\xdb\x2f\x97\xcd\ -\x28\xdb\xbb\x83\xb6\x43\xb9\xa3\xbf\x3c\xb8\xbc\x65\xa7\xc9\xce\ -\xcd\x3b\x3f\x54\xa4\x54\xf4\x54\xfa\x54\x36\xee\xd2\xdd\xb5\x61\ -\xd7\xf8\x6e\xd1\xee\x1b\x7b\xbc\xf6\x34\xec\xd5\xdb\x5b\xbc\xf7\ -\xfd\x3e\xc9\xbe\xdb\x55\x01\x55\x4d\xd5\x66\xd5\x65\xfb\x49\xfb\ -\xb3\xf7\x3f\xae\x89\xaa\xe9\xf8\x96\xfb\x6d\x5d\xad\x4e\x6d\x71\ -\xed\xc7\x03\xd2\x03\xfd\x07\x23\x0e\xb6\xd7\xb9\xd4\xd5\x1d\xd2\ -\x3d\x54\x52\x8f\xd6\x2b\xeb\x47\x0e\xc7\x1f\xbe\xfe\x9d\xef\x77\ -\x2d\x0d\x36\x0d\x55\x8d\x9c\xc6\xe2\x23\x70\x44\x79\xe4\xe9\xf7\ -\x09\xdf\xf7\x1e\x0d\x3a\xda\x76\x8c\x7b\xac\xe1\x07\xd3\x1f\x76\ -\x1d\x67\x1d\x2f\x6a\x42\x9a\xf2\x9a\x46\x9b\x53\x9a\xfb\x5b\x62\ -\x5b\xba\x4f\xcc\x3e\xd1\xd6\xea\xde\x7a\xfc\x47\xdb\x1f\x0f\x9c\ -\x34\x3c\x59\x79\x4a\xf3\x54\xc9\x69\xda\xe9\x82\xd3\x93\x67\xf2\ -\xcf\x8c\x9d\x95\x9d\x7d\x7e\x2e\xf9\xdc\x60\xdb\xa2\xb6\x7b\xe7\ -\x63\xce\xdf\x6a\x0f\x6f\xef\xba\x10\x74\xe1\xd2\x45\xff\x8b\xe7\ -\x3b\xbc\x3b\xce\x5c\xf2\xb8\x74\xf2\xb2\xdb\xe5\x13\x57\xb8\x57\ -\x9a\xaf\x3a\x5f\x6d\xea\x74\xea\x3c\xfe\x93\xd3\x4f\xc7\xbb\x9c\ -\xbb\x9a\xae\xb9\x5c\x6b\xb9\xee\x7a\xbd\xb5\x7b\x66\xf7\xe9\x1b\ -\x9e\x37\xce\xdd\xf4\xbd\x79\xf1\x16\xff\xd6\xd5\x9e\x39\x3d\xdd\ -\xbd\xf3\x7a\x6f\xf7\xc5\xf7\xf5\xdf\x16\xdd\x7e\x72\x27\xfd\xce\ -\xcb\xbb\xd9\x77\x27\xee\xad\xbc\x4f\xbc\x5f\xf4\x40\xed\x41\xd9\ -\x43\xdd\x87\xd5\x3f\x5b\xfe\xdc\xd8\xef\xdc\x7f\x6a\xc0\x77\xa0\ -\xf3\xd1\xdc\x47\xf7\x06\x85\x83\xcf\xfe\x91\xf5\x8f\x0f\x43\x05\ -\x8f\x99\x8f\xcb\x86\x0d\x86\xeb\x9e\x38\x3e\x39\x39\xe2\x3f\x72\ -\xfd\xe9\xfc\xa7\x43\xcf\x64\xcf\x26\x9e\x17\xfe\xa2\xfe\xcb\xae\ -\x17\x16\x2f\x7e\xf8\xd5\xeb\xd7\xce\xd1\x98\xd1\xa1\x97\xf2\x97\ -\x93\xbf\x6d\x7c\xa5\xfd\xea\xc0\xeb\x19\xaf\xdb\xc6\xc2\xc6\x1e\ -\xbe\xc9\x78\x33\x31\x5e\xf4\x56\xfb\xed\xc1\x77\xdc\x77\x1d\xef\ -\xa3\xdf\x0f\x4f\xe4\x7c\x20\x7f\x28\xff\x68\xf9\xb1\xf5\x53\xd0\ -\xa7\xfb\x93\x19\x93\x93\xff\x04\x03\x98\xf3\xfc\x63\x33\x2d\xdb\ -\x00\x00\x00\x20\x63\x48\x52\x4d\x00\x00\x7a\x25\x00\x00\x80\x83\ -\x00\x00\xf9\xff\x00\x00\x80\xe9\x00\x00\x75\x30\x00\x00\xea\x60\ -\x00\x00\x3a\x98\x00\x00\x17\x6f\x92\x5f\xc5\x46\x00\x00\x02\x55\ -\x49\x44\x41\x54\x78\xda\x5c\x91\xcd\x8a\x1d\x55\x14\x85\xbf\x53\ -\x55\xdd\xe9\x4e\x2e\x69\xcc\x03\x04\x04\xa1\x1d\x18\x15\x32\x15\ -\x1c\x05\xae\xa3\x8c\x7c\x82\x40\xc4\x51\xa4\x85\xbc\x82\x23\x07\ -\xa2\x20\x08\x3e\x84\x8e\x04\x47\x82\xe0\x30\x12\x47\x81\x06\x21\ -\xf3\x98\xee\x7b\xab\xea\xfc\xee\xbd\x1c\x54\x75\xfb\x73\xe0\x70\ -\xd8\x83\xb5\xd6\xb7\xd7\x09\xef\x9e\x7f\xcc\x9d\xfe\x36\x27\xdd\ -\x86\x5b\xdd\x31\x87\xe1\xe0\x34\x10\x1e\x1b\xfe\x61\x51\x7d\x3f\ -\xab\x10\x3d\xff\x3e\x79\xfc\x65\xf2\xf8\xed\xe8\xf3\xf9\xac\xc4\ -\xec\x89\xac\x42\x77\xd2\x6d\x38\xe9\x36\x6c\xba\x9b\xdc\x08\x87\ -\x67\x5d\xe8\x9e\x19\x7e\x96\x55\xee\x47\x4f\xfd\xec\xa9\x4f\xca\ -\xf7\x8b\xea\x59\xa5\x3d\x37\xfc\xcc\x64\x38\x8e\x10\xc3\xa6\xbb\ -\xc9\x71\x77\x74\xd8\x87\xfe\x07\xc7\xb7\xcd\x8d\xa8\xcc\xe4\x91\ -\xe8\x99\xac\x42\x55\xa3\xa8\x92\x94\x8f\xb3\xca\x97\x59\xf5\x41\ -\x51\x7d\x58\x54\xcb\x70\x18\x06\x80\xaf\x9b\xda\xb6\xaa\x11\x95\ -\xd9\xfb\xc4\xe8\x91\xe4\x99\xa2\x8a\xe1\x98\x6c\x35\x29\x44\xcf\ -\xdb\xe4\xf9\x0b\x9a\x3e\x1f\x04\xf7\x8a\xea\x23\xd3\x92\x7c\x69\ -\x23\x97\x3e\x32\xfa\x4c\x56\xc1\xb4\xa0\x0a\x61\x72\x92\x32\xd5\ -\x2a\x44\x3d\xa1\xfa\x77\x43\x51\x7d\x5c\xd5\xfa\xb4\x26\xbf\xb6\ -\x3d\x17\xb6\x23\x2a\x53\xd5\x10\x02\x20\x10\x68\x32\x54\x1d\xb2\ -\x43\xf4\x9e\xa2\x4f\x87\xd9\xd3\xd6\x30\xa2\x2f\x06\x7b\x9f\x98\ -\x95\x28\xaa\xb8\x16\xf1\xd5\x51\x5b\xc5\xb3\x43\x74\xc8\xfa\x60\ -\x18\x7d\xbe\xdb\x30\xa2\xa7\xeb\xe2\xaa\x1a\x2e\x5d\xa7\x2f\x6a\ -\xa0\x09\x8a\x20\x39\x4c\x0e\xc9\xef\x0e\x7b\x9f\x68\x18\xd9\x0b\ -\x69\x6d\xfc\x6a\xef\xff\x88\x5d\x8b\x41\x5a\xd3\x67\x83\x28\x86\ -\xbd\xcf\x2f\xab\xea\x5b\x55\x8d\x4a\xa3\x52\xd1\xff\xd0\xd1\x2a\ -\xce\x5a\xf0\xc7\xf5\x16\xbd\xec\x76\x3e\xfe\x74\xe9\x23\x3b\x9f\ -\x88\x2d\x61\xd5\xa0\x0a\x4c\xff\xa4\x96\x55\xb8\x37\xb8\x34\xb8\ -\x6c\x30\x1a\x64\xff\x35\xf0\xfc\xbd\x7b\x14\x7f\x46\x53\x4f\x13\ -\xd7\xe4\x61\x7d\x9d\xa5\xb8\xc9\xe1\xa2\xc1\x85\x2d\x46\x55\xc6\ -\x41\x78\x7b\x20\xf9\x1f\x64\xff\x86\xac\x27\xb4\x35\xf1\xca\xc4\ -\x56\x92\xb4\x22\xef\xae\xc5\x10\xf8\x8a\xa3\xee\x7c\x58\x77\x7b\ -\x4a\xf4\x53\x92\x6f\xa9\x2b\xba\xfd\xab\xf5\xec\x0b\xf2\xec\xcb\ -\x0c\x3f\x72\xdc\x3d\xe5\x46\xa0\xc3\x05\xae\x42\xd3\x47\x14\xff\ -\x8c\xd9\x47\x76\x06\xaf\x1b\xfc\xd5\xe0\x55\x85\x57\x6d\xd9\x3d\ -\xfa\x88\xeb\x13\x0e\xc2\x43\x6e\x75\xc6\xed\x9e\xc0\x6f\xef\x2c\ -\xdf\x32\x1a\xec\x1d\x26\x7b\x93\xd9\x1f\x31\xfb\x03\x92\x9f\x52\ -\x05\x55\x2f\x70\xfd\x4c\x17\xbe\xe7\x28\xfc\xc9\xa6\x87\x3b\x03\ -\xbc\x31\xf0\xf7\x00\x1f\xdf\x11\x08\xaa\x52\x16\x46\x00\x00\x00\ +\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x01\x97\x70\x0d\x6e\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\ +\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x07\x0a\x49\x44\x41\x54\x48\ +\xc7\x55\x95\x6b\x70\x5c\x65\x19\xc7\x7f\xef\x39\x67\xf7\x9c\xb3\ +\x97\x64\x2f\xd9\x96\x4d\x43\x2f\x50\xc2\x08\xd2\x32\x50\x2d\x96\ +\x62\x5b\x75\x10\x61\x04\x06\x54\x04\x01\xc5\xaa\x0c\x1f\x44\x40\ +\x40\x1c\x9d\xd1\x51\x04\xf1\x02\x32\x38\xf5\xc2\x54\x07\x66\xb4\ +\x53\x2e\x56\x40\x46\xa0\x97\x34\x09\xb1\x05\x94\xd2\x0b\xb4\x49\ +\xda\x5c\x20\xc9\xe6\xb2\xd9\x26\xdb\xec\x66\xf7\xbc\xe7\x9c\xc7\ +\x0f\x21\x01\x9e\x8f\xef\xcc\xfb\xfc\xde\xe7\x79\xfe\xff\xf7\x51\ +\x22\x82\xef\xfb\xd4\xbc\xfa\x6a\x44\x84\xb7\x0e\x1e\x96\x6a\x6d\ +\x56\x10\x11\x56\xac\x68\x95\x83\x87\x0f\x09\x5a\x6b\x3a\x3b\xbb\ +\x1e\xd2\x5a\xa3\xea\xf5\x3a\x33\xd5\x8a\x1c\x7c\xeb\x30\xc6\x45\ +\x6b\x2f\x11\xc7\x76\x58\xd2\xd2\xac\x78\x3f\x5b\xe3\xf8\x44\x71\ +\x43\x77\x6f\x8f\x78\x9e\x27\xff\xd9\xbf\x5f\x0c\x80\xf6\x8e\xce\ +\x29\x3f\xd0\x7b\xcf\x58\xbe\x82\x5d\xbb\x77\x13\xb1\xac\xf5\x06\ +\x40\xdb\xee\x8e\x3f\xdd\x70\xdd\xcd\x5c\xbc\x6e\x23\xa9\x74\x4a\ +\x7d\xc2\xdd\xfc\x2a\xbe\xef\xe3\xfb\x3e\x41\x10\x70\xe0\xc0\xc1\ +\xa7\x7d\xdf\x47\x6b\x0d\xbe\xef\x2b\xad\x35\x7b\xda\xda\xa5\x30\ +\x36\x2a\x5a\x6b\x11\x11\x0c\xa5\x94\x74\x76\x76\x4d\x2c\x5f\xb1\ +\x94\xa6\x4c\x96\xce\xae\x2e\x86\x86\x46\x36\xab\x9e\xde\x5e\x12\ +\x89\x84\x24\x12\x09\x44\x42\x0e\x1c\x38\x44\x53\x2e\xa3\xd4\xda\ +\x4f\xae\x97\xa9\xa9\x29\x3c\xdf\x63\xcb\x96\xdf\x63\x98\x86\x71\ +\xfe\xf9\xab\xc4\xb8\xff\x81\x9f\xa9\x6c\x36\x4b\xf3\xe2\x3c\x93\ +\xc5\x22\x57\x2c\xf9\x41\xb8\xf8\xa5\x75\xa2\x44\x84\x20\x08\x10\ +\x11\xa5\x94\x32\x80\xe0\xed\x77\x8e\x76\x55\x2a\xb3\xeb\xf2\x4b\ +\x16\xd1\x7c\x5a\x33\xe5\xe9\xe9\x62\x26\x93\xc9\x85\x61\x80\xc1\ +\xfb\xa1\x94\x12\xd3\x34\x83\x7f\xbd\xf8\x6f\x01\xb5\xee\xf4\xa5\ +\xcd\xe4\xb2\x39\x22\x96\x05\x8a\xa6\xdd\x6d\x7b\x65\x70\xf0\xbd\ +\x5b\x94\x88\x70\xe4\xed\x63\xf8\x81\x7e\xb4\x3c\x5d\xbe\xbd\xb9\ +\x39\x4f\xb2\x21\x41\x2a\xd9\x88\x15\xb1\xe8\xee\xe9\x61\x78\xb8\ +\x40\xbe\xf9\x34\xce\x6e\x6d\x55\x4a\x44\xb8\x68\xed\xa7\xa5\x30\ +\x3a\x42\x10\x84\x3c\xf8\xe0\x2f\xb8\xe9\xa6\xeb\xd1\x5a\xd3\xb5\ +\x6f\x1f\x5e\x5d\xd3\xd8\x98\x3c\x51\x3a\x59\x5a\x79\xc1\x05\x17\ +\xa0\x44\x84\xc7\x1e\xfb\xc3\xf7\xfe\xfe\xb7\x6d\xbf\xd3\x5a\xa3\ +\xb5\x26\x08\x43\x2a\x95\x19\x9e\xf9\xc7\x76\xea\xf5\xda\x2b\x77\ +\x2d\xda\x72\x69\x8f\x37\xc8\x74\xad\x1c\x28\x11\x61\xe7\x2b\x6d\ +\x78\xda\x53\x43\xc3\xc3\x0d\x6f\xbc\xf1\xc6\x3f\xdf\x7b\x6f\x68\ +\x63\xe8\x07\x7c\xff\x9e\x3b\xbe\xd5\xbc\x24\xbf\x75\xf5\xa1\x6b\ +\xa7\x99\xd0\x0d\x0c\x7b\x77\x2c\xcc\x6e\x7e\x66\x5a\x6b\xc6\xc7\ +\xc7\xd7\xb6\xb5\x75\xec\xed\x1f\x18\xb8\x3b\x94\x70\xfe\x5c\x89\ +\xc8\x07\x5d\x02\x2c\xa5\x14\x86\x61\x44\xde\x3c\x70\x68\x7f\x53\ +\x2e\xbb\x21\x9e\x4c\xfc\x3a\xf0\x03\x29\x95\x4a\x57\x03\x0a\x58\ +\xb8\x10\x07\x7c\xd3\x34\x79\xe9\xe5\x5d\x95\xf9\x4e\xd9\xd1\x28\ +\x86\x61\x90\xcb\xe5\x76\x1c\x3f\xd1\x77\xfb\x87\x2f\x54\xe6\xda\ +\xfb\xce\xc3\xe9\x74\x2a\xe2\xb8\x51\x62\xb1\x18\xae\xe3\xe2\xfb\ +\x3e\xfb\x5f\x7f\x8d\xbe\xbe\x81\x47\x00\x0c\xa5\x14\x4a\x29\x66\ +\x6b\xf5\x4b\x06\x07\xdf\xbd\x33\x95\x4e\x11\x8f\xc7\x49\xc6\xe3\ +\x98\x86\xc1\x48\x61\x84\x6a\xa5\xc6\xa2\x45\xb9\xb9\x77\xbf\x73\ +\xb4\x07\xa5\x14\xbd\xbd\x3d\x1d\x67\xb7\xb6\x12\x8f\xbb\xc4\x63\ +\x71\x2c\x2b\x42\xad\x56\xa3\xa7\xf7\x38\x96\x19\xe1\xac\xd6\x33\ +\xaf\x04\x30\x82\x50\x83\x04\xcf\xb6\xb6\x9e\x45\x3a\x9b\x22\x16\ +\x8b\x61\x3b\x36\x4a\x29\x8e\x76\x1f\x23\x0c\x42\x12\x89\x44\xbd\ +\x50\x28\xbc\x00\x60\x74\x1f\xed\xf9\xee\xb5\xd7\x5c\x77\xcd\xa6\ +\x8d\x9f\xe3\xc6\xaf\xdd\x42\x32\x9e\xc4\x89\xda\x4c\x96\x26\x19\ +\x1e\x2a\x90\xc9\x64\x39\x39\x35\xb9\xac\x58\x2c\x02\x60\x8c\x8d\ +\x8e\x37\x64\x32\x19\x72\xb9\x1c\x03\x03\x03\x2c\x69\x59\xc1\xb6\ +\x6d\xdb\x39\xd1\xd7\x47\x26\x9b\xc5\xf7\x75\x87\x52\xe6\xd8\x39\ +\xe7\x7c\x6c\x4e\xa4\x3b\x77\xb7\xf1\x93\x1f\xff\x54\x82\x20\xc0\ +\xf3\x3c\xb4\xf6\xf1\x74\x9d\xdb\x6e\xbb\x95\xcb\x2e\xbf\x94\x1f\ +\x3a\x7f\x9c\x7d\xbd\x76\xc4\x2d\x87\x15\x66\x26\xcb\xd7\x19\x12\ +\x86\xdc\x73\xef\x3d\xb1\x64\x32\x49\x32\x99\x24\x9d\x4e\x91\x49\ +\x67\xf8\xcb\xd6\x27\xa8\xd5\x6a\x7f\x7e\xb5\x76\xc0\x1d\xf1\x27\ +\x98\x39\x59\x86\x37\xab\x5f\x36\x08\x15\xc9\x44\xbc\xbe\xf9\xdb\ +\x9b\xd5\x86\x4d\x1b\x36\x67\x73\x4d\x7e\x22\x99\xe4\xdc\xf3\xce\ +\xad\x46\x22\x91\x5b\x8b\x7d\x63\xb7\xb2\x7f\x06\x5e\x98\xaa\x32\ +\xa1\xaf\x5f\x70\xdc\x7c\x88\x08\x4a\x29\x00\x25\x22\x02\x60\x9a\ +\x26\xc5\xe2\xe4\x17\x0e\x1d\x3a\xfc\xec\x4c\xa5\xe2\x66\xb3\x19\ +\xb2\x4d\x59\x12\x89\x38\xa6\x61\xcc\x5a\xa6\xf5\xb8\xeb\xba\x8f\ +\xc4\x62\xb1\x01\x80\x30\x14\x40\x88\x44\x22\x7c\x04\x20\x22\x16\ +\x70\x9a\x52\xaa\x00\x04\xf3\xc9\xfb\xfa\x07\xee\x3f\x7a\xac\xe7\ +\x47\xa9\xc6\x06\x12\x89\x04\xf1\x78\x8c\xa8\x1d\xc1\x75\x5d\x12\ +\xb1\x38\xb6\x6d\x63\x18\x06\xe5\x72\x59\x4e\x9d\x3a\xf5\x70\x3e\ +\x9f\xbf\x5b\x21\x28\xc3\xfc\x08\x40\x7d\x50\xc4\x5c\x15\x5a\xeb\ +\xe4\xbe\x7d\xaf\xbd\x5a\xf7\xbc\x55\xd9\x6c\x16\x37\xe6\x10\x8f\ +\xc7\xb0\x6d\x1b\xc7\x71\x88\xc7\x62\x44\xac\x08\x22\x82\xe7\x79\ +\x8c\x8e\x8d\x31\x30\x38\x48\xb5\x32\x5b\xfc\xcc\xa6\x8d\x17\xba\ +\xae\xf3\xee\x87\xdd\x23\x80\x28\xa5\xb0\x2c\x8b\x52\xe9\xe4\x65\ +\x2f\xbd\xbc\xb3\x6c\x5a\xd6\xaa\x96\x96\x16\x52\xa9\x14\xc9\x64\ +\x02\xc7\x75\x88\xc7\xe3\x24\x62\x31\x22\xa6\x85\x88\x50\xad\x56\ +\xe9\x1b\xe8\xa7\xaf\x7f\x80\xc0\x0f\x49\x26\x93\x4d\xdd\xdd\x3d\ +\xdf\x04\xb0\x00\xc6\xc6\xc7\x3f\x44\x91\xe8\xbb\x83\x43\xcf\x8f\ +\x8d\x4d\x7c\xbe\xa5\xa5\x85\x78\x2c\x8e\xed\x44\x89\x3a\x11\x9c\ +\xa8\x8d\xeb\xb8\x44\xa3\x51\x4c\xc3\x20\x10\xa1\x5c\x2e\xd3\xdb\ +\x7b\x9c\x4a\xa5\x4a\x10\x04\xd8\x76\x94\x65\xcb\x97\x0e\x2d\xc9\ +\xe7\xb7\x2e\x00\x8a\x13\x93\x73\x46\xb2\xac\x35\x85\xd1\xd1\x2e\ +\xad\x75\x74\xc5\xf2\x65\xd8\xae\x8d\xe3\x44\x89\x46\xa3\xd8\x8e\ +\x83\x6b\xdb\x44\xac\x08\x86\x61\xe0\x07\x01\xc5\xc9\x22\xdd\xdd\ +\xbd\x68\xed\x23\x22\x34\x36\x36\x92\x4e\xa7\x3a\x6c\x3b\xba\x61\ +\xb2\x54\x62\xf1\xa2\x45\x73\x00\xc7\x71\x38\x76\xac\xe7\xbe\xf6\ +\xf6\xf6\x07\x83\x30\x64\xd9\xd2\xd3\xb1\x22\x26\x6b\xd6\x5c\x48\ +\x43\xb2\x01\x09\x43\x44\xe6\x16\x9f\xa1\x0c\xb4\xd6\x0c\x8f\x16\ +\xe8\xed\xee\x45\x04\x1c\xc7\x25\x9d\x4e\x51\x3e\x35\xfd\x50\x61\ +\x74\xe4\xbe\x91\xc2\x30\xae\xeb\x7e\x00\x78\xfa\xa9\x67\x9e\xdf\ +\xb1\xe3\xb9\x2f\x2a\xa5\xa8\xd5\x6a\x78\xda\xc3\xd3\x9a\x4a\xa5\ +\x42\xbd\x5e\x67\xfd\xfa\x8b\x79\xe0\x81\x9f\xb3\x7a\xd5\x79\x88\ +\x08\xbd\xc7\x8e\x73\xe2\x44\xdf\x42\x62\x37\xe6\x50\x2c\x16\xbf\ +\xe3\xfb\xfa\xf1\x68\x34\xca\xca\x95\x2b\x71\x5d\x97\x79\xad\xf3\ +\xdc\x73\x2f\xb6\x3c\xf9\xc4\x93\xff\x1d\x1e\x1e\x59\x3c\x0f\x09\ +\x82\x80\x20\x08\x08\xc3\x10\x41\xa8\x79\x1e\xb5\xd9\x59\xbe\xfe\ +\x8d\x1b\xb9\xea\xaa\x2b\xe7\xbe\xff\x54\x03\x20\xec\xb0\x3b\x7e\ +\x39\x90\x1c\xdf\x3c\x19\x4c\xe7\x4e\xfa\x65\xa6\xc2\xf2\x54\xc1\ +\x2f\xde\x3b\x1b\xd4\xb6\x2a\x11\x61\xd7\xee\x36\x50\x8a\xf6\x3d\ +\xed\xbf\x6d\xdb\xb3\xf7\xae\x20\x0c\x30\x4d\x93\x30\x0c\x17\x20\ +\x61\x18\x22\xa1\x30\x5b\x9b\x25\xdf\x9c\xe7\x91\x47\x7f\x43\x24\ +\x62\x79\xc5\x62\xf1\xb3\x77\xe6\xb7\x74\x0e\xea\x11\x26\x83\xe9\ +\x39\xb1\xeb\x10\x26\x7c\x98\x0e\xb6\xcf\xad\x91\x9d\x6d\x73\x0a\ +\x0a\x85\xa9\xa9\x29\xfa\xfa\xfb\xbf\x7a\xe4\xc8\x91\x5f\x8d\x8d\ +\x8e\x9d\xee\xfb\x3e\xa6\x69\xa2\x94\x5a\x30\x64\xb5\x3a\xcb\x35\ +\x5f\xba\xea\xd4\xe5\x57\x5c\xf6\xa9\x30\x0c\xdf\x5e\x5d\xbb\xa1\ +\x8e\x27\x51\x94\x02\x2d\x30\x54\x87\xfe\x3a\x04\xdc\x3c\x57\xc1\ +\xae\x3d\xf3\x2a\x35\x45\x84\xe9\xf2\x4c\x10\x04\x01\xb5\x5a\x8d\ +\x52\xa9\x44\xbd\xee\xad\x31\x4d\xe3\x72\x65\xd0\x9a\x6a\x4c\x4d\ +\x9d\x79\xe6\x19\x7f\x4d\xa5\x1b\xff\x67\x98\x0a\xcb\xb4\xf8\x78\ +\xdf\xb5\x30\xe2\x5d\xcd\x84\xfe\x0a\xe5\xc0\xa4\x2e\xcf\x12\x55\ +\x4f\x61\x1b\xfc\x1f\x0b\x03\xc8\x05\x59\x65\x3b\x42\x00\x00\x00\ \x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x03\x34\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x01\x68\xf4\xcf\xf7\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\ +\x0b\x13\x01\x00\x9a\x9c\x18\x00\x00\x02\xd4\x49\x44\x41\x54\x38\ +\xcb\x55\x92\x4f\x68\x5d\x65\x10\xc5\x7f\xdf\xbb\x37\xaf\x49\x48\ +\xd5\x04\x23\x22\x22\x88\x85\x08\x12\x05\x0b\xa2\x0b\xc1\x8d\x90\ +\x6c\x14\x04\xa1\xee\x94\x42\x15\x14\x22\xed\x56\x77\x6e\x0d\x82\ +\x2b\x05\x97\xba\x15\xdd\x58\x10\x0a\x82\xab\x5a\x50\x2b\x41\x24\ +\xb1\x31\x31\x79\x6d\xfe\xbc\x97\xfb\xde\xfd\xf7\xdd\xef\x7e\x33\ +\xe3\xe2\x3e\x0a\xce\x76\xe6\x9c\x39\x67\xe6\xb8\x67\x77\xde\xe4\ +\xa9\xfe\xe3\xb1\x57\xab\x6f\xbe\x9d\xdc\x48\x92\xb7\x0f\x3e\x5e\ +\xa9\xde\x7b\x68\xe8\x66\xb7\x5e\x30\x7f\x98\xe3\x5e\xdb\xdb\x58\ +\x3d\x8a\xc3\xdb\xdb\x61\x9f\x5c\x4b\x1c\x37\x57\xe1\xb8\x35\x1a\ +\x85\xdf\x2b\xdc\xeb\x7b\x1b\x3c\x98\x9c\xbf\xb5\x1b\x0e\x7f\xda\ +\x6a\xfe\xbe\x96\x02\x76\xa3\xbc\x49\xa1\xd5\xc5\x6c\x32\xde\x48\ +\x7f\xa9\xb7\x18\xc4\x13\x10\x83\x3f\xab\x24\x1d\x1c\x0c\xa0\x56\ +\x18\x04\xd8\x6b\x36\xdd\xfa\x3f\xef\xb3\x9c\x2e\xfe\x20\x26\x6b\ +\xa7\x92\x91\x49\x4e\xa9\x35\x99\xe6\x8c\x64\x7c\x2e\x2d\xb5\xde\ +\x3e\xf2\xc3\x0b\x07\xf1\x88\xa1\x64\xa8\x19\x00\x56\x44\x18\xc6\ +\x26\xbd\xe5\xb7\xae\x57\xea\x3f\x20\x76\x0d\x0c\x28\x04\xee\x34\ +\x70\x37\xe0\xf8\xf9\x19\x38\x89\x30\x8c\x39\x85\x2c\x50\x08\x8c\ +\x05\xc4\xde\xe5\x91\x99\x2f\xdd\x2b\xbb\x97\x79\x2c\x5d\xe6\x9c\ +\xeb\x7f\x5a\x5b\xb3\x91\x49\xfe\xdb\x71\x1c\x5d\x3a\x96\xd1\xce\ +\x99\x4c\x48\x1f\x4d\x1f\xee\xcf\xb8\xb4\x19\x6b\xc1\x69\xcc\x28\ +\xb4\xba\x38\xd1\x62\xbb\x52\x7f\xbd\xb1\xb0\x9e\x06\x6b\xab\x91\ +\x8c\xd9\x6f\xef\x31\x94\x8c\x68\x42\x34\x21\x8f\xc5\x1a\x13\x59\ +\x49\x8f\xe2\x30\x39\x8e\x23\x0e\xe2\x11\x5e\x43\xa7\x33\x2a\x8c\ +\x22\x64\xf2\x75\x3a\x88\x27\x8c\xa5\xc0\x6b\xc0\xb0\xce\x85\x57\ +\x38\x8b\x70\x1c\x9f\x48\xff\x6d\xef\x11\x25\x42\x04\x12\xa0\x35\ +\x38\x8d\x70\x18\xa0\xd4\x6f\x12\x7d\x6b\x69\x91\x91\xbc\x48\x26\ +\x1d\xed\xdd\x00\xbb\x4d\x67\xbd\xdf\x7b\x29\xa5\xd6\x0f\x19\xb6\ +\xbb\x8c\xe5\x33\x4a\x85\x89\x40\x21\x05\xb3\xbd\xf3\x2c\xa7\xb8\ +\x97\xef\xbc\xc3\x52\xf2\x00\x0b\xbd\x79\xfa\x6e\xe6\xaa\x73\xee\ +\x93\x68\x32\xd7\x58\xc0\x6b\x83\xb7\x40\x63\x81\x5a\x1b\x2a\xf3\ +\x75\xa5\xfe\xa3\x4a\xeb\xcd\xda\x1a\x82\xb5\x5d\x20\xe6\x7a\xb3\ +\x5f\xf4\x70\x57\x5a\x8b\xd4\xd6\x90\x6b\x49\xa1\x35\x5e\xbb\x21\ +\x41\x11\x13\x82\xb5\xf8\x29\x99\xd7\x66\x93\x68\xd7\xd2\xc6\xda\ +\xcf\x83\xc4\x2b\x7e\x0a\x3c\x93\x9c\x4c\x26\xd4\xd6\xd0\x5a\xec\ +\x2e\x03\x38\x1c\xd1\x04\x6b\x15\x1a\x85\x5a\xaf\x12\x2c\x71\xcf\ +\xef\x5c\x6a\x22\xd2\xaf\xd5\x53\x6a\x4d\xae\x15\xb5\x79\xc4\xf4\ +\x3e\xf8\x7e\x48\x1a\x85\x4a\xbb\xb0\x14\x0a\x5e\x4f\xd2\x41\x3c\ +\xd9\x6f\xad\xbd\xd0\x5a\xa4\x25\x76\x92\x55\xf9\x5f\x99\x75\xe7\ +\x2f\xa7\xff\x19\x0b\xe4\x02\xc1\xf6\x1d\xb7\x9f\x5b\x25\xe8\xaf\ +\x44\x4b\x88\xd3\x47\x76\x9a\xbb\xd2\xe9\xe6\x52\x21\x8b\x90\x4d\ +\xc1\xad\x09\x33\xee\xe9\x94\x42\xfe\xa0\xd2\x79\x6a\xfd\x0e\xaf\ +\x6b\xb4\x06\x6a\x20\x40\x34\x08\xd6\x11\x14\xd2\xc9\x0f\x06\xf0\ +\x3d\x73\xbd\x37\x98\xef\x49\x8a\x03\x7a\x04\xcc\xd6\x09\x06\xa5\ +\x3c\x49\xa5\x97\xa9\xf4\x55\xbc\xae\xd0\x1a\xb4\xf6\x17\x6a\x3f\ +\xd2\x73\x5f\x31\xeb\x76\x59\x48\x60\x29\x85\xc5\x94\xff\x00\xe1\ +\x78\x1f\x4c\x73\x1c\xbc\x8b\x00\x00\x00\x00\x49\x45\x4e\x44\xae\ +\x42\x60\x82\ " qt_resource_name = "\ @@ -2413,22 +1158,22 @@ qt_resource_struct = "\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\ \x00\x00\x00\x18\x00\x02\x00\x00\x00\x10\x00\x00\x00\x03\ -\x00\x00\x02\x18\x00\x00\x00\x00\x00\x01\x00\x00\x70\x57\ -\x00\x00\x00\x76\x00\x00\x00\x00\x00\x01\x00\x00\x13\x07\ +\x00\x00\x02\x18\x00\x00\x00\x00\x00\x01\x00\x00\x35\x5d\ +\x00\x00\x00\x76\x00\x00\x00\x00\x00\x01\x00\x00\x09\x8e\ \x00\x00\x00\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x12\x00\x00\x00\x00\x00\x01\x00\x00\x36\x91\ -\x00\x00\x01\xd0\x00\x00\x00\x00\x00\x01\x00\x00\x6a\xea\ -\x00\x00\x00\xd2\x00\x00\x00\x00\x00\x01\x00\x00\x25\xc8\ -\x00\x00\x00\xae\x00\x00\x00\x00\x00\x01\x00\x00\x23\x23\ -\x00\x00\x01\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x49\xf5\ -\x00\x00\x01\xf0\x00\x00\x00\x00\x00\x01\x00\x00\x6d\xde\ -\x00\x00\x02\x4c\x00\x00\x00\x00\x00\x01\x00\x00\x81\x41\ -\x00\x00\x00\xfa\x00\x00\x00\x00\x00\x01\x00\x00\x33\xde\ -\x00\x00\x01\x92\x00\x00\x00\x00\x00\x01\x00\x00\x5a\x9d\ -\x00\x00\x01\xb4\x00\x00\x00\x00\x00\x01\x00\x00\x5e\x07\ -\x00\x00\x00\x98\x00\x00\x00\x00\x00\x01\x00\x00\x1f\xe8\ -\x00\x00\x00\x60\x00\x00\x00\x00\x00\x01\x00\x00\x10\xdf\ -\x00\x00\x01\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x39\x0c\ +\x00\x00\x01\x12\x00\x00\x00\x00\x00\x01\x00\x00\x18\x92\ +\x00\x00\x01\xd0\x00\x00\x00\x00\x00\x01\x00\x00\x2f\xf0\ +\x00\x00\x00\xd2\x00\x00\x00\x00\x00\x01\x00\x00\x11\xec\ +\x00\x00\x00\xae\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x47\ +\x00\x00\x01\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x22\x76\ +\x00\x00\x01\xf0\x00\x00\x00\x00\x00\x01\x00\x00\x32\xe4\ +\x00\x00\x02\x4c\x00\x00\x00\x00\x00\x01\x00\x00\x3c\xcb\ +\x00\x00\x00\xfa\x00\x00\x00\x00\x00\x01\x00\x00\x15\xdf\ +\x00\x00\x01\x92\x00\x00\x00\x00\x00\x01\x00\x00\x29\xb6\ +\x00\x00\x01\xb4\x00\x00\x00\x00\x00\x01\x00\x00\x2d\x20\ +\x00\x00\x00\x98\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x0c\ +\x00\x00\x00\x60\x00\x00\x00\x00\x00\x01\x00\x00\x07\x66\ +\x00\x00\x01\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x0d\ " def qInitResources(): -- 2.45.1 From 63744bfb27c9d8caf14187071cd141201e246c17 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 20:00:56 +0200 Subject: [PATCH 19/42] autopep8 bitmessagemain.py file + fixed typo --- src/bitmessagemain.py | 3395 +++++++++++++++++++++++++---------------- 1 file changed, 2072 insertions(+), 1323 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 6fd42dd1..01202da1 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -4,17 +4,18 @@ # Distributed under the MIT/X11 software license. See the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -#Right now, PyBitmessage only support connecting to stream 1. It doesn't yet contain logic to expand into further streams. +# Right now, PyBitmessage only support connecting to stream 1. It doesn't +# yet contain logic to expand into further streams. -#The software version variable is now held in shared.py +# The software version variable is now held in shared.py verbose = 1 -maximumAgeOfAnObjectThatIAmWillingToAccept = 216000 #Equals two days and 12 hours. -lengthOfTimeToLeaveObjectsInInventory = 237600 #Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice. -lengthOfTimeToHoldOnToAllPubkeys = 2419200 #Equals 4 weeks. You could make this longer if you want but making it shorter would not be advisable because there is a very small possibility that it could keep you from obtaining a needed pubkey for a period of time. -maximumAgeOfObjectsThatIAdvertiseToOthers = 216000 #Equals two days and 12 hours -maximumAgeOfNodesThatIAdvertiseToOthers = 10800 #Equals three hours -storeConfigFilesInSameDirectoryAsProgramByDefault = False #The user may de-select Portable Mode in the settings if they want the config files to stay in the application data folder. -useVeryEasyProofOfWorkForTesting = False #If you set this to True while on the normal network, you won't be able to send or sometimes receive messages. +maximumAgeOfAnObjectThatIAmWillingToAccept = 216000 # Equals two days and 12 hours. +lengthOfTimeToLeaveObjectsInInventory = 237600 # Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice. +lengthOfTimeToHoldOnToAllPubkeys = 2419200 # Equals 4 weeks. You could make this longer if you want but making it shorter would not be advisable because there is a very small possibility that it could keep you from obtaining a needed pubkey for a period of time. +maximumAgeOfObjectsThatIAdvertiseToOthers = 216000 # Equals two days and 12 hours +maximumAgeOfNodesThatIAdvertiseToOthers = 10800 # Equals three hours +storeConfigFilesInSameDirectoryAsProgramByDefault = False # The user may de-select Portable Mode in the settings if they want the config files to stay in the application data folder. +useVeryEasyProofOfWorkForTesting = False # If you set this to True while on the normal network, you won't be able to send or sometimes receive messages. encryptedBroadcastSwitchoverTime = 1369735200 import sys @@ -33,174 +34,213 @@ import random import sqlite3 import threading from time import strftime, localtime, gmtime -import shutil #used for moving the messages.dat file +import shutil # used for moving the messages.dat file import string import socks import highlevelcrypto from pyelliptic.openssl import OpenSSL import ctypes from pyelliptic import arithmetic -import signal #Used to capture a Ctrl-C keypress so that Bitmessage can shutdown gracefully. -#The next 3 are used for the API +import signal # Used to capture a Ctrl-C keypress so that Bitmessage can shutdown gracefully. +# The next 3 are used for the API from SimpleXMLRPCServer import * import json -from subprocess import call #used when the API must execute an outside program +from subprocess import call # used when the API must execute an outside program import singleton import proofofwork -#For each stream to which we connect, several outgoingSynSender threads will exist and will collectively create 8 connections with peers. +# For each stream to which we connect, several outgoingSynSender threads +# will exist and will collectively create 8 connections with peers. + + class outgoingSynSender(threading.Thread): + def __init__(self): threading.Thread.__init__(self) - def setup(self,streamNumber): + def setup(self, streamNumber): self.streamNumber = streamNumber def run(self): time.sleep(1) global alreadyAttemptedConnectionsListResetTime while True: - if len(selfInitiatedConnections[self.streamNumber]) >= 8: #maximum number of outgoing connections = 8 + if len(selfInitiatedConnections[self.streamNumber]) >= 8: # maximum number of outgoing connections = 8 time.sleep(10) else: random.seed() - HOST, = random.sample(shared.knownNodes[self.streamNumber], 1) + HOST, = random.sample(shared.knownNodes[self.streamNumber], 1) alreadyAttemptedConnectionsListLock.acquire() while HOST in alreadyAttemptedConnectionsList or HOST in shared.connectedHostsList: alreadyAttemptedConnectionsListLock.release() - #print 'choosing new sample' + # print 'choosing new sample' random.seed() - HOST, = random.sample(shared.knownNodes[self.streamNumber], 1) + HOST, = random.sample(shared.knownNodes[ + self.streamNumber], 1) time.sleep(1) - #Clear out the alreadyAttemptedConnectionsList every half hour so that this program will again attempt a connection to any nodes, even ones it has already tried. + # Clear out the alreadyAttemptedConnectionsList every half + # hour so that this program will again attempt a connection + # to any nodes, even ones it has already tried. if (time.time() - alreadyAttemptedConnectionsListResetTime) > 1800: alreadyAttemptedConnectionsList.clear() - alreadyAttemptedConnectionsListResetTime = int(time.time()) + alreadyAttemptedConnectionsListResetTime = int( + time.time()) alreadyAttemptedConnectionsListLock.acquire() alreadyAttemptedConnectionsList[HOST] = 0 alreadyAttemptedConnectionsListLock.release() - PORT, timeNodeLastSeen = shared.knownNodes[self.streamNumber][HOST] + PORT, timeNodeLastSeen = shared.knownNodes[ + self.streamNumber][HOST] sock = socks.socksocket(socket.AF_INET, socket.SOCK_STREAM) - #This option apparently avoids the TIME_WAIT state so that we can rebind faster + # This option apparently avoids the TIME_WAIT state so that we + # can rebind faster sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) sock.settimeout(20) if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and verbose >= 2: shared.printLock.acquire() print 'Trying an outgoing connection to', HOST, ':', PORT shared.printLock.release() - #sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + # sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS4a': if verbose >= 2: shared.printLock.acquire() print '(Using SOCKS4a) Trying an outgoing connection to', HOST, ':', PORT shared.printLock.release() proxytype = socks.PROXY_TYPE_SOCKS4 - sockshostname = shared.config.get('bitmessagesettings', 'sockshostname') - socksport = shared.config.getint('bitmessagesettings', 'socksport') - rdns = True #Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway. + sockshostname = shared.config.get( + 'bitmessagesettings', 'sockshostname') + socksport = shared.config.getint( + 'bitmessagesettings', 'socksport') + rdns = True # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway. if shared.config.getboolean('bitmessagesettings', 'socksauthentication'): - socksusername = shared.config.get('bitmessagesettings', 'socksusername') - sockspassword = shared.config.get('bitmessagesettings', 'sockspassword') - sock.setproxy(proxytype, sockshostname, socksport, rdns, socksusername, sockspassword) + socksusername = shared.config.get( + 'bitmessagesettings', 'socksusername') + sockspassword = shared.config.get( + 'bitmessagesettings', 'sockspassword') + sock.setproxy( + proxytype, sockshostname, socksport, rdns, socksusername, sockspassword) else: - sock.setproxy(proxytype, sockshostname, socksport, rdns) + sock.setproxy( + proxytype, sockshostname, socksport, rdns) elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS5': if verbose >= 2: shared.printLock.acquire() print '(Using SOCKS5) Trying an outgoing connection to', HOST, ':', PORT shared.printLock.release() proxytype = socks.PROXY_TYPE_SOCKS5 - sockshostname = shared.config.get('bitmessagesettings', 'sockshostname') - socksport = shared.config.getint('bitmessagesettings', 'socksport') - rdns = True #Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway. + sockshostname = shared.config.get( + 'bitmessagesettings', 'sockshostname') + socksport = shared.config.getint( + 'bitmessagesettings', 'socksport') + rdns = True # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway. if shared.config.getboolean('bitmessagesettings', 'socksauthentication'): - socksusername = shared.config.get('bitmessagesettings', 'socksusername') - sockspassword = shared.config.get('bitmessagesettings', 'sockspassword') - sock.setproxy(proxytype, sockshostname, socksport, rdns, socksusername, sockspassword) + socksusername = shared.config.get( + 'bitmessagesettings', 'socksusername') + sockspassword = shared.config.get( + 'bitmessagesettings', 'sockspassword') + sock.setproxy( + proxytype, sockshostname, socksport, rdns, socksusername, sockspassword) else: - sock.setproxy(proxytype, sockshostname, socksport, rdns) + sock.setproxy( + proxytype, sockshostname, socksport, rdns) try: sock.connect((HOST, PORT)) rd = receiveDataThread() - rd.daemon = True # close the main program even if there are threads left + rd.daemon = True # close the main program even if there are threads left objectsOfWhichThisRemoteNodeIsAlreadyAware = {} - rd.setup(sock,HOST,PORT,self.streamNumber,objectsOfWhichThisRemoteNodeIsAlreadyAware) + rd.setup(sock, HOST, PORT, self.streamNumber, + objectsOfWhichThisRemoteNodeIsAlreadyAware) rd.start() shared.printLock.acquire() print self, 'connected to', HOST, 'during an outgoing attempt.' shared.printLock.release() sd = sendDataThread() - sd.setup(sock,HOST,PORT,self.streamNumber,objectsOfWhichThisRemoteNodeIsAlreadyAware) + sd.setup(sock, HOST, PORT, self.streamNumber, + objectsOfWhichThisRemoteNodeIsAlreadyAware) sd.start() sd.sendVersionMessage() - except socks.GeneralProxyError, err: + except socks.GeneralProxyError as err: if verbose >= 2: shared.printLock.acquire() print 'Could NOT connect to', HOST, 'during outgoing attempt.', err shared.printLock.release() - PORT, timeLastSeen = shared.knownNodes[self.streamNumber][HOST] - if (int(time.time())-timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000: # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the shared.knownNodes data-structure. + PORT, timeLastSeen = shared.knownNodes[ + self.streamNumber][HOST] + if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000: # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the shared.knownNodes data-structure. shared.knownNodesLock.acquire() del shared.knownNodes[self.streamNumber][HOST] shared.knownNodesLock.release() shared.printLock.acquire() print 'deleting ', HOST, 'from shared.knownNodes because it is more than 48 hours old and we could not connect to it.' shared.printLock.release() - except socks.Socks5AuthError, err: - shared.UISignalQueue.put(('updateStatusBar',"SOCKS5 Authentication problem: "+str(err))) - except socks.Socks5Error, err: + except socks.Socks5AuthError as err: + shared.UISignalQueue.put(( + 'updateStatusBar', "SOCKS5 Authentication problem: " + str(err))) + except socks.Socks5Error as err: pass - print 'SOCKS5 error. (It is possible that the server wants authentication).)' ,str(err) - except socks.Socks4Error, err: + print 'SOCKS5 error. (It is possible that the server wants authentication).)', str(err) + except socks.Socks4Error as err: print 'Socks4Error:', err - except socket.error, err: + except socket.error as err: if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS': - print 'Bitmessage MIGHT be having trouble connecting to the SOCKS server. '+str(err) + print 'Bitmessage MIGHT be having trouble connecting to the SOCKS server. ' + str(err) else: if verbose >= 1: shared.printLock.acquire() print 'Could NOT connect to', HOST, 'during outgoing attempt.', err shared.printLock.release() - PORT, timeLastSeen = shared.knownNodes[self.streamNumber][HOST] - if (int(time.time())-timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000: # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the knownNodes data-structure. + PORT, timeLastSeen = shared.knownNodes[ + self.streamNumber][HOST] + if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000: # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the knownNodes data-structure. shared.knownNodesLock.acquire() del shared.knownNodes[self.streamNumber][HOST] shared.knownNodesLock.release() shared.printLock.acquire() print 'deleting ', HOST, 'from knownNodes because it is more than 48 hours old and we could not connect to it.' shared.printLock.release() - except Exception, err: - sys.stderr.write('An exception has occurred in the outgoingSynSender thread that was not caught by other exception types: %s\n' % err) + except Exception as err: + sys.stderr.write( + 'An exception has occurred in the outgoingSynSender thread that was not caught by other exception types: %s\n' % err) time.sleep(0.1) -#Only one singleListener thread will ever exist. It creates the receiveDataThread and sendDataThread for each incoming connection. Note that it cannot set the stream number because it is not known yet- the other node will have to tell us its stream number in a version message. If we don't care about their stream, we will close the connection (within the recversion function of the recieveData thread) +# Only one singleListener thread will ever exist. It creates the +# receiveDataThread and sendDataThread for each incoming connection. Note +# that it cannot set the stream number because it is not known yet- the +# other node will have to tell us its stream number in a version message. +# If we don't care about their stream, we will close the connection +# (within the recversion function of the recieveData thread) + + class singleListener(threading.Thread): + def __init__(self): threading.Thread.__init__(self) - def run(self): - #We don't want to accept incoming connections if the user is using a SOCKS proxy. If they eventually select proxy 'none' then this will start listening for connections. + # We don't want to accept incoming connections if the user is using a + # SOCKS proxy. If they eventually select proxy 'none' then this will + # start listening for connections. while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS': time.sleep(300) shared.printLock.acquire() print 'Listening for incoming connections.' shared.printLock.release() - HOST = '' # Symbolic name meaning all available interfaces + HOST = '' # Symbolic name meaning all available interfaces PORT = shared.config.getint('bitmessagesettings', 'port') sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - #This option apparently avoids the TIME_WAIT state so that we can rebind faster + # This option apparently avoids the TIME_WAIT state so that we can + # rebind faster sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) sock.bind((HOST, PORT)) sock.listen(2) - while True: - #We don't want to accept incoming connections if the user is using a SOCKS proxy. If the user eventually select proxy 'none' then this will start listening for connections. + # We don't want to accept incoming connections if the user is using + # a SOCKS proxy. If the user eventually select proxy 'none' then + # this will start listening for connections. while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS': time.sleep(10) while len(shared.connectedHostsList) > 220: @@ -208,85 +248,99 @@ class singleListener(threading.Thread): print 'We are connected to too many people. Not accepting further incoming connections for ten seconds.' shared.printLock.release() time.sleep(10) - a,(HOST,PORT) = sock.accept() + a, (HOST, PORT) = sock.accept() - #The following code will, unfortunately, block an incoming connection if someone else on the same LAN is already connected because the two computers will share the same external IP. This is here to prevent connection flooding. + # The following code will, unfortunately, block an incoming + # connection if someone else on the same LAN is already connected + # because the two computers will share the same external IP. This + # is here to prevent connection flooding. while HOST in shared.connectedHostsList: shared.printLock.acquire() - print 'We are already connected to', HOST+'. Ignoring connection.' + print 'We are already connected to', HOST + '. Ignoring connection.' shared.printLock.release() a.close() - a,(HOST,PORT) = sock.accept() + a, (HOST, PORT) = sock.accept() objectsOfWhichThisRemoteNodeIsAlreadyAware = {} a.settimeout(20) - + sd = sendDataThread() - sd.setup(a,HOST,PORT,-1,objectsOfWhichThisRemoteNodeIsAlreadyAware) + sd.setup( + a, HOST, PORT, -1, objectsOfWhichThisRemoteNodeIsAlreadyAware) sd.start() rd = receiveDataThread() - rd.daemon = True # close the main program even if there are threads left - rd.setup(a,HOST,PORT,-1,objectsOfWhichThisRemoteNodeIsAlreadyAware) + rd.daemon = True # close the main program even if there are threads left + rd.setup( + a, HOST, PORT, -1, objectsOfWhichThisRemoteNodeIsAlreadyAware) rd.start() shared.printLock.acquire() - print self, 'connected to', HOST,'during INCOMING request.' + print self, 'connected to', HOST, 'during INCOMING request.' shared.printLock.release() -#This thread is created either by the synSenderThread(for outgoing connections) or the singleListenerThread(for incoming connectiosn). +# This thread is created either by the synSenderThread(for outgoing +# connections) or the singleListenerThread(for incoming connectiosn). + + class receiveDataThread(threading.Thread): + def __init__(self): threading.Thread.__init__(self) self.data = '' self.verackSent = False self.verackReceived = False - def setup(self,sock,HOST,port,streamNumber,objectsOfWhichThisRemoteNodeIsAlreadyAware): + def setup( + self, + sock, + HOST, + port, + streamNumber, + objectsOfWhichThisRemoteNodeIsAlreadyAware): self.sock = sock self.HOST = HOST self.PORT = port self.streamNumber = streamNumber - self.payloadLength = 0 #This is the protocol payload length thus it doesn't include the 24 byte message header + self.payloadLength = 0 # This is the protocol payload length thus it doesn't include the 24 byte message header self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = {} - shared.connectedHostsList[self.HOST] = 0 #The very fact that this receiveData thread exists shows that we are connected to the remote host. Let's add it to this list so that an outgoingSynSender thread doesn't try to connect to it. - self.connectionIsOrWasFullyEstablished = False #set to true after the remote node and I accept each other's version messages. This is needed to allow the user interface to accurately reflect the current number of connections. - if self.streamNumber == -1: #This was an incoming connection. Send out a version message if we accept the other node's version message. + shared.connectedHostsList[ + self.HOST] = 0 # The very fact that this receiveData thread exists shows that we are connected to the remote host. Let's add it to this list so that an outgoingSynSender thread doesn't try to connect to it. + self.connectionIsOrWasFullyEstablished = False # set to true after the remote node and I accept each other's version messages. This is needed to allow the user interface to accurately reflect the current number of connections. + if self.streamNumber == -1: # This was an incoming connection. Send out a version message if we accept the other node's version message. self.initiatedConnection = False else: self.initiatedConnection = True selfInitiatedConnections[streamNumber][self] = 0 - self.ackDataThatWeHaveYetToSend = [] #When we receive a message bound for us, we store the acknowledgement that we need to send (the ackdata) here until we are done processing all other data received from this peer. + self.ackDataThatWeHaveYetToSend = [ + ] # When we receive a message bound for us, we store the acknowledgement that we need to send (the ackdata) here until we are done processing all other data received from this peer. self.objectsOfWhichThisRemoteNodeIsAlreadyAware = objectsOfWhichThisRemoteNodeIsAlreadyAware def run(self): shared.printLock.acquire() - print 'ID of the receiveDataThread is', str(id(self))+'. The size of the shared.connectedHostsList is now', len(shared.connectedHostsList) + print 'ID of the receiveDataThread is', str(id(self)) + '. The size of the shared.connectedHostsList is now', len(shared.connectedHostsList) shared.printLock.release() while True: try: self.data += self.sock.recv(4096) except socket.timeout: shared.printLock.acquire() - print 'Timeout occurred waiting for data from', self.HOST + '. Closing receiveData thread. (ID:',str(id(self))+ ')' + print 'Timeout occurred waiting for data from', self.HOST + '. Closing receiveData thread. (ID:', str(id(self)) + ')' shared.printLock.release() break - except Exception, err: + except Exception as err: shared.printLock.acquire() - print 'sock.recv error. Closing receiveData thread (HOST:', self.HOST, 'ID:',str(id(self))+ ').', err + print 'sock.recv error. Closing receiveData thread (HOST:', self.HOST, 'ID:', str(id(self)) + ').', err shared.printLock.release() break - #print 'Received', repr(self.data) + # print 'Received', repr(self.data) if self.data == "": shared.printLock.acquire() - print 'Connection to', self.HOST, 'closed. Closing receiveData thread. (ID:',str(id(self))+ ')' + print 'Connection to', self.HOST, 'closed. Closing receiveData thread. (ID:', str(id(self)) + ')' shared.printLock.release() break else: self.processData() - - - try: del selfInitiatedConnections[self.streamNumber][self] shared.printLock.acquire() @@ -297,70 +351,74 @@ class receiveDataThread(threading.Thread): shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST)) try: del shared.connectedHostsList[self.HOST] - except Exception, err: + except Exception as err: shared.printLock.acquire() print 'Could not delete', self.HOST, 'from shared.connectedHostsList.', err shared.printLock.release() try: - del numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[self.HOST] + del numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[ + self.HOST] except: pass - shared.UISignalQueue.put(('updateNetworkStatusTab','no data')) + shared.UISignalQueue.put(('updateNetworkStatusTab', 'no data')) shared.printLock.acquire() print 'The size of the connectedHostsList is now:', len(shared.connectedHostsList) shared.printLock.release() def processData(self): global verbose - #if verbose >= 3: - #shared.printLock.acquire() - #print 'self.data is currently ', repr(self.data) - #shared.printLock.release() - if len(self.data) < 20: #if so little of the data has arrived that we can't even unpack the payload length + # if verbose >= 3: + # shared.printLock.acquire() + # print 'self.data is currently ', repr(self.data) + # shared.printLock.release() + if len(self.data) < 20: # if so little of the data has arrived that we can't even unpack the payload length return if self.data[0:4] != '\xe9\xbe\xb4\xd9': if verbose >= 1: shared.printLock.acquire() - print 'The magic bytes were not correct. First 40 bytes of data: '+ repr(self.data[0:40]) + print 'The magic bytes were not correct. First 40 bytes of data: ' + repr(self.data[0:40]) shared.printLock.release() self.data = "" return - self.payloadLength, = unpack('>L',self.data[16:20]) - if len(self.data) < self.payloadLength+24: #check if the whole message has arrived yet. + self.payloadLength, = unpack('>L', self.data[16:20]) + if len(self.data) < self.payloadLength + 24: # check if the whole message has arrived yet. return - if self.data[20:24] != hashlib.sha512(self.data[24:self.payloadLength+24]).digest()[0:4]:#test the checksum in the message. If it is correct... + if self.data[20:24] != hashlib.sha512(self.data[24:self.payloadLength + 24]).digest()[0:4]: # test the checksum in the message. If it is correct... print 'Checksum incorrect. Clearing this message.' - self.data = self.data[self.payloadLength+24:] + self.data = self.data[self.payloadLength + 24:] self.processData() return - #The time we've last seen this node is obviously right now since we just received valid data from it. So update the knownNodes list so that other peers can be made aware of its existance. - if self.initiatedConnection and self.connectionIsOrWasFullyEstablished: #The remote port is only something we should share with others if it is the remote node's incoming port (rather than some random operating-system-assigned outgoing port). + # The time we've last seen this node is obviously right now since we + # just received valid data from it. So update the knownNodes list so + # that other peers can be made aware of its existance. + if self.initiatedConnection and self.connectionIsOrWasFullyEstablished: # The remote port is only something we should share with others if it is the remote node's incoming port (rather than some random operating-system-assigned outgoing port). shared.knownNodesLock.acquire() - shared.knownNodes[self.streamNumber][self.HOST] = (self.PORT,int(time.time())) + shared.knownNodes[self.streamNumber][ + self.HOST] = (self.PORT, int(time.time())) shared.knownNodesLock.release() - if self.payloadLength <= 180000000: #If the size of the message is greater than 180MB, ignore it. (I get memory errors when processing messages much larger than this though it is concievable that this value will have to be lowered if some systems are less tolarant of large messages.) + if self.payloadLength <= 180000000: # If the size of the message is greater than 180MB, ignore it. (I get memory errors when processing messages much larger than this though it is concievable that this value will have to be lowered if some systems are less tolarant of large messages.) remoteCommand = self.data[4:16] shared.printLock.acquire() - print 'remoteCommand', repr(remoteCommand.replace('\x00','')), ' from', self.HOST + print 'remoteCommand', repr(remoteCommand.replace('\x00', '')), ' from', self.HOST shared.printLock.release() if remoteCommand == 'version\x00\x00\x00\x00\x00': - self.recversion(self.data[24:self.payloadLength+24]) + self.recversion(self.data[24:self.payloadLength + 24]) elif remoteCommand == 'verack\x00\x00\x00\x00\x00\x00': self.recverack() elif remoteCommand == 'addr\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: - self.recaddr(self.data[24:self.payloadLength+24]) + self.recaddr(self.data[24:self.payloadLength + 24]) elif remoteCommand == 'getpubkey\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: - self.recgetpubkey(self.data[24:self.payloadLength+24]) + self.recgetpubkey(self.data[24:self.payloadLength + 24]) elif remoteCommand == 'pubkey\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: - self.recpubkey(self.data[24:self.payloadLength+24]) + self.recpubkey(self.data[24:self.payloadLength + 24]) elif remoteCommand == 'inv\x00\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: - self.recinv(self.data[24:self.payloadLength+24]) + self.recinv(self.data[24:self.payloadLength + 24]) elif remoteCommand == 'getdata\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: - self.recgetdata(self.data[24:self.payloadLength+24]) + self.recgetdata(self.data[24:self.payloadLength + 24]) elif remoteCommand == 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: - self.recmsg(self.data[24:self.payloadLength+24]) + self.recmsg(self.data[24:self.payloadLength + 24]) elif remoteCommand == 'broadcast\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: - self.recbroadcast(self.data[24:self.payloadLength+24]) + self.recbroadcast(self.data[24:self.payloadLength + 24]) elif remoteCommand == 'ping\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: self.sendpong() elif remoteCommand == 'pong\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: @@ -368,31 +426,37 @@ class receiveDataThread(threading.Thread): elif remoteCommand == 'alert\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished: pass - self.data = self.data[self.payloadLength+24:]#take this message out and then process the next message + self.data = self.data[ + self.payloadLength + 24:] # take this message out and then process the next message if self.data == '': while len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 0: random.seed() - objectHash, = random.sample(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 1) + objectHash, = random.sample( + self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 1) if objectHash in shared.inventory: shared.printLock.acquire() print 'Inventory (in memory) already has object listed in inv message.' shared.printLock.release() - del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[objectHash] + del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[ + objectHash] elif isInSqlInventory(objectHash): if verbose >= 3: shared.printLock.acquire() print 'Inventory (SQL on disk) already has object listed in inv message.' shared.printLock.release() - del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[objectHash] + del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[ + objectHash] else: self.sendgetdata(objectHash) - del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[objectHash] #It is possible that the remote node doesn't respond with the object. In that case, we'll very likely get it from someone else anyway. + del self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[ + objectHash] # It is possible that the remote node doesn't respond with the object. In that case, we'll very likely get it from someone else anyway. if len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) == 0: shared.printLock.acquire() print '(concerning', self.HOST + ')', 'number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) shared.printLock.release() try: - del numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[self.HOST] #this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together. + del numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[ + self.HOST] # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together. except: pass break @@ -401,35 +465,41 @@ class receiveDataThread(threading.Thread): print '(concerning', self.HOST + ')', 'number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) shared.printLock.release() try: - del numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[self.HOST] #this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together. + del numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[ + self.HOST] # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together. except: pass if len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 0: shared.printLock.acquire() print '(concerning', self.HOST + ')', 'number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) shared.printLock.release() - numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[self.HOST] = len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) #this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together. + numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[self.HOST] = len( + self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together. if len(self.ackDataThatWeHaveYetToSend) > 0: self.data = self.ackDataThatWeHaveYetToSend.pop() self.processData() - - - def isProofOfWorkSufficient(self,data,nonceTrialsPerByte=0,payloadLengthExtraBytes=0): + def isProofOfWorkSufficient( + self, + data, + nonceTrialsPerByte=0, + payloadLengthExtraBytes=0): if nonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte: nonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes: payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes - POW, = unpack('>Q',hashlib.sha512(hashlib.sha512(data[:8]+ hashlib.sha512(data[8:]).digest()).digest()).digest()[0:8]) - #print 'POW:', POW - return POW <= 2**64 / ((len(data)+payloadLengthExtraBytes) * (nonceTrialsPerByte)) + POW, = unpack('>Q', hashlib.sha512(hashlib.sha512(data[ + :8] + hashlib.sha512(data[8:]).digest()).digest()).digest()[0:8]) + # print 'POW:', POW + return POW <= 2 ** 64 / ((len(data) + payloadLengthExtraBytes) * (nonceTrialsPerByte)) def sendpong(self): print 'Sending pong' try: - self.sock.sendall('\xE9\xBE\xB4\xD9\x70\x6F\x6E\x67\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35') - except Exception, err: - #if not 'Bad file descriptor' in err: + self.sock.sendall( + '\xE9\xBE\xB4\xD9\x70\x6F\x6E\x67\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35') + except Exception as err: + # if not 'Bad file descriptor' in err: shared.printLock.acquire() sys.stderr.write('sock.sendall error: %s\n' % err) shared.printLock.release() @@ -437,25 +507,28 @@ class receiveDataThread(threading.Thread): def recverack(self): print 'verack received' self.verackReceived = True - if self.verackSent == True: - #We have thus both sent and received a verack. + if self.verackSent: + # We have thus both sent and received a verack. self.connectionFullyEstablished() def connectionFullyEstablished(self): self.connectionIsOrWasFullyEstablished = True if not self.initiatedConnection: - shared.UISignalQueue.put(('setStatusIcon','green')) - self.sock.settimeout(600) #We'll send out a pong every 5 minutes to make sure the connection stays alive if there has been no other traffic to send lately. - shared.UISignalQueue.put(('updateNetworkStatusTab','no data')) - remoteNodeIncomingPort, remoteNodeSeenTime = shared.knownNodes[self.streamNumber][self.HOST] + shared.UISignalQueue.put(('setStatusIcon', 'green')) + self.sock.settimeout( + 600) # We'll send out a pong every 5 minutes to make sure the connection stays alive if there has been no other traffic to send lately. + shared.UISignalQueue.put(('updateNetworkStatusTab', 'no data')) + remoteNodeIncomingPort, remoteNodeSeenTime = shared.knownNodes[ + self.streamNumber][self.HOST] shared.printLock.acquire() print 'Connection fully established with', self.HOST, remoteNodeIncomingPort print 'The size of the connectedHostsList is now', len(shared.connectedHostsList) print 'The length of sendDataQueues is now:', len(shared.sendDataQueues) print 'broadcasting addr from within connectionFullyEstablished function.' shared.printLock.release() - self.broadcastaddr([(int(time.time()), self.streamNumber, 1, self.HOST, remoteNodeIncomingPort)]) #This lets all of our peers know about this new node. - self.sendaddr() #This is one large addr message to this one peer. + self.broadcastaddr([(int(time.time()), self.streamNumber, 1, self.HOST, + remoteNodeIncomingPort)]) # This lets all of our peers know about this new node. + self.sendaddr() # This is one large addr message to this one peer. if not self.initiatedConnection and len(shared.connectedHostsList) > 200: shared.printLock.acquire() print 'We are connected to too many people. Closing connection.' @@ -466,9 +539,12 @@ class receiveDataThread(threading.Thread): def sendBigInv(self): shared.sqlLock.acquire() - #Select all hashes which are younger than two days old and in this stream. - t = (int(time.time())-maximumAgeOfObjectsThatIAdvertiseToOthers,int(time.time())-lengthOfTimeToHoldOnToAllPubkeys,self.streamNumber) - shared.sqlSubmitQueue.put('''SELECT hash FROM inventory WHERE ((receivedtime>? and objecttype<>'pubkey') or (receivedtime>? and objecttype='pubkey')) and streamnumber=?''') + # Select all hashes which are younger than two days old and in this + # stream. + t = (int(time.time()) - maximumAgeOfObjectsThatIAdvertiseToOthers, int( + time.time()) - lengthOfTimeToHoldOnToAllPubkeys, self.streamNumber) + shared.sqlSubmitQueue.put( + '''SELECT hash FROM inventory WHERE ((receivedtime>? and objecttype<>'pubkey') or (receivedtime>? and objecttype='pubkey')) and streamnumber=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -477,73 +553,83 @@ class receiveDataThread(threading.Thread): hash, = row if hash not in self.objectsOfWhichThisRemoteNodeIsAlreadyAware: bigInvList[hash] = 0 - #We also have messages in our inventory in memory (which is a python dictionary). Let's fetch those too. + # We also have messages in our inventory in memory (which is a python + # dictionary). Let's fetch those too. for hash, storedValue in shared.inventory.items(): if hash not in self.objectsOfWhichThisRemoteNodeIsAlreadyAware: objectType, streamNumber, payload, receivedTime = storedValue - if streamNumber == self.streamNumber and receivedTime > int(time.time())-maximumAgeOfObjectsThatIAdvertiseToOthers: + if streamNumber == self.streamNumber and receivedTime > int(time.time()) - maximumAgeOfObjectsThatIAdvertiseToOthers: bigInvList[hash] = 0 numberOfObjectsInInvMessage = 0 payload = '' - #Now let us start appending all of these hashes together. They will be sent out in a big inv message to our new peer. + # Now let us start appending all of these hashes together. They will be + # sent out in a big inv message to our new peer. for hash, storedValue in bigInvList.items(): payload += hash numberOfObjectsInInvMessage += 1 - if numberOfObjectsInInvMessage >= 50000: #We can only send a max of 50000 items per inv message but we may have more objects to advertise. They must be split up into multiple inv messages. - self.sendinvMessageToJustThisOnePeer(numberOfObjectsInInvMessage,payload) + if numberOfObjectsInInvMessage >= 50000: # We can only send a max of 50000 items per inv message but we may have more objects to advertise. They must be split up into multiple inv messages. + self.sendinvMessageToJustThisOnePeer( + numberOfObjectsInInvMessage, payload) payload = '' numberOfObjectsInInvMessage = 0 if numberOfObjectsInInvMessage > 0: - self.sendinvMessageToJustThisOnePeer(numberOfObjectsInInvMessage,payload) + self.sendinvMessageToJustThisOnePeer( + numberOfObjectsInInvMessage, payload) - #Self explanatory. Notice that there is also a broadcastinv function for broadcasting invs to everyone in our stream. - def sendinvMessageToJustThisOnePeer(self,numberOfObjects,payload): + # Self explanatory. Notice that there is also a broadcastinv function for + # broadcasting invs to everyone in our stream. + def sendinvMessageToJustThisOnePeer(self, numberOfObjects, payload): payload = encodeVarint(numberOfObjects) + payload - headerData = '\xe9\xbe\xb4\xd9' #magic bits, slighly different from Bitcoin's magic bits. + headerData = '\xe9\xbe\xb4\xd9' # magic bits, slighly different from Bitcoin's magic bits. headerData += 'inv\x00\x00\x00\x00\x00\x00\x00\x00\x00' - headerData += pack('>L',len(payload)) + headerData += pack('>L', len(payload)) headerData += hashlib.sha512(payload).digest()[:4] shared.printLock.acquire() print 'Sending huge inv message with', numberOfObjects, 'objects to just this one peer' shared.printLock.release() try: self.sock.sendall(headerData + payload) - except Exception, err: - #if not 'Bad file descriptor' in err: + except Exception as err: + # if not 'Bad file descriptor' in err: shared.printLock.acquire() sys.stderr.write('sock.sendall error: %s\n' % err) shared.printLock.release() - #We have received a broadcast message - def recbroadcast(self,data): + # We have received a broadcast message + def recbroadcast(self, data): self.messageProcessingStartTime = time.time() - #First we must check to make sure the proof of work is sufficient. + # First we must check to make sure the proof of work is sufficient. if not self.isProofOfWorkSufficient(data): print 'Proof of work in broadcast message insufficient.' return - readPosition = 8 #bypass the nonce - embeddedTime, = unpack('>I',data[readPosition:readPosition+4]) + readPosition = 8 # bypass the nonce + embeddedTime, = unpack('>I', data[readPosition:readPosition + 4]) - #This section is used for the transition from 32 bit time to 64 bit time in the protocol. + # This section is used for the transition from 32 bit time to 64 bit + # time in the protocol. if embeddedTime == 0: - embeddedTime, = unpack('>Q',data[readPosition:readPosition+8]) + embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8]) readPosition += 8 else: readPosition += 4 - if embeddedTime > (int(time.time())+10800): #prevent funny business + if embeddedTime > (int(time.time()) + 10800): # prevent funny business print 'The embedded time in this broadcast message is more than three hours in the future. That doesn\'t make sense. Ignoring message.' return - if embeddedTime < (int(time.time())-maximumAgeOfAnObjectThatIAmWillingToAccept): + if embeddedTime < (int(time.time()) - maximumAgeOfAnObjectThatIAmWillingToAccept): print 'The embedded time in this broadcast message is too old. Ignoring message.' return if len(data) < 180: print 'The payload length of this broadcast packet is unreasonably low. Someone is probably trying funny business. Ignoring message.' return - #Let us check to make sure the stream number is correct (thus preventing an individual from sending broadcasts out on the wrong streams or all streams). - broadcastVersion, broadcastVersionLength = decodeVarint(data[readPosition:readPosition+10]) + # Let us check to make sure the stream number is correct (thus + # preventing an individual from sending broadcasts out on the wrong + # streams or all streams). + broadcastVersion, broadcastVersionLength = decodeVarint( + data[readPosition:readPosition + 10]) if broadcastVersion >= 2: - streamNumber, streamNumberLength = decodeVarint(data[readPosition+broadcastVersionLength:readPosition+broadcastVersionLength+10]) + streamNumber, streamNumberLength = decodeVarint(data[ + readPosition + broadcastVersionLength:readPosition + broadcastVersionLength + 10]) if streamNumber != self.streamNumber: print 'The stream number encoded in this broadcast message (' + str(streamNumber) + ') does not match the stream number on which it was received. Ignoring it.' return @@ -558,121 +644,150 @@ class receiveDataThread(threading.Thread): print 'We have already received this broadcast object (it is stored on disk in the SQL inventory). Ignoring it.' shared.inventoryLock.release() return - #It is valid so far. Let's let our peers know about it. + # It is valid so far. Let's let our peers know about it. objectType = 'broadcast' - shared.inventory[self.inventoryHash] = (objectType, self.streamNumber, data, embeddedTime) + shared.inventory[self.inventoryHash] = ( + objectType, self.streamNumber, data, embeddedTime) shared.inventoryLock.release() self.broadcastinv(self.inventoryHash) - shared.UISignalQueue.put(('incrementNumberOfBroadcastsProcessed','no data')) + shared.UISignalQueue.put(( + 'incrementNumberOfBroadcastsProcessed', 'no data')) + self.processbroadcast( + readPosition, data) # When this function returns, we will have either successfully processed this broadcast because we are interested in it, ignored it because we aren't interested in it, or found problem with the broadcast that warranted ignoring it. - self.processbroadcast(readPosition,data)#When this function returns, we will have either successfully processed this broadcast because we are interested in it, ignored it because we aren't interested in it, or found problem with the broadcast that warranted ignoring it. + # Let us now set lengthOfTimeWeShouldUseToProcessThisMessage. If we + # haven't used the specified amount of time, we shall sleep. These + # values are mostly the same values used for msg messages although + # broadcast messages are processed faster. + if len(data) > 100000000: # Size is greater than 100 megabytes + lengthOfTimeWeShouldUseToProcessThisMessage = 100 # seconds. + elif len(data) > 10000000: # Between 100 and 10 megabytes + lengthOfTimeWeShouldUseToProcessThisMessage = 20 # seconds. + elif len(data) > 1000000: # Between 10 and 1 megabyte + lengthOfTimeWeShouldUseToProcessThisMessage = 3 # seconds. + else: # Less than 1 megabyte + lengthOfTimeWeShouldUseToProcessThisMessage = .6 # seconds. - # Let us now set lengthOfTimeWeShouldUseToProcessThisMessage. If we haven't used the specified amount of time, we shall sleep. These values are mostly the same values used for msg messages although broadcast messages are processed faster. - if len(data) > 100000000: #Size is greater than 100 megabytes - lengthOfTimeWeShouldUseToProcessThisMessage = 100 #seconds. - elif len(data) > 10000000: #Between 100 and 10 megabytes - lengthOfTimeWeShouldUseToProcessThisMessage = 20 #seconds. - elif len(data) > 1000000: #Between 10 and 1 megabyte - lengthOfTimeWeShouldUseToProcessThisMessage = 3 #seconds. - else: #Less than 1 megabyte - lengthOfTimeWeShouldUseToProcessThisMessage = .6 #seconds. - - - sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - (time.time()- self.messageProcessingStartTime) + sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \ + (time.time() - self.messageProcessingStartTime) if sleepTime > 0: shared.printLock.acquire() - print 'Timing attack mitigation: Sleeping for', sleepTime ,'seconds.' + print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.' shared.printLock.release() time.sleep(sleepTime) shared.printLock.acquire() - print 'Total message processing time:', time.time()- self.messageProcessingStartTime, 'seconds.' + print 'Total message processing time:', time.time() - self.messageProcessingStartTime, 'seconds.' shared.printLock.release() - #A broadcast message has a valid time and POW and requires processing. The recbroadcast function calls this one. - def processbroadcast(self,readPosition,data): - broadcastVersion, broadcastVersionLength = decodeVarint(data[readPosition:readPosition+9]) + # A broadcast message has a valid time and POW and requires processing. + # The recbroadcast function calls this one. + def processbroadcast(self, readPosition, data): + broadcastVersion, broadcastVersionLength = decodeVarint( + data[readPosition:readPosition + 9]) readPosition += broadcastVersionLength if broadcastVersion < 1 or broadcastVersion > 2: - print 'Cannot decode incoming broadcast versions higher than 2. Assuming the sender isn\' being silly, you should upgrade Bitmessage because this message shall be ignored.' + print 'Cannot decode incoming broadcast versions higher than 2. Assuming the sender isn\'t being silly, you should upgrade Bitmessage because this message shall be ignored.' return if broadcastVersion == 1: - beginningOfPubkeyPosition = readPosition #used when we add the pubkey to our pubkey table - sendersAddressVersion, sendersAddressVersionLength = decodeVarint(data[readPosition:readPosition+9]) - if sendersAddressVersion <= 1 or sendersAddressVersion >=3: - #Cannot decode senderAddressVersion higher than 2. Assuming the sender isn\' being silly, you should upgrade Bitmessage because this message shall be ignored. + beginningOfPubkeyPosition = readPosition # used when we add the pubkey to our pubkey table + sendersAddressVersion, sendersAddressVersionLength = decodeVarint( + data[readPosition:readPosition + 9]) + if sendersAddressVersion <= 1 or sendersAddressVersion >= 3: + # Cannot decode senderAddressVersion higher than 2. Assuming + # the sender isn\'t being silly, you should upgrade Bitmessage + # because this message shall be ignored. return readPosition += sendersAddressVersionLength if sendersAddressVersion == 2: - sendersStream, sendersStreamLength = decodeVarint(data[readPosition:readPosition+9]) + sendersStream, sendersStreamLength = decodeVarint( + data[readPosition:readPosition + 9]) readPosition += sendersStreamLength - behaviorBitfield = data[readPosition:readPosition+4] + behaviorBitfield = data[readPosition:readPosition + 4] readPosition += 4 - sendersPubSigningKey = '\x04' + data[readPosition:readPosition+64] + sendersPubSigningKey = '\x04' + \ + data[readPosition:readPosition + 64] readPosition += 64 - sendersPubEncryptionKey = '\x04' + data[readPosition:readPosition+64] + sendersPubEncryptionKey = '\x04' + \ + data[readPosition:readPosition + 64] readPosition += 64 endOfPubkeyPosition = readPosition - sendersHash = data[readPosition:readPosition+20] + sendersHash = data[readPosition:readPosition + 20] if sendersHash not in shared.broadcastSendersForWhichImWatching: - #Display timing data + # Display timing data shared.printLock.acquire() - print 'Time spent deciding that we are not interested in this v1 broadcast:', time.time()- self.messageProcessingStartTime + print 'Time spent deciding that we are not interested in this v1 broadcast:', time.time() - self.messageProcessingStartTime shared.printLock.release() return - #At this point, this message claims to be from sendersHash and we are interested in it. We still have to hash the public key to make sure it is truly the key that matches the hash, and also check the signiture. + # At this point, this message claims to be from sendersHash and + # we are interested in it. We still have to hash the public key + # to make sure it is truly the key that matches the hash, and + # also check the signiture. readPosition += 20 sha = hashlib.new('sha512') - sha.update(sendersPubSigningKey+sendersPubEncryptionKey) + sha.update(sendersPubSigningKey + sendersPubEncryptionKey) ripe = hashlib.new('ripemd160') ripe.update(sha.digest()) if ripe.digest() != sendersHash: - #The sender of this message lied. + # The sender of this message lied. return - messageEncodingType, messageEncodingTypeLength = decodeVarint(data[readPosition:readPosition+9]) + messageEncodingType, messageEncodingTypeLength = decodeVarint( + data[readPosition:readPosition + 9]) if messageEncodingType == 0: return readPosition += messageEncodingTypeLength - messageLength, messageLengthLength = decodeVarint(data[readPosition:readPosition+9]) + messageLength, messageLengthLength = decodeVarint( + data[readPosition:readPosition + 9]) readPosition += messageLengthLength - message = data[readPosition:readPosition+messageLength] + message = data[readPosition:readPosition + messageLength] readPosition += messageLength readPositionAtBottomOfMessage = readPosition - signatureLength, signatureLengthLength = decodeVarint(data[readPosition:readPosition+9]) + signatureLength, signatureLengthLength = decodeVarint( + data[readPosition:readPosition + 9]) readPosition += signatureLengthLength - signature = data[readPosition:readPosition+signatureLength] + signature = data[readPosition:readPosition + signatureLength] try: - if not highlevelcrypto.verify(data[12:readPositionAtBottomOfMessage],signature,sendersPubSigningKey.encode('hex')): + if not highlevelcrypto.verify(data[12:readPositionAtBottomOfMessage], signature, sendersPubSigningKey.encode('hex')): print 'ECDSA verify failed' return print 'ECDSA verify passed' - except Exception, err: + except Exception as err: print 'ECDSA verify failed', err return - #verify passed + # verify passed - #Let's store the public key in case we want to reply to this person. - #We don't have the correct nonce or time (which would let us send out a pubkey message) so we'll just fill it with 1's. We won't be able to send this pubkey to others (without doing the proof of work ourselves, which this program is programmed to not do.) - t = (ripe.digest(),'\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF'+'\xFF\xFF\xFF\xFF'+data[beginningOfPubkeyPosition:endOfPubkeyPosition],int(time.time()),'yes') + # Let's store the public key in case we want to reply to this person. + # We don't have the correct nonce or time (which would let us + # send out a pubkey message) so we'll just fill it with 1's. We + # won't be able to send this pubkey to others (without doing + # the proof of work ourselves, which this program is programmed + # to not do.) + t = (ripe.digest(), '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF' + '\xFF\xFF\xFF\xFF' + data[ + beginningOfPubkeyPosition:endOfPubkeyPosition], int(time.time()), 'yes') shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO pubkeys VALUES (?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - #shared.workerQueue.put(('newpubkey',(sendersAddressVersion,sendersStream,ripe.digest()))) #This will check to see whether we happen to be awaiting this pubkey in order to send a message. If we are, it will do the POW and send it. + # shared.workerQueue.put(('newpubkey',(sendersAddressVersion,sendersStream,ripe.digest()))) + # This will check to see whether we happen to be awaiting this + # pubkey in order to send a message. If we are, it will do the + # POW and send it. self.possibleNewPubkey(ripe.digest()) - fromAddress = encodeAddress(sendersAddressVersion,sendersStream,ripe.digest()) + fromAddress = encodeAddress( + sendersAddressVersion, sendersStream, ripe.digest()) shared.printLock.acquire() print 'fromAddress:', fromAddress shared.printLock.release() if messageEncodingType == 2: - bodyPositionIndex = string.find(message,'\nBody:') + bodyPositionIndex = string.find(message, '\nBody:') if bodyPositionIndex > 1: subject = message[8:bodyPositionIndex] - body = message[bodyPositionIndex+6:] + body = message[bodyPositionIndex + 6:] else: subject = '' body = message @@ -686,127 +801,153 @@ class receiveDataThread(threading.Thread): subject = '' toAddress = '[Broadcast subscribers]' - if messageEncodingType <> 0: + if messageEncodingType != 0: shared.sqlLock.acquire() - t = (self.inventoryHash,toAddress,fromAddress,subject,int(time.time()),body,'inbox',messageEncodingType,0) - shared.sqlSubmitQueue.put('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''') + t = (self.inventoryHash, toAddress, fromAddress, subject, int( + time.time()), body, 'inbox', messageEncodingType, 0) + shared.sqlSubmitQueue.put( + '''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('displayNewInboxMessage',(self.inventoryHash,toAddress,fromAddress,subject,body))) + shared.UISignalQueue.put(('displayNewInboxMessage', ( + self.inventoryHash, toAddress, fromAddress, subject, body))) - #If we are behaving as an API then we might need to run an outside command to let some program know that a new message has arrived. - if shared.safeConfigGetBoolean('bitmessagesettings','apienabled'): + # If we are behaving as an API then we might need to run an + # outside command to let some program know that a new + # message has arrived. + if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'): try: - apiNotifyPath = shared.config.get('bitmessagesettings','apinotifypath') + apiNotifyPath = shared.config.get( + 'bitmessagesettings', 'apinotifypath') except: apiNotifyPath = '' if apiNotifyPath != '': call([apiNotifyPath, "newBroadcast"]) - #Display timing data + # Display timing data shared.printLock.acquire() - print 'Time spent processing this interesting broadcast:', time.time()- self.messageProcessingStartTime + print 'Time spent processing this interesting broadcast:', time.time() - self.messageProcessingStartTime shared.printLock.release() if broadcastVersion == 2: - cleartextStreamNumber, cleartextStreamNumberLength = decodeVarint(data[readPosition:readPosition+10]) + cleartextStreamNumber, cleartextStreamNumberLength = decodeVarint( + data[readPosition:readPosition + 10]) readPosition += cleartextStreamNumberLength initialDecryptionSuccessful = False for key, cryptorObject in shared.MyECSubscriptionCryptorObjects.items(): try: decryptedData = cryptorObject.decrypt(data[readPosition:]) - toRipe = key #This is the RIPE hash of the sender's pubkey. We need this below to compare to the RIPE hash of the sender's address to verify that it was encrypted by with their key rather than some other key. + toRipe = key # This is the RIPE hash of the sender's pubkey. We need this below to compare to the RIPE hash of the sender's address to verify that it was encrypted by with their key rather than some other key. initialDecryptionSuccessful = True print 'EC decryption successful using key associated with ripe hash:', key.encode('hex') break - except Exception, err: + except Exception as err: pass - #print 'cryptorObject.decrypt Exception:', err + # print 'cryptorObject.decrypt Exception:', err if not initialDecryptionSuccessful: - #This is not a broadcast I am interested in. + # This is not a broadcast I am interested in. shared.printLock.acquire() - print 'Length of time program spent failing to decrypt this v2 broadcast:', time.time()- self.messageProcessingStartTime, 'seconds.' + print 'Length of time program spent failing to decrypt this v2 broadcast:', time.time() - self.messageProcessingStartTime, 'seconds.' shared.printLock.release() return - #At this point this is a broadcast I have decrypted and thus am interested in. - signedBroadcastVersion, readPosition = decodeVarint(decryptedData[:10]) - beginningOfPubkeyPosition = readPosition #used when we add the pubkey to our pubkey table - sendersAddressVersion, sendersAddressVersionLength = decodeVarint(decryptedData[readPosition:readPosition+9]) + # At this point this is a broadcast I have decrypted and thus am + # interested in. + signedBroadcastVersion, readPosition = decodeVarint( + decryptedData[:10]) + beginningOfPubkeyPosition = readPosition # used when we add the pubkey to our pubkey table + sendersAddressVersion, sendersAddressVersionLength = decodeVarint( + decryptedData[readPosition:readPosition + 9]) if sendersAddressVersion < 2 or sendersAddressVersion > 3: - print 'Cannot decode senderAddressVersion other than 2 or 3. Assuming the sender isn\' being silly, you should upgrade Bitmessage because this message shall be ignored.' + print 'Cannot decode senderAddressVersion other than 2 or 3. Assuming the sender isn\'t being silly, you should upgrade Bitmessage because this message shall be ignored.' return readPosition += sendersAddressVersionLength - sendersStream, sendersStreamLength = decodeVarint(decryptedData[readPosition:readPosition+9]) + sendersStream, sendersStreamLength = decodeVarint( + decryptedData[readPosition:readPosition + 9]) if sendersStream != cleartextStreamNumber: print 'The stream number outside of the encryption on which the POW was completed doesn\'t match the stream number inside the encryption. Ignoring broadcast.' return readPosition += sendersStreamLength - behaviorBitfield = decryptedData[readPosition:readPosition+4] + behaviorBitfield = decryptedData[readPosition:readPosition + 4] readPosition += 4 - sendersPubSigningKey = '\x04' + decryptedData[readPosition:readPosition+64] + sendersPubSigningKey = '\x04' + \ + decryptedData[readPosition:readPosition + 64] readPosition += 64 - sendersPubEncryptionKey = '\x04' + decryptedData[readPosition:readPosition+64] + sendersPubEncryptionKey = '\x04' + \ + decryptedData[readPosition:readPosition + 64] readPosition += 64 if sendersAddressVersion >= 3: - requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += varintLength print 'sender\'s requiredAverageProofOfWorkNonceTrialsPerByte is', requiredAverageProofOfWorkNonceTrialsPerByte - requiredPayloadLengthExtraBytes, varintLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + requiredPayloadLengthExtraBytes, varintLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += varintLength print 'sender\'s requiredPayloadLengthExtraBytes is', requiredPayloadLengthExtraBytes endOfPubkeyPosition = readPosition sha = hashlib.new('sha512') - sha.update(sendersPubSigningKey+sendersPubEncryptionKey) + sha.update(sendersPubSigningKey + sendersPubEncryptionKey) ripe = hashlib.new('ripemd160') ripe.update(sha.digest()) if toRipe != ripe.digest(): print 'The encryption key used to encrypt this message doesn\'t match the keys inbedded in the message itself. Ignoring message.' return - messageEncodingType, messageEncodingTypeLength = decodeVarint(decryptedData[readPosition:readPosition+9]) + messageEncodingType, messageEncodingTypeLength = decodeVarint( + decryptedData[readPosition:readPosition + 9]) if messageEncodingType == 0: return readPosition += messageEncodingTypeLength - messageLength, messageLengthLength = decodeVarint(decryptedData[readPosition:readPosition+9]) + messageLength, messageLengthLength = decodeVarint( + decryptedData[readPosition:readPosition + 9]) readPosition += messageLengthLength - message = decryptedData[readPosition:readPosition+messageLength] + message = decryptedData[readPosition:readPosition + messageLength] readPosition += messageLength readPositionAtBottomOfMessage = readPosition - signatureLength, signatureLengthLength = decodeVarint(decryptedData[readPosition:readPosition+9]) + signatureLength, signatureLengthLength = decodeVarint( + decryptedData[readPosition:readPosition + 9]) readPosition += signatureLengthLength - signature = decryptedData[readPosition:readPosition+signatureLength] + signature = decryptedData[ + readPosition:readPosition + signatureLength] try: - if not highlevelcrypto.verify(decryptedData[:readPositionAtBottomOfMessage],signature,sendersPubSigningKey.encode('hex')): + if not highlevelcrypto.verify(decryptedData[:readPositionAtBottomOfMessage], signature, sendersPubSigningKey.encode('hex')): print 'ECDSA verify failed' return print 'ECDSA verify passed' - except Exception, err: + except Exception as err: print 'ECDSA verify failed', err return - #verify passed + # verify passed - #Let's store the public key in case we want to reply to this person. - t = (ripe.digest(),'\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF'+'\xFF\xFF\xFF\xFF'+decryptedData[beginningOfPubkeyPosition:endOfPubkeyPosition],int(time.time()),'yes') + # Let's store the public key in case we want to reply to this + # person. + t = (ripe.digest(), '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF' + '\xFF\xFF\xFF\xFF' + decryptedData[ + beginningOfPubkeyPosition:endOfPubkeyPosition], int(time.time()), 'yes') shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO pubkeys VALUES (?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - #shared.workerQueue.put(('newpubkey',(sendersAddressVersion,sendersStream,ripe.digest()))) #This will check to see whether we happen to be awaiting this pubkey in order to send a message. If we are, it will do the POW and send it. + # shared.workerQueue.put(('newpubkey',(sendersAddressVersion,sendersStream,ripe.digest()))) + # This will check to see whether we happen to be awaiting this + # pubkey in order to send a message. If we are, it will do the POW + # and send it. self.possibleNewPubkey(ripe.digest()) - fromAddress = encodeAddress(sendersAddressVersion,sendersStream,ripe.digest()) + fromAddress = encodeAddress( + sendersAddressVersion, sendersStream, ripe.digest()) shared.printLock.acquire() print 'fromAddress:', fromAddress shared.printLock.release() if messageEncodingType == 2: - bodyPositionIndex = string.find(message,'\nBody:') + bodyPositionIndex = string.find(message, '\nBody:') if bodyPositionIndex > 1: subject = message[8:bodyPositionIndex] - body = message[bodyPositionIndex+6:] + body = message[bodyPositionIndex + 6:] else: subject = '' body = message @@ -820,56 +961,63 @@ class receiveDataThread(threading.Thread): subject = '' toAddress = '[Broadcast subscribers]' - if messageEncodingType <> 0: + if messageEncodingType != 0: shared.sqlLock.acquire() - t = (self.inventoryHash,toAddress,fromAddress,subject,int(time.time()),body,'inbox',messageEncodingType,0) - shared.sqlSubmitQueue.put('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''') + t = (self.inventoryHash, toAddress, fromAddress, subject, int( + time.time()), body, 'inbox', messageEncodingType, 0) + shared.sqlSubmitQueue.put( + '''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('displayNewInboxMessage',(self.inventoryHash,toAddress,fromAddress,subject,body))) + shared.UISignalQueue.put(('displayNewInboxMessage', ( + self.inventoryHash, toAddress, fromAddress, subject, body))) - #If we are behaving as an API then we might need to run an outside command to let some program know that a new message has arrived. - if shared.safeConfigGetBoolean('bitmessagesettings','apienabled'): + # If we are behaving as an API then we might need to run an + # outside command to let some program know that a new message + # has arrived. + if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'): try: - apiNotifyPath = shared.config.get('bitmessagesettings','apinotifypath') + apiNotifyPath = shared.config.get( + 'bitmessagesettings', 'apinotifypath') except: apiNotifyPath = '' if apiNotifyPath != '': call([apiNotifyPath, "newBroadcast"]) - #Display timing data + # Display timing data shared.printLock.acquire() - print 'Time spent processing this interesting broadcast:', time.time()- self.messageProcessingStartTime + print 'Time spent processing this interesting broadcast:', time.time() - self.messageProcessingStartTime shared.printLock.release() - - #We have received a msg message. - def recmsg(self,data): + # We have received a msg message. + def recmsg(self, data): self.messageProcessingStartTime = time.time() - #First we must check to make sure the proof of work is sufficient. + # First we must check to make sure the proof of work is sufficient. if not self.isProofOfWorkSufficient(data): print 'Proof of work in msg message insufficient.' return readPosition = 8 - embeddedTime, = unpack('>I',data[readPosition:readPosition+4]) + embeddedTime, = unpack('>I', data[readPosition:readPosition + 4]) - #This section is used for the transition from 32 bit time to 64 bit time in the protocol. + # This section is used for the transition from 32 bit time to 64 bit + # time in the protocol. if embeddedTime == 0: - embeddedTime, = unpack('>Q',data[readPosition:readPosition+8]) + embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8]) readPosition += 8 else: readPosition += 4 - if embeddedTime > int(time.time())+10800: + if embeddedTime > int(time.time()) + 10800: print 'The time in the msg message is too new. Ignoring it. Time:', embeddedTime return - if embeddedTime < int(time.time())-maximumAgeOfAnObjectThatIAmWillingToAccept: + if embeddedTime < int(time.time()) - maximumAgeOfAnObjectThatIAmWillingToAccept: print 'The time in the msg message is too old. Ignoring it. Time:', embeddedTime return - streamNumberAsClaimedByMsg, streamNumberAsClaimedByMsgLength = decodeVarint(data[readPosition:readPosition+9]) + streamNumberAsClaimedByMsg, streamNumberAsClaimedByMsgLength = decodeVarint( + data[readPosition:readPosition + 9]) if streamNumberAsClaimedByMsg != self.streamNumber: print 'The stream number encoded in this msg (' + str(streamNumberAsClaimedByMsg) + ') message does not match the stream number on which it was received. Ignoring it.' return @@ -884,88 +1032,99 @@ class receiveDataThread(threading.Thread): print 'We have already received this msg message (it is stored on disk in the SQL inventory). Ignoring it.' shared.inventoryLock.release() return - #This msg message is valid. Let's let our peers know about it. + # This msg message is valid. Let's let our peers know about it. objectType = 'msg' - shared.inventory[self.inventoryHash] = (objectType, self.streamNumber, data, embeddedTime) + shared.inventory[self.inventoryHash] = ( + objectType, self.streamNumber, data, embeddedTime) shared.inventoryLock.release() self.broadcastinv(self.inventoryHash) - shared.UISignalQueue.put(('incrementNumberOfMessagesProcessed','no data')) + shared.UISignalQueue.put(( + 'incrementNumberOfMessagesProcessed', 'no data')) + self.processmsg( + readPosition, data) # When this function returns, we will have either successfully processed the message bound for us, ignored it because it isn't bound for us, or found problem with the message that warranted ignoring it. - self.processmsg(readPosition,data) #When this function returns, we will have either successfully processed the message bound for us, ignored it because it isn't bound for us, or found problem with the message that warranted ignoring it. + # Let us now set lengthOfTimeWeShouldUseToProcessThisMessage. If we + # haven't used the specified amount of time, we shall sleep. These + # values are based on test timings and you may change them at-will. + if len(data) > 100000000: # Size is greater than 100 megabytes + lengthOfTimeWeShouldUseToProcessThisMessage = 100 # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 100 MB message: 3.7 seconds. + elif len(data) > 10000000: # Between 100 and 10 megabytes + lengthOfTimeWeShouldUseToProcessThisMessage = 20 # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 10 MB message: 0.53 seconds. Actual length of time it takes in practice when processing a real message: 1.44 seconds. + elif len(data) > 1000000: # Between 10 and 1 megabyte + lengthOfTimeWeShouldUseToProcessThisMessage = 3 # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 1 MB message: 0.18 seconds. Actual length of time it takes in practice when processing a real message: 0.30 seconds. + else: # Less than 1 megabyte + lengthOfTimeWeShouldUseToProcessThisMessage = .6 # seconds. Actual length of time it took my computer to decrypt and verify the signature of a 100 KB message: 0.15 seconds. Actual length of time it takes in practice when processing a real message: 0.25 seconds. - # Let us now set lengthOfTimeWeShouldUseToProcessThisMessage. If we haven't used the specified amount of time, we shall sleep. These values are based on test timings and you may change them at-will. - if len(data) > 100000000: #Size is greater than 100 megabytes - lengthOfTimeWeShouldUseToProcessThisMessage = 100 #seconds. Actual length of time it took my computer to decrypt and verify the signature of a 100 MB message: 3.7 seconds. - elif len(data) > 10000000: #Between 100 and 10 megabytes - lengthOfTimeWeShouldUseToProcessThisMessage = 20 #seconds. Actual length of time it took my computer to decrypt and verify the signature of a 10 MB message: 0.53 seconds. Actual length of time it takes in practice when processing a real message: 1.44 seconds. - elif len(data) > 1000000: #Between 10 and 1 megabyte - lengthOfTimeWeShouldUseToProcessThisMessage = 3 #seconds. Actual length of time it took my computer to decrypt and verify the signature of a 1 MB message: 0.18 seconds. Actual length of time it takes in practice when processing a real message: 0.30 seconds. - else: #Less than 1 megabyte - lengthOfTimeWeShouldUseToProcessThisMessage = .6 #seconds. Actual length of time it took my computer to decrypt and verify the signature of a 100 KB message: 0.15 seconds. Actual length of time it takes in practice when processing a real message: 0.25 seconds. - - - sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - (time.time()- self.messageProcessingStartTime) + sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \ + (time.time() - self.messageProcessingStartTime) if sleepTime > 0: shared.printLock.acquire() - print 'Timing attack mitigation: Sleeping for', sleepTime ,'seconds.' + print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.' shared.printLock.release() time.sleep(sleepTime) shared.printLock.acquire() - print 'Total message processing time:', time.time()- self.messageProcessingStartTime, 'seconds.' + print 'Total message processing time:', time.time() - self.messageProcessingStartTime, 'seconds.' shared.printLock.release() - - #A msg message has a valid time and POW and requires processing. The recmsg function calls this one. - def processmsg(self,readPosition, encryptedData): + # A msg message has a valid time and POW and requires processing. The + # recmsg function calls this one. + def processmsg(self, readPosition, encryptedData): initialDecryptionSuccessful = False - #Let's check whether this is a message acknowledgement bound for us. + # Let's check whether this is a message acknowledgement bound for us. if encryptedData[readPosition:] in ackdataForWhichImWatching: shared.printLock.acquire() print 'This msg IS an acknowledgement bound for me.' shared.printLock.release() del ackdataForWhichImWatching[encryptedData[readPosition:]] - t = ('ackreceived',encryptedData[readPosition:]) + t = ('ackreceived', encryptedData[readPosition:]) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('UPDATE sent SET status=? WHERE ackdata=?') + shared.sqlSubmitQueue.put( + 'UPDATE sent SET status=? WHERE ackdata=?') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(encryptedData[readPosition:],'Acknowledgement of the message received just now. '+ unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (encryptedData[readPosition:], 'Acknowledgement of the message received just now. ' + unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) return else: shared.printLock.acquire() - print 'This was NOT an acknowledgement bound for me.' - #print 'ackdataForWhichImWatching', ackdataForWhichImWatching + print 'This was NOT an acknowledgement bound for me.' + # print 'ackdataForWhichImWatching', ackdataForWhichImWatching shared.printLock.release() - #This is not an acknowledgement bound for me. See if it is a message bound for me by trying to decrypt it with my private keys. + # This is not an acknowledgement bound for me. See if it is a message + # bound for me by trying to decrypt it with my private keys. for key, cryptorObject in shared.myECCryptorObjects.items(): try: - decryptedData = cryptorObject.decrypt(encryptedData[readPosition:]) - toRipe = key #This is the RIPE hash of my pubkeys. We need this below to compare to the destination_ripe included in the encrypted data. + decryptedData = cryptorObject.decrypt( + encryptedData[readPosition:]) + toRipe = key # This is the RIPE hash of my pubkeys. We need this below to compare to the destination_ripe included in the encrypted data. initialDecryptionSuccessful = True print 'EC decryption successful using key associated with ripe hash:', key.encode('hex') break - except Exception, err: + except Exception as err: pass - #print 'cryptorObject.decrypt Exception:', err + # print 'cryptorObject.decrypt Exception:', err if not initialDecryptionSuccessful: - #This is not a message bound for me. + # This is not a message bound for me. shared.printLock.acquire() - print 'Length of time program spent failing to decrypt this message:', time.time()- self.messageProcessingStartTime, 'seconds.' + print 'Length of time program spent failing to decrypt this message:', time.time() - self.messageProcessingStartTime, 'seconds.' shared.printLock.release() else: - #This is a message bound for me. - toAddress = shared.myAddressesByHash[toRipe] #Look up my address based on the RIPE hash. + # This is a message bound for me. + toAddress = shared.myAddressesByHash[ + toRipe] # Look up my address based on the RIPE hash. readPosition = 0 - messageVersion, messageVersionLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + messageVersion, messageVersionLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += messageVersionLength if messageVersion != 1: print 'Cannot understand message versions other than one. Ignoring message.' return - sendersAddressVersionNumber, sendersAddressVersionNumberLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + sendersAddressVersionNumber, sendersAddressVersionNumberLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += sendersAddressVersionNumberLength if sendersAddressVersionNumber == 0: print 'Cannot understand sendersAddressVersionNumber = 0. Ignoring message.' @@ -976,89 +1135,111 @@ class receiveDataThread(threading.Thread): if len(decryptedData) < 170: print 'Length of the unencrypted data is unreasonably short. Sanity check failed. Ignoring message.' return - sendersStreamNumber, sendersStreamNumberLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + sendersStreamNumber, sendersStreamNumberLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) if sendersStreamNumber == 0: print 'sender\'s stream number is 0. Ignoring message.' return readPosition += sendersStreamNumberLength - behaviorBitfield = decryptedData[readPosition:readPosition+4] + behaviorBitfield = decryptedData[readPosition:readPosition + 4] readPosition += 4 - pubSigningKey = '\x04' + decryptedData[readPosition:readPosition+64] + pubSigningKey = '\x04' + decryptedData[ + readPosition:readPosition + 64] readPosition += 64 - pubEncryptionKey = '\x04' + decryptedData[readPosition:readPosition+64] + pubEncryptionKey = '\x04' + decryptedData[ + readPosition:readPosition + 64] readPosition += 64 if sendersAddressVersionNumber >= 3: - requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += varintLength print 'sender\'s requiredAverageProofOfWorkNonceTrialsPerByte is', requiredAverageProofOfWorkNonceTrialsPerByte - requiredPayloadLengthExtraBytes, varintLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + requiredPayloadLengthExtraBytes, varintLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += varintLength print 'sender\'s requiredPayloadLengthExtraBytes is', requiredPayloadLengthExtraBytes - endOfThePublicKeyPosition = readPosition #needed for when we store the pubkey in our database of pubkeys for later use. - if toRipe != decryptedData[readPosition:readPosition+20]: + endOfThePublicKeyPosition = readPosition # needed for when we store the pubkey in our database of pubkeys for later use. + if toRipe != decryptedData[readPosition:readPosition + 20]: shared.printLock.acquire() print 'The original sender of this message did not send it to you. Someone is attempting a Surreptitious Forwarding Attack.' print 'See: http://world.std.com/~dtd/sign_encrypt/sign_encrypt7.html' print 'your toRipe:', toRipe.encode('hex') - print 'embedded destination toRipe:', decryptedData[readPosition:readPosition+20].encode('hex') + print 'embedded destination toRipe:', decryptedData[readPosition:readPosition + 20].encode('hex') shared.printLock.release() return readPosition += 20 - messageEncodingType, messageEncodingTypeLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + messageEncodingType, messageEncodingTypeLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += messageEncodingTypeLength - messageLength, messageLengthLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + messageLength, messageLengthLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += messageLengthLength - message = decryptedData[readPosition:readPosition+messageLength] - #print 'First 150 characters of message:', repr(message[:150]) + message = decryptedData[readPosition:readPosition + messageLength] + # print 'First 150 characters of message:', repr(message[:150]) readPosition += messageLength - ackLength, ackLengthLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + ackLength, ackLengthLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += ackLengthLength - ackData = decryptedData[readPosition:readPosition+ackLength] + ackData = decryptedData[readPosition:readPosition + ackLength] readPosition += ackLength - positionOfBottomOfAckData = readPosition #needed to mark the end of what is covered by the signature - signatureLength, signatureLengthLength = decodeVarint(decryptedData[readPosition:readPosition+10]) + positionOfBottomOfAckData = readPosition # needed to mark the end of what is covered by the signature + signatureLength, signatureLengthLength = decodeVarint( + decryptedData[readPosition:readPosition + 10]) readPosition += signatureLengthLength - signature = decryptedData[readPosition:readPosition+signatureLength] + signature = decryptedData[ + readPosition:readPosition + signatureLength] try: - if not highlevelcrypto.verify(decryptedData[:positionOfBottomOfAckData],signature,pubSigningKey.encode('hex')): + if not highlevelcrypto.verify(decryptedData[:positionOfBottomOfAckData], signature, pubSigningKey.encode('hex')): print 'ECDSA verify failed' return print 'ECDSA verify passed' - except Exception, err: + except Exception as err: print 'ECDSA verify failed', err return shared.printLock.acquire() - print 'As a matter of intellectual curiosity, here is the Bitcoin address associated with the keys owned by the other person:', calculateBitcoinAddressFromPubkey(pubSigningKey), ' ..and here is the testnet address:',calculateTestnetAddressFromPubkey(pubSigningKey),'. The other person must take their private signing key from Bitmessage and import it into Bitcoin (or a service like Blockchain.info) for it to be of any use. Do not use this unless you know what you are doing.' + print 'As a matter of intellectual curiosity, here is the Bitcoin address associated with the keys owned by the other person:', calculateBitcoinAddressFromPubkey(pubSigningKey), ' ..and here is the testnet address:', calculateTestnetAddressFromPubkey(pubSigningKey), '. The other person must take their private signing key from Bitmessage and import it into Bitcoin (or a service like Blockchain.info) for it to be of any use. Do not use this unless you know what you are doing.' shared.printLock.release() - #calculate the fromRipe. + # calculate the fromRipe. sha = hashlib.new('sha512') - sha.update(pubSigningKey+pubEncryptionKey) + sha.update(pubSigningKey + pubEncryptionKey) ripe = hashlib.new('ripemd160') ripe.update(sha.digest()) - #Let's store the public key in case we want to reply to this person. - t = (ripe.digest(),'\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF'+'\xFF\xFF\xFF\xFF'+decryptedData[messageVersionLength:endOfThePublicKeyPosition],int(time.time()),'yes') + # Let's store the public key in case we want to reply to this + # person. + t = (ripe.digest(), '\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF' + '\xFF\xFF\xFF\xFF' + decryptedData[ + messageVersionLength:endOfThePublicKeyPosition], int(time.time()), 'yes') shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO pubkeys VALUES (?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - #shared.workerQueue.put(('newpubkey',(sendersAddressVersionNumber,sendersStreamNumber,ripe.digest()))) #This will check to see whether we happen to be awaiting this pubkey in order to send a message. If we are, it will do the POW and send it. + # shared.workerQueue.put(('newpubkey',(sendersAddressVersionNumber,sendersStreamNumber,ripe.digest()))) + # This will check to see whether we happen to be awaiting this + # pubkey in order to send a message. If we are, it will do the POW + # and send it. self.possibleNewPubkey(ripe.digest()) - fromAddress = encodeAddress(sendersAddressVersionNumber,sendersStreamNumber,ripe.digest()) - #If this message is bound for one of my version 3 addresses (or higher), then we must check to make sure it meets our demanded proof of work requirement. - if decodeAddress(toAddress)[1] >= 3:#If the toAddress version number is 3 or higher: - if not shared.isAddressInMyAddressBookSubscriptionsListOrWhitelist(fromAddress): #If I'm not friendly with this person: - requiredNonceTrialsPerByte = shared.config.getint(toAddress,'noncetrialsperbyte') - requiredPayloadLengthExtraBytes = shared.config.getint(toAddress,'payloadlengthextrabytes') - if not self.isProofOfWorkSufficient(encryptedData,requiredNonceTrialsPerByte,requiredPayloadLengthExtraBytes): + fromAddress = encodeAddress( + sendersAddressVersionNumber, sendersStreamNumber, ripe.digest()) + # If this message is bound for one of my version 3 addresses (or + # higher), then we must check to make sure it meets our demanded + # proof of work requirement. + if decodeAddress(toAddress)[1] >= 3: # If the toAddress version number is 3 or higher: + if not shared.isAddressInMyAddressBookSubscriptionsListOrWhitelist(fromAddress): # If I'm not friendly with this person: + requiredNonceTrialsPerByte = shared.config.getint( + toAddress, 'noncetrialsperbyte') + requiredPayloadLengthExtraBytes = shared.config.getint( + toAddress, 'payloadlengthextrabytes') + if not self.isProofOfWorkSufficient(encryptedData, requiredNonceTrialsPerByte, requiredPayloadLengthExtraBytes): print 'Proof of work in msg message insufficient only because it does not meet our higher requirement.' return - blockMessage = False #Gets set to True if the user shouldn't see the message according to black or white lists. - if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': #If we are using a blacklist + blockMessage = False # Gets set to True if the user shouldn't see the message according to black or white lists. + if shared.config.get('bitmessagesettings', 'blackwhitelist') == 'black': # If we are using a blacklist t = (fromAddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT label FROM blacklist where address=? and enabled='1' ''') + shared.sqlSubmitQueue.put( + '''SELECT label FROM blacklist where address=? and enabled='1' ''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -1067,10 +1248,11 @@ class receiveDataThread(threading.Thread): print 'Message ignored because address is in blacklist.' shared.printLock.release() blockMessage = True - else: #We're using a whitelist + else: # We're using a whitelist t = (fromAddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT label FROM whitelist where address=? and enabled='1' ''') + shared.sqlSubmitQueue.put( + '''SELECT label FROM whitelist where address=? and enabled='1' ''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -1086,11 +1268,12 @@ class receiveDataThread(threading.Thread): toLabel = toAddress if messageEncodingType == 2: - bodyPositionIndex = string.find(message,'\nBody:') + bodyPositionIndex = string.find(message, '\nBody:') if bodyPositionIndex > 1: subject = message[8:bodyPositionIndex] - subject = subject[:500] #Only save and show the first 500 characters of the subject. Any more is probably an attak. - body = message[bodyPositionIndex+6:] + subject = subject[ + :500] # Only save and show the first 500 characters of the subject. Any more is probably an attak. + body = message[bodyPositionIndex + 6:] else: subject = '' body = message @@ -1102,56 +1285,73 @@ class receiveDataThread(threading.Thread): else: body = 'Unknown encoding type.\n\n' + repr(message) subject = '' - if messageEncodingType <> 0: + if messageEncodingType != 0: shared.sqlLock.acquire() - t = (self.inventoryHash,toAddress,fromAddress,subject,int(time.time()),body,'inbox',messageEncodingType,0) - shared.sqlSubmitQueue.put('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''') + t = (self.inventoryHash, toAddress, fromAddress, subject, int( + time.time()), body, 'inbox', messageEncodingType, 0) + shared.sqlSubmitQueue.put( + '''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('displayNewInboxMessage',(self.inventoryHash,toAddress,fromAddress,subject,body))) + shared.UISignalQueue.put(('displayNewInboxMessage', ( + self.inventoryHash, toAddress, fromAddress, subject, body))) - #If we are behaving as an API then we might need to run an outside command to let some program know that a new message has arrived. - if shared.safeConfigGetBoolean('bitmessagesettings','apienabled'): + # If we are behaving as an API then we might need to run an + # outside command to let some program know that a new message + # has arrived. + if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'): try: - apiNotifyPath = shared.config.get('bitmessagesettings','apinotifypath') + apiNotifyPath = shared.config.get( + 'bitmessagesettings', 'apinotifypath') except: apiNotifyPath = '' if apiNotifyPath != '': call([apiNotifyPath, "newMessage"]) - #Let us now check and see whether our receiving address is behaving as a mailing list - if shared.safeConfigGetBoolean(toAddress,'mailinglist'): + # Let us now check and see whether our receiving address is + # behaving as a mailing list + if shared.safeConfigGetBoolean(toAddress, 'mailinglist'): try: - mailingListName = shared.config.get(toAddress, 'mailinglistname') + mailingListName = shared.config.get( + toAddress, 'mailinglistname') except: mailingListName = '' - #Let us send out this message as a broadcast - subject = self.addMailingListNameToSubject(subject,mailingListName) - #Let us now send this message out as a broadcast - message = strftime("%a, %Y-%m-%d %H:%M:%S UTC",gmtime()) + ' Message ostensibly from ' + fromAddress + ':\n\n' + body - fromAddress = toAddress #The fromAddress for the broadcast that we are about to send is the toAddress (my address) for the msg message we are currently processing. - ackdata = OpenSSL.rand(32) #We don't actually need the ackdata for acknowledgement since this is a broadcast message but we can use it to update the user interface when the POW is done generating. + # Let us send out this message as a broadcast + subject = self.addMailingListNameToSubject( + subject, mailingListName) + # Let us now send this message out as a broadcast + message = strftime("%a, %Y-%m-%d %H:%M:%S UTC", gmtime( + )) + ' Message ostensibly from ' + fromAddress + ':\n\n' + body + fromAddress = toAddress # The fromAddress for the broadcast that we are about to send is the toAddress (my address) for the msg message we are currently processing. + ackdata = OpenSSL.rand( + 32) # We don't actually need the ackdata for acknowledgement since this is a broadcast message but we can use it to update the user interface when the POW is done generating. toAddress = '[Broadcast subscribers]' ripe = '' shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2) - shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') + t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int( + time.time()), 'broadcastqueued', 1, 1, 'sent', 2) + shared.sqlSubmitQueue.put( + '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('displayNewSentMessage',(toAddress,'[Broadcast subscribers]',fromAddress,subject,message,ackdata))) - shared.workerQueue.put(('sendbroadcast','')) + shared.UISignalQueue.put(('displayNewSentMessage', ( + toAddress, '[Broadcast subscribers]', fromAddress, subject, message, ackdata))) + shared.workerQueue.put(('sendbroadcast', '')) if self.isAckDataValid(ackData): print 'ackData is valid. Will process it.' - self.ackDataThatWeHaveYetToSend.append(ackData) #When we have processed all data, the processData function will pop the ackData out and process it as if it is a message received from our peer. - #Display timing data - timeRequiredToAttemptToDecryptMessage = time.time()- self.messageProcessingStartTime - successfullyDecryptMessageTimings.append(timeRequiredToAttemptToDecryptMessage) + self.ackDataThatWeHaveYetToSend.append( + ackData) # When we have processed all data, the processData function will pop the ackData out and process it as if it is a message received from our peer. + # Display timing data + timeRequiredToAttemptToDecryptMessage = time.time( + ) - self.messageProcessingStartTime + successfullyDecryptMessageTimings.append( + timeRequiredToAttemptToDecryptMessage) sum = 0 for item in successfullyDecryptMessageTimings: sum += item @@ -1160,68 +1360,70 @@ class receiveDataThread(threading.Thread): print 'Average time for all message decryption successes since startup:', sum / len(successfullyDecryptMessageTimings) shared.printLock.release() - def isAckDataValid(self,ackData): + def isAckDataValid(self, ackData): if len(ackData) < 24: print 'The length of ackData is unreasonably short. Not sending ackData.' return False if ackData[0:4] != '\xe9\xbe\xb4\xd9': print 'Ackdata magic bytes were wrong. Not sending ackData.' return False - ackDataPayloadLength, = unpack('>L',ackData[16:20]) - if len(ackData)-24 != ackDataPayloadLength: + ackDataPayloadLength, = unpack('>L', ackData[16:20]) + if len(ackData) - 24 != ackDataPayloadLength: print 'ackData payload length doesn\'t match the payload length specified in the header. Not sending ackdata.' return False - if ackData[4:16] != 'getpubkey\x00\x00\x00' and ackData[4:16] != 'pubkey\x00\x00\x00\x00\x00\x00' and ackData[4:16] != 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00' and ackData[4:16] != 'broadcast\x00\x00\x00' : + if ackData[4:16] != 'getpubkey\x00\x00\x00' and ackData[4:16] != 'pubkey\x00\x00\x00\x00\x00\x00' and ackData[4:16] != 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00' and ackData[4:16] != 'broadcast\x00\x00\x00': return False return True - def addMailingListNameToSubject(self,subject,mailingListName): + def addMailingListNameToSubject(self, subject, mailingListName): subject = subject.strip() if subject[:3] == 'Re:' or subject[:3] == 'RE:': subject = subject[3:].strip() - if '['+mailingListName+']' in subject: + if '[' + mailingListName + ']' in subject: return subject else: - return '['+mailingListName+'] ' + subject + return '[' + mailingListName + '] ' + subject - def possibleNewPubkey(self,toRipe): + def possibleNewPubkey(self, toRipe): if toRipe in neededPubkeys: print 'We have been awaiting the arrival of this pubkey.' del neededPubkeys[toRipe] t = (toRipe,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE sent SET status='doingmsgpow' WHERE toripe=? AND status='awaitingpubkey' and folder='sent' ''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET status='doingmsgpow' WHERE toripe=? AND status='awaitingpubkey' and folder='sent' ''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.workerQueue.put(('sendmessage','')) + shared.workerQueue.put(('sendmessage', '')) else: shared.printLock.acquire() print 'We don\'t need this pub key. We didn\'t ask for it. Pubkey hash:', toRipe.encode('hex') shared.printLock.release() - #We have received a pubkey - def recpubkey(self,data): + # We have received a pubkey + def recpubkey(self, data): self.pubkeyProcessingStartTime = time.time() - if len(data) < 146 or len(data) >600: #sanity check + if len(data) < 146 or len(data) > 600: # sanity check return - #We must check to make sure the proof of work is sufficient. + # We must check to make sure the proof of work is sufficient. if not self.isProofOfWorkSufficient(data): print 'Proof of work in pubkey message insufficient.' return - readPosition = 8 #for the nonce - embeddedTime, = unpack('>I',data[readPosition:readPosition+4]) + readPosition = 8 # for the nonce + embeddedTime, = unpack('>I', data[readPosition:readPosition + 4]) - #This section is used for the transition from 32 bit time to 64 bit time in the protocol. + # This section is used for the transition from 32 bit time to 64 bit + # time in the protocol. if embeddedTime == 0: - embeddedTime, = unpack('>Q',data[readPosition:readPosition+8]) + embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8]) readPosition += 8 else: readPosition += 4 - if embeddedTime < int(time.time())-lengthOfTimeToHoldOnToAllPubkeys: + if embeddedTime < int(time.time()) - lengthOfTimeToHoldOnToAllPubkeys: shared.printLock.acquire() print 'The embedded time in this pubkey message is too old. Ignoring. Embedded time is:', embeddedTime shared.printLock.release() @@ -1231,9 +1433,11 @@ class receiveDataThread(threading.Thread): print 'The embedded time in this pubkey message more than several hours in the future. This is irrational. Ignoring message.' shared.printLock.release() return - addressVersion, varintLength = decodeVarint(data[readPosition:readPosition+10]) + addressVersion, varintLength = decodeVarint( + data[readPosition:readPosition + 10]) readPosition += varintLength - streamNumber, varintLength = decodeVarint(data[readPosition:readPosition+10]) + streamNumber, varintLength = decodeVarint( + data[readPosition:readPosition + 10]) readPosition += varintLength if self.streamNumber != streamNumber: print 'stream number embedded in this pubkey doesn\'t match our stream number. Ignoring.' @@ -1250,62 +1454,71 @@ class receiveDataThread(threading.Thread): shared.inventoryLock.release() return objectType = 'pubkey' - shared.inventory[inventoryHash] = (objectType, self.streamNumber, data, embeddedTime) + shared.inventory[inventoryHash] = ( + objectType, self.streamNumber, data, embeddedTime) shared.inventoryLock.release() self.broadcastinv(inventoryHash) - shared.UISignalQueue.put(('incrementNumberOfPubkeysProcessed','no data')) + shared.UISignalQueue.put(( + 'incrementNumberOfPubkeysProcessed', 'no data')) self.processpubkey(data) lengthOfTimeWeShouldUseToProcessThisMessage = .2 - sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - (time.time()- self.pubkeyProcessingStartTime) + sleepTime = lengthOfTimeWeShouldUseToProcessThisMessage - \ + (time.time() - self.pubkeyProcessingStartTime) if sleepTime > 0: shared.printLock.acquire() - print 'Timing attack mitigation: Sleeping for', sleepTime ,'seconds.' + print 'Timing attack mitigation: Sleeping for', sleepTime, 'seconds.' shared.printLock.release() time.sleep(sleepTime) shared.printLock.acquire() - print 'Total pubkey processing time:', time.time()- self.pubkeyProcessingStartTime, 'seconds.' + print 'Total pubkey processing time:', time.time() - self.pubkeyProcessingStartTime, 'seconds.' shared.printLock.release() - def processpubkey(self,data): - readPosition = 8 #for the nonce - embeddedTime, = unpack('>I',data[readPosition:readPosition+4]) + def processpubkey(self, data): + readPosition = 8 # for the nonce + embeddedTime, = unpack('>I', data[readPosition:readPosition + 4]) - #This section is used for the transition from 32 bit time to 64 bit time in the protocol. + # This section is used for the transition from 32 bit time to 64 bit + # time in the protocol. if embeddedTime == 0: - embeddedTime, = unpack('>Q',data[readPosition:readPosition+8]) + embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8]) readPosition += 8 else: readPosition += 4 - addressVersion, varintLength = decodeVarint(data[readPosition:readPosition+10]) + addressVersion, varintLength = decodeVarint( + data[readPosition:readPosition + 10]) readPosition += varintLength - streamNumber, varintLength = decodeVarint(data[readPosition:readPosition+10]) + streamNumber, varintLength = decodeVarint( + data[readPosition:readPosition + 10]) readPosition += varintLength if addressVersion == 0: print '(Within processpubkey) addressVersion of 0 doesn\'t make sense.' return if addressVersion >= 4 or addressVersion == 1: shared.printLock.acquire() - print 'This version of Bitmessage cannot handle version', addressVersion,'addresses.' + print 'This version of Bitmessage cannot handle version', addressVersion, 'addresses.' shared.printLock.release() return if addressVersion == 2: - if len(data) < 146: #sanity check. This is the minimum possible length. + if len(data) < 146: # sanity check. This is the minimum possible length. print '(within processpubkey) payloadLength less than 146. Sanity check failed.' return - bitfieldBehaviors = data[readPosition:readPosition+4] + bitfieldBehaviors = data[readPosition:readPosition + 4] readPosition += 4 - publicSigningKey = data[readPosition:readPosition+64] - #Is it possible for a public key to be invalid such that trying to encrypt or sign with it will cause an error? If it is, we should probably test these keys here. + publicSigningKey = data[readPosition:readPosition + 64] + # Is it possible for a public key to be invalid such that trying to + # encrypt or sign with it will cause an error? If it is, we should + # probably test these keys here. readPosition += 64 - publicEncryptionKey = data[readPosition:readPosition+64] + publicEncryptionKey = data[readPosition:readPosition + 64] if len(publicEncryptionKey) < 64: print 'publicEncryptionKey length less than 64. Sanity check failed.' return sha = hashlib.new('sha512') - sha.update('\x04'+publicSigningKey+'\x04'+publicEncryptionKey) + sha.update( + '\x04' + publicSigningKey + '\x04' + publicEncryptionKey) ripeHasher = hashlib.new('ripemd160') ripeHasher.update(sha.digest()) ripe = ripeHasher.digest() @@ -1319,54 +1532,62 @@ class receiveDataThread(threading.Thread): t = (ripe,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT usedpersonally FROM pubkeys WHERE hash=? AND usedpersonally='yes' ''') + shared.sqlSubmitQueue.put( + '''SELECT usedpersonally FROM pubkeys WHERE hash=? AND usedpersonally='yes' ''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn != []: #if this pubkey is already in our database and if we have used it personally: + if queryreturn != []: # if this pubkey is already in our database and if we have used it personally: print 'We HAVE used this pubkey personally. Updating time.' - t = (ripe,data,embeddedTime,'yes') + t = (ripe, data, embeddedTime, 'yes') else: print 'We have NOT used this pubkey personally. Inserting in database.' - t = (ripe,data,embeddedTime,'no') #This will also update the embeddedTime. + t = (ripe, data, embeddedTime, 'no') + # This will also update the embeddedTime. shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO pubkeys VALUES (?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - #shared.workerQueue.put(('newpubkey',(addressVersion,streamNumber,ripe))) + # shared.workerQueue.put(('newpubkey',(addressVersion,streamNumber,ripe))) self.possibleNewPubkey(ripe) if addressVersion == 3: - if len(data) < 170: #sanity check. + if len(data) < 170: # sanity check. print '(within processpubkey) payloadLength less than 170. Sanity check failed.' return - bitfieldBehaviors = data[readPosition:readPosition+4] + bitfieldBehaviors = data[readPosition:readPosition + 4] readPosition += 4 - publicSigningKey = '\x04'+data[readPosition:readPosition+64] - #Is it possible for a public key to be invalid such that trying to encrypt or sign with it will cause an error? If it is, we should probably test these keys here. + publicSigningKey = '\x04' + data[readPosition:readPosition + 64] + # Is it possible for a public key to be invalid such that trying to + # encrypt or sign with it will cause an error? If it is, we should + # probably test these keys here. readPosition += 64 - publicEncryptionKey = '\x04'+data[readPosition:readPosition+64] + publicEncryptionKey = '\x04' + data[readPosition:readPosition + 64] readPosition += 64 - specifiedNonceTrialsPerByte, specifiedNonceTrialsPerByteLength = decodeVarint(data[readPosition:readPosition+10]) + specifiedNonceTrialsPerByte, specifiedNonceTrialsPerByteLength = decodeVarint( + data[readPosition:readPosition + 10]) readPosition += specifiedNonceTrialsPerByteLength - specifiedPayloadLengthExtraBytes, specifiedPayloadLengthExtraBytesLength = decodeVarint(data[readPosition:readPosition+10]) + specifiedPayloadLengthExtraBytes, specifiedPayloadLengthExtraBytesLength = decodeVarint( + data[readPosition:readPosition + 10]) readPosition += specifiedPayloadLengthExtraBytesLength endOfSignedDataPosition = readPosition - signatureLength, signatureLengthLength = decodeVarint(data[readPosition:readPosition+10]) + signatureLength, signatureLengthLength = decodeVarint( + data[readPosition:readPosition + 10]) readPosition += signatureLengthLength - signature = data[readPosition:readPosition+signatureLength] + signature = data[readPosition:readPosition + signatureLength] try: - if not highlevelcrypto.verify(data[8:endOfSignedDataPosition],signature,publicSigningKey.encode('hex')): + if not highlevelcrypto.verify(data[8:endOfSignedDataPosition], signature, publicSigningKey.encode('hex')): print 'ECDSA verify failed (within processpubkey)' return print 'ECDSA verify passed (within processpubkey)' - except Exception, err: + except Exception as err: print 'ECDSA verify failed (within processpubkey)', err return sha = hashlib.new('sha512') - sha.update(publicSigningKey+publicEncryptionKey) + sha.update(publicSigningKey + publicEncryptionKey) ripeHasher = hashlib.new('ripemd160') ripeHasher.update(sha.digest()) ripe = ripeHasher.digest() @@ -1380,54 +1601,59 @@ class receiveDataThread(threading.Thread): t = (ripe,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT usedpersonally FROM pubkeys WHERE hash=? AND usedpersonally='yes' ''') + shared.sqlSubmitQueue.put( + '''SELECT usedpersonally FROM pubkeys WHERE hash=? AND usedpersonally='yes' ''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn != []: #if this pubkey is already in our database and if we have used it personally: + if queryreturn != []: # if this pubkey is already in our database and if we have used it personally: print 'We HAVE used this pubkey personally. Updating time.' - t = (ripe,data,embeddedTime,'yes') + t = (ripe, data, embeddedTime, 'yes') else: print 'We have NOT used this pubkey personally. Inserting in database.' - t = (ripe,data,embeddedTime,'no') #This will also update the embeddedTime. + t = (ripe, data, embeddedTime, 'no') + # This will also update the embeddedTime. shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO pubkeys VALUES (?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - #shared.workerQueue.put(('newpubkey',(addressVersion,streamNumber,ripe))) + # shared.workerQueue.put(('newpubkey',(addressVersion,streamNumber,ripe))) self.possibleNewPubkey(ripe) - - #We have received a getpubkey message - def recgetpubkey(self,data): + # We have received a getpubkey message + def recgetpubkey(self, data): if not self.isProofOfWorkSufficient(data): print 'Proof of work in getpubkey message insufficient.' return if len(data) < 34: print 'getpubkey message doesn\'t contain enough data. Ignoring.' return - readPosition = 8 #bypass the nonce - embeddedTime, = unpack('>I',data[readPosition:readPosition+4]) + readPosition = 8 # bypass the nonce + embeddedTime, = unpack('>I', data[readPosition:readPosition + 4]) - #This section is used for the transition from 32 bit time to 64 bit time in the protocol. + # This section is used for the transition from 32 bit time to 64 bit + # time in the protocol. if embeddedTime == 0: - embeddedTime, = unpack('>Q',data[readPosition:readPosition+8]) + embeddedTime, = unpack('>Q', data[readPosition:readPosition + 8]) readPosition += 8 else: readPosition += 4 - if embeddedTime > int(time.time())+10800: + if embeddedTime > int(time.time()) + 10800: print 'The time in this getpubkey message is too new. Ignoring it. Time:', embeddedTime return - if embeddedTime < int(time.time())-maximumAgeOfAnObjectThatIAmWillingToAccept: + if embeddedTime < int(time.time()) - maximumAgeOfAnObjectThatIAmWillingToAccept: print 'The time in this getpubkey message is too old. Ignoring it. Time:', embeddedTime return - requestedAddressVersionNumber, addressVersionLength = decodeVarint(data[readPosition:readPosition+10]) + requestedAddressVersionNumber, addressVersionLength = decodeVarint( + data[readPosition:readPosition + 10]) readPosition += addressVersionLength - streamNumber, streamNumberLength = decodeVarint(data[readPosition:readPosition+10]) - if streamNumber <> self.streamNumber: + streamNumber, streamNumberLength = decodeVarint( + data[readPosition:readPosition + 10]) + if streamNumber != self.streamNumber: print 'The streamNumber', streamNumber, 'doesn\'t match our stream number:', self.streamNumber return readPosition += streamNumberLength @@ -1444,9 +1670,10 @@ class receiveDataThread(threading.Thread): return objectType = 'getpubkey' - shared.inventory[inventoryHash] = (objectType, self.streamNumber, data, embeddedTime) + shared.inventory[inventoryHash] = ( + objectType, self.streamNumber, data, embeddedTime) shared.inventoryLock.release() - #This getpubkey request is valid so far. Forward to peers. + # This getpubkey request is valid so far. Forward to peers. self.broadcastinv(inventoryHash) if requestedAddressVersionNumber == 0: @@ -1459,43 +1686,46 @@ class receiveDataThread(threading.Thread): print 'The requestedAddressVersionNumber of the pubkey request is too high. Can\'t understand. Ignoring it.' return - requestedHash = data[readPosition:readPosition+20] + requestedHash = data[readPosition:readPosition + 20] if len(requestedHash) != 20: print 'The length of the requested hash is not 20 bytes. Something is wrong. Ignoring.' return print 'the hash requested in this getpubkey request is:', requestedHash.encode('hex') - if requestedHash in shared.myAddressesByHash: #if this address hash is one of mine + if requestedHash in shared.myAddressesByHash: # if this address hash is one of mine if decodeAddress(shared.myAddressesByHash[requestedHash])[1] != requestedAddressVersionNumber: shared.printLock.acquire() - sys.stderr.write('(Within the recgetpubkey function) Someone requested one of my pubkeys but the requestedAddressVersionNumber doesn\'t match my actual address version number. That shouldn\'t have happened. Ignoring.\n') + sys.stderr.write( + '(Within the recgetpubkey function) Someone requested one of my pubkeys but the requestedAddressVersionNumber doesn\'t match my actual address version number. That shouldn\'t have happened. Ignoring.\n') shared.printLock.release() return try: - lastPubkeySendTime = int(shared.config.get(shared.myAddressesByHash[requestedHash],'lastpubkeysendtime')) + lastPubkeySendTime = int(shared.config.get( + shared.myAddressesByHash[requestedHash], 'lastpubkeysendtime')) except: lastPubkeySendTime = 0 - if lastPubkeySendTime < time.time()-lengthOfTimeToHoldOnToAllPubkeys: #If the last time we sent our pubkey was 28 days ago + if lastPubkeySendTime < time.time() - lengthOfTimeToHoldOnToAllPubkeys: # If the last time we sent our pubkey was 28 days ago shared.printLock.acquire() print 'Found getpubkey-requested-hash in my list of EC hashes. Telling Worker thread to do the POW for a pubkey message and send it out.' shared.printLock.release() if requestedAddressVersionNumber == 2: - shared.workerQueue.put(('doPOWForMyV2Pubkey',requestedHash)) + shared.workerQueue.put(( + 'doPOWForMyV2Pubkey', requestedHash)) elif requestedAddressVersionNumber == 3: - shared.workerQueue.put(('doPOWForMyV3Pubkey',requestedHash)) + shared.workerQueue.put(( + 'doPOWForMyV3Pubkey', requestedHash)) else: shared.printLock.acquire() - print 'Found getpubkey-requested-hash in my list of EC hashes BUT we already sent it recently. Ignoring request. The lastPubkeySendTime is:',lastPubkeySendTime + print 'Found getpubkey-requested-hash in my list of EC hashes BUT we already sent it recently. Ignoring request. The lastPubkeySendTime is:', lastPubkeySendTime shared.printLock.release() else: shared.printLock.acquire() print 'This getpubkey request is not for any of my keys.' shared.printLock.release() - - #We have received an inv message - def recinv(self,data): - totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = 0 # ..from all peers, counting duplicates seperately (because they take up memory) + # We have received an inv message + def recinv(self, data): + totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = 0 # ..from all peers, counting duplicates seperately (because they take up memory) if len(numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer) > 0: for key, value in numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer.items(): totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave += value @@ -1510,85 +1740,94 @@ class receiveDataThread(threading.Thread): if len(data) < lengthOfVarint + (numberOfItemsInInv * 32): print 'inv message doesn\'t contain enough data. Ignoring.' return - if numberOfItemsInInv == 1: #we'll just request this data from the person who advertised the object. - if totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave > 200000 and len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 1000: #inv flooding attack mitigation + if numberOfItemsInInv == 1: # we'll just request this data from the person who advertised the object. + if totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave > 200000 and len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 1000: # inv flooding attack mitigation shared.printLock.acquire() print 'We already have', totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 'items yet to retrieve from peers and over 1000 from this node in particular. Ignoring this inv message.' - shared.printLock.release() + shared.printLock.release() return - self.objectsOfWhichThisRemoteNodeIsAlreadyAware[data[lengthOfVarint:32+lengthOfVarint]] = 0 - if data[lengthOfVarint:32+lengthOfVarint] in shared.inventory: + self.objectsOfWhichThisRemoteNodeIsAlreadyAware[ + data[lengthOfVarint:32 + lengthOfVarint]] = 0 + if data[lengthOfVarint:32 + lengthOfVarint] in shared.inventory: shared.printLock.acquire() print 'Inventory (in memory) has inventory item already.' shared.printLock.release() - elif isInSqlInventory(data[lengthOfVarint:32+lengthOfVarint]): + elif isInSqlInventory(data[lengthOfVarint:32 + lengthOfVarint]): print 'Inventory (SQL on disk) has inventory item already.' else: - self.sendgetdata(data[lengthOfVarint:32+lengthOfVarint]) + self.sendgetdata(data[lengthOfVarint:32 + lengthOfVarint]) else: print 'inv message lists', numberOfItemsInInv, 'objects.' - for i in range(numberOfItemsInInv): #upon finishing dealing with an incoming message, the receiveDataThread will request a random object from the peer. This way if we get multiple inv messages from multiple peers which list mostly the same objects, we will make getdata requests for different random objects from the various peers. - if len(data[lengthOfVarint+(32*i):32+lengthOfVarint+(32*i)]) == 32: #The length of an inventory hash should be 32. If it isn't 32 then the remote node is either badly programmed or behaving nefariously. - if totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave > 200000 and len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 1000: #inv flooding attack mitigation + for i in range(numberOfItemsInInv): # upon finishing dealing with an incoming message, the receiveDataThread will request a random object from the peer. This way if we get multiple inv messages from multiple peers which list mostly the same objects, we will make getdata requests for different random objects from the various peers. + if len(data[lengthOfVarint + (32 * i):32 + lengthOfVarint + (32 * i)]) == 32: # The length of an inventory hash should be 32. If it isn't 32 then the remote node is either badly programmed or behaving nefariously. + if totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave > 200000 and len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 1000: # inv flooding attack mitigation shared.printLock.acquire() - print 'We already have', totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 'items yet to retrieve from peers and over',len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave),'from this node in particular. Ignoring the rest of this inv message.' + print 'We already have', totalNumberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave, 'items yet to retrieve from peers and over', len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave), 'from this node in particular. Ignoring the rest of this inv message.' shared.printLock.release() break - self.objectsOfWhichThisRemoteNodeIsAlreadyAware[data[lengthOfVarint+(32*i):32+lengthOfVarint+(32*i)]] = 0 - self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[data[lengthOfVarint+(32*i):32+lengthOfVarint+(32*i)]] = 0 - numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[self.HOST] = len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) + self.objectsOfWhichThisRemoteNodeIsAlreadyAware[data[ + lengthOfVarint + (32 * i):32 + lengthOfVarint + (32 * i)]] = 0 + self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave[ + data[lengthOfVarint + (32 * i):32 + lengthOfVarint + (32 * i)]] = 0 + numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[ + self.HOST] = len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) - - #Send a getdata message to our peer to request the object with the given hash - def sendgetdata(self,hash): + # Send a getdata message to our peer to request the object with the given + # hash + def sendgetdata(self, hash): shared.printLock.acquire() print 'sending getdata to retrieve object with hash:', hash.encode('hex') shared.printLock.release() payload = '\x01' + hash - headerData = '\xe9\xbe\xb4\xd9' #magic bits, slighly different from Bitcoin's magic bits. + headerData = '\xe9\xbe\xb4\xd9' # magic bits, slighly different from Bitcoin's magic bits. headerData += 'getdata\x00\x00\x00\x00\x00' - headerData += pack('>L',len(payload)) #payload length. Note that we add an extra 8 for the nonce. + headerData += pack('>L', len( + payload)) # payload length. Note that we add an extra 8 for the nonce. headerData += hashlib.sha512(payload).digest()[:4] try: self.sock.sendall(headerData + payload) - except Exception, err: - #if not 'Bad file descriptor' in err: + except Exception as err: + # if not 'Bad file descriptor' in err: shared.printLock.acquire() sys.stderr.write('sock.sendall error: %s\n' % err) shared.printLock.release() - #We have received a getdata request from our peer + # We have received a getdata request from our peer def recgetdata(self, data): - numberOfRequestedInventoryItems, lengthOfVarint = decodeVarint(data[:10]) + numberOfRequestedInventoryItems, lengthOfVarint = decodeVarint( + data[:10]) if len(data) < lengthOfVarint + (32 * numberOfRequestedInventoryItems): print 'getdata message does not contain enough data. Ignoring.' return for i in xrange(numberOfRequestedInventoryItems): - hash = data[lengthOfVarint+(i*32):32+lengthOfVarint+(i*32)] + hash = data[lengthOfVarint + ( + i * 32):32 + lengthOfVarint + (i * 32)] shared.printLock.acquire() print 'received getdata request for item:', hash.encode('hex') shared.printLock.release() - #print 'inventory is', shared.inventory + # print 'inventory is', shared.inventory if hash in shared.inventory: - objectType, streamNumber, payload, receivedTime = shared.inventory[hash] - self.sendData(objectType,payload) + objectType, streamNumber, payload, receivedTime = shared.inventory[ + hash] + self.sendData(objectType, payload) else: t = (hash,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''select objecttype, payload from inventory where hash=?''') + shared.sqlSubmitQueue.put( + '''select objecttype, payload from inventory where hash=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: objectType, payload = row - self.sendData(objectType,payload) + self.sendData(objectType, payload) else: print 'Someone asked for an object with a getdata which is not in either our memory inventory or our SQL inventory. That shouldn\'t have happened.' - #Our peer has requested (in a getdata message) that we send an object. - def sendData(self,objectType,payload): - headerData = '\xe9\xbe\xb4\xd9' #magic bits, slighly different from Bitcoin's magic bits. + # Our peer has requested (in a getdata message) that we send an object. + def sendData(self, objectType, payload): + headerData = '\xe9\xbe\xb4\xd9' # magic bits, slighly different from Bitcoin's magic bits. if objectType == 'pubkey': shared.printLock.acquire() print 'sending pubkey' @@ -1610,31 +1849,32 @@ class receiveDataThread(threading.Thread): shared.printLock.release() headerData += 'broadcast\x00\x00\x00' else: - sys.stderr.write('Error: sendData has been asked to send a strange objectType: %s\n' % str(objectType)) + sys.stderr.write( + 'Error: sendData has been asked to send a strange objectType: %s\n' % str(objectType)) return - headerData += pack('>L',len(payload)) #payload length. + headerData += pack('>L', len(payload)) # payload length. headerData += hashlib.sha512(payload).digest()[:4] try: self.sock.sendall(headerData + payload) - except Exception, err: - #if not 'Bad file descriptor' in err: + except Exception as err: + # if not 'Bad file descriptor' in err: shared.printLock.acquire() sys.stderr.write('sock.sendall error: %s\n' % err) shared.printLock.release() - #Send an inv message with just one hash to all of our peers - def broadcastinv(self,hash): + # Send an inv message with just one hash to all of our peers + def broadcastinv(self, hash): shared.printLock.acquire() print 'broadcasting inv with hash:', hash.encode('hex') shared.printLock.release() shared.broadcastToSendDataQueues((self.streamNumber, 'sendinv', hash)) - - #We have received an addr message. - def recaddr(self,data): + # We have received an addr message. + def recaddr(self, data): listOfAddressDetailsToBroadcastToPeers = [] numberOfAddressesIncluded = 0 - numberOfAddressesIncluded, lengthOfNumberOfAddresses = decodeVarint(data[:10]) + numberOfAddressesIncluded, lengthOfNumberOfAddresses = decodeVarint( + data[:10]) if verbose >= 1: shared.printLock.acquire() @@ -1649,86 +1889,103 @@ class receiveDataThread(threading.Thread): return needToWriteKnownNodesToDisk = False - for i in range(0,numberOfAddressesIncluded): + for i in range(0, numberOfAddressesIncluded): try: - if data[16+lengthOfNumberOfAddresses+(34*i):28+lengthOfNumberOfAddresses+(34*i)] != '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF': + if data[16 + lengthOfNumberOfAddresses + (34 * i):28 + lengthOfNumberOfAddresses + (34 * i)] != '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF': shared.printLock.acquire() - print 'Skipping IPv6 address.', repr(data[16+lengthOfNumberOfAddresses+(34*i):28+lengthOfNumberOfAddresses+(34*i)]) + print 'Skipping IPv6 address.', repr(data[16 + lengthOfNumberOfAddresses + (34 * i):28 + lengthOfNumberOfAddresses + (34 * i)]) shared.printLock.release() continue - except Exception, err: + except Exception as err: shared.printLock.acquire() - sys.stderr.write('ERROR TRYING TO UNPACK recaddr (to test for an IPv6 address). Message: %s\n' % str(err)) + sys.stderr.write( + 'ERROR TRYING TO UNPACK recaddr (to test for an IPv6 address). Message: %s\n' % str(err)) shared.printLock.release() - break #giving up on unpacking any more. We should still be connected however. + break # giving up on unpacking any more. We should still be connected however. try: - recaddrStream, = unpack('>I',data[4+lengthOfNumberOfAddresses+(34*i):8+lengthOfNumberOfAddresses+(34*i)]) - except Exception, err: + recaddrStream, = unpack('>I', data[4 + lengthOfNumberOfAddresses + ( + 34 * i):8 + lengthOfNumberOfAddresses + (34 * i)]) + except Exception as err: shared.printLock.acquire() - sys.stderr.write('ERROR TRYING TO UNPACK recaddr (recaddrStream). Message: %s\n' % str(err)) + sys.stderr.write( + 'ERROR TRYING TO UNPACK recaddr (recaddrStream). Message: %s\n' % str(err)) shared.printLock.release() - break #giving up on unpacking any more. We should still be connected however. + break # giving up on unpacking any more. We should still be connected however. if recaddrStream == 0: continue - if recaddrStream != self.streamNumber and recaddrStream != (self.streamNumber * 2) and recaddrStream != ((self.streamNumber * 2) + 1): #if the embedded stream number is not in my stream or either of my child streams then ignore it. Someone might be trying funny business. + if recaddrStream != self.streamNumber and recaddrStream != (self.streamNumber * 2) and recaddrStream != ((self.streamNumber * 2) + 1): # if the embedded stream number is not in my stream or either of my child streams then ignore it. Someone might be trying funny business. continue try: - recaddrServices, = unpack('>Q',data[8+lengthOfNumberOfAddresses+(34*i):16+lengthOfNumberOfAddresses+(34*i)]) - except Exception, err: + recaddrServices, = unpack('>Q', data[8 + lengthOfNumberOfAddresses + ( + 34 * i):16 + lengthOfNumberOfAddresses + (34 * i)]) + except Exception as err: shared.printLock.acquire() - sys.stderr.write('ERROR TRYING TO UNPACK recaddr (recaddrServices). Message: %s\n' % str(err)) + sys.stderr.write( + 'ERROR TRYING TO UNPACK recaddr (recaddrServices). Message: %s\n' % str(err)) shared.printLock.release() - break #giving up on unpacking any more. We should still be connected however. + break # giving up on unpacking any more. We should still be connected however. try: - recaddrPort, = unpack('>H',data[32+lengthOfNumberOfAddresses+(34*i):34+lengthOfNumberOfAddresses+(34*i)]) - except Exception, err: + recaddrPort, = unpack('>H', data[32 + lengthOfNumberOfAddresses + ( + 34 * i):34 + lengthOfNumberOfAddresses + (34 * i)]) + except Exception as err: shared.printLock.acquire() - sys.stderr.write('ERROR TRYING TO UNPACK recaddr (recaddrPort). Message: %s\n' % str(err)) + sys.stderr.write( + 'ERROR TRYING TO UNPACK recaddr (recaddrPort). Message: %s\n' % str(err)) shared.printLock.release() - break #giving up on unpacking any more. We should still be connected however. - #print 'Within recaddr(): IP', recaddrIP, ', Port', recaddrPort, ', i', i - hostFromAddrMessage = socket.inet_ntoa(data[28+lengthOfNumberOfAddresses+(34*i):32+lengthOfNumberOfAddresses+(34*i)]) - #print 'hostFromAddrMessage', hostFromAddrMessage - if data[28+lengthOfNumberOfAddresses+(34*i)] == '\x7F': + break # giving up on unpacking any more. We should still be connected however. + # print 'Within recaddr(): IP', recaddrIP, ', Port', + # recaddrPort, ', i', i + hostFromAddrMessage = socket.inet_ntoa(data[ + 28 + lengthOfNumberOfAddresses + (34 * i):32 + lengthOfNumberOfAddresses + (34 * i)]) + # print 'hostFromAddrMessage', hostFromAddrMessage + if data[28 + lengthOfNumberOfAddresses + (34 * i)] == '\x7F': print 'Ignoring IP address in loopback range:', hostFromAddrMessage continue if isHostInPrivateIPRange(hostFromAddrMessage): print 'Ignoring IP address in private range:', hostFromAddrMessage continue - timeSomeoneElseReceivedMessageFromThisNode, = unpack('>I',data[lengthOfNumberOfAddresses+(34*i):4+lengthOfNumberOfAddresses+(34*i)]) #This is the 'time' value in the received addr message. - if recaddrStream not in shared.knownNodes: #knownNodes is a dictionary of dictionaries with one outer dictionary for each stream. If the outer stream dictionary doesn't exist yet then we must make it. + timeSomeoneElseReceivedMessageFromThisNode, = unpack('>I', data[lengthOfNumberOfAddresses + ( + 34 * i):4 + lengthOfNumberOfAddresses + (34 * i)]) # This is the 'time' value in the received addr message. + if recaddrStream not in shared.knownNodes: # knownNodes is a dictionary of dictionaries with one outer dictionary for each stream. If the outer stream dictionary doesn't exist yet then we must make it. shared.knownNodesLock.acquire() shared.knownNodes[recaddrStream] = {} shared.knownNodesLock.release() if hostFromAddrMessage not in shared.knownNodes[recaddrStream]: - if len(shared.knownNodes[recaddrStream]) < 20000 and timeSomeoneElseReceivedMessageFromThisNode > (int(time.time())-10800) and timeSomeoneElseReceivedMessageFromThisNode < (int(time.time()) + 10800): #If we have more than 20000 nodes in our list already then just forget about adding more. Also, make sure that the time that someone else received a message from this node is within three hours from now. + if len(shared.knownNodes[recaddrStream]) < 20000 and timeSomeoneElseReceivedMessageFromThisNode > (int(time.time()) - 10800) and timeSomeoneElseReceivedMessageFromThisNode < (int(time.time()) + 10800): # If we have more than 20000 nodes in our list already then just forget about adding more. Also, make sure that the time that someone else received a message from this node is within three hours from now. shared.knownNodesLock.acquire() - shared.knownNodes[recaddrStream][hostFromAddrMessage] = (recaddrPort, timeSomeoneElseReceivedMessageFromThisNode) + shared.knownNodes[recaddrStream][hostFromAddrMessage] = ( + recaddrPort, timeSomeoneElseReceivedMessageFromThisNode) shared.knownNodesLock.release() needToWriteKnownNodesToDisk = True - hostDetails = (timeSomeoneElseReceivedMessageFromThisNode, recaddrStream, recaddrServices, hostFromAddrMessage, recaddrPort) - listOfAddressDetailsToBroadcastToPeers.append(hostDetails) + hostDetails = ( + timeSomeoneElseReceivedMessageFromThisNode, + recaddrStream, recaddrServices, hostFromAddrMessage, recaddrPort) + listOfAddressDetailsToBroadcastToPeers.append( + hostDetails) else: - PORT, timeLastReceivedMessageFromThisNode = shared.knownNodes[recaddrStream][hostFromAddrMessage]#PORT in this case is either the port we used to connect to the remote node, or the port that was specified by someone else in a past addr message. + PORT, timeLastReceivedMessageFromThisNode = shared.knownNodes[recaddrStream][ + hostFromAddrMessage] # PORT in this case is either the port we used to connect to the remote node, or the port that was specified by someone else in a past addr message. if (timeLastReceivedMessageFromThisNode < timeSomeoneElseReceivedMessageFromThisNode) and (timeSomeoneElseReceivedMessageFromThisNode < int(time.time())): shared.knownNodesLock.acquire() - shared.knownNodes[recaddrStream][hostFromAddrMessage] = (PORT, timeSomeoneElseReceivedMessageFromThisNode) + shared.knownNodes[recaddrStream][hostFromAddrMessage] = ( + PORT, timeSomeoneElseReceivedMessageFromThisNode) shared.knownNodesLock.release() if PORT != recaddrPort: - print 'Strange occurance: The port specified in an addr message', str(recaddrPort),'does not match the port',str(PORT),'that this program (or some other peer) used to connect to it',str(hostFromAddrMessage),'. Perhaps they changed their port or are using a strange NAT configuration.' - if needToWriteKnownNodesToDisk: #Runs if any nodes were new to us. Also, share those nodes with our peers. + print 'Strange occurance: The port specified in an addr message', str(recaddrPort), 'does not match the port', str(PORT), 'that this program (or some other peer) used to connect to it', str(hostFromAddrMessage), '. Perhaps they changed their port or are using a strange NAT configuration.' + if needToWriteKnownNodesToDisk: # Runs if any nodes were new to us. Also, share those nodes with our peers. shared.knownNodesLock.acquire() output = open(shared.appdata + 'knownnodes.dat', 'wb') pickle.dump(shared.knownNodes, output) output.close() shared.knownNodesLock.release() - self.broadcastaddr(listOfAddressDetailsToBroadcastToPeers) #no longer broadcast + self.broadcastaddr( + listOfAddressDetailsToBroadcastToPeers) # no longer broadcast shared.printLock.acquire() print 'knownNodes currently has', len(shared.knownNodes[self.streamNumber]), 'nodes for this stream.' shared.printLock.release() - elif self.remoteProtocolVersion >= 2: #The difference is that in protocol version 2, network addresses use 64 bit times rather than 32 bit times. + elif self.remoteProtocolVersion >= 2: # The difference is that in protocol version 2, network addresses use 64 bit times rather than 32 bit times. if numberOfAddressesIncluded > 1000 or numberOfAddressesIncluded == 0: return if len(data) != lengthOfNumberOfAddresses + (38 * numberOfAddressesIncluded): @@ -1736,82 +1993,98 @@ class receiveDataThread(threading.Thread): return needToWriteKnownNodesToDisk = False - for i in range(0,numberOfAddressesIncluded): + for i in range(0, numberOfAddressesIncluded): try: - if data[20+lengthOfNumberOfAddresses+(38*i):32+lengthOfNumberOfAddresses+(38*i)] != '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF': + if data[20 + lengthOfNumberOfAddresses + (38 * i):32 + lengthOfNumberOfAddresses + (38 * i)] != '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF': shared.printLock.acquire() - print 'Skipping IPv6 address.', repr(data[20+lengthOfNumberOfAddresses+(38*i):32+lengthOfNumberOfAddresses+(38*i)]) + print 'Skipping IPv6 address.', repr(data[20 + lengthOfNumberOfAddresses + (38 * i):32 + lengthOfNumberOfAddresses + (38 * i)]) shared.printLock.release() continue - except Exception, err: + except Exception as err: shared.printLock.acquire() - sys.stderr.write('ERROR TRYING TO UNPACK recaddr (to test for an IPv6 address). Message: %s\n' % str(err)) + sys.stderr.write( + 'ERROR TRYING TO UNPACK recaddr (to test for an IPv6 address). Message: %s\n' % str(err)) shared.printLock.release() - break #giving up on unpacking any more. We should still be connected however. + break # giving up on unpacking any more. We should still be connected however. try: - recaddrStream, = unpack('>I',data[8+lengthOfNumberOfAddresses+(38*i):12+lengthOfNumberOfAddresses+(38*i)]) - except Exception, err: + recaddrStream, = unpack('>I', data[8 + lengthOfNumberOfAddresses + ( + 38 * i):12 + lengthOfNumberOfAddresses + (38 * i)]) + except Exception as err: shared.printLock.acquire() - sys.stderr.write('ERROR TRYING TO UNPACK recaddr (recaddrStream). Message: %s\n' % str(err)) + sys.stderr.write( + 'ERROR TRYING TO UNPACK recaddr (recaddrStream). Message: %s\n' % str(err)) shared.printLock.release() - break #giving up on unpacking any more. We should still be connected however. + break # giving up on unpacking any more. We should still be connected however. if recaddrStream == 0: continue - if recaddrStream != self.streamNumber and recaddrStream != (self.streamNumber * 2) and recaddrStream != ((self.streamNumber * 2) + 1): #if the embedded stream number is not in my stream or either of my child streams then ignore it. Someone might be trying funny business. + if recaddrStream != self.streamNumber and recaddrStream != (self.streamNumber * 2) and recaddrStream != ((self.streamNumber * 2) + 1): # if the embedded stream number is not in my stream or either of my child streams then ignore it. Someone might be trying funny business. continue try: - recaddrServices, = unpack('>Q',data[12+lengthOfNumberOfAddresses+(38*i):20+lengthOfNumberOfAddresses+(38*i)]) - except Exception, err: + recaddrServices, = unpack('>Q', data[12 + lengthOfNumberOfAddresses + ( + 38 * i):20 + lengthOfNumberOfAddresses + (38 * i)]) + except Exception as err: shared.printLock.acquire() - sys.stderr.write('ERROR TRYING TO UNPACK recaddr (recaddrServices). Message: %s\n' % str(err)) + sys.stderr.write( + 'ERROR TRYING TO UNPACK recaddr (recaddrServices). Message: %s\n' % str(err)) shared.printLock.release() - break #giving up on unpacking any more. We should still be connected however. + break # giving up on unpacking any more. We should still be connected however. try: - recaddrPort, = unpack('>H',data[36+lengthOfNumberOfAddresses+(38*i):38+lengthOfNumberOfAddresses+(38*i)]) - except Exception, err: + recaddrPort, = unpack('>H', data[36 + lengthOfNumberOfAddresses + ( + 38 * i):38 + lengthOfNumberOfAddresses + (38 * i)]) + except Exception as err: shared.printLock.acquire() - sys.stderr.write('ERROR TRYING TO UNPACK recaddr (recaddrPort). Message: %s\n' % str(err)) + sys.stderr.write( + 'ERROR TRYING TO UNPACK recaddr (recaddrPort). Message: %s\n' % str(err)) shared.printLock.release() - break #giving up on unpacking any more. We should still be connected however. - #print 'Within recaddr(): IP', recaddrIP, ', Port', recaddrPort, ', i', i - hostFromAddrMessage = socket.inet_ntoa(data[32+lengthOfNumberOfAddresses+(38*i):36+lengthOfNumberOfAddresses+(38*i)]) - #print 'hostFromAddrMessage', hostFromAddrMessage - if data[32+lengthOfNumberOfAddresses+(38*i)] == '\x7F': + break # giving up on unpacking any more. We should still be connected however. + # print 'Within recaddr(): IP', recaddrIP, ', Port', + # recaddrPort, ', i', i + hostFromAddrMessage = socket.inet_ntoa(data[ + 32 + lengthOfNumberOfAddresses + (38 * i):36 + lengthOfNumberOfAddresses + (38 * i)]) + # print 'hostFromAddrMessage', hostFromAddrMessage + if data[32 + lengthOfNumberOfAddresses + (38 * i)] == '\x7F': print 'Ignoring IP address in loopback range:', hostFromAddrMessage continue - if data[32+lengthOfNumberOfAddresses+(38*i)] == '\x0A': + if data[32 + lengthOfNumberOfAddresses + (38 * i)] == '\x0A': print 'Ignoring IP address in private range:', hostFromAddrMessage continue - if data[32+lengthOfNumberOfAddresses+(38*i):34+lengthOfNumberOfAddresses+(38*i)] == '\xC0A8': + if data[32 + lengthOfNumberOfAddresses + (38 * i):34 + lengthOfNumberOfAddresses + (38 * i)] == '\xC0A8': print 'Ignoring IP address in private range:', hostFromAddrMessage continue - timeSomeoneElseReceivedMessageFromThisNode, = unpack('>Q',data[lengthOfNumberOfAddresses+(38*i):8+lengthOfNumberOfAddresses+(38*i)]) #This is the 'time' value in the received addr message. 64-bit. - if recaddrStream not in shared.knownNodes: #knownNodes is a dictionary of dictionaries with one outer dictionary for each stream. If the outer stream dictionary doesn't exist yet then we must make it. + timeSomeoneElseReceivedMessageFromThisNode, = unpack('>Q', data[lengthOfNumberOfAddresses + ( + 38 * i):8 + lengthOfNumberOfAddresses + (38 * i)]) # This is the 'time' value in the received addr message. 64-bit. + if recaddrStream not in shared.knownNodes: # knownNodes is a dictionary of dictionaries with one outer dictionary for each stream. If the outer stream dictionary doesn't exist yet then we must make it. shared.knownNodesLock.acquire() shared.knownNodes[recaddrStream] = {} shared.knownNodesLock.release() if hostFromAddrMessage not in shared.knownNodes[recaddrStream]: - if len(shared.knownNodes[recaddrStream]) < 20000 and timeSomeoneElseReceivedMessageFromThisNode > (int(time.time())-10800) and timeSomeoneElseReceivedMessageFromThisNode < (int(time.time()) + 10800): #If we have more than 20000 nodes in our list already then just forget about adding more. Also, make sure that the time that someone else received a message from this node is within three hours from now. + if len(shared.knownNodes[recaddrStream]) < 20000 and timeSomeoneElseReceivedMessageFromThisNode > (int(time.time()) - 10800) and timeSomeoneElseReceivedMessageFromThisNode < (int(time.time()) + 10800): # If we have more than 20000 nodes in our list already then just forget about adding more. Also, make sure that the time that someone else received a message from this node is within three hours from now. shared.knownNodesLock.acquire() - shared.knownNodes[recaddrStream][hostFromAddrMessage] = (recaddrPort, timeSomeoneElseReceivedMessageFromThisNode) + shared.knownNodes[recaddrStream][hostFromAddrMessage] = ( + recaddrPort, timeSomeoneElseReceivedMessageFromThisNode) shared.knownNodesLock.release() shared.printLock.acquire() print 'added new node', hostFromAddrMessage, 'to knownNodes in stream', recaddrStream shared.printLock.release() needToWriteKnownNodesToDisk = True - hostDetails = (timeSomeoneElseReceivedMessageFromThisNode, recaddrStream, recaddrServices, hostFromAddrMessage, recaddrPort) - listOfAddressDetailsToBroadcastToPeers.append(hostDetails) + hostDetails = ( + timeSomeoneElseReceivedMessageFromThisNode, + recaddrStream, recaddrServices, hostFromAddrMessage, recaddrPort) + listOfAddressDetailsToBroadcastToPeers.append( + hostDetails) else: - PORT, timeLastReceivedMessageFromThisNode = shared.knownNodes[recaddrStream][hostFromAddrMessage]#PORT in this case is either the port we used to connect to the remote node, or the port that was specified by someone else in a past addr message. + PORT, timeLastReceivedMessageFromThisNode = shared.knownNodes[recaddrStream][ + hostFromAddrMessage] # PORT in this case is either the port we used to connect to the remote node, or the port that was specified by someone else in a past addr message. if (timeLastReceivedMessageFromThisNode < timeSomeoneElseReceivedMessageFromThisNode) and (timeSomeoneElseReceivedMessageFromThisNode < int(time.time())): shared.knownNodesLock.acquire() - shared.knownNodes[recaddrStream][hostFromAddrMessage] = (PORT, timeSomeoneElseReceivedMessageFromThisNode) + shared.knownNodes[recaddrStream][hostFromAddrMessage] = ( + PORT, timeSomeoneElseReceivedMessageFromThisNode) shared.knownNodesLock.release() if PORT != recaddrPort: - print 'Strange occurance: The port specified in an addr message', str(recaddrPort),'does not match the port',str(PORT),'that this program (or some other peer) used to connect to it',str(hostFromAddrMessage),'. Perhaps they changed their port or are using a strange NAT configuration.' - if needToWriteKnownNodesToDisk: #Runs if any nodes were new to us. Also, share those nodes with our peers. + print 'Strange occurance: The port specified in an addr message', str(recaddrPort), 'does not match the port', str(PORT), 'that this program (or some other peer) used to connect to it', str(hostFromAddrMessage), '. Perhaps they changed their port or are using a strange NAT configuration.' + if needToWriteKnownNodesToDisk: # Runs if any nodes were new to us. Also, share those nodes with our peers. shared.knownNodesLock.acquire() output = open(shared.appdata + 'knownnodes.dat', 'wb') pickle.dump(shared.knownNodes, output) @@ -1821,23 +2094,28 @@ class receiveDataThread(threading.Thread): shared.printLock.acquire() print 'knownNodes currently has', len(shared.knownNodes[self.streamNumber]), 'nodes for this stream.' shared.printLock.release() - - #Function runs when we want to broadcast an addr message to all of our peers. Runs when we learn of nodes that we didn't previously know about and want to share them with our peers. - def broadcastaddr(self,listOfAddressDetailsToBroadcastToPeers): - numberOfAddressesInAddrMessage = len(listOfAddressDetailsToBroadcastToPeers) + # Function runs when we want to broadcast an addr message to all of our + # peers. Runs when we learn of nodes that we didn't previously know about + # and want to share them with our peers. + def broadcastaddr(self, listOfAddressDetailsToBroadcastToPeers): + numberOfAddressesInAddrMessage = len( + listOfAddressDetailsToBroadcastToPeers) payload = '' for hostDetails in listOfAddressDetailsToBroadcastToPeers: timeLastReceivedMessageFromThisNode, streamNumber, services, host, port = hostDetails - payload += pack('>Q',timeLastReceivedMessageFromThisNode) #now uses 64-bit time - payload += pack('>I',streamNumber) - payload += pack('>q',services) #service bit flags offered by this node - payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + socket.inet_aton(host) - payload += pack('>H',port)#remote port + payload += pack( + '>Q', timeLastReceivedMessageFromThisNode) # now uses 64-bit time + payload += pack('>I', streamNumber) + payload += pack( + '>q', services) # service bit flags offered by this node + payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \ + socket.inet_aton(host) + payload += pack('>H', port) # remote port payload = encodeVarint(numberOfAddressesInAddrMessage) + payload datatosend = '\xE9\xBE\xB4\xD9addr\x00\x00\x00\x00\x00\x00\x00\x00' - datatosend = datatosend + pack('>L',len(payload)) #payload length + datatosend = datatosend + pack('>L', len(payload)) # payload length datatosend = datatosend + hashlib.sha512(payload).digest()[0:4] datatosend = datatosend + payload @@ -1845,73 +2123,90 @@ class receiveDataThread(threading.Thread): shared.printLock.acquire() print 'Broadcasting addr with', numberOfAddressesInAddrMessage, 'entries.' shared.printLock.release() - shared.broadcastToSendDataQueues((self.streamNumber, 'sendaddr', datatosend)) + shared.broadcastToSendDataQueues(( + self.streamNumber, 'sendaddr', datatosend)) - #Send a big addr message to our peer + # Send a big addr message to our peer def sendaddr(self): addrsInMyStream = {} addrsInChildStreamLeft = {} addrsInChildStreamRight = {} - #print 'knownNodes', shared.knownNodes + # print 'knownNodes', shared.knownNodes - #We are going to share a maximum number of 1000 addrs with our peer. 500 from this stream, 250 from the left child stream, and 250 from the right child stream. + # We are going to share a maximum number of 1000 addrs with our peer. + # 500 from this stream, 250 from the left child stream, and 250 from + # the right child stream. shared.knownNodesLock.acquire() if len(shared.knownNodes[self.streamNumber]) > 0: for i in range(500): random.seed() - HOST, = random.sample(shared.knownNodes[self.streamNumber], 1) + HOST, = random.sample(shared.knownNodes[self.streamNumber], 1) if isHostInPrivateIPRange(HOST): continue - addrsInMyStream[HOST] = shared.knownNodes[self.streamNumber][HOST] - if len(shared.knownNodes[self.streamNumber*2]) > 0: + addrsInMyStream[HOST] = shared.knownNodes[ + self.streamNumber][HOST] + if len(shared.knownNodes[self.streamNumber * 2]) > 0: for i in range(250): random.seed() - HOST, = random.sample(shared.knownNodes[self.streamNumber*2], 1) + HOST, = random.sample(shared.knownNodes[ + self.streamNumber * 2], 1) if isHostInPrivateIPRange(HOST): continue - addrsInChildStreamLeft[HOST] = shared.knownNodes[self.streamNumber*2][HOST] - if len(shared.knownNodes[(self.streamNumber*2)+1]) > 0: + addrsInChildStreamLeft[HOST] = shared.knownNodes[ + self.streamNumber * 2][HOST] + if len(shared.knownNodes[(self.streamNumber * 2) + 1]) > 0: for i in range(250): random.seed() - HOST, = random.sample(shared.knownNodes[(self.streamNumber*2)+1], 1) + HOST, = random.sample(shared.knownNodes[ + (self.streamNumber * 2) + 1], 1) if isHostInPrivateIPRange(HOST): continue - addrsInChildStreamRight[HOST] = shared.knownNodes[(self.streamNumber*2)+1][HOST] + addrsInChildStreamRight[HOST] = shared.knownNodes[ + (self.streamNumber * 2) + 1][HOST] shared.knownNodesLock.release() numberOfAddressesInAddrMessage = 0 payload = '' - #print 'addrsInMyStream.items()', addrsInMyStream.items() + # print 'addrsInMyStream.items()', addrsInMyStream.items() for HOST, value in addrsInMyStream.items(): PORT, timeLastReceivedMessageFromThisNode = value - if timeLastReceivedMessageFromThisNode > (int(time.time())- maximumAgeOfNodesThatIAdvertiseToOthers): #If it is younger than 3 hours old.. + if timeLastReceivedMessageFromThisNode > (int(time.time()) - maximumAgeOfNodesThatIAdvertiseToOthers): # If it is younger than 3 hours old.. numberOfAddressesInAddrMessage += 1 - payload += pack('>Q',timeLastReceivedMessageFromThisNode) #64-bit time - payload += pack('>I',self.streamNumber) - payload += pack('>q',1) #service bit flags offered by this node - payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + socket.inet_aton(HOST) - payload += pack('>H',PORT)#remote port + payload += pack( + '>Q', timeLastReceivedMessageFromThisNode) # 64-bit time + payload += pack('>I', self.streamNumber) + payload += pack( + '>q', 1) # service bit flags offered by this node + payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \ + socket.inet_aton(HOST) + payload += pack('>H', PORT) # remote port for HOST, value in addrsInChildStreamLeft.items(): PORT, timeLastReceivedMessageFromThisNode = value - if timeLastReceivedMessageFromThisNode > (int(time.time())- maximumAgeOfNodesThatIAdvertiseToOthers): #If it is younger than 3 hours old.. + if timeLastReceivedMessageFromThisNode > (int(time.time()) - maximumAgeOfNodesThatIAdvertiseToOthers): # If it is younger than 3 hours old.. numberOfAddressesInAddrMessage += 1 - payload += pack('>Q',timeLastReceivedMessageFromThisNode) #64-bit time - payload += pack('>I',self.streamNumber*2) - payload += pack('>q',1) #service bit flags offered by this node - payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + socket.inet_aton(HOST) - payload += pack('>H',PORT)#remote port + payload += pack( + '>Q', timeLastReceivedMessageFromThisNode) # 64-bit time + payload += pack('>I', self.streamNumber * 2) + payload += pack( + '>q', 1) # service bit flags offered by this node + payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \ + socket.inet_aton(HOST) + payload += pack('>H', PORT) # remote port for HOST, value in addrsInChildStreamRight.items(): PORT, timeLastReceivedMessageFromThisNode = value - if timeLastReceivedMessageFromThisNode > (int(time.time())- maximumAgeOfNodesThatIAdvertiseToOthers): #If it is younger than 3 hours old.. + if timeLastReceivedMessageFromThisNode > (int(time.time()) - maximumAgeOfNodesThatIAdvertiseToOthers): # If it is younger than 3 hours old.. numberOfAddressesInAddrMessage += 1 - payload += pack('>Q',timeLastReceivedMessageFromThisNode) #64-bit time - payload += pack('>I',(self.streamNumber*2)+1) - payload += pack('>q',1) #service bit flags offered by this node - payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + socket.inet_aton(HOST) - payload += pack('>H',PORT)#remote port + payload += pack( + '>Q', timeLastReceivedMessageFromThisNode) # 64-bit time + payload += pack('>I', (self.streamNumber * 2) + 1) + payload += pack( + '>q', 1) # service bit flags offered by this node + payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \ + socket.inet_aton(HOST) + payload += pack('>H', PORT) # remote port payload = encodeVarint(numberOfAddressesInAddrMessage) + payload datatosend = '\xE9\xBE\xB4\xD9addr\x00\x00\x00\x00\x00\x00\x00\x00' - datatosend = datatosend + pack('>L',len(payload)) #payload length + datatosend = datatosend + pack('>L', len(payload)) # payload length datatosend = datatosend + hashlib.sha512(payload).digest()[0:4] datatosend = datatosend + payload try: @@ -1920,60 +2215,68 @@ class receiveDataThread(threading.Thread): shared.printLock.acquire() print 'Sending addr with', numberOfAddressesInAddrMessage, 'entries.' shared.printLock.release() - except Exception, err: - #if not 'Bad file descriptor' in err: + except Exception as err: + # if not 'Bad file descriptor' in err: shared.printLock.acquire() sys.stderr.write('sock.sendall error: %s\n' % err) shared.printLock.release() - #We have received a version message - def recversion(self,data): + # We have received a version message + def recversion(self, data): if len(data) < 83: - #This version message is unreasonably short. Forget it. + # This version message is unreasonably short. Forget it. return - elif not self.verackSent: - self.remoteProtocolVersion, = unpack('>L',data[:4]) + elif not self.verackSent: + self.remoteProtocolVersion, = unpack('>L', data[:4]) if self.remoteProtocolVersion <= 1: shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST)) shared.printLock.acquire() print 'Closing connection to old protocol version 1 node: ', self.HOST shared.printLock.release() return - #print 'remoteProtocolVersion', self.remoteProtocolVersion + # print 'remoteProtocolVersion', self.remoteProtocolVersion self.myExternalIP = socket.inet_ntoa(data[40:44]) - #print 'myExternalIP', self.myExternalIP - self.remoteNodeIncomingPort, = unpack('>H',data[70:72]) - #print 'remoteNodeIncomingPort', self.remoteNodeIncomingPort - useragentLength, lengthOfUseragentVarint = decodeVarint(data[80:84]) + # print 'myExternalIP', self.myExternalIP + self.remoteNodeIncomingPort, = unpack('>H', data[70:72]) + # print 'remoteNodeIncomingPort', self.remoteNodeIncomingPort + useragentLength, lengthOfUseragentVarint = decodeVarint( + data[80:84]) readPosition = 80 + lengthOfUseragentVarint - useragent = data[readPosition:readPosition+useragentLength] + useragent = data[readPosition:readPosition + useragentLength] readPosition += useragentLength - numberOfStreamsInVersionMessage, lengthOfNumberOfStreamsInVersionMessage = decodeVarint(data[readPosition:]) + numberOfStreamsInVersionMessage, lengthOfNumberOfStreamsInVersionMessage = decodeVarint( + data[readPosition:]) readPosition += lengthOfNumberOfStreamsInVersionMessage - self.streamNumber, lengthOfRemoteStreamNumber = decodeVarint(data[readPosition:]) + self.streamNumber, lengthOfRemoteStreamNumber = decodeVarint( + data[readPosition:]) shared.printLock.acquire() print 'Remote node useragent:', useragent, ' stream number:', self.streamNumber shared.printLock.release() if self.streamNumber != 1: shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST)) shared.printLock.acquire() - print 'Closed connection to', self.HOST, 'because they are interested in stream', self.streamNumber,'.' + print 'Closed connection to', self.HOST, 'because they are interested in stream', self.streamNumber, '.' shared.printLock.release() return - shared.connectedHostsList[self.HOST] = 1 #We use this data structure to not only keep track of what hosts we are connected to so that we don't try to connect to them again, but also to list the connections count on the Network Status tab. - #If this was an incoming connection, then the sendData thread doesn't know the stream. We have to set it. + shared.connectedHostsList[ + self.HOST] = 1 # We use this data structure to not only keep track of what hosts we are connected to so that we don't try to connect to them again, but also to list the connections count on the Network Status tab. + # If this was an incoming connection, then the sendData thread + # doesn't know the stream. We have to set it. if not self.initiatedConnection: - shared.broadcastToSendDataQueues((0,'setStreamNumber',(self.HOST,self.streamNumber))) + shared.broadcastToSendDataQueues(( + 0, 'setStreamNumber', (self.HOST, self.streamNumber))) if data[72:80] == eightBytesOfRandomDataUsedToDetectConnectionsToSelf: shared.broadcastToSendDataQueues((0, 'shutdown', self.HOST)) shared.printLock.acquire() print 'Closing connection to myself: ', self.HOST shared.printLock.release() return - shared.broadcastToSendDataQueues((0,'setRemoteProtocolVersion',(self.HOST,self.remoteProtocolVersion))) + shared.broadcastToSendDataQueues((0, 'setRemoteProtocolVersion', ( + self.HOST, self.remoteProtocolVersion))) shared.knownNodesLock.acquire() - shared.knownNodes[self.streamNumber][self.HOST] = (self.remoteNodeIncomingPort, int(time.time())) + shared.knownNodes[self.streamNumber][self.HOST] = ( + self.remoteNodeIncomingPort, int(time.time())) output = open(shared.appdata + 'knownnodes.dat', 'wb') pickle.dump(shared.knownNodes, output) output.close() @@ -1983,40 +2286,46 @@ class receiveDataThread(threading.Thread): if self.initiatedConnection == False: self.sendversion() - #Sends a version message + # Sends a version message def sendversion(self): shared.printLock.acquire() print 'Sending version message' shared.printLock.release() try: - self.sock.sendall(assembleVersionMessage(self.HOST,self.PORT,self.streamNumber)) - except Exception, err: - #if not 'Bad file descriptor' in err: + self.sock.sendall(assembleVersionMessage( + self.HOST, self.PORT, self.streamNumber)) + except Exception as err: + # if not 'Bad file descriptor' in err: shared.printLock.acquire() sys.stderr.write('sock.sendall error: %s\n' % err) shared.printLock.release() - #Sends a verack message + # Sends a verack message def sendverack(self): shared.printLock.acquire() print 'Sending verack' shared.printLock.release() try: - self.sock.sendall('\xE9\xBE\xB4\xD9\x76\x65\x72\x61\x63\x6B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35') - except Exception, err: - #if not 'Bad file descriptor' in err: + self.sock.sendall( + '\xE9\xBE\xB4\xD9\x76\x65\x72\x61\x63\x6B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35') + except Exception as err: + # if not 'Bad file descriptor' in err: shared.printLock.acquire() sys.stderr.write('sock.sendall error: %s\n' % err) shared.printLock.release() - #cf 83 e1 35 + # cf + # 83 + # e1 + # 35 self.verackSent = True - if self.verackReceived == True: + if self.verackReceived: self.connectionFullyEstablished() - -#Every connection to a peer has a sendDataThread (and also a receiveDataThread). +# Every connection to a peer has a sendDataThread (and also a +# receiveDataThread). class sendDataThread(threading.Thread): + def __init__(self): threading.Thread.__init__(self) self.mailbox = Queue.Queue() @@ -2026,28 +2335,37 @@ class sendDataThread(threading.Thread): shared.printLock.release() self.data = '' - def setup(self,sock,HOST,PORT,streamNumber,objectsOfWhichThisRemoteNodeIsAlreadyAware): + def setup( + self, + sock, + HOST, + PORT, + streamNumber, + objectsOfWhichThisRemoteNodeIsAlreadyAware): self.sock = sock self.HOST = HOST self.PORT = PORT self.streamNumber = streamNumber - self.remoteProtocolVersion = -1 #This must be set using setRemoteProtocolVersion command which is sent through the self.mailbox queue. - self.lastTimeISentData = int(time.time()) #If this value increases beyond five minutes ago, we'll send a pong message to keep the connection alive. + self.remoteProtocolVersion = - \ + 1 # This must be set using setRemoteProtocolVersion command which is sent through the self.mailbox queue. + self.lastTimeISentData = int( + time.time()) # If this value increases beyond five minutes ago, we'll send a pong message to keep the connection alive. self.objectsOfWhichThisRemoteNodeIsAlreadyAware = objectsOfWhichThisRemoteNodeIsAlreadyAware shared.printLock.acquire() - print 'The streamNumber of this sendDataThread (ID:', str(id(self))+') at setup() is', self.streamNumber + print 'The streamNumber of this sendDataThread (ID:', str(id(self)) + ') at setup() is', self.streamNumber shared.printLock.release() def sendVersionMessage(self): - datatosend = assembleVersionMessage(self.HOST,self.PORT,self.streamNumber)#the IP and port of the remote host, and my streamNumber. + datatosend = assembleVersionMessage( + self.HOST, self.PORT, self.streamNumber) # the IP and port of the remote host, and my streamNumber. shared.printLock.acquire() print 'Sending version packet: ', repr(datatosend) shared.printLock.release() try: self.sock.sendall(datatosend) - except Exception, err: - #if not 'Bad file descriptor' in err: + except Exception as err: + # if not 'Bad file descriptor' in err: shared.printLock.acquire() sys.stderr.write('sock.sendall error: %s\n' % err) shared.printLock.release() @@ -2055,16 +2373,16 @@ class sendDataThread(threading.Thread): def run(self): while True: - deststream,command,data = self.mailbox.get() - #shared.printLock.acquire() - #print 'sendDataThread, destream:', deststream, ', Command:', command, ', ID:',id(self), ', HOST:', self.HOST - #shared.printLock.release() + deststream, command, data = self.mailbox.get() + # shared.printLock.acquire() + # print 'sendDataThread, destream:', deststream, ', Command:', command, ', ID:',id(self), ', HOST:', self.HOST + # shared.printLock.release() if deststream == self.streamNumber or deststream == 0: if command == 'shutdown': if data == self.HOST or data == 'all': shared.printLock.acquire() - print 'sendDataThread (associated with', self.HOST,') ID:',id(self), 'shutting down now.' + print 'sendDataThread (associated with', self.HOST, ') ID:', id(self), 'shutting down now.' shared.printLock.release() try: self.sock.shutdown(socket.SHUT_RDWR) @@ -2076,24 +2394,32 @@ class sendDataThread(threading.Thread): print 'len of sendDataQueues', len(shared.sendDataQueues) shared.printLock.release() break - #When you receive an incoming connection, a sendDataThread is created even though you don't yet know what stream number the remote peer is interested in. They will tell you in a version message and if you too are interested in that stream then you will continue on with the connection and will set the streamNumber of this send data thread here: + # When you receive an incoming connection, a sendDataThread is + # created even though you don't yet know what stream number the + # remote peer is interested in. They will tell you in a version + # message and if you too are interested in that stream then you + # will continue on with the connection and will set the + # streamNumber of this send data thread here: elif command == 'setStreamNumber': hostInMessage, specifiedStreamNumber = data if hostInMessage == self.HOST: shared.printLock.acquire() - print 'setting the stream number in the sendData thread (ID:',id(self), ') to', specifiedStreamNumber + print 'setting the stream number in the sendData thread (ID:', id(self), ') to', specifiedStreamNumber shared.printLock.release() self.streamNumber = specifiedStreamNumber elif command == 'setRemoteProtocolVersion': hostInMessage, specifiedRemoteProtocolVersion = data if hostInMessage == self.HOST: shared.printLock.acquire() - print 'setting the remote node\'s protocol version in the sendData thread (ID:',id(self), ') to', specifiedRemoteProtocolVersion + print 'setting the remote node\'s protocol version in the sendData thread (ID:', id(self), ') to', specifiedRemoteProtocolVersion shared.printLock.release() self.remoteProtocolVersion = specifiedRemoteProtocolVersion elif command == 'sendaddr': try: - #To prevent some network analysis, 'leak' the data out to our peer after waiting a random amount of time unless we have a long list of messages in our queue to send. + # To prevent some network analysis, 'leak' the data out + # to our peer after waiting a random amount of time + # unless we have a long list of messages in our queue + # to send. random.seed() time.sleep(random.randrange(0, 10)) self.sock.sendall(data) @@ -2106,16 +2432,17 @@ class sendDataThread(threading.Thread): except: pass shared.sendDataQueues.remove(self.mailbox) - print 'sendDataThread thread (ID:',str(id(self))+') ending now. Was connected to', self.HOST + print 'sendDataThread thread (ID:', str(id(self)) + ') ending now. Was connected to', self.HOST break elif command == 'sendinv': if data not in self.objectsOfWhichThisRemoteNodeIsAlreadyAware: payload = '\x01' + data - headerData = '\xe9\xbe\xb4\xd9' #magic bits, slighly different from Bitcoin's magic bits. + headerData = '\xe9\xbe\xb4\xd9' # magic bits, slighly different from Bitcoin's magic bits. headerData += 'inv\x00\x00\x00\x00\x00\x00\x00\x00\x00' - headerData += pack('>L',len(payload)) + headerData += pack('>L', len(payload)) headerData += hashlib.sha512(payload).digest()[:4] - #To prevent some network analysis, 'leak' the data out to our peer after waiting a random amount of time + # To prevent some network analysis, 'leak' the data out + # to our peer after waiting a random amount of time random.seed() time.sleep(random.randrange(0, 10)) try: @@ -2129,16 +2456,17 @@ class sendDataThread(threading.Thread): except: pass shared.sendDataQueues.remove(self.mailbox) - print 'sendDataThread thread (ID:',str(id(self))+') ending now. Was connected to', self.HOST + print 'sendDataThread thread (ID:', str(id(self)) + ') ending now. Was connected to', self.HOST break elif command == 'pong': if self.lastTimeISentData < (int(time.time()) - 298): - #Send out a pong message to keep the connection alive. + # Send out a pong message to keep the connection alive. shared.printLock.acquire() print 'Sending pong to', self.HOST, 'to keep connection alive.' shared.printLock.release() try: - self.sock.sendall('\xE9\xBE\xB4\xD9\x70\x6F\x6E\x67\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35') + self.sock.sendall( + '\xE9\xBE\xB4\xD9\x70\x6F\x6E\x67\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35') self.lastTimeISentData = int(time.time()) except: print 'send pong failed' @@ -2152,11 +2480,10 @@ class sendDataThread(threading.Thread): break else: shared.printLock.acquire() - print 'sendDataThread ID:',id(self),'ignoring command', command,'because the thread is not in stream',deststream + print 'sendDataThread ID:', id(self), 'ignoring command', command, 'because the thread is not in stream', deststream shared.printLock.release() - def isInSqlInventory(hash): t = (hash,) shared.sqlLock.acquire() @@ -2169,6 +2496,7 @@ def isInSqlInventory(hash): else: return True + def convertIntToString(n): a = __builtins__.hex(n) if a[-1:] == 'L': @@ -2176,17 +2504,17 @@ def convertIntToString(n): if (len(a) % 2) == 0: return a[2:].decode('hex') else: - return ('0'+a[2:]).decode('hex') + return ('0' + a[2:]).decode('hex') + def convertStringToInt(s): return int(s.encode('hex'), 16) - -#This function expects that pubkey begin with \x04 +# This function expects that pubkey begin with \x04 def calculateBitcoinAddressFromPubkey(pubkey): - if len(pubkey)!= 65: - print 'Could not calculate Bitcoin address from pubkey because function was passed a pubkey that was', len(pubkey),'bytes long rather than 65.' + if len(pubkey) != 65: + print 'Could not calculate Bitcoin address from pubkey because function was passed a pubkey that was', len(pubkey), 'bytes long rather than 65.' return "error" ripe = hashlib.new('ripemd160') sha = hashlib.new('sha256') @@ -2194,18 +2522,20 @@ def calculateBitcoinAddressFromPubkey(pubkey): ripe.update(sha.digest()) ripeWithProdnetPrefix = '\x00' + ripe.digest() - checksum = hashlib.sha256(hashlib.sha256(ripeWithProdnetPrefix).digest()).digest()[:4] + checksum = hashlib.sha256(hashlib.sha256( + ripeWithProdnetPrefix).digest()).digest()[:4] binaryBitcoinAddress = ripeWithProdnetPrefix + checksum numberOfZeroBytesOnBinaryBitcoinAddress = 0 while binaryBitcoinAddress[0] == '\x00': numberOfZeroBytesOnBinaryBitcoinAddress += 1 binaryBitcoinAddress = binaryBitcoinAddress[1:] - base58encoded = arithmetic.changebase(binaryBitcoinAddress,256,58) - return "1"*numberOfZeroBytesOnBinaryBitcoinAddress + base58encoded + base58encoded = arithmetic.changebase(binaryBitcoinAddress, 256, 58) + return "1" * numberOfZeroBytesOnBinaryBitcoinAddress + base58encoded + def calculateTestnetAddressFromPubkey(pubkey): - if len(pubkey)!= 65: - print 'Could not calculate Bitcoin address from pubkey because function was passed a pubkey that was', len(pubkey),'bytes long rather than 65.' + if len(pubkey) != 65: + print 'Could not calculate Bitcoin address from pubkey because function was passed a pubkey that was', len(pubkey), 'bytes long rather than 65.' return "error" ripe = hashlib.new('ripemd160') sha = hashlib.new('sha256') @@ -2213,26 +2543,25 @@ def calculateTestnetAddressFromPubkey(pubkey): ripe.update(sha.digest()) ripeWithProdnetPrefix = '\x6F' + ripe.digest() - checksum = hashlib.sha256(hashlib.sha256(ripeWithProdnetPrefix).digest()).digest()[:4] + checksum = hashlib.sha256(hashlib.sha256( + ripeWithProdnetPrefix).digest()).digest()[:4] binaryBitcoinAddress = ripeWithProdnetPrefix + checksum numberOfZeroBytesOnBinaryBitcoinAddress = 0 while binaryBitcoinAddress[0] == '\x00': numberOfZeroBytesOnBinaryBitcoinAddress += 1 binaryBitcoinAddress = binaryBitcoinAddress[1:] - base58encoded = arithmetic.changebase(binaryBitcoinAddress,256,58) - return "1"*numberOfZeroBytesOnBinaryBitcoinAddress + base58encoded - + base58encoded = arithmetic.changebase(binaryBitcoinAddress, 256, 58) + return "1" * numberOfZeroBytesOnBinaryBitcoinAddress + base58encoded def signal_handler(signal, frame): - if shared.safeConfigGetBoolean('bitmessagesettings','daemon'): + if shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'): shared.doCleanShutdown() sys.exit(0) else: print 'Unfortunately you cannot use Ctrl+C when running the UI because the UI captures the signal.' - def connectToStream(streamNumber): selfInitiatedConnections[streamNumber] = {} if sys.platform[0:3] == 'win': @@ -2244,9 +2573,12 @@ def connectToStream(streamNumber): a.setup(streamNumber) a.start() -#Does an EC point multiplication; turns a private key into a public key. +# Does an EC point multiplication; turns a private key into a public key. + + def pointMult(secret): - #ctx = OpenSSL.BN_CTX_new() #This value proved to cause Seg Faults on Linux. It turns out that it really didn't speed up EC_POINT_mul anyway. + # ctx = OpenSSL.BN_CTX_new() #This value proved to cause Seg Faults on + # Linux. It turns out that it really didn't speed up EC_POINT_mul anyway. k = OpenSSL.EC_KEY_new_by_curve_name(OpenSSL.get_curve('secp256k1')) priv_key = OpenSSL.BN_bin2bn(secret, 32, 0) group = OpenSSL.EC_KEY_get0_group(k) @@ -2255,52 +2587,59 @@ def pointMult(secret): OpenSSL.EC_POINT_mul(group, pub_key, priv_key, None, None, None) OpenSSL.EC_KEY_set_private_key(k, priv_key) OpenSSL.EC_KEY_set_public_key(k, pub_key) - #print 'priv_key',priv_key - #print 'pub_key',pub_key + # print 'priv_key',priv_key + # print 'pub_key',pub_key size = OpenSSL.i2o_ECPublicKey(k, 0) mb = ctypes.create_string_buffer(size) OpenSSL.i2o_ECPublicKey(k, ctypes.byref(ctypes.pointer(mb))) - #print 'mb.raw', mb.raw.encode('hex'), 'length:', len(mb.raw) - #print 'mb.raw', mb.raw, 'length:', len(mb.raw) + # print 'mb.raw', mb.raw.encode('hex'), 'length:', len(mb.raw) + # print 'mb.raw', mb.raw, 'length:', len(mb.raw) OpenSSL.EC_POINT_free(pub_key) - #OpenSSL.BN_CTX_free(ctx) + # OpenSSL.BN_CTX_free(ctx) OpenSSL.BN_free(priv_key) OpenSSL.EC_KEY_free(k) return mb.raw - -def assembleVersionMessage(remoteHost,remotePort,myStreamNumber): +def assembleVersionMessage(remoteHost, remotePort, myStreamNumber): shared.softwareVersion payload = '' - payload += pack('>L',2) #protocol version. - payload += pack('>q',1) #bitflags of the services I offer. - payload += pack('>q',int(time.time())) + payload += pack('>L', 2) # protocol version. + payload += pack('>q', 1) # bitflags of the services I offer. + payload += pack('>q', int(time.time())) - payload += pack('>q',1) #boolservices of remote connection. How can I even know this for sure? This is probably ignored by the remote host. - payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + socket.inet_aton(remoteHost) - payload += pack('>H',remotePort)#remote IPv6 and port + payload += pack( + '>q', 1) # boolservices of remote connection. How can I even know this for sure? This is probably ignored by the remote host. + payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + \ + socket.inet_aton(remoteHost) + payload += pack('>H', remotePort) # remote IPv6 and port - payload += pack('>q',1) #bitflags of the services I offer. - payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + pack('>L',2130706433) # = 127.0.0.1. This will be ignored by the remote host. The actual remote connected IP will be used. - payload += pack('>H',shared.config.getint('bitmessagesettings', 'port'))#my external IPv6 and port + payload += pack('>q', 1) # bitflags of the services I offer. + payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + pack( + '>L', 2130706433) # = 127.0.0.1. This will be ignored by the remote host. The actual remote connected IP will be used. + payload += pack('>H', shared.config.getint( + 'bitmessagesettings', 'port')) # my external IPv6 and port random.seed() payload += eightBytesOfRandomDataUsedToDetectConnectionsToSelf - userAgent = '/PyBitmessage:' + shared.softwareVersion + '/' #Length of userAgent must be less than 253. - payload += pack('>B',len(userAgent)) #user agent string length. If the user agent is more than 252 bytes long, this code isn't going to work. + userAgent = '/PyBitmessage:' + shared.softwareVersion + \ + '/' # Length of userAgent must be less than 253. + payload += pack('>B', len( + userAgent)) # user agent string length. If the user agent is more than 252 bytes long, this code isn't going to work. payload += userAgent - payload += encodeVarint(1) #The number of streams about which I care. PyBitmessage currently only supports 1 per connection. + payload += encodeVarint( + 1) # The number of streams about which I care. PyBitmessage currently only supports 1 per connection. payload += encodeVarint(myStreamNumber) - datatosend = '\xe9\xbe\xb4\xd9' #magic bits, slighly different from Bitcoin's magic bits. - datatosend = datatosend + 'version\x00\x00\x00\x00\x00' #version command - datatosend = datatosend + pack('>L',len(payload)) #payload length + datatosend = '\xe9\xbe\xb4\xd9' # magic bits, slighly different from Bitcoin's magic bits. + datatosend = datatosend + 'version\x00\x00\x00\x00\x00' # version command + datatosend = datatosend + pack('>L', len(payload)) # payload length datatosend = datatosend + hashlib.sha512(payload).digest()[0:4] return datatosend + payload + def isHostInPrivateIPRange(host): if host[:3] == '10.': return True @@ -2312,58 +2651,85 @@ def isHostInPrivateIPRange(host): return True return False -#This thread exists because SQLITE3 is so un-threadsafe that we must submit queries to it and it puts results back in a different queue. They won't let us just use locks. +# This thread exists because SQLITE3 is so un-threadsafe that we must +# submit queries to it and it puts results back in a different queue. They +# won't let us just use locks. + + class sqlThread(threading.Thread): + def __init__(self): threading.Thread.__init__(self) def run(self): - self.conn = sqlite3.connect(shared.appdata + 'messages.dat' ) + self.conn = sqlite3.connect(shared.appdata + 'messages.dat') self.conn.text_factory = str self.cur = self.conn.cursor() try: - self.cur.execute( '''CREATE TABLE inbox (msgid blob, toaddress text, fromaddress text, subject text, received text, message text, folder text, encodingtype int, read bool, UNIQUE(msgid) ON CONFLICT REPLACE)''' ) - self.cur.execute( '''CREATE TABLE sent (msgid blob, toaddress text, toripe blob, fromaddress text, subject text, message text, ackdata blob, lastactiontime integer, status text, pubkeyretrynumber integer, msgretrynumber integer, folder text, encodingtype int)''' ) - self.cur.execute( '''CREATE TABLE subscriptions (label text, address text, enabled bool)''' ) - self.cur.execute( '''CREATE TABLE addressbook (label text, address text)''' ) - self.cur.execute( '''CREATE TABLE blacklist (label text, address text, enabled bool)''' ) - self.cur.execute( '''CREATE TABLE whitelist (label text, address text, enabled bool)''' ) - #Explanation of what is in the pubkeys table: + self.cur.execute( + '''CREATE TABLE inbox (msgid blob, toaddress text, fromaddress text, subject text, received text, message text, folder text, encodingtype int, read bool, UNIQUE(msgid) ON CONFLICT REPLACE)''' ) + self.cur.execute( + '''CREATE TABLE sent (msgid blob, toaddress text, toripe blob, fromaddress text, subject text, message text, ackdata blob, lastactiontime integer, status text, pubkeyretrynumber integer, msgretrynumber integer, folder text, encodingtype int)''' ) + self.cur.execute( + '''CREATE TABLE subscriptions (label text, address text, enabled bool)''' ) + self.cur.execute( + '''CREATE TABLE addressbook (label text, address text)''' ) + self.cur.execute( + '''CREATE TABLE blacklist (label text, address text, enabled bool)''' ) + self.cur.execute( + '''CREATE TABLE whitelist (label text, address text, enabled bool)''' ) + # Explanation of what is in the pubkeys table: # The hash is the RIPEMD160 hash that is encoded in the Bitmessage address. # transmitdata is literally the data that was included in the Bitmessage pubkey message when it arrived, except for the 24 byte protocol header- ie, it starts with the POW nonce. # time is the time that the pubkey was broadcast on the network same as with every other type of Bitmessage object. - # usedpersonally is set to "yes" if we have used the key personally. This keeps us from deleting it because we may want to reply to a message in the future. This field is not a bool because we may need more flexability in the future and it doesn't take up much more space anyway. - self.cur.execute( '''CREATE TABLE pubkeys (hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE)''' ) - self.cur.execute( '''CREATE TABLE inventory (hash blob, objecttype text, streamnumber int, payload blob, receivedtime integer, UNIQUE(hash) ON CONFLICT REPLACE)''' ) - self.cur.execute( '''CREATE TABLE knownnodes (timelastseen int, stream int, services blob, host blob, port blob, UNIQUE(host, stream, port) ON CONFLICT REPLACE)''' ) #This table isn't used in the program yet but I have a feeling that we'll need it. - self.cur.execute( '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''') - self.cur.execute( '''CREATE TABLE settings (key blob, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' ) + # usedpersonally is set to "yes" if we have used the key + # personally. This keeps us from deleting it because we may want to + # reply to a message in the future. This field is not a bool + # because we may need more flexability in the future and it doesn't + # take up much more space anyway. + self.cur.execute( + '''CREATE TABLE pubkeys (hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE)''' ) + self.cur.execute( + '''CREATE TABLE inventory (hash blob, objecttype text, streamnumber int, payload blob, receivedtime integer, UNIQUE(hash) ON CONFLICT REPLACE)''' ) + self.cur.execute( + '''CREATE TABLE knownnodes (timelastseen int, stream int, services blob, host blob, port blob, UNIQUE(host, stream, port) ON CONFLICT REPLACE)''' ) + # This table isn't used in the program yet but I + # have a feeling that we'll need it. + self.cur.execute( + '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''') + self.cur.execute( + '''CREATE TABLE settings (key blob, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' ) self.cur.execute( '''INSERT INTO settings VALUES('version','1')''') - self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''',(int(time.time()),)) + self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', ( + int(time.time()),)) self.conn.commit() print 'Created messages database file' - except Exception, err: + except Exception as err: if str(err) == 'table inbox already exists': shared.printLock.acquire() print 'Database file already exists.' shared.printLock.release() else: - sys.stderr.write('ERROR trying to create database file (message.dat). Error message: %s\n' % str(err)) + sys.stderr.write( + 'ERROR trying to create database file (message.dat). Error message: %s\n' % str(err)) os._exit(0) - #People running earlier versions of PyBitmessage do not have the usedpersonally field in their pubkeys table. Let's add it. - if shared.config.getint('bitmessagesettings','settingsversion') == 2: + # People running earlier versions of PyBitmessage do not have the + # usedpersonally field in their pubkeys table. Let's add it. + if shared.config.getint('bitmessagesettings', 'settingsversion') == 2: item = '''ALTER TABLE pubkeys ADD usedpersonally text DEFAULT 'no' ''' parameters = '' self.cur.execute(item, parameters) self.conn.commit() - shared.config.set('bitmessagesettings','settingsversion','3') + shared.config.set('bitmessagesettings', 'settingsversion', '3') with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - #People running earlier versions of PyBitmessage do not have the encodingtype field in their inbox and sent tables or the read field in the inbox table. Let's add them. - if shared.config.getint('bitmessagesettings','settingsversion') == 3: + # People running earlier versions of PyBitmessage do not have the + # encodingtype field in their inbox and sent tables or the read field + # in the inbox table. Let's add them. + if shared.config.getint('bitmessagesettings', 'settingsversion') == 3: item = '''ALTER TABLE inbox ADD encodingtype int DEFAULT '2' ''' parameters = '' self.cur.execute(item, parameters) @@ -2377,75 +2743,100 @@ class sqlThread(threading.Thread): self.cur.execute(item, parameters) self.conn.commit() - shared.config.set('bitmessagesettings','settingsversion','4') + shared.config.set('bitmessagesettings', 'settingsversion', '4') with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - if shared.config.getint('bitmessagesettings','settingsversion') == 4: - shared.config.set('bitmessagesettings','defaultnoncetrialsperbyte',str(shared.networkDefaultProofOfWorkNonceTrialsPerByte)) - shared.config.set('bitmessagesettings','defaultpayloadlengthextrabytes',str(shared.networkDefaultPayloadLengthExtraBytes)) - shared.config.set('bitmessagesettings','settingsversion','5') + if shared.config.getint('bitmessagesettings', 'settingsversion') == 4: + shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str( + shared.networkDefaultProofOfWorkNonceTrialsPerByte)) + shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str( + shared.networkDefaultPayloadLengthExtraBytes)) + shared.config.set('bitmessagesettings', 'settingsversion', '5') - if shared.config.getint('bitmessagesettings','settingsversion') == 5: - shared.config.set('bitmessagesettings','maxacceptablenoncetrialsperbyte','0') - shared.config.set('bitmessagesettings','maxacceptablepayloadlengthextrabytes','0') - shared.config.set('bitmessagesettings','settingsversion','6') + if shared.config.getint('bitmessagesettings', 'settingsversion') == 5: + shared.config.set( + 'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0') + shared.config.set( + 'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0') + shared.config.set('bitmessagesettings', 'settingsversion', '6') with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - #From now on, let us keep a 'version' embedded in the messages.dat file so that when we make changes to the database, the database version we are on can stay embedded in the messages.dat file. Let us check to see if the settings table exists yet. + # From now on, let us keep a 'version' embedded in the messages.dat + # file so that when we make changes to the database, the database + # version we are on can stay embedded in the messages.dat file. Let us + # check to see if the settings table exists yet. item = '''SELECT name FROM sqlite_master WHERE type='table' AND name='settings';''' parameters = '' self.cur.execute(item, parameters) if self.cur.fetchall() == []: - #The settings table doesn't exist. We need to make it. + # The settings table doesn't exist. We need to make it. print 'In messages.dat database, creating new \'settings\' table.' - self.cur.execute( '''CREATE TABLE settings (key text, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' ) + self.cur.execute( + '''CREATE TABLE settings (key text, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' ) self.cur.execute( '''INSERT INTO settings VALUES('version','1')''') - self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''',(int(time.time()),)) + self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', ( + int(time.time()),)) print 'In messages.dat database, removing an obsolete field from the pubkeys table.' - self.cur.execute( '''CREATE TEMPORARY TABLE pubkeys_backup(hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE);''') - self.cur.execute( '''INSERT INTO pubkeys_backup SELECT hash, transmitdata, time, usedpersonally FROM pubkeys;''') + self.cur.execute( + '''CREATE TEMPORARY TABLE pubkeys_backup(hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE);''') + self.cur.execute( + '''INSERT INTO pubkeys_backup SELECT hash, transmitdata, time, usedpersonally FROM pubkeys;''') self.cur.execute( '''DROP TABLE pubkeys''') - self.cur.execute( '''CREATE TABLE pubkeys (hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE)''' ) - self.cur.execute( '''INSERT INTO pubkeys SELECT hash, transmitdata, time, usedpersonally FROM pubkeys_backup;''') + self.cur.execute( + '''CREATE TABLE pubkeys (hash blob, transmitdata blob, time int, usedpersonally text, UNIQUE(hash) ON CONFLICT REPLACE)''' ) + self.cur.execute( + '''INSERT INTO pubkeys SELECT hash, transmitdata, time, usedpersonally FROM pubkeys_backup;''') self.cur.execute( '''DROP TABLE pubkeys_backup;''') print 'Deleting all pubkeys from inventory. They will be redownloaded and then saved with the correct times.' - self.cur.execute( '''delete from inventory where objecttype = 'pubkey';''') + self.cur.execute( + '''delete from inventory where objecttype = 'pubkey';''') print 'replacing Bitmessage announcements mailing list with a new one.' - self.cur.execute( '''delete from subscriptions where address='BM-BbkPSZbzPwpVcYZpU4yHwf9ZPEapN5Zx' ''') - self.cur.execute( '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''') + self.cur.execute( + '''delete from subscriptions where address='BM-BbkPSZbzPwpVcYZpU4yHwf9ZPEapN5Zx' ''') + self.cur.execute( + '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''') print 'Commiting.' self.conn.commit() print 'Vacuuming message.dat. You might notice that the file size gets much smaller.' self.cur.execute( ''' VACUUM ''') - #After code refactoring, the possible status values for sent messages as changed. - self.cur.execute( '''update sent set status='doingmsgpow' where status='doingpow' ''') - self.cur.execute( '''update sent set status='msgsent' where status='sentmessage' ''') - self.cur.execute( '''update sent set status='doingpubkeypow' where status='findingpubkey' ''') - self.cur.execute( '''update sent set status='broadcastqueued' where status='broadcastpending' ''') + # After code refactoring, the possible status values for sent messages + # as changed. + self.cur.execute( + '''update sent set status='doingmsgpow' where status='doingpow' ''') + self.cur.execute( + '''update sent set status='msgsent' where status='sentmessage' ''') + self.cur.execute( + '''update sent set status='doingpubkeypow' where status='findingpubkey' ''') + self.cur.execute( + '''update sent set status='broadcastqueued' where status='broadcastpending' ''') self.conn.commit() try: testpayload = '\x00\x00' - t = ('1234',testpayload,'12345678','no') - self.cur.execute( '''INSERT INTO pubkeys VALUES(?,?,?,?)''',t) + t = ('1234', testpayload, '12345678', 'no') + self.cur.execute( '''INSERT INTO pubkeys VALUES(?,?,?,?)''', t) self.conn.commit() - self.cur.execute('''SELECT transmitdata FROM pubkeys WHERE hash='1234' ''') + self.cur.execute( + '''SELECT transmitdata FROM pubkeys WHERE hash='1234' ''') queryreturn = self.cur.fetchall() for row in queryreturn: transmitdata, = row self.cur.execute('''DELETE FROM pubkeys WHERE hash='1234' ''') self.conn.commit() if transmitdata == '': - sys.stderr.write('Problem: The version of SQLite you have cannot store Null values. Please download and install the latest revision of your version of Python (for example, the latest Python 2.7 revision) and try again.\n') - sys.stderr.write('PyBitmessage will now exit very abruptly. You may now see threading errors related to this abrupt exit but the problem you need to solve is related to SQLite.\n\n') + sys.stderr.write( + 'Problem: The version of SQLite you have cannot store Null values. Please download and install the latest revision of your version of Python (for example, the latest Python 2.7 revision) and try again.\n') + sys.stderr.write( + 'PyBitmessage will now exit very abruptly. You may now see threading errors related to this abrupt exit but the problem you need to solve is related to SQLite.\n\n') os._exit(0) - except Exception, err: + except Exception as err: print err - #Let us check to see the last time we vaccumed the messages.dat file. If it has been more than a month let's do it now. + # Let us check to see the last time we vaccumed the messages.dat file. + # If it has been more than a month let's do it now. item = '''SELECT value FROM settings WHERE key='lastvacuumtime';''' parameters = '' self.cur.execute(item, parameters) @@ -2475,8 +2866,9 @@ class sqlThread(threading.Thread): shared.printLock.release() self.conn.commit() self.conn.close() - shutil.move(shared.lookupAppdataFolder()+'messages.dat','messages.dat') - self.conn = sqlite3.connect('messages.dat' ) + shutil.move( + shared.lookupAppdataFolder() + 'messages.dat', 'messages.dat') + self.conn = sqlite3.connect('messages.dat') self.conn.text_factory = str self.cur = self.conn.cursor() elif item == 'movemessagstoappdata': @@ -2485,8 +2877,9 @@ class sqlThread(threading.Thread): shared.printLock.release() self.conn.commit() self.conn.close() - shutil.move('messages.dat',shared.lookupAppdataFolder()+'messages.dat') - self.conn = sqlite3.connect(shared.appdata + 'messages.dat' ) + shutil.move( + 'messages.dat', shared.lookupAppdataFolder() + 'messages.dat') + self.conn = sqlite3.connect(shared.appdata + 'messages.dat') self.conn.text_factory = str self.cur = self.conn.cursor() elif item == 'deleteandvacuume': @@ -2496,19 +2889,20 @@ class sqlThread(threading.Thread): self.cur.execute( ''' VACUUM ''') else: parameters = shared.sqlSubmitQueue.get() - #print 'item', item - #print 'parameters', parameters + # print 'item', item + # print 'parameters', parameters try: self.cur.execute(item, parameters) - except Exception, err: + except Exception as err: shared.printLock.acquire() - sys.stderr.write('\nMajor error occurred when trying to execute a SQL statement within the sqlThread. Please tell Atheros about this error message or post it in the forum! Error occurred while trying to execute statement: "'+str(item) + '" Here are the parameters; you might want to censor this data with asterisks (***) as it can contain private information: '+str(repr(parameters))+'\nHere is the actual error message thrown by the sqlThread: '+ str(err)+'\n') + sys.stderr.write('\nMajor error occurred when trying to execute a SQL statement within the sqlThread. Please tell Atheros about this error message or post it in the forum! Error occurred while trying to execute statement: "' + str( + item) + '" Here are the parameters; you might want to censor this data with asterisks (***) as it can contain private information: ' + str(repr(parameters)) + '\nHere is the actual error message thrown by the sqlThread: ' + str(err) + '\n') sys.stderr.write('This program shall now abruptly exit!\n') shared.printLock.release() os._exit(0) shared.sqlReturnQueue.put(self.cur.fetchall()) - #shared.sqlSubmitQueue.task_done() + # shared.sqlSubmitQueue.task_done() '''The singleCleaner class is a timer-driven thread that cleans data structures to free memory, resends messages when a remote node doesn't respond, and sends pong messages to keep connections alive if the network isn't busy. @@ -2524,7 +2918,10 @@ It resends messages when there has been no response: resends msg messages in 4 days (then 8 days, then 16 days, etc...) ''' + + class singleCleaner(threading.Thread): + def __init__(self): threading.Thread.__init__(self) @@ -2533,47 +2930,59 @@ class singleCleaner(threading.Thread): while True: shared.sqlLock.acquire() - shared.UISignalQueue.put(('updateStatusBar','Doing housekeeping (Flushing inventory in memory to disk...)')) + shared.UISignalQueue.put(( + 'updateStatusBar', 'Doing housekeeping (Flushing inventory in memory to disk...)')) for hash, storedValue in shared.inventory.items(): objectType, streamNumber, payload, receivedTime = storedValue - if int(time.time())- 3600 > receivedTime: - t = (hash,objectType,streamNumber,payload,receivedTime) - shared.sqlSubmitQueue.put('''INSERT INTO inventory VALUES (?,?,?,?,?)''') + if int(time.time()) - 3600 > receivedTime: + t = (hash, objectType, streamNumber, payload, receivedTime) + shared.sqlSubmitQueue.put( + '''INSERT INTO inventory VALUES (?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() del shared.inventory[hash] shared.sqlSubmitQueue.put('commit') - shared.UISignalQueue.put(('updateStatusBar','')) + shared.UISignalQueue.put(('updateStatusBar', '')) shared.sqlLock.release() - shared.broadcastToSendDataQueues((0, 'pong', 'no data')) #commands the sendData threads to send out a pong message if they haven't sent anything else in the last five minutes. The socket timeout-time is 10 minutes. - #If we are running as a daemon then we are going to fill up the UI queue which will never be handled by a UI. We should clear it to save memory. - if shared.safeConfigGetBoolean('bitmessagesettings','daemon'): + shared.broadcastToSendDataQueues(( + 0, 'pong', 'no data')) # commands the sendData threads to send out a pong message if they haven't sent anything else in the last five minutes. The socket timeout-time is 10 minutes. + # If we are running as a daemon then we are going to fill up the UI + # queue which will never be handled by a UI. We should clear it to + # save memory. + if shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'): shared.UISignalQueue.queue.clear() if timeWeLastClearedInventoryAndPubkeysTables < int(time.time()) - 7380: timeWeLastClearedInventoryAndPubkeysTables = int(time.time()) - #inventory (moves data from the inventory data structure to the on-disk sql database) + # inventory (moves data from the inventory data structure to + # the on-disk sql database) shared.sqlLock.acquire() - #inventory (clears pubkeys after 28 days and everything else after 2 days and 12 hours) - t = (int(time.time())-lengthOfTimeToLeaveObjectsInInventory,int(time.time())-lengthOfTimeToHoldOnToAllPubkeys) - shared.sqlSubmitQueue.put('''DELETE FROM inventory WHERE (receivedtime'pubkey') OR (receivedtime'pubkey') OR (receivedtime (maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (pubkeyretrynumber))): print 'It has been a long time and we haven\'t heard a response to our getpubkey request. Sending again.' try: - del neededPubkeys[toripe] #We need to take this entry out of the neededPubkeys structure because the shared.workerQueue checks to see whether the entry is already present and will not do the POW and send the message because it assumes that it has already done it recently. + del neededPubkeys[ + toripe] # We need to take this entry out of the neededPubkeys structure because the shared.workerQueue checks to see whether the entry is already present and will not do the POW and send the message because it assumes that it has already done it recently. except: pass - - shared.UISignalQueue.put(('updateStatusBar','Doing work necessary to again attempt to request a public key...')) - t = (int(time.time()),pubkeyretrynumber+1,toripe) - shared.sqlSubmitQueue.put('''UPDATE sent SET lastactiontime=?, pubkeyretrynumber=?, status='msgqueued' WHERE toripe=?''') + + shared.UISignalQueue.put(( + 'updateStatusBar', 'Doing work necessary to again attempt to request a public key...')) + t = (int( + time.time()), pubkeyretrynumber + 1, toripe) + shared.sqlSubmitQueue.put( + '''UPDATE sent SET lastactiontime=?, pubkeyretrynumber=?, status='msgqueued' WHERE toripe=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') - shared.workerQueue.put(('sendmessage','')) - else:# status == msgsent + shared.workerQueue.put(('sendmessage', '')) + else: # status == msgsent if int(time.time()) - lastactiontime > (maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (msgretrynumber))): print 'It has been a long time and we haven\'t heard an acknowledgement to our msg. Sending again.' - t = (int(time.time()),msgretrynumber+1,'msgqueued',ackdata) - shared.sqlSubmitQueue.put('''UPDATE sent SET lastactiontime=?, msgretrynumber=?, status=? WHERE ackdata=?''') + t = (int( + time.time()), msgretrynumber + 1, 'msgqueued', ackdata) + shared.sqlSubmitQueue.put( + '''UPDATE sent SET lastactiontime=?, msgretrynumber=?, status=? WHERE ackdata=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') - shared.workerQueue.put(('sendmessage','')) - shared.UISignalQueue.put(('updateStatusBar','Doing work necessary to again attempt to deliver a message...')) + shared.workerQueue.put(('sendmessage', '')) + shared.UISignalQueue.put(( + 'updateStatusBar', 'Doing work necessary to again attempt to deliver a message...')) shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() time.sleep(300) -#This thread, of which there is only one, does the heavy lifting: calculating POWs. +# This thread, of which there is only one, does the heavy lifting: +# calculating POWs. + + class singleWorker(threading.Thread): + def __init__(self): - #QThread.__init__(self, parent) + # QThread.__init__(self, parent) threading.Thread.__init__(self) def run(self): shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT toripe FROM sent WHERE ((status='awaitingpubkey' OR status='doingpubkeypow') AND folder='sent')''') + shared.sqlSubmitQueue.put( + '''SELECT toripe FROM sent WHERE ((status='awaitingpubkey' OR status='doingpubkeypow') AND folder='sent')''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -2623,30 +3044,38 @@ class singleWorker(threading.Thread): toripe, = row neededPubkeys[toripe] = 0 - #Initialize the ackdataForWhichImWatching data structure using data from the sql database. + # Initialize the ackdataForWhichImWatching data structure using data + # from the sql database. shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT ackdata FROM sent where (status='msgsent' OR status='doingmsgpow')''') + shared.sqlSubmitQueue.put( + '''SELECT ackdata FROM sent where (status='msgsent' OR status='doingmsgpow')''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() for row in queryreturn: - ackdata, = row + ackdata, = row print 'Watching for ackdata', ackdata.encode('hex') ackdataForWhichImWatching[ackdata] = 0 shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT DISTINCT toaddress FROM sent WHERE (status='doingpubkeypow' AND folder='sent')''') + shared.sqlSubmitQueue.put( + '''SELECT DISTINCT toaddress FROM sent WHERE (status='doingpubkeypow' AND folder='sent')''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() for row in queryreturn: toaddress, = row self.requestPubKey(toaddress) - - time.sleep(10) #give some time for the GUI to start before we start on existing POW tasks. - self.sendMsg() #just in case there are any pending tasks for msg messages that have yet to be sent. - self.sendBroadcast() #just in case there are any tasks for Broadcasts that have yet to be sent. + time.sleep( + 10) # give some time for the GUI to start before we start on existing POW tasks. + + self.sendMsg() + # just in case there are any pending tasks for msg + # messages that have yet to be sent. + self.sendBroadcast() + # just in case there are any tasks for Broadcasts + # that have yet to be sent. while True: command, data = shared.workerQueue.get() @@ -2677,12 +3106,13 @@ class singleWorker(threading.Thread): shared.printLock.release()""" else: shared.printLock.acquire() - sys.stderr.write('Probable programming error: The command sent to the workerThread is weird. It is: %s\n' % command) + sys.stderr.write( + 'Probable programming error: The command sent to the workerThread is weird. It is: %s\n' % command) shared.printLock.release() shared.workerQueue.task_done() - def doPOWForMyV2Pubkey(self,hash): #This function also broadcasts out the pubkey message once it is done with the POW - #Look up my stream number based on my address hash + def doPOWForMyV2Pubkey(self, hash): # This function also broadcasts out the pubkey message once it is done with the POW + # Look up my stream number based on my address hash """configSections = shared.config.sections() for addressInKeysFile in configSections: if addressInKeysFile <> 'bitmessagesettings': @@ -2691,37 +3121,47 @@ class singleWorker(threading.Thread): myAddress = addressInKeysFile break""" myAddress = shared.myAddressesByHash[hash] - status,addressVersionNumber,streamNumber,hash = decodeAddress(myAddress) - embeddedTime = int(time.time()+random.randrange(-300, 300)) #the current time plus or minus five minutes - payload = pack('>I',(embeddedTime)) - payload += encodeVarint(addressVersionNumber) #Address version number + status, addressVersionNumber, streamNumber, hash = decodeAddress( + myAddress) + embeddedTime = int(time.time() + random.randrange( + -300, 300)) # the current time plus or minus five minutes + payload = pack('>I', (embeddedTime)) + payload += encodeVarint(addressVersionNumber) # Address version number payload += encodeVarint(streamNumber) - payload += '\x00\x00\x00\x01' #bitfield of features supported by me (see the wiki). + payload += '\x00\x00\x00\x01' # bitfield of features supported by me (see the wiki). try: - privSigningKeyBase58 = shared.config.get(myAddress, 'privsigningkey') - privEncryptionKeyBase58 = shared.config.get(myAddress, 'privencryptionkey') - except Exception, err: + privSigningKeyBase58 = shared.config.get( + myAddress, 'privsigningkey') + privEncryptionKeyBase58 = shared.config.get( + myAddress, 'privencryptionkey') + except Exception as err: shared.printLock.acquire() - sys.stderr.write('Error within doPOWForMyV2Pubkey. Could not read the keys from the keys.dat file for a requested address. %s\n' % err) + sys.stderr.write( + 'Error within doPOWForMyV2Pubkey. Could not read the keys from the keys.dat file for a requested address. %s\n' % err) shared.printLock.release() return - privSigningKeyHex = shared.decodeWalletImportFormat(privSigningKeyBase58).encode('hex') - privEncryptionKeyHex = shared.decodeWalletImportFormat(privEncryptionKeyBase58).encode('hex') - pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode('hex') - pubEncryptionKey = highlevelcrypto.privToPub(privEncryptionKeyHex).decode('hex') + privSigningKeyHex = shared.decodeWalletImportFormat( + privSigningKeyBase58).encode('hex') + privEncryptionKeyHex = shared.decodeWalletImportFormat( + privEncryptionKeyBase58).encode('hex') + pubSigningKey = highlevelcrypto.privToPub( + privSigningKeyHex).decode('hex') + pubEncryptionKey = highlevelcrypto.privToPub( + privEncryptionKeyHex).decode('hex') payload += pubSigningKey[1:] payload += pubEncryptionKey[1:] - #Do the POW for this pubkey message - target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) + # Do the POW for this pubkey message + target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes + + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For pubkey message) Doing proof of work...' initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) print '(For pubkey message) Found proof of work', trialValue, 'Nonce:', nonce - payload = pack('>Q',nonce) + payload + payload = pack('>Q', nonce) + payload """t = (hash,payload,embeddedTime,'no') shared.sqlLock.acquire() shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''') @@ -2732,57 +3172,72 @@ class singleWorker(threading.Thread): inventoryHash = calculateInventoryHash(payload) objectType = 'pubkey' - shared.inventory[inventoryHash] = (objectType, streamNumber, payload, embeddedTime) + shared.inventory[inventoryHash] = ( + objectType, streamNumber, payload, embeddedTime) shared.printLock.acquire() print 'broadcasting inv with hash:', inventoryHash.encode('hex') shared.printLock.release() - shared.broadcastToSendDataQueues((streamNumber, 'sendinv', inventoryHash)) - shared.UISignalQueue.put(('updateStatusBar','')) - shared.config.set(myAddress,'lastpubkeysendtime',str(int(time.time()))) + shared.broadcastToSendDataQueues(( + streamNumber, 'sendinv', inventoryHash)) + shared.UISignalQueue.put(('updateStatusBar', '')) + shared.config.set( + myAddress, 'lastpubkeysendtime', str(int(time.time()))) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - def doPOWForMyV3Pubkey(self,hash): #This function also broadcasts out the pubkey message once it is done with the POW + def doPOWForMyV3Pubkey(self, hash): # This function also broadcasts out the pubkey message once it is done with the POW myAddress = shared.myAddressesByHash[hash] - status,addressVersionNumber,streamNumber,hash = decodeAddress(myAddress) - embeddedTime = int(time.time()+random.randrange(-300, 300)) #the current time plus or minus five minutes - payload = pack('>I',(embeddedTime)) - payload += encodeVarint(addressVersionNumber) #Address version number + status, addressVersionNumber, streamNumber, hash = decodeAddress( + myAddress) + embeddedTime = int(time.time() + random.randrange( + -300, 300)) # the current time plus or minus five minutes + payload = pack('>I', (embeddedTime)) + payload += encodeVarint(addressVersionNumber) # Address version number payload += encodeVarint(streamNumber) - payload += '\x00\x00\x00\x01' #bitfield of features supported by me (see the wiki). + payload += '\x00\x00\x00\x01' # bitfield of features supported by me (see the wiki). try: - privSigningKeyBase58 = shared.config.get(myAddress, 'privsigningkey') - privEncryptionKeyBase58 = shared.config.get(myAddress, 'privencryptionkey') - except Exception, err: + privSigningKeyBase58 = shared.config.get( + myAddress, 'privsigningkey') + privEncryptionKeyBase58 = shared.config.get( + myAddress, 'privencryptionkey') + except Exception as err: shared.printLock.acquire() - sys.stderr.write('Error within doPOWForMyV3Pubkey. Could not read the keys from the keys.dat file for a requested address. %s\n' % err) + sys.stderr.write( + 'Error within doPOWForMyV3Pubkey. Could not read the keys from the keys.dat file for a requested address. %s\n' % err) shared.printLock.release() return - privSigningKeyHex = shared.decodeWalletImportFormat(privSigningKeyBase58).encode('hex') - privEncryptionKeyHex = shared.decodeWalletImportFormat(privEncryptionKeyBase58).encode('hex') - pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode('hex') - pubEncryptionKey = highlevelcrypto.privToPub(privEncryptionKeyHex).decode('hex') + privSigningKeyHex = shared.decodeWalletImportFormat( + privSigningKeyBase58).encode('hex') + privEncryptionKeyHex = shared.decodeWalletImportFormat( + privEncryptionKeyBase58).encode('hex') + pubSigningKey = highlevelcrypto.privToPub( + privSigningKeyHex).decode('hex') + pubEncryptionKey = highlevelcrypto.privToPub( + privEncryptionKeyHex).decode('hex') payload += pubSigningKey[1:] payload += pubEncryptionKey[1:] - payload += encodeVarint(shared.config.getint(myAddress,'noncetrialsperbyte')) - payload += encodeVarint(shared.config.getint(myAddress,'payloadlengthextrabytes')) - signature = highlevelcrypto.sign(payload,privSigningKeyHex) + payload += encodeVarint(shared.config.getint( + myAddress, 'noncetrialsperbyte')) + payload += encodeVarint(shared.config.getint( + myAddress, 'payloadlengthextrabytes')) + signature = highlevelcrypto.sign(payload, privSigningKeyHex) payload += encodeVarint(len(signature)) payload += signature - #Do the POW for this pubkey message - target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) + # Do the POW for this pubkey message + target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes + + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For pubkey message) Doing proof of work...' initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) print '(For pubkey message) Found proof of work', trialValue, 'Nonce:', nonce - payload = pack('>Q',nonce) + payload + payload = pack('>Q', nonce) + payload """t = (hash,payload,embeddedTime,'no') shared.sqlLock.acquire() shared.sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''') @@ -2793,384 +3248,509 @@ class singleWorker(threading.Thread): inventoryHash = calculateInventoryHash(payload) objectType = 'pubkey' - shared.inventory[inventoryHash] = (objectType, streamNumber, payload, embeddedTime) + shared.inventory[inventoryHash] = ( + objectType, streamNumber, payload, embeddedTime) shared.printLock.acquire() print 'broadcasting inv with hash:', inventoryHash.encode('hex') shared.printLock.release() - shared.broadcastToSendDataQueues((streamNumber, 'sendinv', inventoryHash)) - shared.UISignalQueue.put(('updateStatusBar','')) - shared.config.set(myAddress,'lastpubkeysendtime',str(int(time.time()))) + shared.broadcastToSendDataQueues(( + streamNumber, 'sendinv', inventoryHash)) + shared.UISignalQueue.put(('updateStatusBar', '')) + shared.config.set( + myAddress, 'lastpubkeysendtime', str(int(time.time()))) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) def sendBroadcast(self): shared.sqlLock.acquire() t = ('broadcastqueued',) - shared.sqlSubmitQueue.put('''SELECT fromaddress, subject, message, ackdata FROM sent WHERE status=? and folder='sent' ''') + shared.sqlSubmitQueue.put( + '''SELECT fromaddress, subject, message, ackdata FROM sent WHERE status=? and folder='sent' ''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() for row in queryreturn: fromaddress, subject, body, ackdata = row - status,addressVersionNumber,streamNumber,ripe = decodeAddress(fromaddress) + status, addressVersionNumber, streamNumber, ripe = decodeAddress( + fromaddress) if addressVersionNumber == 2 and int(time.time()) < encryptedBroadcastSwitchoverTime: - #We need to convert our private keys to public keys in order to include them. + # We need to convert our private keys to public keys in order + # to include them. try: - privSigningKeyBase58 = shared.config.get(fromaddress, 'privsigningkey') - privEncryptionKeyBase58 = shared.config.get(fromaddress, 'privencryptionkey') + privSigningKeyBase58 = shared.config.get( + fromaddress, 'privsigningkey') + privEncryptionKeyBase58 = shared.config.get( + fromaddress, 'privencryptionkey') except: - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Error! Could not find sender address (your address) in the keys.dat file.'))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( + ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) continue - privSigningKeyHex = shared.decodeWalletImportFormat(privSigningKeyBase58).encode('hex') - privEncryptionKeyHex = shared.decodeWalletImportFormat(privEncryptionKeyBase58).encode('hex') + privSigningKeyHex = shared.decodeWalletImportFormat( + privSigningKeyBase58).encode('hex') + privEncryptionKeyHex = shared.decodeWalletImportFormat( + privEncryptionKeyBase58).encode('hex') - pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode('hex') #At this time these pubkeys are 65 bytes long because they include the encoding byte which we won't be sending in the broadcast message. - pubEncryptionKey = highlevelcrypto.privToPub(privEncryptionKeyHex).decode('hex') + pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode( + 'hex') # At this time these pubkeys are 65 bytes long because they include the encoding byte which we won't be sending in the broadcast message. + pubEncryptionKey = highlevelcrypto.privToPub( + privEncryptionKeyHex).decode('hex') - payload = pack('>Q',(int(time.time())+random.randrange(-300, 300)))#the current time plus or minus five minutes - payload += encodeVarint(1) #broadcast version + payload = pack('>Q', (int(time.time()) + random.randrange( + -300, 300))) # the current time plus or minus five minutes + payload += encodeVarint(1) # broadcast version payload += encodeVarint(addressVersionNumber) payload += encodeVarint(streamNumber) - payload += '\x00\x00\x00\x01' #behavior bitfield + payload += '\x00\x00\x00\x01' # behavior bitfield payload += pubSigningKey[1:] payload += pubEncryptionKey[1:] payload += ripe - payload += '\x02' #message encoding type - payload += encodeVarint(len('Subject:' + subject + '\n' + 'Body:' + body)) #Type 2 is simple UTF-8 message encoding. + payload += '\x02' # message encoding type + payload += encodeVarint(len( + 'Subject:' + subject + '\n' + 'Body:' + body)) # Type 2 is simple UTF-8 message encoding. payload += 'Subject:' + subject + '\n' + 'Body:' + body - signature = highlevelcrypto.sign(payload,privSigningKeyHex) + signature = highlevelcrypto.sign(payload, privSigningKeyHex) payload += encodeVarint(len(signature)) payload += signature - target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) + target = 2 ** 64 / ((len( + payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For broadcast message) Doing proof of work...' - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Doing work necessary to send broadcast...'))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( + ackdata, 'Doing work necessary to send broadcast...'))) initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce - payload = pack('>Q',nonce) + payload + payload = pack('>Q', nonce) + payload inventoryHash = calculateInventoryHash(payload) objectType = 'broadcast' - shared.inventory[inventoryHash] = (objectType, streamNumber, payload, int(time.time())) + shared.inventory[inventoryHash] = ( + objectType, streamNumber, payload, int(time.time())) print 'Broadcasting inv for my broadcast (within sendBroadcast function):', inventoryHash.encode('hex') - shared.broadcastToSendDataQueues((streamNumber, 'sendinv', inventoryHash)) + shared.broadcastToSendDataQueues(( + streamNumber, 'sendinv', inventoryHash)) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Broadcast sent on '+unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Broadcast sent on ' + unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) - #Update the status of the message in the 'sent' table to have a 'broadcastsent' status + # Update the status of the message in the 'sent' table to have + # a 'broadcastsent' status shared.sqlLock.acquire() - t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastqueued') - shared.sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?') + t = ('broadcastsent', int( + time.time()), fromaddress, subject, body, 'broadcastqueued') + shared.sqlSubmitQueue.put( + 'UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() elif addressVersionNumber == 3 or int(time.time()) > encryptedBroadcastSwitchoverTime: - #We need to convert our private keys to public keys in order to include them. + # We need to convert our private keys to public keys in order + # to include them. try: - privSigningKeyBase58 = shared.config.get(fromaddress, 'privsigningkey') - privEncryptionKeyBase58 = shared.config.get(fromaddress, 'privencryptionkey') + privSigningKeyBase58 = shared.config.get( + fromaddress, 'privsigningkey') + privEncryptionKeyBase58 = shared.config.get( + fromaddress, 'privencryptionkey') except: - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Error! Could not find sender address (your address) in the keys.dat file.'))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( + ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) continue - privSigningKeyHex = shared.decodeWalletImportFormat(privSigningKeyBase58).encode('hex') - privEncryptionKeyHex = shared.decodeWalletImportFormat(privEncryptionKeyBase58).encode('hex') + privSigningKeyHex = shared.decodeWalletImportFormat( + privSigningKeyBase58).encode('hex') + privEncryptionKeyHex = shared.decodeWalletImportFormat( + privEncryptionKeyBase58).encode('hex') - pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode('hex') #At this time these pubkeys are 65 bytes long because they include the encoding byte which we won't be sending in the broadcast message. - pubEncryptionKey = highlevelcrypto.privToPub(privEncryptionKeyHex).decode('hex') + pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode( + 'hex') # At this time these pubkeys are 65 bytes long because they include the encoding byte which we won't be sending in the broadcast message. + pubEncryptionKey = highlevelcrypto.privToPub( + privEncryptionKeyHex).decode('hex') - payload = pack('>Q',(int(time.time())+random.randrange(-300, 300)))#the current time plus or minus five minutes - payload += encodeVarint(2) #broadcast version + payload = pack('>Q', (int(time.time()) + random.randrange( + -300, 300))) # the current time plus or minus five minutes + payload += encodeVarint(2) # broadcast version payload += encodeVarint(streamNumber) - - dataToEncrypt = encodeVarint(2) #broadcast version + + dataToEncrypt = encodeVarint(2) # broadcast version dataToEncrypt += encodeVarint(addressVersionNumber) dataToEncrypt += encodeVarint(streamNumber) - dataToEncrypt += '\x00\x00\x00\x01' #behavior bitfield + dataToEncrypt += '\x00\x00\x00\x01' # behavior bitfield dataToEncrypt += pubSigningKey[1:] dataToEncrypt += pubEncryptionKey[1:] - if addressVersionNumber >= 3: - dataToEncrypt += encodeVarint(shared.config.getint(fromaddress,'noncetrialsperbyte')) - dataToEncrypt += encodeVarint(shared.config.getint(fromaddress,'payloadlengthextrabytes')) - dataToEncrypt += '\x02' #message encoding type - dataToEncrypt += encodeVarint(len('Subject:' + subject + '\n' + 'Body:' + body)) #Type 2 is simple UTF-8 message encoding. + if addressVersionNumber >= 3: + dataToEncrypt += encodeVarint(shared.config.getint( + fromaddress, 'noncetrialsperbyte')) + dataToEncrypt += encodeVarint(shared.config.getint( + fromaddress, 'payloadlengthextrabytes')) + dataToEncrypt += '\x02' # message encoding type + dataToEncrypt += encodeVarint(len( + 'Subject:' + subject + '\n' + 'Body:' + body)) # Type 2 is simple UTF-8 message encoding. dataToEncrypt += 'Subject:' + subject + '\n' + 'Body:' + body - signature = highlevelcrypto.sign(dataToEncrypt,privSigningKeyHex) + signature = highlevelcrypto.sign( + dataToEncrypt, privSigningKeyHex) dataToEncrypt += encodeVarint(len(signature)) dataToEncrypt += signature - privEncryptionKey = hashlib.sha512(encodeVarint(addressVersionNumber)+encodeVarint(streamNumber)+ripe).digest()[:32] + privEncryptionKey = hashlib.sha512(encodeVarint( + addressVersionNumber) + encodeVarint(streamNumber) + ripe).digest()[:32] pubEncryptionKey = pointMult(privEncryptionKey) - payload += highlevelcrypto.encrypt(dataToEncrypt,pubEncryptionKey.encode('hex')) + payload += highlevelcrypto.encrypt( + dataToEncrypt, pubEncryptionKey.encode('hex')) - target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) + target = 2 ** 64 / ((len( + payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For broadcast message) Doing proof of work...' - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Doing work necessary to send broadcast...'))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( + ackdata, 'Doing work necessary to send broadcast...'))) initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce - payload = pack('>Q',nonce) + payload + payload = pack('>Q', nonce) + payload inventoryHash = calculateInventoryHash(payload) objectType = 'broadcast' - shared.inventory[inventoryHash] = (objectType, streamNumber, payload, int(time.time())) + shared.inventory[inventoryHash] = ( + objectType, streamNumber, payload, int(time.time())) print 'sending inv (within sendBroadcast function)' - shared.broadcastToSendDataQueues((streamNumber, 'sendinv', inventoryHash)) + shared.broadcastToSendDataQueues(( + streamNumber, 'sendinv', inventoryHash)) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Broadcast sent on '+unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Broadcast sent on ' + unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) - #Update the status of the message in the 'sent' table to have a 'broadcastsent' status + # Update the status of the message in the 'sent' table to have + # a 'broadcastsent' status shared.sqlLock.acquire() - t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastqueued') - shared.sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?') + t = ('broadcastsent', int( + time.time()), fromaddress, subject, body, 'broadcastqueued') + shared.sqlSubmitQueue.put( + 'UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() else: shared.printLock.acquire() - sys.stderr.write('Error: In the singleWorker thread, the sendBroadcast function doesn\'t understand the address version.\n') + sys.stderr.write( + 'Error: In the singleWorker thread, the sendBroadcast function doesn\'t understand the address version.\n') shared.printLock.release() def sendMsg(self): - #Check to see if there are any messages queued to be sent + # Check to see if there are any messages queued to be sent shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT DISTINCT toaddress FROM sent WHERE (status='msgqueued' AND folder='sent')''') + shared.sqlSubmitQueue.put( + '''SELECT DISTINCT toaddress FROM sent WHERE (status='msgqueued' AND folder='sent')''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - for row in queryreturn: #For each address to which we need to send a message, check to see if we have its pubkey already. + for row in queryreturn: # For each address to which we need to send a message, check to see if we have its pubkey already. toaddress, = row toripe = decodeAddress(toaddress)[3] shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT hash FROM pubkeys WHERE hash=? ''') + shared.sqlSubmitQueue.put( + '''SELECT hash FROM pubkeys WHERE hash=? ''') shared.sqlSubmitQueue.put((toripe,)) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn != []: #If we have the needed pubkey, set the status to doingmsgpow (we'll do it further down) + if queryreturn != []: # If we have the needed pubkey, set the status to doingmsgpow (we'll do it further down) t = (toaddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE sent SET status='doingmsgpow' WHERE toaddress=? AND status='msgqueued' ''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET status='doingmsgpow' WHERE toaddress=? AND status='msgqueued' ''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - else: #We don't have the needed pubkey. Set the status to 'awaitingpubkey' and request it if we haven't already + else: # We don't have the needed pubkey. Set the status to 'awaitingpubkey' and request it if we haven't already if toripe in neededPubkeys: - #We already sent a request for the pubkey + # We already sent a request for the pubkey t = (toaddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE sent SET status='awaitingpubkey' WHERE toaddress=? AND status='msgqueued' ''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET status='awaitingpubkey' WHERE toaddress=? AND status='msgqueued' ''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateSentItemStatusByHash',(toripe,'Encryption key was requested earlier.'))) + shared.UISignalQueue.put(('updateSentItemStatusByHash', ( + toripe, 'Encryption key was requested earlier.'))) else: - #We have not yet sent a request for the pubkey + # We have not yet sent a request for the pubkey t = (toaddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE sent SET status='doingpubkeypow' WHERE toaddress=? AND status='msgqueued' ''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET status='doingpubkeypow' WHERE toaddress=? AND status='msgqueued' ''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateSentItemStatusByHash',(toripe,'Sending a request for the recipient\'s encryption key.'))) + shared.UISignalQueue.put(('updateSentItemStatusByHash', ( + toripe, 'Sending a request for the recipient\'s encryption key.'))) self.requestPubKey(toaddress) shared.sqlLock.acquire() - #Get all messages that are ready to be sent, and also all messages which we have sent in the last 28 days which were previously marked as 'toodifficult'. If the user as raised the maximum acceptable difficulty then those messages may now be sendable. - shared.sqlSubmitQueue.put('''SELECT toaddress, toripe, fromaddress, subject, message, ackdata, status FROM sent WHERE (status='doingmsgpow' or status='forcepow' or (status='toodifficult' and lastactiontime>?)) and folder='sent' ''') - shared.sqlSubmitQueue.put((int(time.time())-2419200,)) + # Get all messages that are ready to be sent, and also all messages + # which we have sent in the last 28 days which were previously marked + # as 'toodifficult'. If the user as raised the maximum acceptable + # difficulty then those messages may now be sendable. + shared.sqlSubmitQueue.put( + '''SELECT toaddress, toripe, fromaddress, subject, message, ackdata, status FROM sent WHERE (status='doingmsgpow' or status='forcepow' or (status='toodifficult' and lastactiontime>?)) and folder='sent' ''') + shared.sqlSubmitQueue.put((int(time.time()) - 2419200,)) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - for row in queryreturn: #For each message we need to send.. + for row in queryreturn: # For each message we need to send.. toaddress, toripe, fromaddress, subject, message, ackdata, status = row - #There is a remote possibility that we may no longer have the recipient's pubkey. Let us make sure we still have it or else the sendMsg function will appear to freeze. This can happen if the user sends a message but doesn't let the POW function finish, then leaves their client off for a long time which could cause the needed pubkey to expire and be deleted. + # There is a remote possibility that we may no longer have the + # recipient's pubkey. Let us make sure we still have it or else the + # sendMsg function will appear to freeze. This can happen if the + # user sends a message but doesn't let the POW function finish, + # then leaves their client off for a long time which could cause + # the needed pubkey to expire and be deleted. shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT hash FROM pubkeys WHERE hash=? ''') + shared.sqlSubmitQueue.put( + '''SELECT hash FROM pubkeys WHERE hash=? ''') shared.sqlSubmitQueue.put((toripe,)) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() if queryreturn == [] and toripe not in neededPubkeys: - #We no longer have the needed pubkey and we haven't requested it. + # We no longer have the needed pubkey and we haven't requested + # it. shared.printLock.acquire() - sys.stderr.write('For some reason, the status of a message in our outbox is \'doingmsgpow\' even though we lack the pubkey. Here is the RIPE hash of the needed pubkey: %s\n' % toripe.encode('hex')) + sys.stderr.write( + 'For some reason, the status of a message in our outbox is \'doingmsgpow\' even though we lack the pubkey. Here is the RIPE hash of the needed pubkey: %s\n' % toripe.encode('hex')) shared.printLock.release() t = (toaddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE sent SET status='msgqueued' WHERE toaddress=? AND status='doingmsgpow' ''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET status='msgqueued' WHERE toaddress=? AND status='doingmsgpow' ''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateSentItemStatusByHash',(toripe,'Sending a request for the recipient\'s encryption key.'))) + shared.UISignalQueue.put(('updateSentItemStatusByHash', ( + toripe, 'Sending a request for the recipient\'s encryption key.'))) self.requestPubKey(toaddress) continue ackdataForWhichImWatching[ackdata] = 0 - toStatus,toAddressVersionNumber,toStreamNumber,toHash = decodeAddress(toaddress) - fromStatus,fromAddressVersionNumber,fromStreamNumber,fromHash = decodeAddress(fromaddress) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Looking up the receiver\'s public key'))) + toStatus, toAddressVersionNumber, toStreamNumber, toHash = decodeAddress( + toaddress) + fromStatus, fromAddressVersionNumber, fromStreamNumber, fromHash = decodeAddress( + fromaddress) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( + ackdata, 'Looking up the receiver\'s public key'))) shared.printLock.acquire() print 'Found a message in our database that needs to be sent with this pubkey.' print 'First 150 characters of message:', repr(message[:150]) shared.printLock.release() - #mark the pubkey as 'usedpersonally' so that we don't ever delete it. + # mark the pubkey as 'usedpersonally' so that we don't ever delete + # it. shared.sqlLock.acquire() t = (toripe,) - shared.sqlSubmitQueue.put('''UPDATE pubkeys SET usedpersonally='yes' WHERE hash=?''') + shared.sqlSubmitQueue.put( + '''UPDATE pubkeys SET usedpersonally='yes' WHERE hash=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') - #Let us fetch the recipient's public key out of our database. If the required proof of work difficulty is too hard then we'll abort. - shared.sqlSubmitQueue.put('SELECT transmitdata FROM pubkeys WHERE hash=?') + # Let us fetch the recipient's public key out of our database. If + # the required proof of work difficulty is too hard then we'll + # abort. + shared.sqlSubmitQueue.put( + 'SELECT transmitdata FROM pubkeys WHERE hash=?') shared.sqlSubmitQueue.put((toripe,)) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() if queryreturn == []: shared.printLock.acquire() - sys.stderr.write('(within sendMsg) The needed pubkey was not found. This should never happen. Aborting send.\n') + sys.stderr.write( + '(within sendMsg) The needed pubkey was not found. This should never happen. Aborting send.\n') shared.printLock.release() return for row in queryreturn: pubkeyPayload, = row - #The pubkey message is stored the way we originally received it which means that we need to read beyond things like the nonce and time to get to the actual public keys. - readPosition = 8 #to bypass the nonce - pubkeyEmbeddedTime, = unpack('>I',pubkeyPayload[readPosition:readPosition+4]) - #This section is used for the transition from 32 bit time to 64 bit time in the protocol. + # The pubkey message is stored the way we originally received it + # which means that we need to read beyond things like the nonce and + # time to get to the actual public keys. + readPosition = 8 # to bypass the nonce + pubkeyEmbeddedTime, = unpack( + '>I', pubkeyPayload[readPosition:readPosition + 4]) + # This section is used for the transition from 32 bit time to 64 + # bit time in the protocol. if pubkeyEmbeddedTime == 0: - pubkeyEmbeddedTime, = unpack('>Q',pubkeyPayload[readPosition:readPosition+8]) + pubkeyEmbeddedTime, = unpack( + '>Q', pubkeyPayload[readPosition:readPosition + 8]) readPosition += 8 else: readPosition += 4 - readPosition += 1 #to bypass the address version whose length is definitely 1 - streamNumber, streamNumberLength = decodeVarint(pubkeyPayload[readPosition:readPosition+10]) + readPosition += 1 # to bypass the address version whose length is definitely 1 + streamNumber, streamNumberLength = decodeVarint( + pubkeyPayload[readPosition:readPosition + 10]) readPosition += streamNumberLength - behaviorBitfield = pubkeyPayload[readPosition:readPosition+4] - readPosition += 4 #to bypass the bitfield of behaviors - #pubSigningKeyBase256 = pubkeyPayload[readPosition:readPosition+64] #We don't use this key for anything here. + behaviorBitfield = pubkeyPayload[readPosition:readPosition + 4] + readPosition += 4 # to bypass the bitfield of behaviors + # pubSigningKeyBase256 = + # pubkeyPayload[readPosition:readPosition+64] #We don't use this + # key for anything here. readPosition += 64 - pubEncryptionKeyBase256 = pubkeyPayload[readPosition:readPosition+64] + pubEncryptionKeyBase256 = pubkeyPayload[ + readPosition:readPosition + 64] readPosition += 64 if toAddressVersionNumber == 2: requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.)'))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( + ackdata, 'Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.)'))) elif toAddressVersionNumber == 3: - requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint(pubkeyPayload[readPosition:readPosition+10]) + requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint( + pubkeyPayload[readPosition:readPosition + 10]) readPosition += varintLength - requiredPayloadLengthExtraBytes, varintLength = decodeVarint(pubkeyPayload[readPosition:readPosition+10]) + requiredPayloadLengthExtraBytes, varintLength = decodeVarint( + pubkeyPayload[readPosition:readPosition + 10]) readPosition += varintLength - if requiredAverageProofOfWorkNonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte: #We still have to meet a minimum POW difficulty regardless of what they say is allowed in order to get our message to propagate through the network. + if requiredAverageProofOfWorkNonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte: # We still have to meet a minimum POW difficulty regardless of what they say is allowed in order to get our message to propagate through the network. requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte if requiredPayloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes: requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Doing work necessary to send message.\nReceiver\'s required difficulty: '+str(float(requiredAverageProofOfWorkNonceTrialsPerByte)/shared.networkDefaultProofOfWorkNonceTrialsPerByte)+' and '+ str(float(requiredPayloadLengthExtraBytes)/shared.networkDefaultPayloadLengthExtraBytes)))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Doing work necessary to send message.\nReceiver\'s required difficulty: ' + str(float( + requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte) + ' and ' + str(float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)))) if status != 'forcepow': - if (requiredAverageProofOfWorkNonceTrialsPerByte > shared.config.getint('bitmessagesettings','maxacceptablenoncetrialsperbyte') and shared.config.getint('bitmessagesettings','maxacceptablenoncetrialsperbyte') != 0) or (requiredPayloadLengthExtraBytes > shared.config.getint('bitmessagesettings','maxacceptablepayloadlengthextrabytes') and shared.config.getint('bitmessagesettings','maxacceptablepayloadlengthextrabytes') != 0): - #The demanded difficulty is more than we are willing to do. + if (requiredAverageProofOfWorkNonceTrialsPerByte > shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') and shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') != 0) or (requiredPayloadLengthExtraBytes > shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') and shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') != 0): + # The demanded difficulty is more than we are willing + # to do. shared.sqlLock.acquire() t = (ackdata,) - shared.sqlSubmitQueue.put('''UPDATE sent SET status='toodifficult' WHERE ackdata=? ''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET status='toodifficult' WHERE ackdata=? ''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Problem: The work demanded by the recipient (' + str(float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte) + ' and ' + str(float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes) + ') is more difficult than you are willing to do. ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Problem: The work demanded by the recipient (' + str(float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte) + ' and ' + str(float( + requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes) + ') is more difficult than you are willing to do. ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) continue - - embeddedTime = pack('>Q',(int(time.time())+random.randrange(-300, 300)))#the current time plus or minus five minutes. We will use this time both for our message and for the ackdata packed within our message. + embeddedTime = pack('>Q', (int(time.time()) + random.randrange( + -300, 300))) # the current time plus or minus five minutes. We will use this time both for our message and for the ackdata packed within our message. if fromAddressVersionNumber == 2: - payload = '\x01' #Message version. + payload = '\x01' # Message version. payload += encodeVarint(fromAddressVersionNumber) payload += encodeVarint(fromStreamNumber) - payload += '\x00\x00\x00\x01' #Bitfield of features and behaviors that can be expected from me. (See https://bitmessage.org/wiki/Protocol_specification#Pubkey_bitfield_features ) + payload += '\x00\x00\x00\x01' # Bitfield of features and behaviors that can be expected from me. (See https://bitmessage.org/wiki/Protocol_specification#Pubkey_bitfield_features ) - #We need to convert our private keys to public keys in order to include them. + # We need to convert our private keys to public keys in order + # to include them. try: - privSigningKeyBase58 = shared.config.get(fromaddress, 'privsigningkey') - privEncryptionKeyBase58 = shared.config.get(fromaddress, 'privencryptionkey') + privSigningKeyBase58 = shared.config.get( + fromaddress, 'privsigningkey') + privEncryptionKeyBase58 = shared.config.get( + fromaddress, 'privencryptionkey') except: - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Error! Could not find sender address (your address) in the keys.dat file.'))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( + ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) continue - privSigningKeyHex = shared.decodeWalletImportFormat(privSigningKeyBase58).encode('hex') - privEncryptionKeyHex = shared.decodeWalletImportFormat(privEncryptionKeyBase58).encode('hex') + privSigningKeyHex = shared.decodeWalletImportFormat( + privSigningKeyBase58).encode('hex') + privEncryptionKeyHex = shared.decodeWalletImportFormat( + privEncryptionKeyBase58).encode('hex') - pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode('hex') - pubEncryptionKey = highlevelcrypto.privToPub(privEncryptionKeyHex).decode('hex') + pubSigningKey = highlevelcrypto.privToPub( + privSigningKeyHex).decode('hex') + pubEncryptionKey = highlevelcrypto.privToPub( + privEncryptionKeyHex).decode('hex') - payload += pubSigningKey[1:] #The \x04 on the beginning of the public keys are not sent. This way there is only one acceptable way to encode and send a public key. + payload += pubSigningKey[ + 1:] # The \x04 on the beginning of the public keys are not sent. This way there is only one acceptable way to encode and send a public key. payload += pubEncryptionKey[1:] - payload += toHash #This hash will be checked by the receiver of the message to verify that toHash belongs to them. This prevents a Surreptitious Forwarding Attack. - payload += '\x02' #Type 2 is simple UTF-8 message encoding as specified on the Protocol Specification on the Bitmessage Wiki. - messageToTransmit = 'Subject:' + subject + '\n' + 'Body:' + message + payload += toHash # This hash will be checked by the receiver of the message to verify that toHash belongs to them. This prevents a Surreptitious Forwarding Attack. + payload += '\x02' # Type 2 is simple UTF-8 message encoding as specified on the Protocol Specification on the Bitmessage Wiki. + messageToTransmit = 'Subject:' + \ + subject + '\n' + 'Body:' + message payload += encodeVarint(len(messageToTransmit)) payload += messageToTransmit - fullAckPayload = self.generateFullAckMessage(ackdata,toStreamNumber,embeddedTime)#The fullAckPayload is a normal msg protocol message with the proof of work already completed that the receiver of this message can easily send out. + fullAckPayload = self.generateFullAckMessage( + ackdata, toStreamNumber, embeddedTime) # The fullAckPayload is a normal msg protocol message with the proof of work already completed that the receiver of this message can easily send out. payload += encodeVarint(len(fullAckPayload)) payload += fullAckPayload - signature = highlevelcrypto.sign(payload,privSigningKeyHex) + signature = highlevelcrypto.sign(payload, privSigningKeyHex) payload += encodeVarint(len(signature)) payload += signature if fromAddressVersionNumber == 3: - payload = '\x01' #Message version. + payload = '\x01' # Message version. payload += encodeVarint(fromAddressVersionNumber) payload += encodeVarint(fromStreamNumber) - payload += '\x00\x00\x00\x01' #Bitfield of features and behaviors that can be expected from me. (See https://bitmessage.org/wiki/Protocol_specification#Pubkey_bitfield_features ) + payload += '\x00\x00\x00\x01' # Bitfield of features and behaviors that can be expected from me. (See https://bitmessage.org/wiki/Protocol_specification#Pubkey_bitfield_features ) - #We need to convert our private keys to public keys in order to include them. + # We need to convert our private keys to public keys in order + # to include them. try: - privSigningKeyBase58 = shared.config.get(fromaddress, 'privsigningkey') - privEncryptionKeyBase58 = shared.config.get(fromaddress, 'privencryptionkey') + privSigningKeyBase58 = shared.config.get( + fromaddress, 'privsigningkey') + privEncryptionKeyBase58 = shared.config.get( + fromaddress, 'privencryptionkey') except: - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Error! Could not find sender address (your address) in the keys.dat file.'))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( + ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) continue - privSigningKeyHex = shared.decodeWalletImportFormat(privSigningKeyBase58).encode('hex') - privEncryptionKeyHex = shared.decodeWalletImportFormat(privEncryptionKeyBase58).encode('hex') + privSigningKeyHex = shared.decodeWalletImportFormat( + privSigningKeyBase58).encode('hex') + privEncryptionKeyHex = shared.decodeWalletImportFormat( + privEncryptionKeyBase58).encode('hex') - pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode('hex') - pubEncryptionKey = highlevelcrypto.privToPub(privEncryptionKeyHex).decode('hex') + pubSigningKey = highlevelcrypto.privToPub( + privSigningKeyHex).decode('hex') + pubEncryptionKey = highlevelcrypto.privToPub( + privEncryptionKeyHex).decode('hex') - payload += pubSigningKey[1:] #The \x04 on the beginning of the public keys are not sent. This way there is only one acceptable way to encode and send a public key. + payload += pubSigningKey[ + 1:] # The \x04 on the beginning of the public keys are not sent. This way there is only one acceptable way to encode and send a public key. payload += pubEncryptionKey[1:] - #If the receiver of our message is in our address book, subscriptions list, or whitelist then we will allow them to do the network-minimum proof of work. Let us check to see if the receiver is in any of those lists. + # If the receiver of our message is in our address book, + # subscriptions list, or whitelist then we will allow them to + # do the network-minimum proof of work. Let us check to see if + # the receiver is in any of those lists. if shared.isAddressInMyAddressBookSubscriptionsListOrWhitelist(toaddress): - payload += encodeVarint(shared.networkDefaultProofOfWorkNonceTrialsPerByte) - payload += encodeVarint(shared.networkDefaultPayloadLengthExtraBytes) + payload += encodeVarint( + shared.networkDefaultProofOfWorkNonceTrialsPerByte) + payload += encodeVarint( + shared.networkDefaultPayloadLengthExtraBytes) else: - payload += encodeVarint(shared.config.getint(fromaddress,'noncetrialsperbyte')) - payload += encodeVarint(shared.config.getint(fromaddress,'payloadlengthextrabytes')) + payload += encodeVarint(shared.config.getint( + fromaddress, 'noncetrialsperbyte')) + payload += encodeVarint(shared.config.getint( + fromaddress, 'payloadlengthextrabytes')) - payload += toHash #This hash will be checked by the receiver of the message to verify that toHash belongs to them. This prevents a Surreptitious Forwarding Attack. - payload += '\x02' #Type 2 is simple UTF-8 message encoding as specified on the Protocol Specification on the Bitmessage Wiki. - messageToTransmit = 'Subject:' + subject + '\n' + 'Body:' + message + payload += toHash # This hash will be checked by the receiver of the message to verify that toHash belongs to them. This prevents a Surreptitious Forwarding Attack. + payload += '\x02' # Type 2 is simple UTF-8 message encoding as specified on the Protocol Specification on the Bitmessage Wiki. + messageToTransmit = 'Subject:' + \ + subject + '\n' + 'Body:' + message payload += encodeVarint(len(messageToTransmit)) payload += messageToTransmit - fullAckPayload = self.generateFullAckMessage(ackdata,toStreamNumber,embeddedTime)#The fullAckPayload is a normal msg protocol message with the proof of work already completed that the receiver of this message can easily send out. + fullAckPayload = self.generateFullAckMessage( + ackdata, toStreamNumber, embeddedTime) # The fullAckPayload is a normal msg protocol message with the proof of work already completed that the receiver of this message can easily send out. payload += encodeVarint(len(fullAckPayload)) payload += fullAckPayload - signature = highlevelcrypto.sign(payload,privSigningKeyHex) + signature = highlevelcrypto.sign(payload, privSigningKeyHex) payload += encodeVarint(len(signature)) payload += signature - #We have assembled the data that will be encrypted. - encrypted = highlevelcrypto.encrypt(payload,"04"+pubEncryptionKeyBase256.encode('hex')) - encryptedPayload = embeddedTime + encodeVarint(toStreamNumber) + encrypted - target = 2**64 / ((len(encryptedPayload)+requiredPayloadLengthExtraBytes+8) * requiredAverageProofOfWorkNonceTrialsPerByte) + # We have assembled the data that will be encrypted. + encrypted = highlevelcrypto.encrypt( + payload, "04" + pubEncryptionKeyBase256.encode('hex')) + encryptedPayload = embeddedTime + \ + encodeVarint(toStreamNumber) + encrypted + target = 2 ** 64 / ((len( + encryptedPayload) + requiredPayloadLengthExtraBytes + 8) * requiredAverageProofOfWorkNonceTrialsPerByte) shared.printLock.acquire() - print '(For msg message) Doing proof of work. Total required difficulty:', float(requiredAverageProofOfWorkNonceTrialsPerByte)/shared.networkDefaultProofOfWorkNonceTrialsPerByte,'Required small message difficulty:', float(requiredPayloadLengthExtraBytes)/shared.networkDefaultPayloadLengthExtraBytes + print '(For msg message) Doing proof of work. Total required difficulty:', float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte, 'Required small message difficulty:', float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes shared.printLock.release() powStartTime = time.time() initialHash = hashlib.sha512(encryptedPayload).digest() @@ -3178,76 +3758,91 @@ class singleWorker(threading.Thread): shared.printLock.acquire() print '(For msg message) Found proof of work', trialValue, 'Nonce:', nonce try: - print 'POW took', int(time.time()-powStartTime), 'seconds.', nonce/(time.time()-powStartTime), 'nonce trials per second.' + print 'POW took', int(time.time() - powStartTime), 'seconds.', nonce / (time.time() - powStartTime), 'nonce trials per second.' except: pass shared.printLock.release() - encryptedPayload = pack('>Q',nonce) + encryptedPayload + encryptedPayload = pack('>Q', nonce) + encryptedPayload inventoryHash = calculateInventoryHash(encryptedPayload) objectType = 'msg' - shared.inventory[inventoryHash] = (objectType, toStreamNumber, encryptedPayload, int(time.time())) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Message sent. Waiting on acknowledgement. Sent on ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))) + shared.inventory[inventoryHash] = ( + objectType, toStreamNumber, encryptedPayload, int(time.time())) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Message sent. Waiting on acknowledgement. Sent on ' + unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) print 'Broadcasting inv for my msg(within sendmsg function):', inventoryHash.encode('hex') - shared.broadcastToSendDataQueues((streamNumber, 'sendinv', inventoryHash)) + shared.broadcastToSendDataQueues(( + streamNumber, 'sendinv', inventoryHash)) - #Update the status of the message in the 'sent' table to have a 'msgsent' status + # Update the status of the message in the 'sent' table to have a + # 'msgsent' status shared.sqlLock.acquire() t = (ackdata,) - shared.sqlSubmitQueue.put('''UPDATE sent SET status='msgsent' WHERE ackdata=? AND (status='doingmsgpow' or status='forcepow') ''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET status='msgsent' WHERE ackdata=? AND (status='doingmsgpow' or status='forcepow') ''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - - def requestPubKey(self,toAddress): - toStatus,addressVersionNumber,streamNumber,ripe = decodeAddress(toAddress) + def requestPubKey(self, toAddress): + toStatus, addressVersionNumber, streamNumber, ripe = decodeAddress( + toAddress) if toStatus != 'success': shared.printLock.acquire() - sys.stderr.write('Very abnormal error occurred in requestPubKey. toAddress is: '+repr(toAddress)+'. Please report this error to Atheros.') + sys.stderr.write('Very abnormal error occurred in requestPubKey. toAddress is: ' + repr( + toAddress) + '. Please report this error to Atheros.') shared.printLock.release() return neededPubkeys[ripe] = 0 - payload = pack('>Q',(int(time.time())+random.randrange(-300, 300)))#the current time plus or minus five minutes. + payload = pack('>Q', (int(time.time()) + random.randrange( + -300, 300))) # the current time plus or minus five minutes. payload += encodeVarint(addressVersionNumber) payload += encodeVarint(streamNumber) payload += ripe shared.printLock.acquire() print 'making request for pubkey with ripe:', ripe.encode('hex') shared.printLock.release() - #print 'trial value', trialValue + # print 'trial value', trialValue statusbar = 'Doing the computations necessary to request the recipient\'s public key.' - shared.UISignalQueue.put(('updateStatusBar',statusbar)) - shared.UISignalQueue.put(('updateSentItemStatusByHash',(ripe,'Doing work necessary to request encryption key.'))) - target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) + shared.UISignalQueue.put(('updateStatusBar', statusbar)) + shared.UISignalQueue.put(('updateSentItemStatusByHash', ( + ripe, 'Doing work necessary to request encryption key.'))) + target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes + + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) shared.printLock.acquire() print 'Found proof of work', trialValue, 'Nonce:', nonce shared.printLock.release() - payload = pack('>Q',nonce) + payload + payload = pack('>Q', nonce) + payload inventoryHash = calculateInventoryHash(payload) objectType = 'getpubkey' - shared.inventory[inventoryHash] = (objectType, streamNumber, payload, int(time.time())) + shared.inventory[inventoryHash] = ( + objectType, streamNumber, payload, int(time.time())) print 'sending inv (for the getpubkey message)' - shared.broadcastToSendDataQueues((streamNumber, 'sendinv', inventoryHash)) + shared.broadcastToSendDataQueues(( + streamNumber, 'sendinv', inventoryHash)) t = (toAddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE sent SET status='awaitingpubkey' WHERE toaddress=? AND status='doingpubkeypow' ''') + shared.sqlSubmitQueue.put( + '''UPDATE sent SET status='awaitingpubkey' WHERE toaddress=? AND status='doingpubkeypow' ''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateStatusBar','Broacasting the public key request. This program will auto-retry if they are offline.')) - shared.UISignalQueue.put(('updateSentItemStatusByHash',(ripe,'Sending public key request. Waiting for reply. Requested at ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))) + shared.UISignalQueue.put(( + 'updateStatusBar', 'Broacasting the public key request. This program will auto-retry if they are offline.')) + shared.UISignalQueue.put(('updateSentItemStatusByHash', (ripe, 'Sending public key request. Waiting for reply. Requested at ' + unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) - def generateFullAckMessage(self,ackdata,toStreamNumber,embeddedTime): + def generateFullAckMessage(self, ackdata, toStreamNumber, embeddedTime): payload = embeddedTime + encodeVarint(toStreamNumber) + ackdata - target = 2**64 / ((len(payload)+shared.networkDefaultPayloadLengthExtraBytes+8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) + target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes + + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) shared.printLock.acquire() print '(For ack message) Doing proof of work...' shared.printLock.release() @@ -3257,20 +3852,22 @@ class singleWorker(threading.Thread): shared.printLock.acquire() print '(For ack message) Found proof of work', trialValue, 'Nonce:', nonce try: - print 'POW took', int(time.time()-powStartTime), 'seconds.', nonce/(time.time()-powStartTime), 'nonce trials per second.' + print 'POW took', int(time.time() - powStartTime), 'seconds.', nonce / (time.time() - powStartTime), 'nonce trials per second.' except: pass shared.printLock.release() - payload = pack('>Q',nonce) + payload - headerData = '\xe9\xbe\xb4\xd9' #magic bits, slighly different from Bitcoin's magic bits. + payload = pack('>Q', nonce) + payload + headerData = '\xe9\xbe\xb4\xd9' # magic bits, slighly different from Bitcoin's magic bits. headerData += 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00' - headerData += pack('>L',len(payload)) + headerData += pack('>L', len(payload)) headerData += hashlib.sha512(payload).digest()[:4] return headerData + payload + class addressGenerator(threading.Thread): + def __init__(self): - #QThread.__init__(self, parent) + # QThread.__init__(self, parent) threading.Thread.__init__(self) def run(self): @@ -3279,27 +3876,33 @@ class addressGenerator(threading.Thread): nonceTrialsPerByte = 0 payloadLengthExtraBytes = 0 if len(queueValue) == 7: - command,addressVersionNumber,streamNumber,label,numberOfAddressesToMake,deterministicPassphrase,eighteenByteRipe = queueValue + command, addressVersionNumber, streamNumber, label, numberOfAddressesToMake, deterministicPassphrase, eighteenByteRipe = queueValue elif len(queueValue) == 9: - command,addressVersionNumber,streamNumber,label,numberOfAddressesToMake,deterministicPassphrase,eighteenByteRipe,nonceTrialsPerByte,payloadLengthExtraBytes = queueValue + command, addressVersionNumber, streamNumber, label, numberOfAddressesToMake, deterministicPassphrase, eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes = queueValue else: - sys.stderr.write('Programming error: A structure with the wrong number of values was passed into the addressGeneratorQueue. Here is the queueValue: %s\n' % queueValue) + sys.stderr.write( + 'Programming error: A structure with the wrong number of values was passed into the addressGeneratorQueue. Here is the queueValue: %s\n' % queueValue) if addressVersionNumber < 3 or addressVersionNumber > 3: - sys.stderr.write('Program error: For some reason the address generator queue has been given a request to create at least one version %s address which it cannot do.\n' % addressVersionNumber) + sys.stderr.write( + 'Program error: For some reason the address generator queue has been given a request to create at least one version %s address which it cannot do.\n' % addressVersionNumber) if nonceTrialsPerByte == 0: - nonceTrialsPerByte = shared.config.getint('bitmessagesettings','defaultnoncetrialsperbyte') + nonceTrialsPerByte = shared.config.getint( + 'bitmessagesettings', 'defaultnoncetrialsperbyte') if nonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte: nonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte if payloadLengthExtraBytes == 0: - payloadLengthExtraBytes = shared.config.getint('bitmessagesettings','defaultpayloadlengthextrabytes') + payloadLengthExtraBytes = shared.config.getint( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes: payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes - if addressVersionNumber == 3: #currently the only one supported. + if addressVersionNumber == 3: # currently the only one supported. if command == 'createRandomAddress': - shared.UISignalQueue.put(('updateStatusBar','Generating one new address')) - #This next section is a little bit strange. We're going to generate keys over and over until we - #find one that starts with either \x00 or \x00\x00. Then when we pack them into a Bitmessage address, - #we won't store the \x00 or \x00\x00 bytes thus making the address shorter. + shared.UISignalQueue.put(( + 'updateStatusBar', 'Generating one new address')) + # This next section is a little bit strange. We're going to generate keys over and over until we + # find one that starts with either \x00 or \x00\x00. Then when we pack them into a Bitmessage address, + # we won't store the \x00 or \x00\x00 bytes thus making the + # address shorter. startTime = time.time() numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix = 0 potentialPrivSigningKey = OpenSSL.rand(32) @@ -3307,14 +3910,18 @@ class addressGenerator(threading.Thread): while True: numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix += 1 potentialPrivEncryptionKey = OpenSSL.rand(32) - potentialPubEncryptionKey = pointMult(potentialPrivEncryptionKey) - #print 'potentialPubSigningKey', potentialPubSigningKey.encode('hex') - #print 'potentialPubEncryptionKey', potentialPubEncryptionKey.encode('hex') + potentialPubEncryptionKey = pointMult( + potentialPrivEncryptionKey) + # print 'potentialPubSigningKey', potentialPubSigningKey.encode('hex') + # print 'potentialPubEncryptionKey', + # potentialPubEncryptionKey.encode('hex') ripe = hashlib.new('ripemd160') sha = hashlib.new('sha512') - sha.update(potentialPubSigningKey+potentialPubEncryptionKey) + sha.update( + potentialPubSigningKey + potentialPubEncryptionKey) ripe.update(sha.digest()) - #print 'potential ripe.digest', ripe.digest().encode('hex') + # print 'potential ripe.digest', + # ripe.digest().encode('hex') if eighteenByteRipe: if ripe.digest()[:2] == '\x00\x00': break @@ -3322,71 +3929,96 @@ class addressGenerator(threading.Thread): if ripe.digest()[:1] == '\x00': break print 'Generated address with ripe digest:', ripe.digest().encode('hex') - print 'Address generator calculated', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix, 'addresses at', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix/(time.time()-startTime),'addresses per second before finding one with the correct ripe-prefix.' - address = encodeAddress(3,streamNumber,ripe.digest()) + print 'Address generator calculated', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix, 'addresses at', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix / (time.time() - startTime), 'addresses per second before finding one with the correct ripe-prefix.' + address = encodeAddress(3, streamNumber, ripe.digest()) - #An excellent way for us to store our keys is in Wallet Import Format. Let us convert now. - #https://en.bitcoin.it/wiki/Wallet_import_format - privSigningKey = '\x80'+potentialPrivSigningKey - checksum = hashlib.sha256(hashlib.sha256(privSigningKey).digest()).digest()[0:4] - privSigningKeyWIF = arithmetic.changebase(privSigningKey + checksum,256,58) - #print 'privSigningKeyWIF',privSigningKeyWIF + # An excellent way for us to store our keys is in Wallet Import Format. Let us convert now. + # https://en.bitcoin.it/wiki/Wallet_import_format + privSigningKey = '\x80' + potentialPrivSigningKey + checksum = hashlib.sha256(hashlib.sha256( + privSigningKey).digest()).digest()[0:4] + privSigningKeyWIF = arithmetic.changebase( + privSigningKey + checksum, 256, 58) + # print 'privSigningKeyWIF',privSigningKeyWIF - privEncryptionKey = '\x80'+potentialPrivEncryptionKey - checksum = hashlib.sha256(hashlib.sha256(privEncryptionKey).digest()).digest()[0:4] - privEncryptionKeyWIF = arithmetic.changebase(privEncryptionKey + checksum,256,58) - #print 'privEncryptionKeyWIF',privEncryptionKeyWIF + privEncryptionKey = '\x80' + potentialPrivEncryptionKey + checksum = hashlib.sha256(hashlib.sha256( + privEncryptionKey).digest()).digest()[0:4] + privEncryptionKeyWIF = arithmetic.changebase( + privEncryptionKey + checksum, 256, 58) + # print 'privEncryptionKeyWIF',privEncryptionKeyWIF shared.config.add_section(address) - shared.config.set(address,'label',label) - shared.config.set(address,'enabled','true') - shared.config.set(address,'decoy','false') - shared.config.set(address,'noncetrialsperbyte',str(nonceTrialsPerByte)) - shared.config.set(address,'payloadlengthextrabytes',str(payloadLengthExtraBytes)) - shared.config.set(address,'privSigningKey',privSigningKeyWIF) - shared.config.set(address,'privEncryptionKey',privEncryptionKeyWIF) + shared.config.set(address, 'label', label) + shared.config.set(address, 'enabled', 'true') + shared.config.set(address, 'decoy', 'false') + shared.config.set(address, 'noncetrialsperbyte', str( + nonceTrialsPerByte)) + shared.config.set(address, 'payloadlengthextrabytes', str( + payloadLengthExtraBytes)) + shared.config.set( + address, 'privSigningKey', privSigningKeyWIF) + shared.config.set( + address, 'privEncryptionKey', privEncryptionKeyWIF) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - #It may be the case that this address is being generated as a result of a call to the API. Let us put the result in the necessary queue. + # It may be the case that this address is being generated + # as a result of a call to the API. Let us put the result + # in the necessary queue. apiAddressGeneratorReturnQueue.put(address) - shared.UISignalQueue.put(('updateStatusBar','Done generating address. Doing work necessary to broadcast it...')) - shared.UISignalQueue.put(('writeNewAddressToTable',(label,address,streamNumber))) + shared.UISignalQueue.put(( + 'updateStatusBar', 'Done generating address. Doing work necessary to broadcast it...')) + shared.UISignalQueue.put(('writeNewAddressToTable', ( + label, address, streamNumber))) shared.reloadMyAddressHashes() - shared.workerQueue.put(('doPOWForMyV3Pubkey',ripe.digest())) + shared.workerQueue.put(( + 'doPOWForMyV3Pubkey', ripe.digest())) elif command == 'createDeterministicAddresses' or command == 'getDeterministicAddress': if len(deterministicPassphrase) == 0: - sys.stderr.write('WARNING: You are creating deterministic address(es) using a blank passphrase. Bitmessage will do it but it is rather stupid.') + sys.stderr.write( + 'WARNING: You are creating deterministic address(es) using a blank passphrase. Bitmessage will do it but it is rather stupid.') if command == 'createDeterministicAddresses': - statusbar = 'Generating '+str(numberOfAddressesToMake) + ' new addresses.' - shared.UISignalQueue.put(('updateStatusBar',statusbar)) + statusbar = 'Generating ' + str( + numberOfAddressesToMake) + ' new addresses.' + shared.UISignalQueue.put(( + 'updateStatusBar', statusbar)) signingKeyNonce = 0 encryptionKeyNonce = 1 - listOfNewAddressesToSendOutThroughTheAPI = [] #We fill out this list no matter what although we only need it if we end up passing the info to the API. + listOfNewAddressesToSendOutThroughTheAPI = [ + ] # We fill out this list no matter what although we only need it if we end up passing the info to the API. for i in range(numberOfAddressesToMake): - #This next section is a little bit strange. We're going to generate keys over and over until we - #find one that has a RIPEMD hash that starts with either \x00 or \x00\x00. Then when we pack them - #into a Bitmessage address, we won't store the \x00 or \x00\x00 bytes thus making the address shorter. + # This next section is a little bit strange. We're going to generate keys over and over until we + # find one that has a RIPEMD hash that starts with either \x00 or \x00\x00. Then when we pack them + # into a Bitmessage address, we won't store the \x00 or + # \x00\x00 bytes thus making the address shorter. startTime = time.time() numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix = 0 while True: numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix += 1 - potentialPrivSigningKey = hashlib.sha512(deterministicPassphrase + encodeVarint(signingKeyNonce)).digest()[:32] - potentialPrivEncryptionKey = hashlib.sha512(deterministicPassphrase + encodeVarint(encryptionKeyNonce)).digest()[:32] - potentialPubSigningKey = pointMult(potentialPrivSigningKey) - potentialPubEncryptionKey = pointMult(potentialPrivEncryptionKey) - #print 'potentialPubSigningKey', potentialPubSigningKey.encode('hex') - #print 'potentialPubEncryptionKey', potentialPubEncryptionKey.encode('hex') + potentialPrivSigningKey = hashlib.sha512( + deterministicPassphrase + encodeVarint(signingKeyNonce)).digest()[:32] + potentialPrivEncryptionKey = hashlib.sha512( + deterministicPassphrase + encodeVarint(encryptionKeyNonce)).digest()[:32] + potentialPubSigningKey = pointMult( + potentialPrivSigningKey) + potentialPubEncryptionKey = pointMult( + potentialPrivEncryptionKey) + # print 'potentialPubSigningKey', potentialPubSigningKey.encode('hex') + # print 'potentialPubEncryptionKey', + # potentialPubEncryptionKey.encode('hex') signingKeyNonce += 2 encryptionKeyNonce += 2 ripe = hashlib.new('ripemd160') sha = hashlib.new('sha512') - sha.update(potentialPubSigningKey+potentialPubEncryptionKey) + sha.update( + potentialPubSigningKey + potentialPubEncryptionKey) ripe.update(sha.digest()) - #print 'potential ripe.digest', ripe.digest().encode('hex') + # print 'potential ripe.digest', + # ripe.digest().encode('hex') if eighteenByteRipe: if ripe.digest()[:2] == '\x00\x00': break @@ -3395,65 +4027,93 @@ class addressGenerator(threading.Thread): break print 'ripe.digest', ripe.digest().encode('hex') - print 'Address generator calculated', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix, 'addresses at', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix/(time.time()-startTime),'keys per second.' - address = encodeAddress(3,streamNumber,ripe.digest()) + print 'Address generator calculated', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix, 'addresses at', numberOfAddressesWeHadToMakeBeforeWeFoundOneWithTheCorrectRipePrefix / (time.time() - startTime), 'keys per second.' + address = encodeAddress(3, streamNumber, ripe.digest()) if command == 'createDeterministicAddresses': - #An excellent way for us to store our keys is in Wallet Import Format. Let us convert now. - #https://en.bitcoin.it/wiki/Wallet_import_format - privSigningKey = '\x80'+potentialPrivSigningKey - checksum = hashlib.sha256(hashlib.sha256(privSigningKey).digest()).digest()[0:4] - privSigningKeyWIF = arithmetic.changebase(privSigningKey + checksum,256,58) + # An excellent way for us to store our keys is in Wallet Import Format. Let us convert now. + # https://en.bitcoin.it/wiki/Wallet_import_format + privSigningKey = '\x80' + potentialPrivSigningKey + checksum = hashlib.sha256(hashlib.sha256( + privSigningKey).digest()).digest()[0:4] + privSigningKeyWIF = arithmetic.changebase( + privSigningKey + checksum, 256, 58) - privEncryptionKey = '\x80'+potentialPrivEncryptionKey - checksum = hashlib.sha256(hashlib.sha256(privEncryptionKey).digest()).digest()[0:4] - privEncryptionKeyWIF = arithmetic.changebase(privEncryptionKey + checksum,256,58) + privEncryptionKey = '\x80' + \ + potentialPrivEncryptionKey + checksum = hashlib.sha256(hashlib.sha256( + privEncryptionKey).digest()).digest()[0:4] + privEncryptionKeyWIF = arithmetic.changebase( + privEncryptionKey + checksum, 256, 58) try: shared.config.add_section(address) print 'label:', label - shared.config.set(address,'label',label) - shared.config.set(address,'enabled','true') - shared.config.set(address,'decoy','false') - shared.config.set(address,'noncetrialsperbyte',str(nonceTrialsPerByte)) - shared.config.set(address,'payloadlengthextrabytes',str(payloadLengthExtraBytes)) - shared.config.set(address,'privSigningKey',privSigningKeyWIF) - shared.config.set(address,'privEncryptionKey',privEncryptionKeyWIF) + shared.config.set(address, 'label', label) + shared.config.set(address, 'enabled', 'true') + shared.config.set(address, 'decoy', 'false') + shared.config.set(address, 'noncetrialsperbyte', str( + nonceTrialsPerByte)) + shared.config.set(address, 'payloadlengthextrabytes', str( + payloadLengthExtraBytes)) + shared.config.set( + address, 'privSigningKey', privSigningKeyWIF) + shared.config.set( + address, 'privEncryptionKey', privEncryptionKeyWIF) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - shared.UISignalQueue.put(('writeNewAddressToTable',(label,address,str(streamNumber)))) - listOfNewAddressesToSendOutThroughTheAPI.append(address) - #if eighteenByteRipe: - # shared.reloadMyAddressHashes()#This is necessary here (rather than just at the end) because otherwise if the human generates a large number of new addresses and uses one before they are done generating, the program will receive a getpubkey message and will ignore it. - shared.myECCryptorObjects[ripe.digest()] = highlevelcrypto.makeCryptor(potentialPrivEncryptionKey.encode('hex')) - shared.myAddressesByHash[ripe.digest()] = address - shared.workerQueue.put(('doPOWForMyV3Pubkey',ripe.digest())) + shared.UISignalQueue.put(('writeNewAddressToTable', ( + label, address, str(streamNumber)))) + listOfNewAddressesToSendOutThroughTheAPI.append( + address) + # if eighteenByteRipe: + # shared.reloadMyAddressHashes()#This is + # necessary here (rather than just at the end) + # because otherwise if the human generates a + # large number of new addresses and uses one + # before they are done generating, the program + # will receive a getpubkey message and will + # ignore it. + shared.myECCryptorObjects[ripe.digest()] = highlevelcrypto.makeCryptor( + potentialPrivEncryptionKey.encode('hex')) + shared.myAddressesByHash[ + ripe.digest()] = address + shared.workerQueue.put(( + 'doPOWForMyV3Pubkey', ripe.digest())) except: - print address,'already exists. Not adding it again.' + print address, 'already exists. Not adding it again.' - #Done generating addresses. + # Done generating addresses. if command == 'createDeterministicAddresses': - #It may be the case that this address is being generated as a result of a call to the API. Let us put the result in the necessary queue. - apiAddressGeneratorReturnQueue.put(listOfNewAddressesToSendOutThroughTheAPI) - shared.UISignalQueue.put(('updateStatusBar','Done generating address')) - #shared.reloadMyAddressHashes() + # It may be the case that this address is being + # generated as a result of a call to the API. Let us + # put the result in the necessary queue. + apiAddressGeneratorReturnQueue.put( + listOfNewAddressesToSendOutThroughTheAPI) + shared.UISignalQueue.put(( + 'updateStatusBar', 'Done generating address')) + # shared.reloadMyAddressHashes() elif command == 'getDeterministicAddress': apiAddressGeneratorReturnQueue.put(address) else: - raise Exception("Error in the addressGenerator thread. Thread was given a command it could not understand: "+command) + raise Exception( + "Error in the addressGenerator thread. Thread was given a command it could not understand: " + command) + +# This is one of several classes that constitute the API +# This class was written by Vaibhav Bhatia. Modified by Jonathan Warren (Atheros). +# http://code.activestate.com/recipes/501148-xmlrpc-serverclient-which-does-cookie-handling-and/ + -#This is one of several classes that constitute the API -#This class was written by Vaibhav Bhatia. Modified by Jonathan Warren (Atheros). -#http://code.activestate.com/recipes/501148-xmlrpc-serverclient-which-does-cookie-handling-and/ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): - def do_POST(self): - #Handles the HTTP POST request. - #Attempts to interpret all HTTP POST requests as XML-RPC calls, - #which are forwarded to the server's _dispatch method for handling. - #Note: this method is the same as in SimpleXMLRPCRequestHandler, - #just hacked to handle cookies + def do_POST(self): + # Handles the HTTP POST request. + # Attempts to interpret all HTTP POST requests as XML-RPC calls, + # which are forwarded to the server's _dispatch method for handling. + + # Note: this method is the same as in SimpleXMLRPCRequestHandler, + # just hacked to handle cookies # Check that the path is legal if not self.is_rpc_path_valid(): @@ -3465,7 +4125,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): # We read this in chunks to avoid straining # socket.read(); around the 10 or 15Mb mark, some platforms # begin to have problems (bug #792570). - max_chunk_size = 10*1024*1024 + max_chunk_size = 10 * 1024 * 1024 size_remaining = int(self.headers["content-length"]) L = [] while size_remaining: @@ -3480,9 +4140,9 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): # check to see if a subclass implements _dispatch and dispatch # using that method if present. response = self.server._marshaled_dispatch( - data, getattr(self, '_dispatch', None) - ) - except: # This should only happen if the module is buggy + data, getattr(self, '_dispatch', None) + ) + except: # This should only happen if the module is buggy # internal error, report as HTTP server error self.send_response(500) self.end_headers() @@ -3495,7 +4155,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): # HACK :start -> sends cookies here if self.cookies: for cookie in self.cookies: - self.send_header('Set-Cookie',cookie.output(header='')) + self.send_header('Set-Cookie', cookie.output(header='')) # HACK :end self.end_headers() @@ -3505,11 +4165,10 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): self.wfile.flush() self.connection.shutdown(1) - def APIAuthenticateClient(self): - if self.headers.has_key('Authorization'): + if 'Authorization' in self.headers: # handle Basic authentication - (enctype, encstr) = self.headers.get('Authorization').split() + (enctype, encstr) = self.headers.get('Authorization').split() (emailid, password) = encstr.decode('base64').split(':') if emailid == shared.config.get('bitmessagesettings', 'apiusername') and password == shared.config.get('bitmessagesettings', 'apipassword'): return True @@ -3531,24 +4190,26 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): return "RPC Username or password incorrect or HTTP header lacks authentication at all." # handle request if method == 'helloWorld': - (a,b) = params - return a+'-'+b + (a, b) = params + return a + '-' + b elif method == 'add': - (a,b) = params - return a+b + (a, b) = params + return a + b elif method == 'statusBar': message, = params - shared.UISignalQueue.put(('updateStatusBar',message)) + shared.UISignalQueue.put(('updateStatusBar', message)) elif method == 'listAddresses': data = '{"addresses":[' configSections = shared.config.sections() for addressInKeysFile in configSections: - if addressInKeysFile <> 'bitmessagesettings': - status,addressVersionNumber,streamNumber,hash = decodeAddress(addressInKeysFile) + if addressInKeysFile != 'bitmessagesettings': + status, addressVersionNumber, streamNumber, hash = decodeAddress( + addressInKeysFile) data if len(data) > 20: data += ',' - data += json.dumps({'label':shared.config.get(addressInKeysFile,'label'),'address':addressInKeysFile,'stream':streamNumber,'enabled':shared.config.getboolean(addressInKeysFile,'enabled')},indent=4, separators=(',', ': ')) + data += json.dumps({'label': shared.config.get(addressInKeysFile, 'label'), 'address': addressInKeysFile, 'stream': + streamNumber, 'enabled': shared.config.getboolean(addressInKeysFile, 'enabled')}, indent=4, separators=(',', ': ')) data += ']}' return data elif method == 'createRandomAddress': @@ -3557,30 +4218,39 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): elif len(params) == 1: label, = params eighteenByteRipe = False - nonceTrialsPerByte = shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte') - payloadLengthExtraBytes = shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes') + nonceTrialsPerByte = shared.config.get( + 'bitmessagesettings', 'defaultnoncetrialsperbyte') + payloadLengthExtraBytes = shared.config.get( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') elif len(params) == 2: label, eighteenByteRipe = params - nonceTrialsPerByte = shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte') - payloadLengthExtraBytes = shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes') + nonceTrialsPerByte = shared.config.get( + 'bitmessagesettings', 'defaultnoncetrialsperbyte') + payloadLengthExtraBytes = shared.config.get( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') elif len(params) == 3: label, eighteenByteRipe, totalDifficulty = params - nonceTrialsPerByte = int(shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty) - payloadLengthExtraBytes = shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes') + nonceTrialsPerByte = int( + shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty) + payloadLengthExtraBytes = shared.config.get( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') elif len(params) == 4: label, eighteenByteRipe, totalDifficulty, smallMessageDifficulty = params - nonceTrialsPerByte = int(shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty) - payloadLengthExtraBytes = int(shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty) + nonceTrialsPerByte = int( + shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty) + payloadLengthExtraBytes = int( + shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty) else: return 'API Error 0000: Too many parameters!' label = label.decode('base64') try: - unicode(label,'utf-8') + unicode(label, 'utf-8') except: - return 'API Error 0017: Label is not valid UTF-8 data.' + return 'API Error 0017: Label is not valid UTF-8 data.' apiAddressGeneratorReturnQueue.queue.clear() streamNumberForAddress = 1 - shared.addressGeneratorQueue.put(('createRandomAddress',3,streamNumberForAddress,label,1,"",eighteenByteRipe,nonceTrialsPerByte,payloadLengthExtraBytes)) + shared.addressGeneratorQueue.put(( + 'createRandomAddress', 3, streamNumberForAddress, label, 1, "", eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes)) return apiAddressGeneratorReturnQueue.get() elif method == 'createDeterministicAddresses': if len(params) == 0: @@ -3591,48 +4261,62 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): addressVersionNumber = 0 streamNumber = 0 eighteenByteRipe = False - nonceTrialsPerByte = shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte') - payloadLengthExtraBytes = shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes') + nonceTrialsPerByte = shared.config.get( + 'bitmessagesettings', 'defaultnoncetrialsperbyte') + payloadLengthExtraBytes = shared.config.get( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') elif len(params) == 2: passphrase, numberOfAddresses = params addressVersionNumber = 0 streamNumber = 0 eighteenByteRipe = False - nonceTrialsPerByte = shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte') - payloadLengthExtraBytes = shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes') + nonceTrialsPerByte = shared.config.get( + 'bitmessagesettings', 'defaultnoncetrialsperbyte') + payloadLengthExtraBytes = shared.config.get( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') elif len(params) == 3: passphrase, numberOfAddresses, addressVersionNumber = params streamNumber = 0 eighteenByteRipe = False - nonceTrialsPerByte = shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte') - payloadLengthExtraBytes = shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes') + nonceTrialsPerByte = shared.config.get( + 'bitmessagesettings', 'defaultnoncetrialsperbyte') + payloadLengthExtraBytes = shared.config.get( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') elif len(params) == 4: passphrase, numberOfAddresses, addressVersionNumber, streamNumber = params eighteenByteRipe = False - nonceTrialsPerByte = shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte') - payloadLengthExtraBytes = shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes') + nonceTrialsPerByte = shared.config.get( + 'bitmessagesettings', 'defaultnoncetrialsperbyte') + payloadLengthExtraBytes = shared.config.get( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') elif len(params) == 5: passphrase, numberOfAddresses, addressVersionNumber, streamNumber, eighteenByteRipe = params - nonceTrialsPerByte = shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte') - payloadLengthExtraBytes = shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes') + nonceTrialsPerByte = shared.config.get( + 'bitmessagesettings', 'defaultnoncetrialsperbyte') + payloadLengthExtraBytes = shared.config.get( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') elif len(params) == 6: passphrase, numberOfAddresses, addressVersionNumber, streamNumber, eighteenByteRipe, totalDifficulty = params - nonceTrialsPerByte = int(shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty) - payloadLengthExtraBytes = shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes') + nonceTrialsPerByte = int( + shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty) + payloadLengthExtraBytes = shared.config.get( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes') elif len(params) == 7: passphrase, numberOfAddresses, addressVersionNumber, streamNumber, eighteenByteRipe, totalDifficulty, smallMessageDifficulty = params - nonceTrialsPerByte = int(shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty) - payloadLengthExtraBytes = int(shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty) + nonceTrialsPerByte = int( + shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty) + payloadLengthExtraBytes = int( + shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty) else: return 'API Error 0000: Too many parameters!' if len(passphrase) == 0: return 'API Error 0001: The specified passphrase is blank.' passphrase = passphrase.decode('base64') - if addressVersionNumber == 0: #0 means "just use the proper addressVersionNumber" + if addressVersionNumber == 0: # 0 means "just use the proper addressVersionNumber" addressVersionNumber = 3 if addressVersionNumber != 3: - return 'API Error 0002: The address version number currently must be 3 (or 0 which means auto-select). '+ addressVersionNumber+' isn\'t supported.' - if streamNumber == 0: #0 means "just use the most available stream" + return 'API Error 0002: The address version number currently must be 3 (or 0 which means auto-select). ' + addressVersionNumber + ' isn\'t supported.' + if streamNumber == 0: # 0 means "just use the most available stream" streamNumber = 1 if streamNumber != 1: return 'API Error 0003: The stream number must be 1 (or 0 which means auto-select). Others aren\'t supported.' @@ -3642,13 +4326,15 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): return 'API Error 0005: You have (accidentally?) specified too many addresses to make. Maximum 999. This check only exists to prevent mischief; if you really want to create more addresses than this, contact the Bitmessage developers and we can modify the check or you can do it yourself by searching the source code for this message.' apiAddressGeneratorReturnQueue.queue.clear() print 'Requesting that the addressGenerator create', numberOfAddresses, 'addresses.' - shared.addressGeneratorQueue.put(('createDeterministicAddresses',addressVersionNumber,streamNumber,'unused API address',numberOfAddresses,passphrase,eighteenByteRipe,nonceTrialsPerByte,payloadLengthExtraBytes)) + shared.addressGeneratorQueue.put( + ('createDeterministicAddresses', addressVersionNumber, streamNumber, + 'unused API address', numberOfAddresses, passphrase, eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes)) data = '{"addresses":[' queueReturn = apiAddressGeneratorReturnQueue.get() for item in queueReturn: if len(data) > 20: data += ',' - data += "\""+item+ "\"" + data += "\"" + item + "\"" data += ']}' return data elif method == 'getDeterministicAddress': @@ -3661,16 +4347,19 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): return 'API Error 0001: The specified passphrase is blank.' passphrase = passphrase.decode('base64') if addressVersionNumber != 3: - return 'API Error 0002: The address version number currently must be 3. '+ addressVersionNumber +' isn\'t supported.' + return 'API Error 0002: The address version number currently must be 3. ' + addressVersionNumber + ' isn\'t supported.' if streamNumber != 1: return 'API Error 0003: The stream number must be 1. Others aren\'t supported.' apiAddressGeneratorReturnQueue.queue.clear() print 'Requesting that the addressGenerator create', numberOfAddresses, 'addresses.' - shared.addressGeneratorQueue.put(('getDeterministicAddress',addressVersionNumber,streamNumber,'unused API address',numberOfAddresses,passphrase,eighteenByteRipe)) + shared.addressGeneratorQueue.put( + ('getDeterministicAddress', addressVersionNumber, + streamNumber, 'unused API address', numberOfAddresses, passphrase, eighteenByteRipe)) return apiAddressGeneratorReturnQueue.get() elif method == 'getAllInboxMessages': shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT msgid, toaddress, fromaddress, subject, received, message FROM inbox where folder='inbox' ORDER BY received''') + shared.sqlSubmitQueue.put( + '''SELECT msgid, toaddress, fromaddress, subject, received, message FROM inbox where folder='inbox' ORDER BY received''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -3681,7 +4370,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): message = shared.fixPotentiallyInvalidUTF8Data(message) if len(data) > 25: data += ',' - data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':2,'receivedTime':received},indent=4, separators=(',', ': ')) + data += json.dumps({'msgid': msgid.encode('hex'), 'toAddress': toAddress, 'fromAddress': fromAddress, 'subject': subject.encode( + 'base64'), 'message': message.encode('base64'), 'encodingType': 2, 'receivedTime': received}, indent=4, separators=(',', ': ')) data += ']}' return data elif method == 'trashMessage': @@ -3690,12 +4380,13 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): msgid = params[0].decode('hex') t = (msgid,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''UPDATE inbox SET folder='trash' WHERE msgid=?''') + shared.sqlSubmitQueue.put( + '''UPDATE inbox SET folder='trash' WHERE msgid=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('removeInboxRowByMsgid',msgid)) + shared.UISignalQueue.put(('removeInboxRowByMsgid', msgid)) return 'Trashed message (assuming message existed).' elif method == 'sendMessage': if len(params) == 0: @@ -3709,34 +4400,36 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): return 'API Error 0006: The encoding type must be 2 because that is the only one this program currently supports.' subject = subject.decode('base64') message = message.decode('base64') - status,addressVersionNumber,streamNumber,toRipe = decodeAddress(toAddress) - if status <> 'success': + status, addressVersionNumber, streamNumber, toRipe = decodeAddress( + toAddress) + if status != 'success': shared.printLock.acquire() print 'API Error 0007: Could not decode address:', toAddress, ':', status shared.printLock.release() if status == 'checksumfailed': return 'API Error 0008: Checksum failed for address: ' + toAddress if status == 'invalidcharacters': - return 'API Error 0009: Invalid characters in address: '+ toAddress + return 'API Error 0009: Invalid characters in address: ' + toAddress if status == 'versiontoohigh': return 'API Error 0010: Address version number too high (or zero) in address: ' + toAddress - return 'API Error 0007: Could not decode address: ' + toAddress+ ' : '+ status + return 'API Error 0007: Could not decode address: ' + toAddress + ' : ' + status if addressVersionNumber < 2 or addressVersionNumber > 3: return 'API Error 0011: The address version number currently must be 2 or 3. Others aren\'t supported. Check the toAddress.' if streamNumber != 1: return 'API Error 0012: The stream number must be 1. Others aren\'t supported. Check the toAddress.' - status,addressVersionNumber,streamNumber,fromRipe = decodeAddress(fromAddress) - if status <> 'success': + status, addressVersionNumber, streamNumber, fromRipe = decodeAddress( + fromAddress) + if status != 'success': shared.printLock.acquire() print 'API Error 0007: Could not decode address:', fromAddress, ':', status shared.printLock.release() if status == 'checksumfailed': return 'API Error 0008: Checksum failed for address: ' + fromAddress if status == 'invalidcharacters': - return 'API Error 0009: Invalid characters in address: '+ fromAddress + return 'API Error 0009: Invalid characters in address: ' + fromAddress if status == 'versiontoohigh': return 'API Error 0010: Address version number too high (or zero) in address: ' + fromAddress - return 'API Error 0007: Could not decode address: ' + fromAddress+ ' : '+ status + return 'API Error 0007: Could not decode address: ' + fromAddress + ' : ' + status if addressVersionNumber < 2 or addressVersionNumber > 3: return 'API Error 0011: The address version number currently must be 2 or 3. Others aren\'t supported. Check the fromAddress.' if streamNumber != 1: @@ -3744,7 +4437,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): toAddress = addBMIfNotPresent(toAddress) fromAddress = addBMIfNotPresent(fromAddress) try: - fromAddressEnabled = shared.config.getboolean(fromAddress,'enabled') + fromAddressEnabled = shared.config.getboolean( + fromAddress, 'enabled') except: return 'API Error 0013: Could not find your fromAddress in the keys.dat file.' if not fromAddressEnabled: @@ -3752,30 +4446,34 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): ackdata = OpenSSL.rand(32) shared.sqlLock.acquire() - t = ('',toAddress,toRipe,fromAddress,subject,message,ackdata,int(time.time()),'msgqueued',1,1,'sent',2) - shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') + t = ('', toAddress, toRipe, fromAddress, subject, message, ackdata, int( + time.time()), 'msgqueued', 1, 1, 'sent', 2) + shared.sqlSubmitQueue.put( + '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - + toLabel = '' t = (toAddress,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''select label from addressbook where address=?''') + shared.sqlSubmitQueue.put( + '''select label from addressbook where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() - if queryreturn <> []: + if queryreturn != []: for row in queryreturn: toLabel, = row - #apiSignalQueue.put(('displayNewSentMessage',(toAddress,toLabel,fromAddress,subject,message,ackdata))) - shared.UISignalQueue.put(('displayNewSentMessage',(toAddress,toLabel,fromAddress,subject,message,ackdata))) + # apiSignalQueue.put(('displayNewSentMessage',(toAddress,toLabel,fromAddress,subject,message,ackdata))) + shared.UISignalQueue.put(('displayNewSentMessage', ( + toAddress, toLabel, fromAddress, subject, message, ackdata))) + + shared.workerQueue.put(('sendmessage', toAddress)) - shared.workerQueue.put(('sendmessage',toAddress)) - return ackdata.encode('hex') - + elif method == 'sendBroadcast': if len(params) == 0: return 'API Error 0000: I need parameters!' @@ -3789,25 +4487,27 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): subject = subject.decode('base64') message = message.decode('base64') - status,addressVersionNumber,streamNumber,fromRipe = decodeAddress(fromAddress) - if status <> 'success': + status, addressVersionNumber, streamNumber, fromRipe = decodeAddress( + fromAddress) + if status != 'success': shared.printLock.acquire() print 'API Error 0007: Could not decode address:', fromAddress, ':', status shared.printLock.release() if status == 'checksumfailed': return 'API Error 0008: Checksum failed for address: ' + fromAddress if status == 'invalidcharacters': - return 'API Error 0009: Invalid characters in address: '+ fromAddress + return 'API Error 0009: Invalid characters in address: ' + fromAddress if status == 'versiontoohigh': return 'API Error 0010: Address version number too high (or zero) in address: ' + fromAddress - return 'API Error 0007: Could not decode address: ' + fromAddress+ ' : '+ status + return 'API Error 0007: Could not decode address: ' + fromAddress + ' : ' + status if addressVersionNumber < 2 or addressVersionNumber > 3: return 'API Error 0011: the address version number currently must be 2 or 3. Others aren\'t supported. Check the fromAddress.' if streamNumber != 1: return 'API Error 0012: the stream number must be 1. Others aren\'t supported. Check the fromAddress.' fromAddress = addBMIfNotPresent(fromAddress) try: - fromAddressEnabled = shared.config.getboolean(fromAddress,'enabled') + fromAddressEnabled = shared.config.getboolean( + fromAddress, 'enabled') except: return 'API Error 0013: could not find your fromAddress in the keys.dat file.' ackdata = OpenSSL.rand(32) @@ -3815,18 +4515,21 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): ripe = '' shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2) - shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') + t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int( + time.time()), 'broadcastqueued', 1, 1, 'sent', 2) + shared.sqlSubmitQueue.put( + '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() toLabel = '[Broadcast subscribers]' - shared.UISignalQueue.put(('displayNewSentMessage',(toAddress,toLabel,fromAddress,subject,message,ackdata))) - shared.workerQueue.put(('sendbroadcast','')) + shared.UISignalQueue.put(('displayNewSentMessage', ( + toAddress, toLabel, fromAddress, subject, message, ackdata))) + shared.workerQueue.put(('sendbroadcast', '')) - return ackdata.encode('hex') + return ackdata.encode('hex') elif method == 'getStatus': if len(params) != 1: return 'API Error 0000: I need one parameter!' @@ -3834,7 +4537,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): if len(ackdata) != 64: return 'API Error 0015: The length of ackData should be 32 bytes (encoded in hex thus 64 characters).' shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT status FROM sent where ackdata=?''') + shared.sqlSubmitQueue.put( + '''SELECT status FROM sent where ackdata=?''') shared.sqlSubmitQueue.put((ackdata.decode('hex'),)) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() @@ -3853,47 +4557,51 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): address, label = params label = label.decode('base64') try: - unicode(label,'utf-8') + unicode(label, 'utf-8') except: - return 'API Error 0017: Label is not valid UTF-8 data.' - if len(params) >2: + return 'API Error 0017: Label is not valid UTF-8 data.' + if len(params) > 2: return 'API Error 0000: I need either 1 or 2 parameters!' address = addBMIfNotPresent(address) - status,addressVersionNumber,streamNumber,toRipe = decodeAddress(address) - if status <> 'success': + status, addressVersionNumber, streamNumber, toRipe = decodeAddress( + address) + if status != 'success': shared.printLock.acquire() print 'API Error 0007: Could not decode address:', address, ':', status shared.printLock.release() if status == 'checksumfailed': return 'API Error 0008: Checksum failed for address: ' + address if status == 'invalidcharacters': - return 'API Error 0009: Invalid characters in address: '+ address + return 'API Error 0009: Invalid characters in address: ' + address if status == 'versiontoohigh': return 'API Error 0010: Address version number too high (or zero) in address: ' + address - return 'API Error 0007: Could not decode address: ' + address+ ' : '+ status + return 'API Error 0007: Could not decode address: ' + address + ' : ' + status if addressVersionNumber < 2 or addressVersionNumber > 3: return 'API Error 0011: The address version number currently must be 2 or 3. Others aren\'t supported.' if streamNumber != 1: return 'API Error 0012: The stream number must be 1. Others aren\'t supported.' - #First we must check to see if the address is already in the subscriptions list. + # First we must check to see if the address is already in the + # subscriptions list. shared.sqlLock.acquire() t = (address,) - shared.sqlSubmitQueue.put('''select * from subscriptions where address=?''') + shared.sqlSubmitQueue.put( + '''select * from subscriptions where address=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() if queryreturn != []: return 'API Error 0016: You are already subscribed to that address.' - t = (label,address,True) + t = (label, address, True) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''INSERT INTO subscriptions VALUES (?,?,?)''') + shared.sqlSubmitQueue.put( + '''INSERT INTO subscriptions VALUES (?,?,?)''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() shared.reloadBroadcastSendersForWhichImWatching() - shared.UISignalQueue.put(('rerenderInboxFromLabels','')) - shared.UISignalQueue.put(('rerenderSubscriptions','')) + shared.UISignalQueue.put(('rerenderInboxFromLabels', '')) + shared.UISignalQueue.put(('rerenderSubscriptions', '')) return 'Added subscription.' elif method == 'deleteSubscription': @@ -3903,56 +4611,70 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): address = addBMIfNotPresent(address) t = (address,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''DELETE FROM subscriptions WHERE address=?''') + shared.sqlSubmitQueue.put( + '''DELETE FROM subscriptions WHERE address=?''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() shared.reloadBroadcastSendersForWhichImWatching() - shared.UISignalQueue.put(('rerenderInboxFromLabels','')) - shared.UISignalQueue.put(('rerenderSubscriptions','')) + shared.UISignalQueue.put(('rerenderInboxFromLabels', '')) + shared.UISignalQueue.put(('rerenderSubscriptions', '')) return 'Deleted subscription if it existed.' else: - return 'Invalid Method: %s'%method + return 'Invalid Method: %s' % method + +# This thread, of which there is only one, runs the API. + -#This thread, of which there is only one, runs the API. class singleAPI(threading.Thread): + def __init__(self): threading.Thread.__init__(self) def run(self): - se = SimpleXMLRPCServer((shared.config.get('bitmessagesettings', 'apiinterface'),shared.config.getint('bitmessagesettings', 'apiport')), MySimpleXMLRPCRequestHandler, True, True) + se = SimpleXMLRPCServer((shared.config.get('bitmessagesettings', 'apiinterface'), shared.config.getint( + 'bitmessagesettings', 'apiport')), MySimpleXMLRPCRequestHandler, True, True) se.register_introspection_functions() se.serve_forever() -selfInitiatedConnections = {} #This is a list of current connections (the thread pointers at least) -alreadyAttemptedConnectionsList = {} #This is a list of nodes to which we have already attempted a connection +selfInitiatedConnections = {} + # This is a list of current connections (the thread pointers at least) +alreadyAttemptedConnectionsList = { +} # This is a list of nodes to which we have already attempted a connection ackdataForWhichImWatching = {} alreadyAttemptedConnectionsListLock = threading.Lock() -eightBytesOfRandomDataUsedToDetectConnectionsToSelf = pack('>Q',random.randrange(1, 18446744073709551615)) +eightBytesOfRandomDataUsedToDetectConnectionsToSelf = pack( + '>Q', random.randrange(1, 18446744073709551615)) neededPubkeys = {} -successfullyDecryptMessageTimings = [] #A list of the amounts of time it took to successfully decrypt msg messages -apiAddressGeneratorReturnQueue = Queue.Queue() #The address generator thread uses this queue to get information back to the API thread. -alreadyAttemptedConnectionsListResetTime = int(time.time()) #used to clear out the alreadyAttemptedConnectionsList periodically so that we will retry connecting to hosts to which we have already tried to connect. +successfullyDecryptMessageTimings = [ +] # A list of the amounts of time it took to successfully decrypt msg messages +apiAddressGeneratorReturnQueue = Queue.Queue( +) # The address generator thread uses this queue to get information back to the API thread. +alreadyAttemptedConnectionsListResetTime = int( + time.time()) # used to clear out the alreadyAttemptedConnectionsList periodically so that we will retry connecting to hosts to which we have already tried to connect. numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer = {} if useVeryEasyProofOfWorkForTesting: - shared.networkDefaultProofOfWorkNonceTrialsPerByte = int(shared.networkDefaultProofOfWorkNonceTrialsPerByte / 16) - shared.networkDefaultPayloadLengthExtraBytes = int(shared.networkDefaultPayloadLengthExtraBytes / 7000) + shared.networkDefaultProofOfWorkNonceTrialsPerByte = int( + shared.networkDefaultProofOfWorkNonceTrialsPerByte / 16) + shared.networkDefaultPayloadLengthExtraBytes = int( + shared.networkDefaultPayloadLengthExtraBytes / 7000) if __name__ == "__main__": # is the application already running? If yes then exit. thisapp = singleton.singleinstance() signal.signal(signal.SIGINT, signal_handler) - #signal.signal(signal.SIGINT, signal.SIG_DFL) + # signal.signal(signal.SIGINT, signal.SIG_DFL) # Check the Major version, the first element in the array if sqlite3.sqlite_version_info[0] < 3: print 'This program requires sqlite version 3 or higher because 2 and lower cannot store NULL values. I see version:', sqlite3.sqlite_version_info os._exit(0) - #First try to load the config file (the keys.dat file) from the program directory + # First try to load the config file (the keys.dat file) from the program + # directory shared.config = ConfigParser.SafeConfigParser() shared.config.read('keys.dat') try: @@ -3960,7 +4682,8 @@ if __name__ == "__main__": print 'Loading config files from same directory as program' shared.appdata = '' except: - #Could not load the keys.dat file in the program directory. Perhaps it is in the appdata directory. + # Could not load the keys.dat file in the program directory. Perhaps it + # is in the appdata directory. shared.appdata = shared.lookupAppdataFolder() shared.config = ConfigParser.SafeConfigParser() shared.config.read(shared.appdata + 'keys.dat') @@ -3968,35 +4691,51 @@ if __name__ == "__main__": shared.config.get('bitmessagesettings', 'settingsversion') print 'Loading existing config files from', shared.appdata except: - #This appears to be the first time running the program; there is no config file (or it cannot be accessed). Create config file. + # This appears to be the first time running the program; there is + # no config file (or it cannot be accessed). Create config file. shared.config.add_section('bitmessagesettings') - shared.config.set('bitmessagesettings','settingsversion','6') - shared.config.set('bitmessagesettings','port','8444') - shared.config.set('bitmessagesettings','timeformat','%%a, %%d %%b %%Y %%I:%%M %%p') - shared.config.set('bitmessagesettings','blackwhitelist','black') - shared.config.set('bitmessagesettings','startonlogon','false') + shared.config.set('bitmessagesettings', 'settingsversion', '6') + shared.config.set('bitmessagesettings', 'port', '8444') + shared.config.set( + 'bitmessagesettings', 'timeformat', '%%a, %%d %%b %%Y %%I:%%M %%p') + shared.config.set('bitmessagesettings', 'blackwhitelist', 'black') + shared.config.set('bitmessagesettings', 'startonlogon', 'false') if 'linux' in sys.platform: - shared.config.set('bitmessagesettings','minimizetotray','false')#This isn't implimented yet and when True on Ubuntu causes Bitmessage to disappear while running when minimized. + shared.config.set( + 'bitmessagesettings', 'minimizetotray', 'false') + # This isn't implimented yet and when True on + # Ubuntu causes Bitmessage to disappear while + # running when minimized. else: - shared.config.set('bitmessagesettings','minimizetotray','true') - shared.config.set('bitmessagesettings','showtraynotifications','true') - shared.config.set('bitmessagesettings','startintray','false') - shared.config.set('bitmessagesettings','socksproxytype','none') - shared.config.set('bitmessagesettings','sockshostname','localhost') - shared.config.set('bitmessagesettings','socksport','9050') - shared.config.set('bitmessagesettings','socksauthentication','false') - shared.config.set('bitmessagesettings','socksusername','') - shared.config.set('bitmessagesettings','sockspassword','') - shared.config.set('bitmessagesettings','keysencrypted','false') - shared.config.set('bitmessagesettings','messagesencrypted','false') - shared.config.set('bitmessagesettings','defaultnoncetrialsperbyte',str(shared.networkDefaultProofOfWorkNonceTrialsPerByte)) - shared.config.set('bitmessagesettings','defaultpayloadlengthextrabytes',str(shared.networkDefaultPayloadLengthExtraBytes)) - shared.config.set('bitmessagesettings','minimizeonclose','false') - shared.config.set('bitmessagesettings','maxacceptablenoncetrialsperbyte','0') - shared.config.set('bitmessagesettings','maxacceptablepayloadlengthextrabytes','0') + shared.config.set( + 'bitmessagesettings', 'minimizetotray', 'true') + shared.config.set( + 'bitmessagesettings', 'showtraynotifications', 'true') + shared.config.set('bitmessagesettings', 'startintray', 'false') + shared.config.set('bitmessagesettings', 'socksproxytype', 'none') + shared.config.set( + 'bitmessagesettings', 'sockshostname', 'localhost') + shared.config.set('bitmessagesettings', 'socksport', '9050') + shared.config.set( + 'bitmessagesettings', 'socksauthentication', 'false') + shared.config.set('bitmessagesettings', 'socksusername', '') + shared.config.set('bitmessagesettings', 'sockspassword', '') + shared.config.set('bitmessagesettings', 'keysencrypted', 'false') + shared.config.set( + 'bitmessagesettings', 'messagesencrypted', 'false') + shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str( + shared.networkDefaultProofOfWorkNonceTrialsPerByte)) + shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str( + shared.networkDefaultPayloadLengthExtraBytes)) + shared.config.set('bitmessagesettings', 'minimizeonclose', 'false') + shared.config.set( + 'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0') + shared.config.set( + 'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0') if storeConfigFilesInSameDirectoryAsProgramByDefault: - #Just use the same directory as the program and forget about the appdata folder + # Just use the same directory as the program and forget about + # the appdata folder shared.appdata = '' print 'Creating new config files in same directory as program.' else: @@ -4005,23 +4744,26 @@ if __name__ == "__main__": os.makedirs(shared.appdata) with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) - - if shared.config.getint('bitmessagesettings','settingsversion') == 1: - shared.config.set('bitmessagesettings','settingsversion','4') #If the settings version is equal to 2 or 3 then the sqlThread will modify the pubkeys table and change the settings version to 4. - shared.config.set('bitmessagesettings','socksproxytype','none') - shared.config.set('bitmessagesettings','sockshostname','localhost') - shared.config.set('bitmessagesettings','socksport','9050') - shared.config.set('bitmessagesettings','socksauthentication','false') - shared.config.set('bitmessagesettings','socksusername','') - shared.config.set('bitmessagesettings','sockspassword','') - shared.config.set('bitmessagesettings','keysencrypted','false') - shared.config.set('bitmessagesettings','messagesencrypted','false') + if shared.config.getint('bitmessagesettings', 'settingsversion') == 1: + shared.config.set('bitmessagesettings', 'settingsversion', '4') + # If the settings version is equal to 2 or 3 then the + # sqlThread will modify the pubkeys table and change + # the settings version to 4. + shared.config.set('bitmessagesettings', 'socksproxytype', 'none') + shared.config.set('bitmessagesettings', 'sockshostname', 'localhost') + shared.config.set('bitmessagesettings', 'socksport', '9050') + shared.config.set('bitmessagesettings', 'socksauthentication', 'false') + shared.config.set('bitmessagesettings', 'socksusername', '') + shared.config.set('bitmessagesettings', 'sockspassword', '') + shared.config.set('bitmessagesettings', 'keysencrypted', 'false') + shared.config.set('bitmessagesettings', 'messagesencrypted', 'false') with open(shared.appdata + 'keys.dat', 'wb') as configfile: shared.config.write(configfile) try: - #We shouldn't have to use the shared.knownNodesLock because this had better be the only thread accessing knownNodes right now. + # We shouldn't have to use the shared.knownNodesLock because this had + # better be the only thread accessing knownNodes right now. pickleFile = open(shared.appdata + 'knownnodes.dat', 'rb') shared.knownNodes = pickle.load(pickleFile) pickleFile.close() @@ -4034,48 +4776,53 @@ if __name__ == "__main__": print 'Bitmessage cannot read future versions of the keys file (keys.dat). Run the newer version of Bitmessage.' raise SystemExit - #DNS bootstrap. This could be programmed to use the SOCKS proxy to do the DNS lookup some day but for now we will just rely on the entries in defaultKnownNodes.py. Hopefully either they are up to date or the user has run Bitmessage recently without SOCKS turned on and received good bootstrap nodes using that method. + # DNS bootstrap. This could be programmed to use the SOCKS proxy to do the + # DNS lookup some day but for now we will just rely on the entries in + # defaultKnownNodes.py. Hopefully either they are up to date or the user + # has run Bitmessage recently without SOCKS turned on and received good + # bootstrap nodes using that method. if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none': try: - for item in socket.getaddrinfo('bootstrap8080.bitmessage.org',80): - print 'Adding', item[4][0],'to knownNodes based on DNS boostrap method' - shared.knownNodes[1][item[4][0]] = (8080,int(time.time())) + for item in socket.getaddrinfo('bootstrap8080.bitmessage.org', 80): + print 'Adding', item[4][0], 'to knownNodes based on DNS boostrap method' + shared.knownNodes[1][item[4][0]] = (8080, int(time.time())) except: print 'bootstrap8080.bitmessage.org DNS bootstraping failed.' try: - for item in socket.getaddrinfo('bootstrap8444.bitmessage.org',80): - print 'Adding', item[4][0],'to knownNodes based on DNS boostrap method' - shared.knownNodes[1][item[4][0]] = (8444,int(time.time())) + for item in socket.getaddrinfo('bootstrap8444.bitmessage.org', 80): + print 'Adding', item[4][0], 'to knownNodes based on DNS boostrap method' + shared.knownNodes[1][item[4][0]] = (8444, int(time.time())) except: print 'bootstrap8444.bitmessage.org DNS bootstrapping failed.' else: print 'DNS bootstrap skipped because SOCKS is used.' - #Start the address generation thread + # Start the address generation thread addressGeneratorThread = addressGenerator() - addressGeneratorThread.daemon = True # close the main program even if there are threads left + addressGeneratorThread.daemon = True # close the main program even if there are threads left addressGeneratorThread.start() - #Start the thread that calculates POWs + # Start the thread that calculates POWs singleWorkerThread = singleWorker() - singleWorkerThread.daemon = True # close the main program even if there are threads left + singleWorkerThread.daemon = True # close the main program even if there are threads left singleWorkerThread.start() - #Start the SQL thread + # Start the SQL thread sqlLookup = sqlThread() - sqlLookup.daemon = False # DON'T close the main program even if there are threads left. The closeEvent should command this thread to exit gracefully. + sqlLookup.daemon = False # DON'T close the main program even if there are threads left. The closeEvent should command this thread to exit gracefully. sqlLookup.start() - #Start the cleanerThread + # Start the cleanerThread singleCleanerThread = singleCleaner() - singleCleanerThread.daemon = True # close the main program even if there are threads left + singleCleanerThread.daemon = True # close the main program even if there are threads left singleCleanerThread.start() shared.reloadMyAddressHashes() shared.reloadBroadcastSendersForWhichImWatching() - if shared.safeConfigGetBoolean('bitmessagesettings','apienabled'): + if shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'): try: - apiNotifyPath = shared.config.get('bitmessagesettings','apinotifypath') + apiNotifyPath = shared.config.get( + 'bitmessagesettings', 'apinotifypath') except: apiNotifyPath = '' if apiNotifyPath != '': @@ -4084,25 +4831,27 @@ if __name__ == "__main__": shared.printLock.release() call([apiNotifyPath, "startingUp"]) singleAPIThread = singleAPI() - singleAPIThread.daemon = True #close the main program even if there are threads left + singleAPIThread.daemon = True # close the main program even if there are threads left singleAPIThread.start() - #self.singleAPISignalHandlerThread = singleAPISignalHandler() - #self.singleAPISignalHandlerThread.start() - #QtCore.QObject.connect(self.singleAPISignalHandlerThread, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) - #QtCore.QObject.connect(self.singleAPISignalHandlerThread, QtCore.SIGNAL("passAddressGeneratorObjectThrough(PyQt_PyObject)"), self.connectObjectToAddressGeneratorSignals) - #QtCore.QObject.connect(self.singleAPISignalHandlerThread, QtCore.SIGNAL("displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.displayNewSentMessage) + # self.singleAPISignalHandlerThread = singleAPISignalHandler() + # self.singleAPISignalHandlerThread.start() + # QtCore.QObject.connect(self.singleAPISignalHandlerThread, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) + # QtCore.QObject.connect(self.singleAPISignalHandlerThread, QtCore.SIGNAL("passAddressGeneratorObjectThrough(PyQt_PyObject)"), self.connectObjectToAddressGeneratorSignals) + # QtCore.QObject.connect(self.singleAPISignalHandlerThread, + # QtCore.SIGNAL("displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), + # self.displayNewSentMessage) connectToStream(1) singleListenerThread = singleListener() - singleListenerThread.daemon = True # close the main program even if there are threads left + singleListenerThread.daemon = True # close the main program even if there are threads left singleListenerThread.start() - if not shared.safeConfigGetBoolean('bitmessagesettings','daemon'): + if not shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'): try: from PyQt4.QtCore import * from PyQt4.QtGui import * - except Exception, err: + except Exception as err: print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download PyQt from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\'. If you want to run in daemon mode, see https://bitmessage.org/wiki/Daemon' print 'Error message:', err os._exit(0) -- 2.45.1 From dbc5abbe1969ea1bbd2ada39eae05e97006a10e3 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 20:16:48 +0200 Subject: [PATCH 20/42] new string find to be translated in bitmessagemain + fixed english typo in GUI --- src/bitmessagemain.py | 3 +- src/iconglossary.py | 37 +++- src/newaddressdialog.py | 65 +++++--- src/translations/bitmessage_fr_BE.qm | Bin 50175 -> 50389 bytes src/translations/bitmessage_fr_BE.ts | 241 ++++++++++++++------------- 5 files changed, 198 insertions(+), 148 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 01202da1..bd46e308 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -177,7 +177,8 @@ class outgoingSynSender(threading.Thread): shared.printLock.release() except socks.Socks5AuthError as err: shared.UISignalQueue.put(( - 'updateStatusBar', "SOCKS5 Authentication problem: " + str(err))) + 'updateStatusBar', _translate( + "MainWindow", "SOCKS5 Authentication problem: %1").arg(str(err)))) except socks.Socks5Error as err: pass print 'SOCKS5 error. (It is possible that the server wants authentication).)', str(err) diff --git a/src/iconglossary.py b/src/iconglossary.py index dc6a7ffd..32d92db6 100644 --- a/src/iconglossary.py +++ b/src/iconglossary.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'iconglossary.ui' # -# Created: Tue Dec 18 14:31:18 2012 -# by: PyQt4 UI code generator 4.9.4 +# Created: Thu Jun 13 20:15:48 2013 +# by: PyQt4 UI code generator 4.10.1 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - _fromUtf8 = lambda s: s + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_iconGlossaryDialog(object): def setupUi(self, iconGlossaryDialog): @@ -69,11 +78,21 @@ class Ui_iconGlossaryDialog(object): QtCore.QMetaObject.connectSlotsByName(iconGlossaryDialog) def retranslateUi(self, iconGlossaryDialog): - iconGlossaryDialog.setWindowTitle(QtGui.QApplication.translate("iconGlossaryDialog", "Icon Glossary", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox.setTitle(QtGui.QApplication.translate("iconGlossaryDialog", "Icon Glossary", None, QtGui.QApplication.UnicodeUTF8)) - self.label_2.setText(QtGui.QApplication.translate("iconGlossaryDialog", "You have no connections with other peers. ", None, QtGui.QApplication.UnicodeUTF8)) - self.label_4.setText(QtGui.QApplication.translate("iconGlossaryDialog", "You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn\'t configured to foward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.", None, QtGui.QApplication.UnicodeUTF8)) - self.labelPortNumber.setText(QtGui.QApplication.translate("iconGlossaryDialog", "You are using TCP port ?. (This can be changed in the settings).", None, QtGui.QApplication.UnicodeUTF8)) - self.label_6.setText(QtGui.QApplication.translate("iconGlossaryDialog", "You do have connections with other peers and your firewall is correctly configured.", None, QtGui.QApplication.UnicodeUTF8)) + iconGlossaryDialog.setWindowTitle(_translate("iconGlossaryDialog", "Icon Glossary", None)) + self.groupBox.setTitle(_translate("iconGlossaryDialog", "Icon Glossary", None)) + self.label_2.setText(_translate("iconGlossaryDialog", "You have no connections with other peers. ", None)) + self.label_4.setText(_translate("iconGlossaryDialog", "You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn\'t configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.", None)) + self.labelPortNumber.setText(_translate("iconGlossaryDialog", "You are using TCP port ?. (This can be changed in the settings).", None)) + self.label_6.setText(_translate("iconGlossaryDialog", "You do have connections with other peers and your firewall is correctly configured.", None)) import bitmessage_icons_rc + +if __name__ == "__main__": + import sys + app = QtGui.QApplication(sys.argv) + iconGlossaryDialog = QtGui.QDialog() + ui = Ui_iconGlossaryDialog() + ui.setupUi(iconGlossaryDialog) + iconGlossaryDialog.show() + sys.exit(app.exec_()) + diff --git a/src/newaddressdialog.py b/src/newaddressdialog.py index 637c3a46..f9bf9203 100644 --- a/src/newaddressdialog.py +++ b/src/newaddressdialog.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'newaddressdialog.ui' # -# Created: Tue Apr 30 12:21:14 2013 -# by: PyQt4 UI code generator 4.9.4 +# Created: Thu Jun 13 20:12:21 2013 +# by: PyQt4 UI code generator 4.10.1 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui try: _fromUtf8 = QtCore.QString.fromUtf8 except AttributeError: - _fromUtf8 = lambda s: s + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) class Ui_NewAddressDialog(object): def setupUi(self, NewAddressDialog): @@ -161,24 +170,34 @@ class Ui_NewAddressDialog(object): NewAddressDialog.setTabOrder(self.checkBoxEighteenByteRipe, self.buttonBox) def retranslateUi(self, NewAddressDialog): - NewAddressDialog.setWindowTitle(QtGui.QApplication.translate("NewAddressDialog", "Create new Address", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("NewAddressDialog", "Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a \"deterministic\" address.\n" -"The \'Random Number\' option is selected by default but deterministic addresses have several pros and cons:", None, QtGui.QApplication.UnicodeUTF8)) - self.label_5.setText(QtGui.QApplication.translate("NewAddressDialog", "

Pros:
You can recreate your addresses on any computer from memory.
You need-not worry about backing up your keys.dat file as long as you can remember your passphrase.
Cons:
You must remember (or write down) your passphrase if you expect to be able to recreate your keys if they are lost.
You must remember the address version number and the stream number along with your passphrase.
If you choose a weak passphrase and someone on the Internet can brute-force it, they can read your messages and send messages as you.

", None, QtGui.QApplication.UnicodeUTF8)) - self.radioButtonRandomAddress.setText(QtGui.QApplication.translate("NewAddressDialog", "Use a random number generator to make an address", None, QtGui.QApplication.UnicodeUTF8)) - self.radioButtonDeterministicAddress.setText(QtGui.QApplication.translate("NewAddressDialog", "Use a passpharase to make addresses", None, QtGui.QApplication.UnicodeUTF8)) - self.checkBoxEighteenByteRipe.setText(QtGui.QApplication.translate("NewAddressDialog", "Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBoxDeterministic.setTitle(QtGui.QApplication.translate("NewAddressDialog", "Make deterministic addresses", None, QtGui.QApplication.UnicodeUTF8)) - self.label_9.setText(QtGui.QApplication.translate("NewAddressDialog", "Address version number: 3", None, QtGui.QApplication.UnicodeUTF8)) - self.label_8.setText(QtGui.QApplication.translate("NewAddressDialog", "In addition to your passphrase, you must remember these numbers:", None, QtGui.QApplication.UnicodeUTF8)) - self.label_6.setText(QtGui.QApplication.translate("NewAddressDialog", "Passphrase", None, QtGui.QApplication.UnicodeUTF8)) - self.label_11.setText(QtGui.QApplication.translate("NewAddressDialog", "Number of addresses to make based on your passphrase:", None, QtGui.QApplication.UnicodeUTF8)) - self.label_10.setText(QtGui.QApplication.translate("NewAddressDialog", "Stream number: 1", None, QtGui.QApplication.UnicodeUTF8)) - self.label_7.setText(QtGui.QApplication.translate("NewAddressDialog", "Retype passphrase", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox.setTitle(QtGui.QApplication.translate("NewAddressDialog", "Randomly generate address", None, QtGui.QApplication.UnicodeUTF8)) - self.label_2.setText(QtGui.QApplication.translate("NewAddressDialog", "Label (not shown to anyone except you)", None, QtGui.QApplication.UnicodeUTF8)) - self.radioButtonMostAvailable.setText(QtGui.QApplication.translate("NewAddressDialog", "Use the most available stream", None, QtGui.QApplication.UnicodeUTF8)) - self.label_3.setText(QtGui.QApplication.translate("NewAddressDialog", " (best if this is the first of many addresses you will create)", None, QtGui.QApplication.UnicodeUTF8)) - self.radioButtonExisting.setText(QtGui.QApplication.translate("NewAddressDialog", "Use the same stream as an existing address", None, QtGui.QApplication.UnicodeUTF8)) - self.label_4.setText(QtGui.QApplication.translate("NewAddressDialog", "(saves you some bandwidth and processing power)", None, QtGui.QApplication.UnicodeUTF8)) + NewAddressDialog.setWindowTitle(_translate("NewAddressDialog", "Create new Address", None)) + self.label.setText(_translate("NewAddressDialog", "Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a \"deterministic\" address.\n" +"The \'Random Number\' option is selected by default but deterministic addresses have several pros and cons:", None)) + self.label_5.setText(_translate("NewAddressDialog", "

Pros:
You can recreate your addresses on any computer from memory.
You need-not worry about backing up your keys.dat file as long as you can remember your passphrase.
Cons:
You must remember (or write down) your passphrase if you expect to be able to recreate your keys if they are lost.
You must remember the address version number and the stream number along with your passphrase.
If you choose a weak passphrase and someone on the Internet can brute-force it, they can read your messages and send messages as you.

", None)) + self.radioButtonRandomAddress.setText(_translate("NewAddressDialog", "Use a random number generator to make an address", None)) + self.radioButtonDeterministicAddress.setText(_translate("NewAddressDialog", "Use a passphrase to make addresses", None)) + self.checkBoxEighteenByteRipe.setText(_translate("NewAddressDialog", "Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter", None)) + self.groupBoxDeterministic.setTitle(_translate("NewAddressDialog", "Make deterministic addresses", None)) + self.label_9.setText(_translate("NewAddressDialog", "Address version number: 3", None)) + self.label_8.setText(_translate("NewAddressDialog", "In addition to your passphrase, you must remember these numbers:", None)) + self.label_6.setText(_translate("NewAddressDialog", "Passphrase", None)) + self.label_11.setText(_translate("NewAddressDialog", "Number of addresses to make based on your passphrase:", None)) + self.label_10.setText(_translate("NewAddressDialog", "Stream number: 1", None)) + self.label_7.setText(_translate("NewAddressDialog", "Retype passphrase", None)) + self.groupBox.setTitle(_translate("NewAddressDialog", "Randomly generate address", None)) + self.label_2.setText(_translate("NewAddressDialog", "Label (not shown to anyone except you)", None)) + self.radioButtonMostAvailable.setText(_translate("NewAddressDialog", "Use the most available stream", None)) + self.label_3.setText(_translate("NewAddressDialog", " (best if this is the first of many addresses you will create)", None)) + self.radioButtonExisting.setText(_translate("NewAddressDialog", "Use the same stream as an existing address", None)) + self.label_4.setText(_translate("NewAddressDialog", "(saves you some bandwidth and processing power)", None)) + + +if __name__ == "__main__": + import sys + app = QtGui.QApplication(sys.argv) + NewAddressDialog = QtGui.QDialog() + ui = Ui_NewAddressDialog() + ui.setupUi(NewAddressDialog) + NewAddressDialog.show() + sys.exit(app.exec_()) diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm index ed4cf2571c0562c0c2dce59c857a5ceb5aaaed7b..3b0328a99f3d150b36643692f28d12dc0bcbdd3a 100644 GIT binary patch delta 1793 zcmX9X5xrZ@>+kv@{;ODFW7Cu10^#Y*a z3c|KuAflE&+;kVSw=041-(zmLh4i!`I_osx=hla7M8%D{VW0s--B&@&rDO6NfRL$)#E7 z`LYX$p3f*Mp8@Wd8Lz?QZ<3LDP4EG7EsWpdUx6(p%%nV;-msSmT@(OBwKB%*^xmug zFpC%L0Se_zVLZ{L-eo?kCwYx&%&EOBFk`G(&ICB_OZM9vfI(Wx<;8@CUdfHz^FXad za#NE8%xsg~=avC$6Io#sPqY7I)z^*yisP(yZ3q3|!%pZp47_4w{RfH(yge2liQ z>R--atOizga_K4(R&4rKz9kn_=FE?>qa_CQut}lj6nZxe%76DDYx@{ zLS7>|SMa7da&D0G_6ipf9pMY|$wB=%z9fiZ=`-y9~OgI&xKBlbVV_3Lw&Mz@9itV+b5*^kKQD@c&Tf1e_&O! z^w`Uwigrl9t#P9^>1A%k)RLe(vZxjcSRW>fEhd_RFjcEtNkH9W<7$siBdL~Dm6VrX)#p*ht4b0?$D0p9qYsL zC(08lDte^1vMF^65Hd)4KA(b*Jg0oTBMn8|V_4 zt-4Wa1a|wWICILM(X=e=I!U!VDjazkZOmigsJ@cw`Id0p zo&v143a1!qQ&@W+);9`Q(@4;|HsP9<1O?s@I>ykvB6p#89zc~<0)gOrny<^~6gmY> z`y13g**kr>=3`B#aW&=hXCLm0*W58B0G_^DeJjb|*Q}khcM7niPP_2X89-dCZ3rV( zg`)PjR|ViT?vl3URU(cVuI&@z)c#$xhK|cK+O4KKmz%7}pnC<;_yw7;!v+(U!u;|( z0V)0XXmh4DTkNMB;Mx^&i19IEE{)rf3@aWY17_%GhA)z^0?T2cXPcPxg@-Bzb6~(M z#6T}bE$TnqJ7$hyR*YU3x?;J-Y+Ih1lC(V4ZqsEhwI^H68E@%EP86Nd?yjgvzsc(1 z?=Cazl609#%a&zYT+a151DGwMy1bcL>S`}9kT5;s%-zF8du1A9c70!2CuJleWAhNp O4kR$CuD=dQhyD+yy&4Mu delta 1593 zcmX9;do)#f7~RJ`=RVwX?;U!Gb|~XYk4EG`1<1ofbbsxp91--2*nrDo zfdv)dbPIt+UWBx9@neWW7XgizVY28gkm3isuJ?fRGdNpx04to}nyUxa*~6nd9Y~i$ znb%50&EuG5gWx=4z~uo}EZs(W+OaaR5pXpf$3vSDdRz@yRE{7l_5e`jjSa%%z@_)t zI1)_)_T`RRY0gz6KhX-v%|rW*aKQQzIu%)fM=<(YY5?PzcswRk!wqUV@f7t zqYDsg&78e(08(5kWv-P9$QQM?jPdZFVN@PZwB`znW-oXZ zwv(!C5ey`z08wqMB7!VAU%^hUTnmIMS>G!(ql$TKfa*LoWyWrol8S5#cHd|Ku&0bo zGw~vi{n+YRWq?@{YtT&u)_lX>`g11jJIJ=~w+A#+9hRj_%at zOU~nUKDjo?d9}X=P8V|vhE%|W*IZEleR8RV3s1QWD3x4H7_}K7=Hm4RBC6%mQ>lUK ztz5nr5pCCTXWr7fp64nv$)3R7TvcW=VF_20!9fF)AGoVqiFoNC*O93vWq)uZ3r#3J z!`xWF0N@lY6ujL@@r5w*3rbneIpLlh3Q4t2So-KL;N2iBuj?ZrXN6ZjIG5EeykBWb zA&M87=4b$~eo;s>#l>AI3e6$nv?HP`vutpNU?m zsK3ceMI-i2H2o&Ar|=EY&C!ku%)DI0$G=?%?EOfb>qNGzJH?IH=F^dh6Sr5ik_#E) z+Zrp9+AHoWAaqw%uh1pZb#K!Bx4OHfY0)cx5emzi=)Qsewt14-{V;5Y}_EFga<_!Uyq#+_?a8G zq|yw6-W&gQIt3`XsvTt=)`jhsssbrH$#&zYTPY10Bk`5a(&!|A8of}ObAucVIw?KV zMcFCTNOcl7YN}V-mKqC$Ka{rpS_3T4l=c*;fTEq!-u(k4CsdovnMs^@zgZ+Ir9)fD zS!v?b{Hf0@DA3vbsZD`E(hUB5;#JB~9bfywna`d1I`<+XP2}t2qk)4}{56L1q2$N0 zdXT@TCXyo(zEeRYo;`e*GwsV-&5x|o19p!5NEf|#;AG7i9++o(6u$7;J;xeB^ek6E@pK+3bo+ zNZ7S4%CIRTX(Dq%`=s!ep-7)@#0+UIOQvc4i`9k;#Z^LbB~%-dK1sW)BHVDVg0uV& Dw9Dm! diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index c2186dfd..d69ccdfe 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -1,5 +1,6 @@ - + + MainWindow @@ -266,107 +267,107 @@ p, li { white-space: pre-wrap; } Supprimer tous les messages dans la corbeille - + Total Connections: %1 Nombre total de connexions : %1 - + Not Connected Déconnecté - + Connected Connecté - + Show Bitmessage Afficher Bitmessage - + Subscribe S'abonner - + Processed %1 person-to-person messages. %1 messages de pair à pair traités. - + Processed %1 broadcast messages. %1 messages de diffusion traités. - + Processed %1 public keys. %1 clés publiques traitées. - + Since startup on %1 Depuis lancement le %1 - + Waiting on their encryption key. Will request it again soon. En attente de la clé de chiffrement. Une nouvelle requête sera bientôt lancée. - + Encryption key request queued. Demande de clé de chiffrement en attente. - + Queued. En attente. - + Need to do work to send message. Work is queued. Travail nécessaire pour envoyer le message. Travail en attente. - + Acknowledgement of the message received %1 Accusé de réception reçu le %1 - + Broadcast queued. Message de diffusion en attente. - + Broadcast on %1 Message de diffusion à %1 - + Problem: The work demanded by the recipient is more difficult than you are willing to do. %1 Problème : Le travail demandé par le destinataire est plus difficile que ce que vous avez paramétré. %1 - + Forced difficulty override. Send should start soon. Neutralisation forcée de la difficulté. L'envoi devrait bientôt commencer. - + Message sent. Waiting on acknowledgement. Sent at %1 Message envoyé. En attente de l'accusé de réception. Envoyé le %1 - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Vous pouvez éditer vos clés en éditant le fichier keys.dat stocké dans le même répertoire que ce programme. Il est important de faire des sauvegardes de ce fichier. - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. @@ -375,12 +376,12 @@ It is important that you back up this file. Il est important de faire des sauvegardes de ce fichier. - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) Vous pouvez éditer vos clés en éditant le fichier keys.dat stocké dans le même répertoire que ce programme. Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'ouvrir maintenant ? (Assurez-vous de fermer Bitmessage avant d'effectuer des changements.) - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) @@ -389,432 +390,442 @@ It is important that you back up this file. Would you like to open the file now? Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'ouvrir maintenant ? (Assurez-vous de fermer Bitmessage avant d'effectuer des changements.) - + Add sender to your Address Book Ajouter l'expéditeur au carnet d'adresses - + Move to Trash Envoyer à la Corbeille - + View HTML code as formatted text Voir le code HTML comme du texte formaté - + Enable Activer - + Disable Désactiver - + Copy address to clipboard Copier l'adresse dans le presse-papier - + Special address behavior... Comportement spécial de l'adresse... - + Send message to this address Envoyer un message à cette adresse - + Add New Address Ajouter nouvelle adresse - + Delete Supprimer - + Copy destination address to clipboard Copier l'adresse de destination dans le presse-papier - + Force send Forcer l'envoi - + Are you sure you want to delete all trashed messages? Êtes-vous sûr de vouloir supprimer tous les messages dans la corbeille ? - + You must type your passphrase. If you don't have one then this is not the form for you. Vous devez taper votre phrase secrète. Si vous n'en avez pas, ce formulaire n'est pas pour vous. - + Delete trash? Supprimer la corbeille ? - + Open keys.dat? Ouvrir keys.dat ? - + bad passphrase Mauvaise phrase secrète - + Restart Redémarrer - + You must restart Bitmessage for the port number change to take effect. Vous devez redémarrer Bitmessage pour que le changement de port prenne effet. - + Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections. Bitmessage utilisera votre proxy à partir de maintenant mais il vous faudra redémarrer Bitmessage pour fermer les connexions existantes. - + Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want. Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre liste. Essayez de renommer l'adresse existante. - + The address you entered was invalid. Ignoring it. L'adresse que vous avez entrée est invalide. Adresse ignorée. - + Passphrase mismatch Phrases secrètes différentes - + The passphrase you entered twice doesn't match. Try again. Les phrases secrètes entrées sont différentes. Réessayez. - + Choose a passphrase Choisissez une phrase secrète - + You really do need a passphrase. Vous devez vraiment utiliser une phrase secrète. - + All done. Closing user interface... Terminé. Fermeture de l'interface... - + Address is gone L'adresse a disparu - + Bitmessage cannot find your address %1. Perhaps you removed it? Bitmessage ne peut pas trouver votre adresse %1. Peut-être l'avez-vous supprimée ? - + Address disabled Adresse désactivée - + Error: The address from which you are trying to send is disabled. You'll have to enable it on the 'Your Identities' tab before using it. Erreur : L'adresse avec laquelle vous essayez de communiquer est désactivée. Vous devez d'abord l'activer dans l'onglet 'Vos identités' avant de l'utiliser. - + Entry added to the Address Book. Edit the label to your liking. Entrée ajoutée au carnet d'adresses. Éditez le label selon votre souhait. - + Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want. Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre carnet d'adresses. Essayez de renommer l'adresse existante. - + Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back. Messages déplacés dans la corbeille. Il n'y a pas d'interface utilisateur pour voir votre corbeille, mais ils sont toujours présents sur le disque si vous souhaitez les récupérer. - + No addresses selected. Aucune adresse sélectionnée. - + Options have been disabled because they either aren't applicable or because they haven't yet been implimented for your operating system. Certaines options ont été désactivées car elles n'étaient pas applicables ou car elles n'ont pas encore été implémentées pour votre système d'exploitation. - + The address should start with ''BM-'' L'adresse devrait commencer avec "BM-" - + The address is not typed or copied correctly (the checksum failed). L'adresse n'est pas correcte (la somme de contrôle a échoué). - + The version number of this address is higher than this software can support. Please upgrade Bitmessage. Le numéro de version de cette adresse est supérieur à celui que le programme peut supporter. Veuiller mettre Bitmessage à jour. - + The address contains invalid characters. L'adresse contient des caractères invalides. - + Some data encoded in the address is too short. Certaines données encodées dans l'adresse sont trop courtes. - + Some data encoded in the address is too long. Certaines données encodées dans l'adresse sont trop longues. - + Address is valid. L'adresse est valide. - + You are using TCP port %1. (This can be changed in the settings). Vous utilisez le port TCP %1. (Ceci peut être changé dans les paramètres). - + Error: Bitmessage addresses start with BM- Please check %1 Erreur : Les adresses Bitmessage commencent avec BM- Merci de vérifier %1 - + Error: The address %1 contains invalid characters. Please check it. Erreur : L'adresse %1 contient des caractères invalides. Veuillez la vérifier. - + Error: The address %1 is not typed or copied correctly. Please check it. Erreur : L'adresse %1 n'est pas correctement recopiée. Veuillez la vérifier. - + Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever. Erreur : La version de l'adresse %1 est trop grande. Pensez à mettre à jour Bitmessage. - + Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance. Erreur : Certaines données encodées dans l'adresse %1 sont trop courtes. Il peut y avoir un problème avec le logiciel ou votre connaissance. - + Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance. Erreur : Certaines données encodées dans l'adresse %1 sont trop longues. Il peut y avoir un problème avec le logiciel ou votre connaissance. - + Error: Something is wrong with the address %1. Erreur : Problème avec l'adresse %1. - + Error: You must specify a From address. If you don't have one, go to the 'Your Identities' tab. Erreur : Vous devez spécifier une adresse d'expéditeur. Si vous n'en avez pas, rendez-vous dans l'onglet 'Vos identités'. - + Sending to your address Envoi vers votre adresse - + Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM. Erreur : Une des adresses vers lesquelles vous envoyez un message, %1, est vôtre. Malheureusement, Bitmessage ne peut pas traiter ses propres messages. Essayez de lancer un second client sur une machine différente. - + Address version number Numéro de version de l'adresse - + Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version. Concernant l'adresse %1, Bitmessage ne peut pas comprendre les numéros de version de %2. Essayez de mettre à jour Bitmessage vers la dernière version. - + Stream number Numéro de flux - + Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version. Concernant l'adresse %1, Bitmessage ne peut pas supporter les nombres de flux de %2. Essayez de mettre à jour Bitmessage vers la dernière version. - + Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won't send until you connect. Avertissement : Vous êtes actuellement déconnecté. Bitmessage fera le travail nécessaire pour envoyer le message mais il ne sera pas envoyé tant que vous ne vous connecterez pas. - + Your 'To' field is empty. Votre champ 'Vers' est vide. - + Right click one or more entries in your address book and select 'Send message to this address'. Cliquez droit sur une ou plusieurs entrées dans votre carnet d'adresses et sélectionnez 'Envoyer un message à ces adresses'. - + Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want. Erreur : Vous ne pouvez pas ajouter une même adresse à vos abonnements deux fois. Essayez de renommer l'adresse existante. - + Message trashed Message envoyé à la corbeille - + One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now? Une de vos adresses, %1, est une vieille adresse de la version 1. Les adresses de la version 1 ne sont plus supportées. Nous pourrions la supprimer maintenant ? - + Unknown status: %1 %2 Statut inconnu : %1 %2 - + Connection lost Connexion perdue + + + SOCKS5 Authentication problem: %1 + Problème d'authentification SOCKS5 : %1 + + + + Reply + Répondre + NewAddressDialog - + Create new Address Créer une nouvelle adresse - + Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a "deterministic" address. The 'Random Number' option is selected by default but deterministic addresses have several pros and cons: Vous pouvez générer autant d'adresses que vous le souhaitez. En effet, nous vous encourageons à créer et à délaisser vos adresses. Vous pouvez générer des adresses en utilisant des nombres aléatoires ou en utilisant une phrase secrète. Si vous utilisez une phrase secrète, l'adresse sera une adresse "déterministe". L'option 'Nombre Aléatoire' est sélectionnée par défaut mais les adresses déterministes ont certains avantages et inconvénients : - + <html><head/><body><p><span style=" font-weight:600;">Pros:<br/></span>You can recreate your addresses on any computer from memory. <br/>You need-not worry about backing up your keys.dat file as long as you can remember your passphrase. <br/><span style=" font-weight:600;">Cons:<br/></span>You must remember (or write down) your passphrase if you expect to be able to recreate your keys if they are lost. <br/>You must remember the address version number and the stream number along with your passphrase. <br/>If you choose a weak passphrase and someone on the Internet can brute-force it, they can read your messages and send messages as you.</p></body></html> <html><head/><body><p><span style=" font-weight:600;">Avantages :<br/></span>Vous pouvez recréer vos adresses sur n'importe quel ordinateur. <br/>Vous n'avez pas à vous inquiéter à propos de la sauvegarde de votre fichier keys.dat tant que vous vous rappelez de votre phrase secrète. <br/><span style=" font-weight:600;">Inconvénients :<br/></span>Vous devez vous rappeler (ou noter) votre phrase secrète si vous souhaitez être capable de récréer vos clés si vous les perdez. <br/>Vous devez vous rappeler du numéro de version de l'adresse et du numéro de flux en plus de votre phrase secrète. <br/>Si vous choisissez une phrase secrète faible et que quelqu'un sur Internet parvient à la brute-forcer, il pourra lire vos messages et vous en envoyer.</p></body></html> - + Use a random number generator to make an address Utiliser un générateur de nombres aléatoires pour créer une adresse - + Use a passphrase to make addresses Utiliser une phrase secrète pour créer une adresse - + Spend several minutes of extra computing time to make the address(es) 1 or 2 characters shorter Créer une adresse plus courte d'un ou deux caractères (nécessite plusieurs minutes de temps de calcul supplémentaires) - + Make deterministic addresses Créer une adresse déterministe - + Address version number: 3 Numéro de version de l'adresse : 3 - + In addition to your passphrase, you must remember these numbers: En plus de votre phrase secrète, vous devez vous rappeler ces numéros : - + Passphrase Phrase secrète - + Number of addresses to make based on your passphrase: Nombre d'adresses à créer sur base de votre phrase secrète : - + Stream number: 1 Nombre de flux : 1 - + Retype passphrase Retapez la phrase secrète - + Randomly generate address Générer une adresse de manière aléatoire - + Label (not shown to anyone except you) Label (seulement visible par vous) - + Use the most available stream Utiliser le flux le plus disponible - + (best if this is the first of many addresses you will create) (préférable si vous générez votre première adresse) - + Use the same stream as an existing address Utiliser le même flux qu'une adresse existante - + (saves you some bandwidth and processing power) (économise de la bande passante et de la puissance de calcul) @@ -882,7 +893,7 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais About À propos - + Copyright © 2013 Jonathan Warren Copyright © 2013 Jonathan Warren @@ -919,27 +930,27 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais iconGlossaryDialog - + Icon Glossary Glossaire des icônes - + You have no connections with other peers. Vous n'avez aucune connexion avec d'autres pairs. - + You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn't configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node. Vous avez au moins une connexion sortante avec un pair mais vous n'avez encore reçu aucune connexion entrante. Votre pare-feu ou routeur n'est probablement pas configuré pour transmettre les connexions TCP vers votre ordinateur. Bitmessage fonctionnera correctement, mais le réseau Bitmessage se portera mieux si vous autorisez les connexions entrantes. Cela vous permettra d'être un nœud mieux connecté. - + You are using TCP port ?. (This can be changed in the settings). Vous utilisez le port TCP ?. (Peut être changé dans les paramètres). - + You do have connections with other peers and your firewall is correctly configured. Vous avez des connexions avec d'autres pairs et votre pare-feu est configuré correctement. -- 2.45.1 From 0bfb6c45903bc3f1bf8e6b7b28fd2d99b16ec980 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 20:21:10 +0200 Subject: [PATCH 21/42] 2 new translatable strings in bitmessagemain --- src/bitmessagemain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index bd46e308..30fafa6f 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -3899,7 +3899,7 @@ class addressGenerator(threading.Thread): if addressVersionNumber == 3: # currently the only one supported. if command == 'createRandomAddress': shared.UISignalQueue.put(( - 'updateStatusBar', 'Generating one new address')) + 'updateStatusBar', _translate("MainWindow", "Generating one new address"))) # This next section is a little bit strange. We're going to generate keys over and over until we # find one that starts with either \x00 or \x00\x00. Then when we pack them into a Bitmessage address, # we won't store the \x00 or \x00\x00 bytes thus making the @@ -3970,7 +3970,7 @@ class addressGenerator(threading.Thread): apiAddressGeneratorReturnQueue.put(address) shared.UISignalQueue.put(( - 'updateStatusBar', 'Done generating address. Doing work necessary to broadcast it...')) + 'updateStatusBar', _translate("MainWindow", "Done generating address. Doing work necessary to broadcast it..."))) shared.UISignalQueue.put(('writeNewAddressToTable', ( label, address, streamNumber))) shared.reloadMyAddressHashes() -- 2.45.1 From 45ac908b1e1c743b09c9cc0de6d70bdb98542eea Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 20:22:59 +0200 Subject: [PATCH 22/42] update french translation --- src/translations/bitmessage_fr_BE.qm | Bin 50389 -> 50763 bytes src/translations/bitmessage_fr_BE.ts | 10 ++++++++++ 2 files changed, 10 insertions(+) diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm index 3b0328a99f3d150b36643692f28d12dc0bcbdd3a..ed5326b43a02c43d9c4767d020eb3c852c81a783 100644 GIT binary patch delta 2118 zcmY*a4OCO-8GiC}lib{!M8F>kR%vB)a5fI-CY)}Aumjj7_xZe-Zgh4#G4_I9b z@ne6$Ki!2@kzmTjfK~~nRtrQL2;+e$2GWGhK*wL;w)rVgco4n=Q^3l8tnhLIw(Z-o z=1d)s6o+*Wi-8k?h&J26$-yum-2DC57zR6Tz>qTU?QT`31ur_D_KR4tx*7%tohM3@DmR+7YRkziUF0Z8(MtA-n?gJ$8OlV)H}t1$mtBI-L=_{L!(lpHH; zvJlZ{eiGi>Pq=xX@KJs@aK$McQW}70f8mHY8z}i$#FsNP8NEnx-*z2fZ;DhW27uR- zME(QUD6vkowv-YtOcw=N3V_C7QHV}W2c|{g$%BAtMC6p30EM4uG?9ozSBReEQe5ho zSd~m8zx+Tvzj-&X%OVbG*8Qon)fb-!XzeY5?~&jB-gJY3s(U z8#@mK?PP-c#(?VIGn>YBfX5gUGyH%?-p%L>+Q^I+#+XPG(3%-borCIKXKclV)JdzI zIUh^~5A`rLPbr{2h-p4Wql>L(E}zOL>|8It06%=-tZaO?ucc`BVcUBFCg-N>vH z%yh&PV1-U1dTOSd1j+uaI-traIZ{c|w%(OAe)$I=#7EL}V~B`!OB@v*K=Bfrqe+|fjTv!q(?Fu9UZEn)P>1YD;qok959ptqU*?P(ML};&Uv(g&~ustu^ z-Eo!SXr*-$m% zQmt&F=oO&IDVto|0dQ~0{{0oLy{+urksUyA59|HT57gKMyDljeSn~~=t)o1eSJ>>s zbl$dUl&$%kG>m)9)-KeOIX-3UUz{d9!+w}aBMmXL-#+UEbO+h-Kwl!1z)s()0K%r^ z(wE8ATL$C@jdj5FW%Bf4%2W8P3oq`J-{Qt8@9XkAX&ZrXo4mV_G}kSb|MRT^GW7_@ zT1|BSJsUW==spnI#w{N2pxdD5mfq0=UZq^92aS4nHK&UvSKDG-Sa*!uHcgYclE|gz zh0~i+!&P>Yrg80D%|HZj@e)_d29U`@xx0mFfI-CF{VPee&A~mY)&ULYxk2j_;93zk zwDnEWnw9g?VkMw7^8N`_IA%K^wsNME2|nta8Q8?}yYe#tX%lb!A(^gS3U4}B2bin) zv!PyeEpPE>Q=)Bc?Jpiv$VS>|^mPj57Fs`NQ+Q{7P4_oO zvACKN22?9n*_(mV0Y%vNN+N7k?0jJg@cdGd{BAXkx=dk=`-tNHtjL%s0MgwQN1TNI zZz^83MVzLl1Qp`;fZ18psombP4B|`Zso915BRvN0`D#Y-dUo0sc|Ea=C0cFUI%dY zAF7qDk;J&{N7YTAI&$R=Ro6T!9DhX^|Q>Zk6N-a z)MisE?HRJH>KuzYCCg$krW&$y)M+^yjr|u3<~fAwrSrWv{eK%o#4=mjh$Z%Gr@ZZ* eoeF!Uj`i@0{9m=1;%3uPd%x#G$MT@d75@QSb7j~7 delta 1844 zcmX9;e^gX;9=&hoy?O7=doz=0tcr`3iTDF_K>~IYwE+=>Nz*_~z<^c+#LD9?NH8eK z2?d1JRUjmm&=iDH4*tj>1$X1%M!FOR**RE=9gi9<Ah9+Wd9T_xe?`CckE zeo zO$7Gk1NomJ{J=$u=x|~2bwnL7lkiKdj7Xu@ZoHWJ5#Zx zwVwn7_9Cn|?FL#eB5o{+LV}Ur%KE_t$g1-Np7uia5ht85x8Ti;D&XiFsL1pL{t<)j zkK=*q*KoyF3mcyXEflb$ix0|TEHB~rQZv>Xj z69)4_Xr&_D%3>rFJcV(C9WZ4ZdctZIell9FI8OrV8KZ4iFJFur7xbQB zVTaMbh=o0z#%H$V0(HH{MUE$cQ3 zmg-4B>?`7h+p~dV;o`-tnZV?0VxL2AX^%XGJiH(&MG7`~0Bh zvedALmObw;HSWnFCQHpl5+nGJ^x;MluQ(y~>`A4t6Vh1d1P zVA}9T4N#t9+E&I$n-Wd+*FFROa@KU@)BuIVnOaIG0y{34PCs(6VgUT;o z^E|awoiwzX_eQ+x@!kUxmZ^d3leo6I>Q)Eq_!O#JU*rEv3)HGF7@;$=P_3R850w5@ zt$lW!I9ENNPD`Iv)bIb;14J3rk$@TOU|1bLTM8_$Fv}}B&0(9(Dakd!2c72BK^DqA z?ZQJpn9ph>K;)C=woM_xk}2lSJZ2tw-hAg^F7R%ire@Ll$#t69c!m2P@`C0y(#|c2 z*Sy=}xjr@8;)%3+t-t12!D-I9;le}i+NyCn({N8q%3jJFu}dran3+bd(yDsxoE^JX ztuCZv{aRPvCLrOE*7XgeS{bEXt#knY^3(dW?o#kHZD9F7$!FH(d@D1zChH5LNgQ!o zUo!8JC1rZVfeb1?tgp>U1LPxm@`D7fTcZBzff``*JbnM-sa(g^`u@ZfK=zP+Eb~Kd z!72UZqli}D(N6``a$EkapV>m|cc$y-1P*t2j|-bx^~tkz3Fk_ZJ*30K!l0_M6t1@SQm8 zU~)X*Im;H%Reply Répondre + + + Generating one new address + Génération d'une nouvelle adresse + + + + Done generating address. Doing work necessary to broadcast it... + Génération de l'adresse terminée. Travail pour la diffuser en cours... + NewAddressDialog -- 2.45.1 From 1f10b2d50c9d2111d04cd4f3d74410edf276cc41 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 20:57:35 +0200 Subject: [PATCH 23/42] new translatable string in bitmessagemain --- src/bitmessagemain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 30fafa6f..9e4a0eed 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -4093,7 +4093,7 @@ class addressGenerator(threading.Thread): apiAddressGeneratorReturnQueue.put( listOfNewAddressesToSendOutThroughTheAPI) shared.UISignalQueue.put(( - 'updateStatusBar', 'Done generating address')) + 'updateStatusBar', _translate("MainWindows", "Done generating address"))) # shared.reloadMyAddressHashes() elif command == 'getDeterministicAddress': apiAddressGeneratorReturnQueue.put(address) -- 2.45.1 From 930159303c626cad741389a8eedf457f0ff11677 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 20:59:37 +0200 Subject: [PATCH 24/42] fixed typo + translations updated --- src/bitmessagemain.py | 2 +- src/translations/bitmessage_fr_BE.qm | Bin 50763 -> 50889 bytes src/translations/bitmessage_fr_BE.ts | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 9e4a0eed..44c854a2 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -4093,7 +4093,7 @@ class addressGenerator(threading.Thread): apiAddressGeneratorReturnQueue.put( listOfNewAddressesToSendOutThroughTheAPI) shared.UISignalQueue.put(( - 'updateStatusBar', _translate("MainWindows", "Done generating address"))) + 'updateStatusBar', _translate("MainWindow", "Done generating address"))) # shared.reloadMyAddressHashes() elif command == 'getDeterministicAddress': apiAddressGeneratorReturnQueue.put(address) diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm index ed5326b43a02c43d9c4767d020eb3c852c81a783..00d002533f828c955953bae2446bc4badb285991 100644 GIT binary patch delta 1880 zcmX9;eOOd=8a*>}@65e(@7!7NTU=q6rTjz^iO>a61_g|%3_%S66*N8sH*|wo81f55 zQ4};mA~K>vgMtS!6$o%Q@`IJd)rHNTd3MQse2PpF_GvfSll(Jh?#%DL?|IKT@9)Y% z!ti|fAi^QREEYKsmC}d5G#P(#h4sz~pN>_vxJc**UsdswXG1=@us3 z1CH#_Ey`ovPx5ukV*P=aYjpOTJU8jTx`cJ7fTBU&{tey^AhlI@@?$b@S)sd7V*tV= zoijfO2pQDf%cdnRGj(J75WtwDpYN>U1RnZrh3UYr>h-yINz}7QU%Z`!;yd-V86-M= zyZ%}NF|<#AE4Pb^*z^P1Mj)bAe@Dm!3YHkugChIgFj#sWjeva4VBOotKmKO$>HCz0 z?FQfdEIh+$cs3&ssA(_++L@DcI}OX?`++U7h8|NAVDU2Ciy@I!f?+6&=MuLF)_6*O zCPJ88w+>kQjS$#kqq6@HLhK&_dCfwqLSlzogx7!OKv^NeE{6-fS~NpAGw*$1N{-M} zIgx=26gs|}4V?BAE@gXhqCnxMYbOit6$aWFBA+Bt_fK!Yb)l#|?MKB5MF0CIXu%aR z;PQQjd8xR3*bYp%FRpUlpyXX*TwXIX@Qs)lLj`PuVn$UH`!$M=-T9oPK^9NYXQVF{ zD<1Md^%=450Huqxil-0c5`)G1{UWXSi+Fx38$Vwx_8dqd!D4aL=EAU!h+`o`z}!nl z!^3oL5{wD2RRN_ohV2-`?nqi8g%hc(| zcFhH*Z|$6Sa=2;Ks|`qtm7X*H$f~_ksOCnUE2MR8Wq{No?TdU&ov%to@2#g1_0o|! zG-z9fbn!wE^$C+Me|U)rDwnP}W^$N*X`q}q>%26w>kp)DlSX~p0Oc*|f4BMUaQi`? zc;{u_7K>%K4<4~$n(QCDnM=A}&a|_T_qTH9b`}UpkjuXJ1*U!_SNxsE**D3RGva`f z<#P4!$A~8R^EB!hI4Ix!br1jlS|0ZEU*{Cs5z@R>dB{C_6gFvFd^H(ijywb4}Ttvy9hajZ)H1Bkl8*ioOsU zR_(4-%8Mvnv(lZP3~bC+y8lIkR?k*$mD_>$G^Ia#2>A3r%0SpLHZ-fI-5Q`Jsy@+d zysBFbo<~LAOjE;;rvuC1RM+OF0;XCu@liZ?ZIhaGyb8#W)Uu`1xr+^a~ZT?Pndc^m&xqcjbp+gKI3QBY8kdfn{e8@fpSPM#y1Wu)=clvNsUd zV;MZWiIz2M_?(SS_G{kulMHE!7B)f)PBm)PuRI4V?a;1P^0GL3SL<0oi%hn0+!w9I z_S<(+x*OUPd^bRICdL8og;u}rnZO5cTVJRN0+I`@>py7&j%~EouO#6E8P;>|RltII z*3L<69QD{bPGp<)r{X9vhJ RlGC@AI;YNPa`gzP{XaF!CB6Uv delta 1818 zcmX9;X;2hr6ztuZ*=uHY10JXtv4VKJ5(O0$0l5TW??b~K5787eZZx&fTtE* zfhXXzif}35%Rw3F1=Riq3$M38@;cZy_W_gdW6}sSAT3^uX$K2|umH?_yc5{%2%kd@ zM51m0Gkp+nNJ9hbvCwxNakR(c*eisw1Gpz0foV}dxh;a$?;u=@;6^7R@)}`^G@xc8 zR`f;y^N(Re74>)SKwPmNu(LpXsRRj{N+g)_fs;>hBz6>#a}`b3jKJtdJkX^BvntVA zUjb+);JLLQDfA0^Zgv7oYGvx8ZeZv=nav2=-0^$ac)=D(GRvl|>;SU*WDZHx_pCkYU~d>>-+Yc58<^>-)OchRGb1Jm zC~;z345R5lKjR+W0<39g%*r)@XvcH}5fQ&krZbl6BDz>zI7xo$5j(Uj1PG2{U1~gm zvem4I;Up>J%0}}|@J1YN%sduThAmzUE{<>jBGYoOYZed27MV>^cI>SjIUubpd&|xq00NU{Dvg zpzRS!Ue6hmswj*xTx1X_;A!Gw3M*;ec~07yOq*2Xa7UbI;Kl|n|1A|1&EU%RlXU)h z+^PMEgiTyUDo0lQz+GBPgZ-^I^ZqE>)Qao%w4ku|aQz;gz$Al$d26DZ1jWiNg+R7h zu`P?Nt+=HqdG;gVVxuUnZY3i1iptDEz|L`QikeSSW`0yWDzl{Y9#vXqQ6^@4D;L#~ z1vAQ(fmuXgSGh9YMoVGrRqpX0PNCYR%#W@BCOpl#$5=@L$~s3HS7o96(?I(U^;P!T z)l#zBRkIXtX#8@Om)06^7^4cQ%>`67syzXHbg=_fY2Stdv9nYMCz3%M-m9)$o=eGl zsA@XVKnb!{-H}GoGA*jsJi_sws-Be1K#Ez_JG~a*53BxtPT!JsoO*Ek62PfJZGHS5 ztaClo!MqN2{!e6Bz$YDtNmHLp4jaa5{yv;U5pL(zaisIGVqU{M09>p1vE8*4eIq~qsu38G%DWCCT|@GC zgC9j$S}=fx3H+jdQs#6J9}(|P&!C>qx<&>D)bRPu6yakh`2w}W7>blDe=B)Cu!`Yt z{Z7U#s^p*K8Gzy=d`ny>a4sb$gR_zr3vQD?@$M0P51B|0UIfH^`|O1WI-2h6A~a8;b5dr4(7TidjIk7Yo9V~cE>YE9MM4*fT5tOPLK3Yv z{6SZ9fjBmg8am{OQ*z3H)MnA`jg|<G^@o~DZO6CIVEp?%1 zYk}OqbQL~CIPJaef=wYMuv%9)q>~yh-KYD+1pd9c4;j0FGoj?#HOoq8W!tdItkF)T F{{g+t7RLYp diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index 83cc7679..427a7ca6 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -739,6 +739,11 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o Done generating address. Doing work necessary to broadcast it... Génération de l'adresse terminée. Travail pour la diffuser en cours... + + + Done generating address + Génération de l'adresse terminée + NewAddressDialog -- 2.45.1 From 574f4d5c3e28f533683938f7f8232e6dbc945ec0 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 21:39:24 +0200 Subject: [PATCH 25/42] new translatable strings found + french translation updated --- src/bitmessagemain.py | 36 +++++++++++------------ src/translations/bitmessage_fr_BE.qm | Bin 50889 -> 52917 bytes src/translations/bitmessage_fr_BE.ts | 42 +++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 18 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 44c854a2..36c2ff4c 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -3285,7 +3285,7 @@ class singleWorker(threading.Thread): fromaddress, 'privencryptionkey') except: shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) + ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file.")))) continue privSigningKeyHex = shared.decodeWalletImportFormat( @@ -3320,7 +3320,7 @@ class singleWorker(threading.Thread): payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For broadcast message) Doing proof of work...' shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Doing work necessary to send broadcast...'))) + ackdata, _translate("MainWindow", "Doing work necessary to send broadcast...")))) initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce @@ -3335,8 +3335,8 @@ class singleWorker(threading.Thread): shared.broadcastToSendDataQueues(( streamNumber, 'sendinv', inventoryHash)) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Broadcast sent on ' + unicode( - strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Broadcast sent on %1").arg(unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) # Update the status of the message in the 'sent' table to have # a 'broadcastsent' status @@ -3359,7 +3359,7 @@ class singleWorker(threading.Thread): fromaddress, 'privencryptionkey') except: shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) + ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file.")))) continue privSigningKeyHex = shared.decodeWalletImportFormat( @@ -3406,7 +3406,7 @@ class singleWorker(threading.Thread): payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) print '(For broadcast message) Doing proof of work...' shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Doing work necessary to send broadcast...'))) + ackdata, _translate("MainWindow", "Doing work necessary to send broadcast...")))) initialHash = hashlib.sha512(payload).digest() trialValue, nonce = proofofwork.run(target, initialHash) print '(For broadcast message) Found proof of work', trialValue, 'Nonce:', nonce @@ -3421,8 +3421,8 @@ class singleWorker(threading.Thread): shared.broadcastToSendDataQueues(( streamNumber, 'sendinv', inventoryHash)) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Broadcast sent on ' + unicode( - strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Broadcast sent on %1").arg(unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) # Update the status of the message in the 'sent' table to have # a 'broadcastsent' status @@ -3542,7 +3542,7 @@ class singleWorker(threading.Thread): fromStatus, fromAddressVersionNumber, fromStreamNumber, fromHash = decodeAddress( fromaddress) shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Looking up the receiver\'s public key'))) + ackdata, _translate("MainWindow", "Looking up the receiver\'s public key")))) shared.printLock.acquire() print 'Found a message in our database that needs to be sent with this pubkey.' print 'First 150 characters of message:', repr(message[:150]) @@ -3605,7 +3605,7 @@ class singleWorker(threading.Thread): requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.)'))) + ackdata, _translate("MainWindow", "Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.)")))) elif toAddressVersionNumber == 3: requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint( pubkeyPayload[readPosition:readPosition + 10]) @@ -3617,8 +3617,8 @@ class singleWorker(threading.Thread): requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte if requiredPayloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes: requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Doing work necessary to send message.\nReceiver\'s required difficulty: ' + str(float( - requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte) + ' and ' + str(float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Doing work necessary to send message.\nReceiver\'s required difficulty: %1 and %2").arg(str(float( + requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte)).arg(str(float(requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes))))) if status != 'forcepow': if (requiredAverageProofOfWorkNonceTrialsPerByte > shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') and shared.config.getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') != 0) or (requiredPayloadLengthExtraBytes > shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') and shared.config.getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') != 0): # The demanded difficulty is more than we are willing @@ -3631,8 +3631,8 @@ class singleWorker(threading.Thread): shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Problem: The work demanded by the recipient (' + str(float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte) + ' and ' + str(float( - requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes) + ') is more difficult than you are willing to do. ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do.").arg(str(float(requiredAverageProofOfWorkNonceTrialsPerByte) / shared.networkDefaultProofOfWorkNonceTrialsPerByte)).arg(str(float( + requiredPayloadLengthExtraBytes) / shared.networkDefaultPayloadLengthExtraBytes)).arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) continue embeddedTime = pack('>Q', (int(time.time()) + random.randrange( @@ -3652,7 +3652,7 @@ class singleWorker(threading.Thread): fromaddress, 'privencryptionkey') except: shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) + ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file.")))) continue privSigningKeyHex = shared.decodeWalletImportFormat( @@ -3698,7 +3698,7 @@ class singleWorker(threading.Thread): fromaddress, 'privencryptionkey') except: shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, 'Error! Could not find sender address (your address) in the keys.dat file.'))) + ackdata, _translate("MainWindow", "Error! Could not find sender address (your address) in the keys.dat file.")))) continue privSigningKeyHex = shared.decodeWalletImportFormat( @@ -3769,8 +3769,8 @@ class singleWorker(threading.Thread): objectType = 'msg' shared.inventory[inventoryHash] = ( objectType, toStreamNumber, encryptedPayload, int(time.time())) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, 'Message sent. Waiting on acknowledgement. Sent on ' + unicode( - strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent on %1").ack(unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) print 'Broadcasting inv for my msg(within sendmsg function):', inventoryHash.encode('hex') shared.broadcastToSendDataQueues(( streamNumber, 'sendinv', inventoryHash)) diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm index 00d002533f828c955953bae2446bc4badb285991..6af9a1112360d8d67c52d8f6682cde43eac0f437 100644 GIT binary patch delta 2752 zcmZuzYgAO{72U(kW!^J91w`OdgMi|wAU**RB#7duh;Ky(<|4ym24@%p8X2n5_(aUL zD2P;%q7s9NBZ@CnwAE;Wx=3_E>MBVZO{`js2&-uudj=|5>FN*e=6?74&e>=0b3XWV zm$2!eu-wCz4qzNmTSFK@cn4rk0%`vMQf~mUw}Is&fmOeO=xz{gDTAnEB{2R8L{G;8 zk<9~GWdO5N1SF3IQ#}KiyNNIrm>&%Bq6FZE5UvR?fvwvyy!~e&+#jQcwgI+fg$Un6 z$@L~oyuS(9wHS#N*NH^y09F_x8<TmkG?fio7O@Km8brYc;^gRajqdgAFn}-ZfSMpZtXP7uEtk zFR{PKA2{$A+`60wjPS%g^-f^g8gyQ31Z1Ij=sOEI0`&gzIjPenkRIv*yy64_LrH-s zvmit<9N5w=2v2_kRI-BcB^19oOfY@LMA|=3puJD~h7<_Wm)6>V56T7kcRmGteFfWA z5;KcIaNr}Vq~%A!g*qWgd0Nm_8UxHO7d$B@i(GlZYo~a?dA-x420Jr$-{21t@zgRP1C( zs#2ly-YG!ZEL3l92X>bT$F_e$fwjVjZ4@}LSvbK|0-RVbjMlQil|bS2RULp)B5V_L zfHFwby)% z6&cM4zS010M;TRcBzYadOzhqdM7uMSZ*>EQ|Hj1iXaNt7ncejTNk556D`}$U+{4)P zi%EgxawaSCDoN|lm}=~RcQCW5lqx#Y#O$9;iLH;As+Y9y*b=5;2T7QEf%$O92EwOI z<2Hs8Pi4-pCIYFGnYJA{RPkh{Z-y&1aWC^a{y8wV+FAJ0ND~IzG2PGa<(v%Sn6*pcLX)*

0Ov0n+^DNBiQUSnSK>tC`K@F{bgp<& zIT6@-N4!2jMa|hH-jeJ?O;#_i%54P3j1d3+Fj?R;UtC-K9$Dxj{&45FfMmh|mYKw@ zkwoN@EkgWQ>yV^H+!xdW6iOtMoL>;L4UzOT)YrN&DkTlb?iDdS%T!Y&7bP*kaSiOj{ZQ>yKxP$y<5^3(E`Z#N&fYa z-q{;ck4Fp0^4N`1-=nW6p|^D6icIo8Tx!u$poq&-O92I#t&r}076A;akXC(3-Y!x} ztB0kLGS8)lqFxi)rC0Ju;u&Gm@BP~7`*vwhhSg1|yexo7~- zMl0^-5TWuE#XU6*Csocc4(w?etC!V3|$1*2Xhjt@LSvr8nzEgGS(}1_q z)sZ*-fs;wc&JWfcI552h`ACN0GYKlL)M6P!ACD zQUA1y#_;UBhH3qtwWKyMd1pl37QoY!dhuU$Na=aI^n z>lX+$knz(_cqz@`um)BNVgbk3C64l&0v18^KLAT#3j2Q#m-Js%^qA`iJh4A;K4-D$ zR&yFz3YWwBjhs z$_G^XiS@K-a|mXwrWHk-_WY`n>ur>7DM*(?JI>8O!2zhTRU6q~GrZ=tNg zNW?idmn*ht^twX6G~dS_HayVBbqP|4RVK3OX?7s*m+7;T7$5_A#M#jV9C6YUI-VRc zETnZKaVzZaGOB)%+gr&dQ?9|dnza`6=QID(1O?WNJVT~~0q;6th<$F9kAUZ+F7oYO zKKATrflScF=Ol9OA^+QC2<1OZOyVo2d3a{M$%kLm;P|+iVe*i{ZVKh|XKMIwTs-WC I#B|$#0F)jOb^rhX delta 1887 zcmX9;dsGzn8NIVRv$L}^yBiQ~1S>X##3vE~30m;6ivosCVi43IprVa{U`uR33QK%} zD2j?k5D6tn5;Tyo2QexTz&6AOm14Efn8Rs^@puwq6rm?=q&J7Z?#%9QzVCkb-tX6R zO8-T%zQn^h4ZsUP`9op=aMA~m8i2THAm(#m!7kwSnSB2v#2dbV-#LhV>i~auh~N1W z2gdP83#0=gVBZa?!VWCIO^g8|b0Eit18s3|3x5RUe+8f3C%~L#nC00GI9GOI-r-6h zz7xT>*lf=kEI)pkBs#|NU<;y;o7gA>uSC8va9_7-vZ>+I^l%Lg+Ha219c9Z$eIe22H;9t z0`Qwq^jHr7Av4h5Sr3?I;Eq=m6^g;gUxuhoprBL@1Cy=`-kzL%{!C%I=EI5X!n~yW zz~MKAz&zIdIA2&29}K)!BRFpH+{FJ1No%TsqCsKbIzK0n+9I6%h|HUp2^VYhK!i~k z$PWW-gTno6TH-cU7}MDRLym6FKn*9DrrTPW4m?$_%e_aUK1I6XZ6uV~p{vaxQO|9< z>q*4$Ufu27PAX#8^;^~hQMJ0eVkS_qP_G@3*zcy^+~aHnl=FJ)o?ia(cfEh_CoJsH z2kc|vDFgcX8F@fWgFe*3oSfgTUy|4dY>wA=%bNhRul{}kRyjip+Qu4D= z;-tDY!0KkZhIBGX+FQK&!VTPJ7{|1B}Gt{2zrxhUv*TD(Eu2W7!^Dj~!$~4@pa|i0( zWcLzgV&NtE)ec$^>?6mPkiZ@vImg?=Fm9FizBHMk`bjQNtp{d0`~ zR^3HPOn$}W&*lgSz{e;qA zGZwwKmfqAG56`4$TQiK8E{0LE2;-FxE;CeR#;eY$oUhN=Uq+mM!8o$>_ngFT91Um% z)OU>kyTf;{9~6(fukrp^pm@Fim<`jE;P{PP+qFujgLVAARWi5nd#5c)Dg8bGc=}7F z{2%nvu|cVrk^qz}RjPhFMwFG$(kN}{pmOim-TeP6WjM%(lU!5AK0OF5dDA4n!gMc> zG`*2r2{gWIN*Q3C{G;Re?p4#L>M$+*+0?QnjOQPlI`dtuQ(^l4ojmUU>3CJirUg$| zt0sL9uy~gG+;A(mB0-(rLL#1H>Y@phe63Y=L^0jY_HnFysJ=Qzh0b1AH|8wi4Oyd> zw9#9~9JRdH#teC@6-pqLYf`)Nw*c$2)vkZjvXwK`+hq>mJ&W3xJw&fR`H$Kkaf}U3 zn!L*bSdumWSTak?XfX+jP7V$S`W9i#)lW zbG6b9Q9y2o_F>iqZo?6+@fWLBeW9HTs^a!c(#~hlg543?MIn>hP)Bs~q2aK0BZZ6# zYqcKh5Iu8gy|eh?!H3#t3>!RKsEzjW_vbg8jdz=v2@kVn8Q-6IZ1zg~8hESS{9GC9 z1X;~pT*B{k|9m8M2yga>PAb|>n{R}+AY^Acz+zZ zXX&0xi)8ya?v1tdId)RHo8$QB5X(Sv0^nU}4eFW-yno92a!nYprO+C<_TyII*m`UI zax&hZVLk6%3Cx{s?U=~MF;A@HM7COgD(0Fs+@O(dg{~d)Gj1-o$*r=>Done generating address Génération de l'adresse terminée + + + Message sent. Waiting on acknowledgement. Sent on %1 + Message envoyé. En attente de l'accusé de réception. Envoyé le %1 + + + + Error! Could not find sender address (your address) in the keys.dat file. + Erreur ! L'adresse de l'expéditeur (vous) n'a pas pu être trouvée dans le fichier keys.dat. + + + + Doing work necessary to send broadcast... + Travail pour envoyer la diffusion en cours... + + + + Broadcast sent on %1 + Message de diffusion envoyé le %1 + + + + Looking up the receiver's public key + Recherche de la clé publique du destinataire + + + + Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.) + Travail nécessaire pour envoyer le message en cours. (Il n'y a pas de difficulté requise pour ces adresses de version 2.) + + + + Doing work necessary to send message. +Receiver's required difficulty: %1 and %2 + Travail nécessaire pour envoyer le message. +Difficulté requise par le destinataire : %1 et %2 + + + + Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do. + Problème : Le travail demandé par le destinataire (%1 et %2) est plus difficile que ce que vous souhaitez faire. + NewAddressDialog -- 2.45.1 From 71e30e1a6559a62dd6fe5845cd3f63f38f97b0ab Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 23:14:03 +0200 Subject: [PATCH 26/42] translation updated --- src/bitmessageqt/__init__.py | 10 +++++----- src/translations/bitmessage_fr_BE.qm | Bin 52917 -> 53009 bytes src/translations/bitmessage_fr_BE.ts | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 459745c7..ad782937 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1415,7 +1415,7 @@ class MyForm(QtGui.QMainWindow): # send broadcast...'+ # unicode(strftime(config.get('bitmessagesettings', # 'timeformat'),localtime(int(time.time()))),'utf-8')) - newItem = myTableWidgetItem('Work is queued.') + newItem = myTableWidgetItem(_translate("MainWindow", "Work is queued.")) newItem.setData(Qt.UserRole, QByteArray(ackdata)) newItem.setData(33, int(time.time())) self.ui.tableWidgetSent.setItem(0, 3, newItem) @@ -1502,10 +1502,10 @@ class MyForm(QtGui.QMainWindow): # broadcast...'+ # unicode(strftime(shared.config.get('bitmessagesettings', # 'timeformat'),localtime(int(time.time()))),'utf-8')) - newItem = myTableWidgetItem('Work is queued. ' + unicode(strftime(shared.config.get( - 'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')) - newItem.setToolTip('Work is queued. ' + unicode(strftime(shared.config.get( - 'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')) + newItem = myTableWidgetItem(_translate("MainWindow", "Work is queued. %1").arg(unicode(strftime(shared.config.get( + 'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))) + newItem.setToolTip(_translate("MainWindow", "Work is queued. %1").arg(unicode(strftime(shared.config.get( + 'bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))) newItem.setData(Qt.UserRole, QByteArray(ackdata)) newItem.setData(33, int(time.time())) self.ui.tableWidgetSent.setItem(0, 3, newItem) diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm index 6af9a1112360d8d67c52d8f6682cde43eac0f437..90c3af72019ad6bac7b3a5b554f31dcee3f42f4e 100644 GIT binary patch delta 1135 zcmXAndrVVj7{;G-X%D66oTiPDFtXN#0f7zJrZ}oxR5}o1J0JqGffR;B?wQC$7AP@6 z(1B1tSGhWZh5-&VU@f{81((S(VKP`8CM;w#y7&i)5WsA4>|6TRFX!?-&+|U-=j`U} zm$=p~+M@v81$tK~w*!~`?E&vIZhN*tl>zMst3c!L_Ig9^RU|mR2NaVYI@~ZjynzTU zk`t*!WGzywzN7rX!xk3lXNv%5J2DEZDHn0*z7a5Mk)=Ef-04B~#wS4X1d5kxfr4uL zE4^;Sf`+tSz;_jGReGRnI|*eB%t2yi^tuKU^PcrN(0-iRQQHBG)sY&;$M*?S`ty%~ zpC5B3I}E6BGo3@!@J>7#Vq*7BvVG;lfIftswo;mH?4z1{G>(aVEaw8Lsq9m}0%+OI ziA@T6YMzs3M*!6rr>UQ#?|&hotWV}OF50pUxLe8X%~=4-vbY)H2p|P;&oj!X%5`qJ ziVjgyz-w~oa5s|pt%I3>)y_w|Ou)!*e4J$fIPK(%)ilLL7k}ba98ecWx>-Ft>QCJ4 zPPR9etg$8&+Dv%m1UK?Y)- z!s!FPw9>!HA{X?=Jz+9}YPuVQXO?+j>$tEHFb*8g@`_ZxplY)ufH$ayz3d@$sLFC; z<^$O;Or(-GFeT(mKFqsqpQNg zh1l2VUc|PD!C;5ICPGMd@My!+^Bsg-nBYN@=_Q1zs1Woc?xT2vWXzg8n}x6|dI<#~O%J zX|T;mPg?STv|Jf?sruywIn2@tcooU}*J+1?BXZBjkwCmke$ZtEI{uPp!s)gJlZWTh zXl hnqW{qqzk#woViTjT%$ delta 1152 zcmXAneNa?o6vm&s_wK#B?C#xmGf|m#r9zSrD_Dd^AOtiFHedt=1QxKS<+DT*L_UVX z0u6V&49e#a5fVd`E(`Pl0%_8el7r=7IWZMbRzyKCQ{&i~*}tB7-+AA2p67Rty`6Qo zv9@(O3xFqp&UR9N(kZ*w4#sLvGb&l=qLzU->g+Yf%Kg~WcnOeCxU|uV*hV+Nq(fZv zi$G8X5=uTL{oJMX{Ya|I0i03TZ#_m@ivw4Jfmj_5@^!$)7^JOb199WXbG{0M_n@@X z5AexAS$8Gi=D_iSX5jq4cs;R`&Ks9;w!{Fm{2-YaVY%%J|(A6 zRjlUv1wc8>YHOx}(-rLF)8~Qv%&dQHI^a3X1{PKTeW`4Sc{4EP$%bdl00jyuP39i2 z=d>Aw#<9w+?@b0Qb}nQn61eah7h!&nGG%hPDspiqn>%_p0;v3xtJV?HpcSsq_g!MJ z#5r2m0a?Ft;K>eUoem0nHi|6Id%jCJ|fE2}gGr>|mYe;Ec z;)`t*d+-k5_5BnOahvZRyamM1@s9fYfs@hvknlXUHu5)m^)$^9L2sie?c#*^2?`dH zDIKPL^EGj#8-lP5wDFqfV?Dm@@KG78Bg-=3VWGVdk0-R-LQd(>s1RFz#84rIis zN-l*0yNgt|i-jH>2Mg0jw$m5e-IuxS*I)`f564ckV zRO9LY)YFd{fW~(9+CJj6)uLXTrhDH|jbh$O>BcnTZaRBk)p+FnM1#-QY-yr;PgQHS zNxgvmAL&irpzrI`9Eu&M>q$-SY6WoEUmD?!mB%zcpU$FSnIguh$U8NnpScB4u_HBz04T+;T4|e_8^mkdX>>xQOY3FgjJX=9t#WD4oH%i2WV4190l4m+AhNk5WJx6-y;Gt$wNvLjQnwecqPD5EmXYV*jF%O`5#4wV5tBA diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index 1923b015..0e49229c 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -750,7 +750,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o Message envoyé. En attente de l'accusé de réception. Envoyé le %1 - + Error! Could not find sender address (your address) in the keys.dat file. Erreur ! L'adresse de l'expéditeur (vous) n'a pas pu être trouvée dans le fichier keys.dat. @@ -786,6 +786,11 @@ Difficulté requise par le destinataire : %1 et %2 Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do. Problème : Le travail demandé par le destinataire (%1 et %2) est plus difficile que ce que vous souhaitez faire. + + + Work is queued. + Travail en attente. + NewAddressDialog -- 2.45.1 From 8db60e788c25703cf1d9fd0cf477b25031eb6c53 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 23:16:11 +0200 Subject: [PATCH 27/42] translation updated --- src/translations/bitmessage_fr_BE.qm | Bin 53009 -> 53110 bytes src/translations/bitmessage_fr_BE.ts | 5 +++++ 2 files changed, 5 insertions(+) diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm index 90c3af72019ad6bac7b3a5b554f31dcee3f42f4e..ffa7f6b095e620dfa6ed952b3679bcffd085515f 100644 GIT binary patch delta 1069 zcmX9-e@v8R9RED`zW3gpclVx0CKJ}ZkOJ}R=+FbP#2BE>$q`N@ROE0#0ScnhZ;@!J zpaIw81Oy2ZF<@GTCr~>itqB{Vh~aRtS%EgUT#bUwBKvOl$GgwoXV3HbetzuhY7ypI zgt{f>y#Q>$nN-4+gcYu!7*&&>D@%#H1atB%Q1ud)kN*cmTM+Iy3T!)oXjco6TY}h$ zkANC2Hk|w(P+#?8y`Rgi1ZHDvbs^xMLq@@Sz~wb~{dydbV#W@s8o09H`a8PXT>XEMZ41u>CdWm=J-bdzmwn-tq*t z=jJfr@6W2TtiS<3)^wf*UOB_vEWYqfMb%Mq0kDLrZa4{34yo=Qyhgg(RQKc@VDo0x z193l4+aMT@tARnAU>y4z(DezXkH>+!DB;ENi@;)su(E0=5ZEWgl#~PK4Z>PS0NuYW zBxFwl#r-@>eZ)aNmr+iCkr9$5#J*ywl=A(j;!@IN$o$~1QMsD zj?4Fev>Bq5OBz*Zl9I!uxjM=pSDE;syS!T4DX% zuD1FdwdfriDXw#=`n0Ds#2v=V)Jo_F`exlKU{j8MsGGksD}BJS~2GtPOS5zI*uDo?Aiz%R=818a?TpQWfWrCRxkEGHry&C2A5zM zGZDip{}{%@EfiR)VSWo`5$ZI|kJEWXyixnWO%_Ux@_PCYxncC*{VUaFF$Omh-MQ~Oe otRMhEuxV-YA<^fPQL?WnpkRMMX<1%bUapn@oao!LrP$;AAL4RFu>b%7 delta 1044 zcmX9-e@xVM7=FG#?t6FM-S^v>%8+&6=u*NT5I;`D5<*TiCRaGY&_fSL6o_60RMrG$ zDL)G2`ZxjvVoH>!VS(r2+96;~T7n{^;i9?n*V<|e3YyLA-R`evpLcto_j#W8{mixt zo_3*Of%#PcF~G5D!Z_f#)w5(3-xBcTs)<`+UOxj={|xK+e?Y7S%NLIV+e#7ZX$SJ% zNVxVMP_Ao4 zF(7mXO>bL();MP4RBj8);?xv77wh^BXfEaA%UgiHN-o8j0BnDeb6gXFMXzzL9P0h( z7Psf}cR*MeSCbnBlmxh=U(mqwY0SqZ6}>XVce%R(%QAk%MVL{+U*CU$^w{|uavrdG zGk-@c0S-SS7(did+k{{m>jCtAf^u-2>Q{xQ$G-v|aR_lWJAm*$VU@caICWZB>v$X( zC=*h4P6B(KESC?7DG-&N!6S!pdfKM>%HBE_;z?*9{Ei=|K=B`deTDwsW22z8>;JM@iRcphT?{dQGOy^SjgE)~@w4yQLXFBf znN1TlziQCnNT;~ErVW`7X~>xoR;E!SRYR*j9@vy;7_KY?3ila?f1%KFelT2bb^s@3 z!{k01c`aGdqZWkMT+oF*I}; z#}s0C?qB2hatqKnZJgUeSwy;wbK_KBkz~@{@sa5TCOM7X5hJFs;$MM^LDSM^;#+gT zw32!0_MT^Tl4^!2KVy)p!=~M{<-i+NEFf7b3Pw%04(|f8@?;DU$?-`!%5fCX70DZC z$+Wje?%2K>NYl%gTIpxB+>=M6X+K(f5bLw$Nyh=8W+I3u66KruJAfx$ifx!gpKeoL z=u84$uU58w*$=ekDV>%{An~r!y+OuPU~Z*PZ3p5-WoRJ@aC()Xpit$0-TQP#S18 Work is queued. Travail en attente. + + + Work is queued. %1 + Travail en attente. %1 + NewAddressDialog -- 2.45.1 From 7fb20468a8b92cb189d439700555b2205fca2c07 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 23:42:32 +0200 Subject: [PATCH 28/42] trying to resolve _translate undefined --- src/bitmessagemain.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 36c2ff4c..1842dba5 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -52,6 +52,14 @@ import proofofwork # For each stream to which we connect, several outgoingSynSender threads # will exist and will collectively create 8 connections with peers. +try: + from PyQt4 import QtCore, QtGui + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text): + return QtGui.QApplication.translate(context, text) +except AttributeError: + print 'Error message:', err + class outgoingSynSender(threading.Thread): -- 2.45.1 From b7f99a10d2596c22d86f01f783c2742d646f2256 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Thu, 13 Jun 2013 23:52:24 +0200 Subject: [PATCH 29/42] corrected an string comparaison, naturally failed in french --- src/bitmessageqt/__init__.py | 2 +- src/translations/bitmessage_fr_BE.ts | 37 +++++++++++++++++----------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index ad782937..34d3df48 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1594,7 +1594,7 @@ class MyForm(QtGui.QMainWindow): def click_pushButtonAddAddressBook(self): self.NewSubscriptionDialogInstance = NewSubscriptionDialog(self) if self.NewSubscriptionDialogInstance.exec_(): - if self.NewSubscriptionDialogInstance.ui.labelSubscriptionAddressCheck.text() == 'Address is valid.': + if self.NewSubscriptionDialogInstance.ui.labelSubscriptionAddressCheck.text() == _translate("MainWindow", "Address is valid."): # First we must check to see if the address is already in the # address book. The user cannot add it again or else it will # cause problems when updating and deleting the entry. diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index 6448468d..329ad80c 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -1,6 +1,5 @@ - - + MainWindow @@ -720,7 +719,7 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o Connexion perdue - + SOCKS5 Authentication problem: %1 Problème d'authentification SOCKS5 : %1 @@ -730,59 +729,59 @@ Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'o Répondre - + Generating one new address Génération d'une nouvelle adresse - + Done generating address. Doing work necessary to broadcast it... Génération de l'adresse terminée. Travail pour la diffuser en cours... - + Done generating address Génération de l'adresse terminée - + Message sent. Waiting on acknowledgement. Sent on %1 Message envoyé. En attente de l'accusé de réception. Envoyé le %1 - + Error! Could not find sender address (your address) in the keys.dat file. Erreur ! L'adresse de l'expéditeur (vous) n'a pas pu être trouvée dans le fichier keys.dat. - + Doing work necessary to send broadcast... Travail pour envoyer la diffusion en cours... - + Broadcast sent on %1 Message de diffusion envoyé le %1 - + Looking up the receiver's public key Recherche de la clé publique du destinataire - + Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.) Travail nécessaire pour envoyer le message en cours. (Il n'y a pas de difficulté requise pour ces adresses de version 2.) - + Doing work necessary to send message. Receiver's required difficulty: %1 and %2 Travail nécessaire pour envoyer le message. Difficulté requise par le destinataire : %1 et %2 - + Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do. Problème : Le travail demandé par le destinataire (%1 et %2) est plus difficile que ce que vous souhaitez faire. @@ -797,6 +796,14 @@ Difficulté requise par le destinataire : %1 et %2 Travail en attente. %1 + + MainWindows + + + Address is valid. + L'adresse est valide. + + NewAddressDialog @@ -960,7 +967,7 @@ L'option 'Nombre Aléatoire' est sélectionnée par défaut mais About À propos - + Copyright © 2013 Jonathan Warren Copyright © 2013 Jonathan Warren -- 2.45.1 From a8693156b0709fa11c306037181e7cf9607873da Mon Sep 17 00:00:00 2001 From: Joshua Noble Date: Thu, 13 Jun 2013 20:48:55 -0400 Subject: [PATCH 30/42] Add getInboxMessageById API command --- src/bitmessagemain.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 8d9bc461..e347d561 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -3696,6 +3696,22 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':2,'receivedTime':received},indent=4, separators=(',', ': ')) data += ']}' return data + elif method == 'getInboxMessageById': + msgid = params[0].decode('hex') + v = (msgid,) + shared.sqlLock.acquire() + shared.sqlSubmitQueue.put('''SELECT toaddress, fromaddress, subject, received, message FROM inbox WHERE msgid=?''') + shared.sqlSubmitQueue.put(v) + queryreturn = shared.sqlReturnQueue.get() + shared.sqlLock.release() + data = '{"inboxMessage":[' + for row in queryreturn: + toAddress, fromAddress, subject, received, message, = row + subject = shared.fixPotentiallyInvalidUTF8Data(subject) + message = shared.fixPotentiallyInvalidUTF8Data(message) + data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':2,'receivedTime':received},indent=4, separators=(',', ': ')) + data += ']}' + return data elif method == 'trashMessage': if len(params) == 0: return 'API Error 0000: I need parameters!' -- 2.45.1 From cad151a440d52e1f3d077d0b18f3f68b19918f6f Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Fri, 14 Jun 2013 12:47:46 +0200 Subject: [PATCH 31/42] strings comparaison failed with translation: fixed --- src/bitmessageqt/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 34d3df48..d5463b08 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1640,7 +1640,7 @@ class MyForm(QtGui.QMainWindow): self.NewSubscriptionDialogInstance = NewSubscriptionDialog(self) if self.NewSubscriptionDialogInstance.exec_(): - if self.NewSubscriptionDialogInstance.ui.labelSubscriptionAddressCheck.text() == 'Address is valid.': + if self.NewSubscriptionDialogInstance.ui.labelSubscriptionAddressCheck.text() == _translate("MainWindow", "Address is valid."): # First we must check to see if the address is already in the # subscriptions list. The user cannot add it again or else it # will cause problems when updating and deleting the entry. @@ -1853,7 +1853,7 @@ class MyForm(QtGui.QMainWindow): def click_pushButtonAddBlacklist(self): self.NewBlacklistDialogInstance = NewSubscriptionDialog(self) if self.NewBlacklistDialogInstance.exec_(): - if self.NewBlacklistDialogInstance.ui.labelSubscriptionAddressCheck.text() == 'Address is valid.': + if self.NewBlacklistDialogInstance.ui.labelSubscriptionAddressCheck.text() == _translate("MainWindow", "Address is valid."): # First we must check to see if the address is already in the # address book. The user cannot add it again or else it will # cause problems when updating and deleting the entry. -- 2.45.1 From 0343c67b952813b6557653e2f7fb34732f96ce61 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Fri, 14 Jun 2013 13:20:38 +0200 Subject: [PATCH 32/42] applied Atheros1 commit for error handling around .encrypt commit 8d7eceb18e3435d8d8b67943093e9f3685bb6eb0 --- src/bitmessagemain.py | 21 +++++++++++++++++---- src/bitmessageqt/__init__.py | 3 +++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 1842dba5..e759a7bd 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -3398,12 +3398,15 @@ class singleWorker(threading.Thread): fromaddress, 'payloadlengthextrabytes')) dataToEncrypt += '\x02' # message encoding type dataToEncrypt += encodeVarint(len( - 'Subject:' + subject + '\n' + 'Body:' + body)) # Type 2 is simple UTF-8 message encoding. + 'Subject:' + subject + '\n' + 'Body:' + body)) # Type 2 is simple UTF-8 message encoding per the documentation on the wiki. dataToEncrypt += 'Subject:' + subject + '\n' + 'Body:' + body signature = highlevelcrypto.sign( dataToEncrypt, privSigningKeyHex) dataToEncrypt += encodeVarint(len(signature)) dataToEncrypt += signature + # Encrypt the broadcast with the information contained in the broadcaster's address. Anyone who knows the address can generate + # the private encryption key to decrypt the broadcast. This provides virtually no privacy; its purpose is to keep questionable + # and illegal content from flowing through the Internet connections and being stored on the disk of 3rd parties. privEncryptionKey = hashlib.sha512(encodeVarint( addressVersionNumber) + encodeVarint(streamNumber) + ripe).digest()[:32] pubEncryptionKey = pointMult(privEncryptionKey) @@ -3752,8 +3755,18 @@ class singleWorker(threading.Thread): payload += signature # We have assembled the data that will be encrypted. - encrypted = highlevelcrypto.encrypt( - payload, "04" + pubEncryptionKeyBase256.encode('hex')) + try: + encrypted = highlevelcrypto.encrypt(payload,"04"+pubEncryptionKeyBase256.encode('hex')) + except: + shared.sqlLock.acquire() + t = (ackdata,) + shared.sqlSubmitQueue.put('''UPDATE sent SET status='badkey' WHERE ackdata=?''') + shared.sqlSubmitQueue.put(t) + queryreturn = shared.sqlReturnQueue.get() + shared.sqlSubmitQueue.put('commit') + shared.sqlLock.release() + shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Problem: The recipient\'s encryption key is no good. Could not encrypt message. ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))) + continue encryptedPayload = embeddedTime + \ encodeVarint(toStreamNumber) + encrypted target = 2 ** 64 / ((len( @@ -3788,7 +3801,7 @@ class singleWorker(threading.Thread): shared.sqlLock.acquire() t = (ackdata,) shared.sqlSubmitQueue.put( - '''UPDATE sent SET status='msgsent' WHERE ackdata=? AND (status='doingmsgpow' or status='forcepow') ''') + '''UPDATE sent SET status='msgsent' WHERE ackdata=?''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index d5463b08..278ad7d1 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -484,6 +484,9 @@ class MyForm(QtGui.QMainWindow): elif status == 'toodifficult': statusText = _translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg( unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) + elif status == 'badkey': + statusText = QtGui.QApplication.translate("MainWindow", "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg( + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) elif status == 'forcepow': statusText = _translate( "MainWindow", "Forced difficulty override. Send should start soon.") -- 2.45.1 From fd3f1f8ebf5dcca7a9d92e0acb26cd72b63bf030 Mon Sep 17 00:00:00 2001 From: Gatien Bovyn Date: Fri, 14 Jun 2013 13:27:55 +0200 Subject: [PATCH 33/42] fixed typo ack-arg for translation --- src/bitmessagemain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index e759a7bd..1454e699 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -3790,7 +3790,7 @@ class singleWorker(threading.Thread): objectType = 'msg' shared.inventory[inventoryHash] = ( objectType, toStreamNumber, encryptedPayload, int(time.time())) - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent on %1").ack(unicode( + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (ackdata, _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent on %1").arg(unicode( strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) print 'Broadcasting inv for my msg(within sendmsg function):', inventoryHash.encode('hex') shared.broadcastToSendDataQueues(( -- 2.45.1 From 48b5e26e461b989550e090cc6ef7af3d8e68bb85 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Mon, 17 Jun 2013 16:42:30 -0400 Subject: [PATCH 34/42] Finished adjusted _translate function to work under daemon mode --- src/bitmessagemain.py | 44 +++++++++++++++++++++++++----------- src/bitmessageqt/__init__.py | 6 ++--- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 83815253..a834deb6 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -52,15 +52,6 @@ import proofofwork # For each stream to which we connect, several outgoingSynSender threads # will exist and will collectively create 8 connections with peers. -try: - from PyQt4 import QtCore, QtGui - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text): - return QtGui.QApplication.translate(context, text) -except AttributeError: - print 'Error message:', err - - class outgoingSynSender(threading.Thread): def __init__(self): @@ -1094,8 +1085,8 @@ class receiveDataThread(threading.Thread): shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (encryptedData[readPosition:], 'Acknowledgement of the message received just now. ' + unicode( - strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata', (encryptedData[readPosition:], _translate("MainWindow",'Acknowledgement of the message received. %1').arg(unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) return else: shared.printLock.acquire() @@ -4654,6 +4645,18 @@ class singleAPI(threading.Thread): se.register_introspection_functions() se.serve_forever() +# This is used so that the _translate function can be used when we are in daemon mode and not using any QT functions. +class translateClass: + def __init__(self, context, text): + self.context = context + self.text = text + def arg(self,argument): + if '%' in self.text: + return translateClass(self.context, self.text.replace('%','',1)) # This doesn't actually do anything with the arguments because we don't have a UI in which to display this information anyway. + else: + return self.text + + selfInitiatedConnections = {} # This is a list of current connections (the thread pointers at least) alreadyAttemptedConnectionsList = { @@ -4867,19 +4870,34 @@ if __name__ == "__main__": try: from PyQt4.QtCore import * from PyQt4.QtGui import * + from PyQt4 import QtCore, QtGui except Exception as err: print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download PyQt from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\'. If you want to run in daemon mode, see https://bitmessage.org/wiki/Daemon' print 'Error message:', err os._exit(0) + try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text): # A non-QT version of _translate is defined below. + return QtGui.QApplication.translate(context, text) + except Exception as err: + print 'Error:', err + import bitmessageqt bitmessageqt.run() else: + def _translate(context, text): # A QT version of _translate is defined above. + if '%' in text: + return translateClass(context, text.replace('%','',1)) + else: + return text + shared.printLock.acquire() print 'Running as a daemon. You can use Ctrl+C to exit.' + shared.printLock.release() while True: time.sleep(20) -# So far, the Bitmessage protocol, this client, the Wiki, and the forums -# are all a one-man operation. Bitcoin tips are quite appreciated! +# So far, the creation of and management of the Bitmessage protocol and this +# client is a one-man operation. Bitcoin tips are quite appreciated. # 1H5XaDA6fYENLbknwZyjiYXYPQaFjjLX2u diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index f69c29b7..dfdb0b43 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -8,7 +8,7 @@ try: from PyQt4.QtCore import * from PyQt4.QtGui import * except Exception as err: - print 'PyBitmessage requires PyQt. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).' + print 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for \'PyQt Download\' (without quotes).' print 'Error message:', err sys.exit() @@ -1122,9 +1122,9 @@ class MyForm(QtGui.QMainWindow): if ripe == toRipe: self.ui.tableWidgetSent.item(i, 3).setToolTip(textToDisplay) newlinePosition = textToDisplay.indexOf('\n') - if parenPositionIndex > 1: + if newlinePosition > 1: self.ui.tableWidgetSent.item(i, 3).setText( - textToDisplay[:parenPositionIndex]) + textToDisplay[:newlinePosition]) else: self.ui.tableWidgetSent.item(i, 3).setText(textToDisplay) -- 2.45.1 From fa91d31f42d4e19c6601c2545968d111eb3a5b24 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Mon, 17 Jun 2013 17:49:06 -0400 Subject: [PATCH 35/42] adjust translation-related code --- src/bitmessagemain.py | 4 ++-- src/bitmessageqt/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index a834deb6..821e0266 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -3603,7 +3603,7 @@ class singleWorker(threading.Thread): requiredAverageProofOfWorkNonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte requiredPayloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes shared.UISignalQueue.put(('updateSentItemStatusByAckdata', ( - ackdata, _translate("MainWindow", "Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.)")))) + ackdata, _translate("MainWindow", "Doing work necessary to send message.\nThere is no required difficulty for version 2 addresses like this.")))) elif toAddressVersionNumber == 3: requiredAverageProofOfWorkNonceTrialsPerByte, varintLength = decodeVarint( pubkeyPayload[readPosition:readPosition + 10]) @@ -3753,7 +3753,7 @@ class singleWorker(threading.Thread): queryreturn = shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,'Problem: The recipient\'s encryption key is no good. Could not encrypt message. ' + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8')))) + shared.UISignalQueue.put(('updateSentItemStatusByAckdata',(ackdata,_translate("MainWindow",'Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1').arg(unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))),'utf-8'))))) continue encryptedPayload = embeddedTime + encodeVarint(toStreamNumber) + encrypted target = 2**64 / ((len(encryptedPayload)+requiredPayloadLengthExtraBytes+8) * requiredAverageProofOfWorkNonceTrialsPerByte) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index dfdb0b43..057390f1 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -486,7 +486,7 @@ class MyForm(QtGui.QMainWindow): statusText = _translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg( unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) elif status == 'badkey': - statusText = QtGui.QApplication.translate("MainWindow", "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg( + statusText = _translate("MainWindow", "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg( unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) elif status == 'forcepow': statusText = _translate( -- 2.45.1 From 0b602f0f8c1bc3381789632b77d18c953cc473b4 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 18 Jun 2013 11:30:42 -0400 Subject: [PATCH 36/42] Added more translatable strings --- src/bitmessagemain.py | 14 +- src/bitmessageqt/__init__.py | 10 +- src/translations/bitmessage_fr_BE.qm | Bin 53110 -> 53106 bytes src/translations/bitmessage_fr_BE.ts | 250 ++++++++++++++++----------- 4 files changed, 161 insertions(+), 113 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 821e0266..91a8abd2 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -3477,7 +3477,7 @@ class singleWorker(threading.Thread): shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() shared.UISignalQueue.put(('updateSentItemStatusByHash', ( - toripe, 'Encryption key was requested earlier.'))) + toripe, _translate("MainWindow",'Encryption key was requested earlier.')))) else: # We have not yet sent a request for the pubkey t = (toaddress,) @@ -3489,7 +3489,7 @@ class singleWorker(threading.Thread): shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() shared.UISignalQueue.put(('updateSentItemStatusByHash', ( - toripe, 'Sending a request for the recipient\'s encryption key.'))) + toripe, _translate("MainWindow",'Sending a request for the recipient\'s encryption key.')))) self.requestPubKey(toaddress) shared.sqlLock.acquire() # Get all messages that are ready to be sent, and also all messages @@ -3531,7 +3531,7 @@ class singleWorker(threading.Thread): shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() shared.UISignalQueue.put(('updateSentItemStatusByHash', ( - toripe, 'Sending a request for the recipient\'s encryption key.'))) + toripe, _translate("MainWindow",'Sending a request for the recipient\'s encryption key.')))) self.requestPubKey(toaddress) continue ackdataForWhichImWatching[ackdata] = 0 @@ -3814,7 +3814,7 @@ class singleWorker(threading.Thread): statusbar = 'Doing the computations necessary to request the recipient\'s public key.' shared.UISignalQueue.put(('updateStatusBar', statusbar)) shared.UISignalQueue.put(('updateSentItemStatusByHash', ( - ripe, 'Doing work necessary to request encryption key.'))) + ripe, _translate("MainWindow",'Doing work necessary to request encryption key.')))) target = 2 ** 64 / ((len(payload) + shared.networkDefaultPayloadLengthExtraBytes + 8) * shared.networkDefaultProofOfWorkNonceTrialsPerByte) initialHash = hashlib.sha512(payload).digest() @@ -3842,9 +3842,9 @@ class singleWorker(threading.Thread): shared.sqlLock.release() shared.UISignalQueue.put(( - 'updateStatusBar', 'Broacasting the public key request. This program will auto-retry if they are offline.')) - shared.UISignalQueue.put(('updateSentItemStatusByHash', (ripe, 'Sending public key request. Waiting for reply. Requested at ' + unicode( - strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8')))) + 'updateStatusBar', _translate("MainWindow",'Broacasting the public key request. This program will auto-retry if they are offline.'))) + shared.UISignalQueue.put(('updateSentItemStatusByHash', (ripe, _translate("MainWindow",'Sending public key request. Waiting for reply. Requested at %1').arg(unicode( + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))), 'utf-8'))))) def generateFullAckMessage(self, ackdata, toStreamNumber, embeddedTime): payload = embeddedTime + encodeVarint(toStreamNumber) + ackdata diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 057390f1..cf3c1424 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1121,7 +1121,10 @@ class MyForm(QtGui.QMainWindow): toAddress) if ripe == toRipe: self.ui.tableWidgetSent.item(i, 3).setToolTip(textToDisplay) - newlinePosition = textToDisplay.indexOf('\n') + try: + newlinePosition = textToDisplay.indexOf('\n') + except: # If someone misses adding a "_translate" to a string before passing it to this function, this function won't receive a qstring which will cause an exception. + newlinePosition = 0 if newlinePosition > 1: self.ui.tableWidgetSent.item(i, 3).setText( textToDisplay[:newlinePosition]) @@ -1138,7 +1141,10 @@ class MyForm(QtGui.QMainWindow): toAddress) if ackdata == tableAckdata: self.ui.tableWidgetSent.item(i, 3).setToolTip(textToDisplay) - newlinePosition = textToDisplay.indexOf('\n') + try: + newlinePosition = textToDisplay.indexOf('\n') + except: # If someone misses adding a "_translate" to a string before passing it to this function, this function won't receive a qstring which will cause an exception. + newlinePosition = 0 if newlinePosition > 1: self.ui.tableWidgetSent.item(i, 3).setText( textToDisplay[:newlinePosition]) diff --git a/src/translations/bitmessage_fr_BE.qm b/src/translations/bitmessage_fr_BE.qm index ffa7f6b095e620dfa6ed952b3679bcffd085515f..1eb1b25f0d8b48845705610da5e5ab47b7240a6c 100644 GIT binary patch delta 1903 zcmX9cKFmPDxMkWB2aNyz@Nwz4t!vj#RV1RkKBo zmS6zhz_A?we-4QL9SFY#ETYf)=|GGVxG!93NglYqC}7SYxcjpK)5USDumhjZ0U_{yKE}X#L)klFz z!zj&k0xI*-*%l4B*`V8y4=hYU|8**;bI13_<)qwMjNE)kYJJB@M;-(Aiy3DJQe;6Y zGfi;;_Es@ovG;(o+svFCs(-nU35fKe^&yP8m!rmZ=}c?{HMIIMxlx|L8+J^^S=v$C z`%H5UOOl>v26p)a!THR+EV9bR%8Y3O0d2O%W1xn160b?wmkLa%*X+DYM5je-3et(t zW}~JytsZc4)7*|F49(Vjv-3JBR;B6JZveu~nnBKz0URi1m3$t!=E17n7XaxpYk02* zD4M~}?)i`kn_2H%D*W6<_QkXu;H=2{nV+TgU2H&1ACTI}b_tsR)s?-smWYI%VIOAF zx-D&-A%?8Dc#N~FivVH^IKL*!NW%+Up!pOjqvw)elZjdB1n#YWXh*v$x!pG8;oKqa z%*^8?H(>hnx7W{Yk`OkRJ`Qp`4EJV}TEW*`-=`IF*J7+Su2tfr={a zwjy$`sYF}z-RD4HpSJc=KMlkkZA0Nx!2S_!(|=;kEBQ?ORh=ybH%YK9q8KcOu&SL@ z_Dc}f6cK@f9YVIVp7QpguqR{^aOD-DJh>j2^}O`~>uhlp+D+81WkC4V{1t_$RTy<` zrSLS0bG47C{d94O-U#@niV>~FfY>DN34H==d_&ATwhnk(5D!i#54LrPA2s_^xQ4{e zlQe#z0ph0?C)!M(*k4BIQ7De=-b%Eq#8K~7KrRvg{+_Na&t8`%4!%MMMUG@VL5Ier zo03oDM)J;6$}m$Q?`A0@oeBhtQt<@6 zH0kc-E_%L4dTeqbVy@EIl|o>dqfS^!X*EC6ZH})7uKuA*8Zgn^?z{j051gE$yCT!v ztv;@6N%W@|s&v}4I>4J_@E-5$46%A@6JEzvX{jq<{$ zNZ$=jvUxeBb)UmHo(Ps#jgdl)Zt}+L06Gan~Jcu++BHf zXEGqvD)GO^&=AEbn+{h4Z*5SD7dp_8?Nf^5mIHf?%Bjq&bgc9$7ydISYO8X|bcATN zDwoqp_xul(W+sDj7B-Ge_mnS^sC&_v(ruvbi$;~68T6i|Bv=^@rv~nk%4iQgm^n`s z2OCN76jlEcT~GZ)HE#KdhS5QFE2Dz*a#Rm%9dPKVy1>>Sa6YasdZZ`fCF<(=PiPoL zHRfa)=^UZPhki`!Z>Y&5Il$`!>b5RI(+}!)54u0UOx+%MfQ);lS?%rg1QMpIKOcxA z9i#NPMvZH{^dk2HozR_nPjdxDHc9{T2pMu()*o3vmxSl_pH zPTyzV4di)@QbzY5-^6Wg6!y>+J{PjEIeL)Na4e27F)e+CN@l&5_bAu4qh*Z delta 1903 zcmX9K= zg#hpZPNxI>r$F>yKzIk>_cidE8xS)M+)ZaXk^`*4ZNX=Az?!+> zO9FwA!xY1TwKJiK3<5gN!7AtxkhvI6J;H{E9ZH!h&_p^UMY&Q03Q#I8SO0xbT_>)&1n?ChA#C_=W+mMQ*( zI%+%3v{bM}={aT~-4|GGW(HG9Dk}>!rV0Sm2UYF^71Yso)$2!-famH|hkhf#E^(^k zy9wBK2UX>+I>6pd^-V0rV3X?Bp)15#xvF2c2?z^Q-Q!Hjz=;A@&gOwjo~+V+77&|Q z{kuJYc@8_b=W|MIWW6#e@rzCDOS{s5Ph{4|=t$?kWBp_LfTU)&OS1(~oY}#31SIS; zb|{6;?YzS2V@Qf~XShi<>w(x@&ZjXDs5fu{#%f~7noHa&5we1b+?!9Sqx3Q^!-_Oq zILv)K`y-c1q~U^|z6^3_d*bqX%GphS$wB zkmg?ef`SBj)n)>!{r|X3JF8#95O+?($@mOvN=`O!ct^63aa7BB?NEm5_n@PRKVs*t&-vR-*)s^S_X&~;Z>vJXm$DXJg|08Qr{!R7wHP&R@B#pJ1Y_N>e ztZgTjeG)a1W&&_LU31VuN4{&&99c6NXkMo&N~{Cs%&mCVyDEL8tN8W0V!Yj=QdrN96Q8`_gibIz?3|(=m*j!QYV&7i6+fI6w8*3QH&Qa z?Ia!pXN$j0?V{&d;;_MqfVqle%{jnIN3AB5+-iKR-5y^GT=++uFkqm$J^JwfKd5ri zHcK>r5!Kp@JACPda_yD$dP?-N_CbCcxwTmmQ;G1&HjEI%cCWii_tV5 z&C=2d#P6mS$+(K#denYAo(YlGjuAr*Zqnw1{ip8b*B!X%T=BFAInkbEyD}M|Hgvmlmh`LNVpeTl-^DcVB0L^ z&WSkUagz?0sBpzgI)U?~P2HvQFcy<#6Lc?+kRY{sUD<03iFi?WqlC6YageTS4hg0S z9FIBmx;|qDkmWfZtMhaN@zKEaSiRwzJ@DxheMp5bu;;FR!)L9O;Dc6ug?%5*#;^Li z71W94hQ7(6l)i18zWsRuvav=#4s5di$?m8?u)&2`|GB7#- diff --git a/src/translations/bitmessage_fr_BE.ts b/src/translations/bitmessage_fr_BE.ts index 329ad80c..28b5e270 100644 --- a/src/translations/bitmessage_fr_BE.ts +++ b/src/translations/bitmessage_fr_BE.ts @@ -266,107 +266,107 @@ p, li { white-space: pre-wrap; } Supprimer tous les messages dans la corbeille - + Total Connections: %1 Nombre total de connexions : %1 - + Not Connected Déconnecté - + Connected Connecté - + Show Bitmessage Afficher Bitmessage - + Subscribe S'abonner - + Processed %1 person-to-person messages. %1 messages de pair à pair traités. - + Processed %1 broadcast messages. %1 messages de diffusion traités. - + Processed %1 public keys. %1 clés publiques traitées. - + Since startup on %1 Depuis lancement le %1 - + Waiting on their encryption key. Will request it again soon. En attente de la clé de chiffrement. Une nouvelle requête sera bientôt lancée. - + Encryption key request queued. Demande de clé de chiffrement en attente. - + Queued. En attente. - + Need to do work to send message. Work is queued. Travail nécessaire pour envoyer le message. Travail en attente. - + Acknowledgement of the message received %1 Accusé de réception reçu le %1 - + Broadcast queued. Message de diffusion en attente. - + Broadcast on %1 Message de diffusion à %1 - + Problem: The work demanded by the recipient is more difficult than you are willing to do. %1 Problème : Le travail demandé par le destinataire est plus difficile que ce que vous avez paramétré. %1 - + Forced difficulty override. Send should start soon. Neutralisation forcée de la difficulté. L'envoi devrait bientôt commencer. - + Message sent. Waiting on acknowledgement. Sent at %1 Message envoyé. En attente de l'accusé de réception. Envoyé le %1 - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Vous pouvez éditer vos clés en éditant le fichier keys.dat stocké dans le même répertoire que ce programme. Il est important de faire des sauvegardes de ce fichier. - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. @@ -375,12 +375,12 @@ It is important that you back up this file. Il est important de faire des sauvegardes de ce fichier. - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) Vous pouvez éditer vos clés en éditant le fichier keys.dat stocké dans le même répertoire que ce programme. Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'ouvrir maintenant ? (Assurez-vous de fermer Bitmessage avant d'effectuer des changements.) - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) @@ -389,412 +389,454 @@ It is important that you back up this file. Would you like to open the file now? Il est important de faire des sauvegardes de ce fichier. Souhaitez-vous l'ouvrir maintenant ? (Assurez-vous de fermer Bitmessage avant d'effectuer des changements.) - + Add sender to your Address Book Ajouter l'expéditeur au carnet d'adresses - + Move to Trash Envoyer à la Corbeille - + View HTML code as formatted text Voir le code HTML comme du texte formaté - + Enable Activer - + Disable Désactiver - + Copy address to clipboard Copier l'adresse dans le presse-papier - + Special address behavior... Comportement spécial de l'adresse... - + Send message to this address Envoyer un message à cette adresse - + Add New Address Ajouter nouvelle adresse - + Delete Supprimer - + Copy destination address to clipboard Copier l'adresse de destination dans le presse-papier - + Force send Forcer l'envoi - + Are you sure you want to delete all trashed messages? Êtes-vous sûr de vouloir supprimer tous les messages dans la corbeille ? - + You must type your passphrase. If you don't have one then this is not the form for you. Vous devez taper votre phrase secrète. Si vous n'en avez pas, ce formulaire n'est pas pour vous. - + Delete trash? Supprimer la corbeille ? - + Open keys.dat? Ouvrir keys.dat ? - + bad passphrase Mauvaise phrase secrète - + Restart Redémarrer - + You must restart Bitmessage for the port number change to take effect. Vous devez redémarrer Bitmessage pour que le changement de port prenne effet. - + Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections. Bitmessage utilisera votre proxy à partir de maintenant mais il vous faudra redémarrer Bitmessage pour fermer les connexions existantes. - + Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want. Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre liste. Essayez de renommer l'adresse existante. - + The address you entered was invalid. Ignoring it. L'adresse que vous avez entrée est invalide. Adresse ignorée. - + Passphrase mismatch Phrases secrètes différentes - + The passphrase you entered twice doesn't match. Try again. Les phrases secrètes entrées sont différentes. Réessayez. - + Choose a passphrase Choisissez une phrase secrète - + You really do need a passphrase. Vous devez vraiment utiliser une phrase secrète. - + All done. Closing user interface... Terminé. Fermeture de l'interface... - + Address is gone L'adresse a disparu - + Bitmessage cannot find your address %1. Perhaps you removed it? Bitmessage ne peut pas trouver votre adresse %1. Peut-être l'avez-vous supprimée ? - + Address disabled Adresse désactivée - + Error: The address from which you are trying to send is disabled. You'll have to enable it on the 'Your Identities' tab before using it. Erreur : L'adresse avec laquelle vous essayez de communiquer est désactivée. Vous devez d'abord l'activer dans l'onglet 'Vos identités' avant de l'utiliser. - + Entry added to the Address Book. Edit the label to your liking. Entrée ajoutée au carnet d'adresses. Éditez le label selon votre souhait. - + Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want. Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre carnet d'adresses. Essayez de renommer l'adresse existante. - + Moved items to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back. Messages déplacés dans la corbeille. Il n'y a pas d'interface utilisateur pour voir votre corbeille, mais ils sont toujours présents sur le disque si vous souhaitez les récupérer. - + No addresses selected. Aucune adresse sélectionnée. - + Options have been disabled because they either aren't applicable or because they haven't yet been implimented for your operating system. Certaines options ont été désactivées car elles n'étaient pas applicables ou car elles n'ont pas encore été implémentées pour votre système d'exploitation. - + The address should start with ''BM-'' L'adresse devrait commencer avec "BM-" - + The address is not typed or copied correctly (the checksum failed). L'adresse n'est pas correcte (la somme de contrôle a échoué). - + The version number of this address is higher than this software can support. Please upgrade Bitmessage. Le numéro de version de cette adresse est supérieur à celui que le programme peut supporter. Veuiller mettre Bitmessage à jour. - + The address contains invalid characters. L'adresse contient des caractères invalides. - + Some data encoded in the address is too short. Certaines données encodées dans l'adresse sont trop courtes. - + Some data encoded in the address is too long. Certaines données encodées dans l'adresse sont trop longues. - + Address is valid. L'adresse est valide. - + You are using TCP port %1. (This can be changed in the settings). Vous utilisez le port TCP %1. (Ceci peut être changé dans les paramètres). - + Error: Bitmessage addresses start with BM- Please check %1 Erreur : Les adresses Bitmessage commencent avec BM- Merci de vérifier %1 - + Error: The address %1 contains invalid characters. Please check it. Erreur : L'adresse %1 contient des caractères invalides. Veuillez la vérifier. - + Error: The address %1 is not typed or copied correctly. Please check it. Erreur : L'adresse %1 n'est pas correctement recopiée. Veuillez la vérifier. - + Error: The address version in %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever. Erreur : La version de l'adresse %1 est trop grande. Pensez à mettre à jour Bitmessage. - + Error: Some data encoded in the address %1 is too short. There might be something wrong with the software of your acquaintance. Erreur : Certaines données encodées dans l'adresse %1 sont trop courtes. Il peut y avoir un problème avec le logiciel ou votre connaissance. - + Error: Some data encoded in the address %1 is too long. There might be something wrong with the software of your acquaintance. Erreur : Certaines données encodées dans l'adresse %1 sont trop longues. Il peut y avoir un problème avec le logiciel ou votre connaissance. - + Error: Something is wrong with the address %1. Erreur : Problème avec l'adresse %1. - + Error: You must specify a From address. If you don't have one, go to the 'Your Identities' tab. Erreur : Vous devez spécifier une adresse d'expéditeur. Si vous n'en avez pas, rendez-vous dans l'onglet 'Vos identités'. - + Sending to your address Envoi vers votre adresse - + Error: One of the addresses to which you are sending a message, %1, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM. Erreur : Une des adresses vers lesquelles vous envoyez un message, %1, est vôtre. Malheureusement, Bitmessage ne peut pas traiter ses propres messages. Essayez de lancer un second client sur une machine différente. - + Address version number Numéro de version de l'adresse - + Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version. Concernant l'adresse %1, Bitmessage ne peut pas comprendre les numéros de version de %2. Essayez de mettre à jour Bitmessage vers la dernière version. - + Stream number Numéro de flux - + Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version. Concernant l'adresse %1, Bitmessage ne peut pas supporter les nombres de flux de %2. Essayez de mettre à jour Bitmessage vers la dernière version. - + Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won't send until you connect. Avertissement : Vous êtes actuellement déconnecté. Bitmessage fera le travail nécessaire pour envoyer le message mais il ne sera pas envoyé tant que vous ne vous connecterez pas. - + Your 'To' field is empty. Votre champ 'Vers' est vide. - + Right click one or more entries in your address book and select 'Send message to this address'. Cliquez droit sur une ou plusieurs entrées dans votre carnet d'adresses et sélectionnez 'Envoyer un message à ces adresses'. - + Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want. Erreur : Vous ne pouvez pas ajouter une même adresse à vos abonnements deux fois. Essayez de renommer l'adresse existante. - + Message trashed Message envoyé à la corbeille - + One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now? Une de vos adresses, %1, est une vieille adresse de la version 1. Les adresses de la version 1 ne sont plus supportées. Nous pourrions la supprimer maintenant ? - + Unknown status: %1 %2 Statut inconnu : %1 %2 - + Connection lost Connexion perdue - + SOCKS5 Authentication problem: %1 Problème d'authentification SOCKS5 : %1 - + Reply Répondre - + Generating one new address Génération d'une nouvelle adresse - + Done generating address. Doing work necessary to broadcast it... Génération de l'adresse terminée. Travail pour la diffuser en cours... - + Done generating address Génération de l'adresse terminée - + Message sent. Waiting on acknowledgement. Sent on %1 Message envoyé. En attente de l'accusé de réception. Envoyé le %1 - + Error! Could not find sender address (your address) in the keys.dat file. Erreur ! L'adresse de l'expéditeur (vous) n'a pas pu être trouvée dans le fichier keys.dat. - + Doing work necessary to send broadcast... Travail pour envoyer la diffusion en cours... - + Broadcast sent on %1 Message de diffusion envoyé le %1 - + Looking up the receiver's public key Recherche de la clé publique du destinataire Doing work necessary to send message. (There is no required difficulty for version 2 addresses like this.) - Travail nécessaire pour envoyer le message en cours. (Il n'y a pas de difficulté requise pour ces adresses de version 2.) + Travail nécessaire pour envoyer le message en cours. (Il n'y a pas de difficulté requise pour ces adresses de version 2.) - + Doing work necessary to send message. Receiver's required difficulty: %1 and %2 Travail nécessaire pour envoyer le message. Difficulté requise par le destinataire : %1 et %2 - + Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do. Problème : Le travail demandé par le destinataire (%1 et %2) est plus difficile que ce que vous souhaitez faire. - + Work is queued. Travail en attente. - + Work is queued. %1 Travail en attente. %1 + + + Acknowledgement of the message received. %1 + + + + + Doing work necessary to send message. +There is no required difficulty for version 2 addresses like this. + Travail nécessaire pour envoyer le message en cours. +Il n'y a pas de difficulté requise pour ces adresses de version 2. + + + + Problem: The recipient's encryption key is no good. Could not encrypt message. %1 + + + + + Encryption key was requested earlier. + + + + + Sending a request for the recipient's encryption key. + + + + + Doing work necessary to request encryption key. + + + + + Broacasting the public key request. This program will auto-retry if they are offline. + + + + + Sending public key request. Waiting for reply. Requested at %1 + + MainWindows -- 2.45.1 From 4f8742655d33296a4b4bfca2fcb742fc26d73e7f Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 18 Jun 2013 12:37:13 -0400 Subject: [PATCH 37/42] update defaultKnownNodes --- src/defaultKnownNodes.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/defaultKnownNodes.py b/src/defaultKnownNodes.py index a6009457..8e7573cd 100644 --- a/src/defaultKnownNodes.py +++ b/src/defaultKnownNodes.py @@ -9,14 +9,15 @@ from time import strftime, localtime def createDefaultKnownNodes(appdata): ############## Stream 1 ################ stream1 = {} - - stream1['109.91.57.2'] = (8443,int(time.time())) - stream1['66.65.120.151'] = (8080,int(time.time())) - stream1['188.18.69.115'] = (8443,int(time.time())) + + stream1['85.171.174.131'] = (8444,int(time.time())) + stream1['23.28.68.159'] = (8444,int(time.time())) + stream1['66.108.210.240'] = (8080,int(time.time())) stream1['204.236.246.212'] = (8444,int(time.time())) - stream1['85.177.81.73'] = (8444,int(time.time())) stream1['78.81.56.239'] = (8444,int(time.time())) + stream1['122.60.235.157'] = (8444,int(time.time())) stream1['204.236.246.212'] = (8444,int(time.time())) + stream1['24.98.219.109'] = (8444,int(time.time())) ############# Stream 2 ################# -- 2.45.1 From 9ff2c9568f7e79b5827c8cedcc4e1eb4dacfcb05 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 18 Jun 2013 12:56:03 -0400 Subject: [PATCH 38/42] adjust code formatting --- src/proofofwork.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/proofofwork.py b/src/proofofwork.py index 058e4bf3..b8369087 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -8,18 +8,18 @@ import sys def _set_idle(): if 'linux' in sys.platform: - import os - os.nice(20) + import os + os.nice(20) else: - try: - sys.getwindowsversion() - import win32api,win32process,win32con - pid = win32api.GetCurrentProcessId() - handle = win32api.OpenProcess(win32con.PROCESS_ALL_ACCESS, True, pid) - win32process.SetPriorityClass(handle, win32process.IDLE_PRIORITY_CLASS) - except: - #Windows 64-bit - pass + try: + sys.getwindowsversion() + import win32api,win32process,win32con + pid = win32api.GetCurrentProcessId() + handle = win32api.OpenProcess(win32con.PROCESS_ALL_ACCESS, True, pid) + win32process.SetPriorityClass(handle, win32process.IDLE_PRIORITY_CLASS) + except: + #Windows 64-bit + pass def _pool_worker(nonce, initialHash, target, pool_size): _set_idle() @@ -70,6 +70,6 @@ def _doFastPoW(target, initialHash): def run(target, initialHash): if 'linux' in sys.platform: - return _doFastPoW(target, initialHash) + return _doFastPoW(target, initialHash) else: - return _doSafePoW(target, initialHash) + return _doSafePoW(target, initialHash) -- 2.45.1 From da0f48617976dd38f368180498cf4835a2987605 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 18 Jun 2013 13:11:30 -0400 Subject: [PATCH 39/42] manually merge github pull request: Unicode chars in localtime prevented the gui from starting --- src/bitmessageqt/__init__.py | 14 +++++++------- src/defaultKnownNodes.py | 2 +- src/messages.dat reader.py | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index cf3c1424..86f24247 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -469,31 +469,31 @@ class MyForm(QtGui.QMainWindow): "MainWindow", "Queued.") elif status == 'msgsent': statusText = _translate("MainWindow", "Message sent. Waiting on acknowledgement. Sent at %1").arg( - unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)))) + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8')) elif status == 'doingmsgpow': statusText = _translate( "MainWindow", "Need to do work to send message. Work is queued.") elif status == 'ackreceived': statusText = _translate("MainWindow", "Acknowledgement of the message received %1").arg( - unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8')) elif status == 'broadcastqueued': statusText = _translate( "MainWindow", "Broadcast queued.") elif status == 'broadcastsent': statusText = _translate("MainWindow", "Broadcast on %1").arg(unicode(strftime( - shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) + shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8')) elif status == 'toodifficult': statusText = _translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg( - unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8')) elif status == 'badkey': statusText = _translate("MainWindow", "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg( - unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8')) elif status == 'forcepow': statusText = _translate( "MainWindow", "Forced difficulty override. Send should start soon.") else: statusText = _translate("MainWindow", "Unknown status: %1 %2").arg(status).arg(unicode( - strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(lastactiontime))))) + strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(lastactiontime)),'utf-8')) newItem = myTableWidgetItem(statusText) newItem.setToolTip(statusText) newItem.setData(Qt.UserRole, QByteArray(ackdata)) @@ -547,7 +547,7 @@ class MyForm(QtGui.QMainWindow): self.statusbar = self.statusBar() self.statusbar.insertPermanentWidget(0, self.ui.pushButtonStatusIcon) self.ui.labelStartupTime.setText(_translate("MainWindow", "Since startup on %1").arg( - unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time())))))) + unicode(strftime(shared.config.get('bitmessagesettings', 'timeformat'), localtime(int(time.time()))),'utf-8'))) self.numberOfMessagesProcessed = 0 self.numberOfBroadcastsProcessed = 0 self.numberOfPubkeysProcessed = 0 diff --git a/src/defaultKnownNodes.py b/src/defaultKnownNodes.py index 8e7573cd..4f4e80ce 100644 --- a/src/defaultKnownNodes.py +++ b/src/defaultKnownNodes.py @@ -52,7 +52,7 @@ def readDefaultKnownNodes(appdata): for stream, storedValue in knownNodes.items(): for host,value in storedValue.items(): port, storedtime = storedValue[host] - print host, '\t', port, '\t', unicode(strftime('%a, %d %b %Y %I:%M %p',localtime(storedtime))) + print host, '\t', port, '\t', unicode(strftime('%a, %d %b %Y %I:%M %p',localtime(storedtime)),'utf-8') if __name__ == "__main__": diff --git a/src/messages.dat reader.py b/src/messages.dat reader.py index b5ade9ff..90f4bedc 100644 --- a/src/messages.dat reader.py +++ b/src/messages.dat reader.py @@ -53,13 +53,13 @@ def readSubscriptions(): def readPubkeys(): print 'Printing everything in pubkeys table:' - item = '''select hash, havecorrectnonce, transmitdata, time, usedpersonally from pubkeys''' + item = '''select hash, transmitdata, time, usedpersonally from pubkeys''' parameters = '' cur.execute(item, parameters) output = cur.fetchall() for row in output: - hash, havecorrectnonce, transmitdata, time, usedpersonally = row - print 'Hash:', hash.encode('hex'), '\tHave correct nonce:', havecorrectnonce, '\tTime first broadcast:', unicode(strftime('%a, %d %b %Y %I:%M %p',localtime(time))), '\tUsed by me personally:', usedpersonally, '\tFull pubkey message:', transmitdata.encode('hex') + hash, transmitdata, time, usedpersonally = row + print 'Hash:', hash.encode('hex'), '\tTime first broadcast:', unicode(strftime('%a, %d %b %Y %I:%M %p',localtime(time)),'utf-8'), '\tUsed by me personally:', usedpersonally, '\tFull pubkey message:', transmitdata.encode('hex') def readInventory(): print 'Printing everything in inventory table:' @@ -69,7 +69,7 @@ def readInventory(): output = cur.fetchall() for row in output: hash, objecttype, streamnumber, payload, receivedtime = row - print 'Hash:', hash.encode('hex'), objecttype, streamnumber, '\t', payload.encode('hex'), '\t', unicode(strftime('%a, %d %b %Y %I:%M %p',localtime(receivedtime))) + print 'Hash:', hash.encode('hex'), objecttype, streamnumber, '\t', payload.encode('hex'), '\t', unicode(strftime('%a, %d %b %Y %I:%M %p',localtime(receivedtime)),'utf-8') def takeInboxMessagesOutOfTrash(): -- 2.45.1 From 28f91441134460480c2880c306f9f6450c1ac892 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 18 Jun 2013 13:24:35 -0400 Subject: [PATCH 40/42] When using API, start giving user actual message encoding type now that the inbox table actually tracks it --- src/bitmessagemain.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 33d815d8..be2fdf48 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -4366,35 +4366,37 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): elif method == 'getAllInboxMessages': shared.sqlLock.acquire() shared.sqlSubmitQueue.put( - '''SELECT msgid, toaddress, fromaddress, subject, received, message FROM inbox where folder='inbox' ORDER BY received''') + '''SELECT msgid, toaddress, fromaddress, subject, received, message, encodingtype FROM inbox where folder='inbox' ORDER BY received''') shared.sqlSubmitQueue.put('') queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() data = '{"inboxMessages":[' for row in queryreturn: - msgid, toAddress, fromAddress, subject, received, message, = row + msgid, toAddress, fromAddress, subject, received, message, encodingtype = row subject = shared.fixPotentiallyInvalidUTF8Data(subject) message = shared.fixPotentiallyInvalidUTF8Data(message) if len(data) > 25: data += ',' data += json.dumps({'msgid': msgid.encode('hex'), 'toAddress': toAddress, 'fromAddress': fromAddress, 'subject': subject.encode( - 'base64'), 'message': message.encode('base64'), 'encodingType': 2, 'receivedTime': received}, indent=4, separators=(',', ': ')) + 'base64'), 'message': message.encode('base64'), 'encodingType': encodingtype, 'receivedTime': received}, indent=4, separators=(',', ': ')) data += ']}' return data elif method == 'getInboxMessageById': + if len(params) < 1: + return 'API Error 0000: I need one parameter.' msgid = params[0].decode('hex') v = (msgid,) shared.sqlLock.acquire() - shared.sqlSubmitQueue.put('''SELECT toaddress, fromaddress, subject, received, message FROM inbox WHERE msgid=?''') + shared.sqlSubmitQueue.put('''SELECT toaddress, fromaddress, subject, received, message, encodingtype FROM inbox WHERE msgid=?''') shared.sqlSubmitQueue.put(v) queryreturn = shared.sqlReturnQueue.get() shared.sqlLock.release() data = '{"inboxMessage":[' for row in queryreturn: - toAddress, fromAddress, subject, received, message, = row + toAddress, fromAddress, subject, received, message, encodingtype = row subject = shared.fixPotentiallyInvalidUTF8Data(subject) message = shared.fixPotentiallyInvalidUTF8Data(message) - data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':2,'receivedTime':received},indent=4, separators=(',', ': ')) + data += json.dumps({'msgid':msgid.encode('hex'),'toAddress':toAddress,'fromAddress':fromAddress,'subject':subject.encode('base64'),'message':message.encode('base64'),'encodingType':encodingtype,'receivedTime':received},indent=4, separators=(',', ': ')) data += ']}' return data elif method == 'trashMessage': -- 2.45.1 From aeeb7c9878bc979fcb6f44c9373b4adeab374b6c Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 18 Jun 2013 13:59:51 -0400 Subject: [PATCH 41/42] Moved UI related files all into the bitmessageqt folder --- src/bitmessagemain.py | 251 +++++++++--------- src/{ => bitmessageqt}/about.py | 0 src/{ => bitmessageqt}/about.ui | 0 src/bitmessageqt/addpeer.ui | 118 ++++++++ src/{ => bitmessageqt}/bitmessage_icons.qrc | 0 src/{ => bitmessageqt}/bitmessage_icons_rc.py | 0 src/{ => bitmessageqt}/bitmessageui.py | 0 src/{ => bitmessageqt}/bitmessageui.ui | 0 src/{ => bitmessageqt}/help.py | 0 src/{ => bitmessageqt}/help.ui | 0 src/{ => bitmessageqt}/iconglossary.py | 0 src/{ => bitmessageqt}/iconglossary.ui | 0 src/{ => bitmessageqt}/newaddressdialog.py | 0 src/{ => bitmessageqt}/newaddressdialog.ui | 0 .../newsubscriptiondialog.py | 0 .../newsubscriptiondialog.ui | 0 src/{ => bitmessageqt}/regenerateaddresses.py | 0 src/{ => bitmessageqt}/regenerateaddresses.ui | 0 src/{ => bitmessageqt}/settings.py | 0 src/{ => bitmessageqt}/settings.ui | 0 .../specialaddressbehavior.py | 0 .../specialaddressbehavior.ui | 0 src/bitmessageqt/wanlan.ui | 217 +++++++++++++++ 23 files changed, 461 insertions(+), 125 deletions(-) rename src/{ => bitmessageqt}/about.py (100%) rename src/{ => bitmessageqt}/about.ui (100%) create mode 100644 src/bitmessageqt/addpeer.ui rename src/{ => bitmessageqt}/bitmessage_icons.qrc (100%) rename src/{ => bitmessageqt}/bitmessage_icons_rc.py (100%) rename src/{ => bitmessageqt}/bitmessageui.py (100%) rename src/{ => bitmessageqt}/bitmessageui.ui (100%) rename src/{ => bitmessageqt}/help.py (100%) rename src/{ => bitmessageqt}/help.ui (100%) rename src/{ => bitmessageqt}/iconglossary.py (100%) rename src/{ => bitmessageqt}/iconglossary.ui (100%) rename src/{ => bitmessageqt}/newaddressdialog.py (100%) rename src/{ => bitmessageqt}/newaddressdialog.ui (100%) rename src/{ => bitmessageqt}/newsubscriptiondialog.py (100%) rename src/{ => bitmessageqt}/newsubscriptiondialog.ui (100%) rename src/{ => bitmessageqt}/regenerateaddresses.py (100%) rename src/{ => bitmessageqt}/regenerateaddresses.ui (100%) rename src/{ => bitmessageqt}/settings.py (100%) rename src/{ => bitmessageqt}/settings.ui (100%) rename src/{ => bitmessageqt}/specialaddressbehavior.py (100%) rename src/{ => bitmessageqt}/specialaddressbehavior.ui (100%) create mode 100644 src/bitmessageqt/wanlan.ui diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index be2fdf48..0eec7149 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -64,146 +64,147 @@ class outgoingSynSender(threading.Thread): time.sleep(1) global alreadyAttemptedConnectionsListResetTime while True: - if len(selfInitiatedConnections[self.streamNumber]) >= 8: # maximum number of outgoing connections = 8 + while len(selfInitiatedConnections[self.streamNumber]) >= 8: # maximum number of outgoing connections = 8 time.sleep(10) - else: - random.seed() - HOST, = random.sample(shared.knownNodes[self.streamNumber], 1) - alreadyAttemptedConnectionsListLock.acquire() - while HOST in alreadyAttemptedConnectionsList or HOST in shared.connectedHostsList: - alreadyAttemptedConnectionsListLock.release() - # print 'choosing new sample' - random.seed() - HOST, = random.sample(shared.knownNodes[ - self.streamNumber], 1) - time.sleep(1) - # Clear out the alreadyAttemptedConnectionsList every half - # hour so that this program will again attempt a connection - # to any nodes, even ones it has already tried. - if (time.time() - alreadyAttemptedConnectionsListResetTime) > 1800: - alreadyAttemptedConnectionsList.clear() - alreadyAttemptedConnectionsListResetTime = int( - time.time()) - alreadyAttemptedConnectionsListLock.acquire() - alreadyAttemptedConnectionsList[HOST] = 0 + if shared.shutdown: + break + random.seed() + HOST, = random.sample(shared.knownNodes[self.streamNumber], 1) + alreadyAttemptedConnectionsListLock.acquire() + while HOST in alreadyAttemptedConnectionsList or HOST in shared.connectedHostsList: alreadyAttemptedConnectionsListLock.release() - PORT, timeNodeLastSeen = shared.knownNodes[ + # print 'choosing new sample' + random.seed() + HOST, = random.sample(shared.knownNodes[ + self.streamNumber], 1) + time.sleep(1) + # Clear out the alreadyAttemptedConnectionsList every half + # hour so that this program will again attempt a connection + # to any nodes, even ones it has already tried. + if (time.time() - alreadyAttemptedConnectionsListResetTime) > 1800: + alreadyAttemptedConnectionsList.clear() + alreadyAttemptedConnectionsListResetTime = int( + time.time()) + alreadyAttemptedConnectionsListLock.acquire() + alreadyAttemptedConnectionsList[HOST] = 0 + alreadyAttemptedConnectionsListLock.release() + PORT, timeNodeLastSeen = shared.knownNodes[ + self.streamNumber][HOST] + sock = socks.socksocket(socket.AF_INET, socket.SOCK_STREAM) + # This option apparently avoids the TIME_WAIT state so that we + # can rebind faster + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + sock.settimeout(20) + if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and verbose >= 2: + shared.printLock.acquire() + print 'Trying an outgoing connection to', HOST, ':', PORT + shared.printLock.release() + # sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS4a': + if verbose >= 2: + shared.printLock.acquire() + print '(Using SOCKS4a) Trying an outgoing connection to', HOST, ':', PORT + shared.printLock.release() + proxytype = socks.PROXY_TYPE_SOCKS4 + sockshostname = shared.config.get( + 'bitmessagesettings', 'sockshostname') + socksport = shared.config.getint( + 'bitmessagesettings', 'socksport') + rdns = True # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway. + if shared.config.getboolean('bitmessagesettings', 'socksauthentication'): + socksusername = shared.config.get( + 'bitmessagesettings', 'socksusername') + sockspassword = shared.config.get( + 'bitmessagesettings', 'sockspassword') + sock.setproxy( + proxytype, sockshostname, socksport, rdns, socksusername, sockspassword) + else: + sock.setproxy( + proxytype, sockshostname, socksport, rdns) + elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS5': + if verbose >= 2: + shared.printLock.acquire() + print '(Using SOCKS5) Trying an outgoing connection to', HOST, ':', PORT + shared.printLock.release() + proxytype = socks.PROXY_TYPE_SOCKS5 + sockshostname = shared.config.get( + 'bitmessagesettings', 'sockshostname') + socksport = shared.config.getint( + 'bitmessagesettings', 'socksport') + rdns = True # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway. + if shared.config.getboolean('bitmessagesettings', 'socksauthentication'): + socksusername = shared.config.get( + 'bitmessagesettings', 'socksusername') + sockspassword = shared.config.get( + 'bitmessagesettings', 'sockspassword') + sock.setproxy( + proxytype, sockshostname, socksport, rdns, socksusername, sockspassword) + else: + sock.setproxy( + proxytype, sockshostname, socksport, rdns) + + try: + sock.connect((HOST, PORT)) + rd = receiveDataThread() + rd.daemon = True # close the main program even if there are threads left + objectsOfWhichThisRemoteNodeIsAlreadyAware = {} + rd.setup(sock, HOST, PORT, self.streamNumber, + objectsOfWhichThisRemoteNodeIsAlreadyAware) + rd.start() + shared.printLock.acquire() + print self, 'connected to', HOST, 'during an outgoing attempt.' + shared.printLock.release() + + sd = sendDataThread() + sd.setup(sock, HOST, PORT, self.streamNumber, + objectsOfWhichThisRemoteNodeIsAlreadyAware) + sd.start() + sd.sendVersionMessage() + + except socks.GeneralProxyError as err: + if verbose >= 2: + shared.printLock.acquire() + print 'Could NOT connect to', HOST, 'during outgoing attempt.', err + shared.printLock.release() + PORT, timeLastSeen = shared.knownNodes[ self.streamNumber][HOST] - sock = socks.socksocket(socket.AF_INET, socket.SOCK_STREAM) - # This option apparently avoids the TIME_WAIT state so that we - # can rebind faster - sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - sock.settimeout(20) - if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and verbose >= 2: + if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000: # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the shared.knownNodes data-structure. + shared.knownNodesLock.acquire() + del shared.knownNodes[self.streamNumber][HOST] + shared.knownNodesLock.release() shared.printLock.acquire() - print 'Trying an outgoing connection to', HOST, ':', PORT + print 'deleting ', HOST, 'from shared.knownNodes because it is more than 48 hours old and we could not connect to it.' shared.printLock.release() - # sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS4a': - if verbose >= 2: - shared.printLock.acquire() - print '(Using SOCKS4a) Trying an outgoing connection to', HOST, ':', PORT - shared.printLock.release() - proxytype = socks.PROXY_TYPE_SOCKS4 - sockshostname = shared.config.get( - 'bitmessagesettings', 'sockshostname') - socksport = shared.config.getint( - 'bitmessagesettings', 'socksport') - rdns = True # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway. - if shared.config.getboolean('bitmessagesettings', 'socksauthentication'): - socksusername = shared.config.get( - 'bitmessagesettings', 'socksusername') - sockspassword = shared.config.get( - 'bitmessagesettings', 'sockspassword') - sock.setproxy( - proxytype, sockshostname, socksport, rdns, socksusername, sockspassword) - else: - sock.setproxy( - proxytype, sockshostname, socksport, rdns) - elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS5': - if verbose >= 2: - shared.printLock.acquire() - print '(Using SOCKS5) Trying an outgoing connection to', HOST, ':', PORT - shared.printLock.release() - proxytype = socks.PROXY_TYPE_SOCKS5 - sockshostname = shared.config.get( - 'bitmessagesettings', 'sockshostname') - socksport = shared.config.getint( - 'bitmessagesettings', 'socksport') - rdns = True # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway. - if shared.config.getboolean('bitmessagesettings', 'socksauthentication'): - socksusername = shared.config.get( - 'bitmessagesettings', 'socksusername') - sockspassword = shared.config.get( - 'bitmessagesettings', 'sockspassword') - sock.setproxy( - proxytype, sockshostname, socksport, rdns, socksusername, sockspassword) - else: - sock.setproxy( - proxytype, sockshostname, socksport, rdns) - - try: - sock.connect((HOST, PORT)) - rd = receiveDataThread() - rd.daemon = True # close the main program even if there are threads left - objectsOfWhichThisRemoteNodeIsAlreadyAware = {} - rd.setup(sock, HOST, PORT, self.streamNumber, - objectsOfWhichThisRemoteNodeIsAlreadyAware) - rd.start() - shared.printLock.acquire() - print self, 'connected to', HOST, 'during an outgoing attempt.' - shared.printLock.release() - - sd = sendDataThread() - sd.setup(sock, HOST, PORT, self.streamNumber, - objectsOfWhichThisRemoteNodeIsAlreadyAware) - sd.start() - sd.sendVersionMessage() - - except socks.GeneralProxyError as err: - if verbose >= 2: + except socks.Socks5AuthError as err: + shared.UISignalQueue.put(( + 'updateStatusBar', _translate( + "MainWindow", "SOCKS5 Authentication problem: %1").arg(str(err)))) + except socks.Socks5Error as err: + pass + print 'SOCKS5 error. (It is possible that the server wants authentication).)', str(err) + except socks.Socks4Error as err: + print 'Socks4Error:', err + except socket.error as err: + if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS': + print 'Bitmessage MIGHT be having trouble connecting to the SOCKS server. ' + str(err) + else: + if verbose >= 1: shared.printLock.acquire() print 'Could NOT connect to', HOST, 'during outgoing attempt.', err shared.printLock.release() PORT, timeLastSeen = shared.knownNodes[ self.streamNumber][HOST] - if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000: # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the shared.knownNodes data-structure. + if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000: # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the knownNodes data-structure. shared.knownNodesLock.acquire() del shared.knownNodes[self.streamNumber][HOST] shared.knownNodesLock.release() shared.printLock.acquire() - print 'deleting ', HOST, 'from shared.knownNodes because it is more than 48 hours old and we could not connect to it.' + print 'deleting ', HOST, 'from knownNodes because it is more than 48 hours old and we could not connect to it.' shared.printLock.release() - except socks.Socks5AuthError as err: - shared.UISignalQueue.put(( - 'updateStatusBar', _translate( - "MainWindow", "SOCKS5 Authentication problem: %1").arg(str(err)))) - except socks.Socks5Error as err: - pass - print 'SOCKS5 error. (It is possible that the server wants authentication).)', str(err) - except socks.Socks4Error as err: - print 'Socks4Error:', err - except socket.error as err: - if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS': - print 'Bitmessage MIGHT be having trouble connecting to the SOCKS server. ' + str(err) - else: - if verbose >= 1: - shared.printLock.acquire() - print 'Could NOT connect to', HOST, 'during outgoing attempt.', err - shared.printLock.release() - PORT, timeLastSeen = shared.knownNodes[ - self.streamNumber][HOST] - if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000: # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the knownNodes data-structure. - shared.knownNodesLock.acquire() - del shared.knownNodes[self.streamNumber][HOST] - shared.knownNodesLock.release() - shared.printLock.acquire() - print 'deleting ', HOST, 'from knownNodes because it is more than 48 hours old and we could not connect to it.' - shared.printLock.release() - except Exception as err: - sys.stderr.write( - 'An exception has occurred in the outgoingSynSender thread that was not caught by other exception types: %s\n' % err) - time.sleep(0.1) + except Exception as err: + sys.stderr.write( + 'An exception has occurred in the outgoingSynSender thread that was not caught by other exception types: %s\n' % err) + time.sleep(0.1) # Only one singleListener thread will ever exist. It creates the # receiveDataThread and sendDataThread for each incoming connection. Note diff --git a/src/about.py b/src/bitmessageqt/about.py similarity index 100% rename from src/about.py rename to src/bitmessageqt/about.py diff --git a/src/about.ui b/src/bitmessageqt/about.ui similarity index 100% rename from src/about.ui rename to src/bitmessageqt/about.ui diff --git a/src/bitmessageqt/addpeer.ui b/src/bitmessageqt/addpeer.ui new file mode 100644 index 00000000..522759a8 --- /dev/null +++ b/src/bitmessageqt/addpeer.ui @@ -0,0 +1,118 @@ + + + Dialog + + + + 0 + 0 + 362 + 136 + + + + Dialog + + + + + + When you opened this dialog box, you had X peers in your list of peers. + + + + + + + You can manually add a peer here: + + + + + + + IP + + + + + + + Port + + + + + + + + + + + + + Add + + + + + + + Qt::Horizontal + + + + 47 + 20 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close + + + + + + + + + buttonBox + accepted() + Dialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + Dialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/bitmessage_icons.qrc b/src/bitmessageqt/bitmessage_icons.qrc similarity index 100% rename from src/bitmessage_icons.qrc rename to src/bitmessageqt/bitmessage_icons.qrc diff --git a/src/bitmessage_icons_rc.py b/src/bitmessageqt/bitmessage_icons_rc.py similarity index 100% rename from src/bitmessage_icons_rc.py rename to src/bitmessageqt/bitmessage_icons_rc.py diff --git a/src/bitmessageui.py b/src/bitmessageqt/bitmessageui.py similarity index 100% rename from src/bitmessageui.py rename to src/bitmessageqt/bitmessageui.py diff --git a/src/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui similarity index 100% rename from src/bitmessageui.ui rename to src/bitmessageqt/bitmessageui.ui diff --git a/src/help.py b/src/bitmessageqt/help.py similarity index 100% rename from src/help.py rename to src/bitmessageqt/help.py diff --git a/src/help.ui b/src/bitmessageqt/help.ui similarity index 100% rename from src/help.ui rename to src/bitmessageqt/help.ui diff --git a/src/iconglossary.py b/src/bitmessageqt/iconglossary.py similarity index 100% rename from src/iconglossary.py rename to src/bitmessageqt/iconglossary.py diff --git a/src/iconglossary.ui b/src/bitmessageqt/iconglossary.ui similarity index 100% rename from src/iconglossary.ui rename to src/bitmessageqt/iconglossary.ui diff --git a/src/newaddressdialog.py b/src/bitmessageqt/newaddressdialog.py similarity index 100% rename from src/newaddressdialog.py rename to src/bitmessageqt/newaddressdialog.py diff --git a/src/newaddressdialog.ui b/src/bitmessageqt/newaddressdialog.ui similarity index 100% rename from src/newaddressdialog.ui rename to src/bitmessageqt/newaddressdialog.ui diff --git a/src/newsubscriptiondialog.py b/src/bitmessageqt/newsubscriptiondialog.py similarity index 100% rename from src/newsubscriptiondialog.py rename to src/bitmessageqt/newsubscriptiondialog.py diff --git a/src/newsubscriptiondialog.ui b/src/bitmessageqt/newsubscriptiondialog.ui similarity index 100% rename from src/newsubscriptiondialog.ui rename to src/bitmessageqt/newsubscriptiondialog.ui diff --git a/src/regenerateaddresses.py b/src/bitmessageqt/regenerateaddresses.py similarity index 100% rename from src/regenerateaddresses.py rename to src/bitmessageqt/regenerateaddresses.py diff --git a/src/regenerateaddresses.ui b/src/bitmessageqt/regenerateaddresses.ui similarity index 100% rename from src/regenerateaddresses.ui rename to src/bitmessageqt/regenerateaddresses.ui diff --git a/src/settings.py b/src/bitmessageqt/settings.py similarity index 100% rename from src/settings.py rename to src/bitmessageqt/settings.py diff --git a/src/settings.ui b/src/bitmessageqt/settings.ui similarity index 100% rename from src/settings.ui rename to src/bitmessageqt/settings.ui diff --git a/src/specialaddressbehavior.py b/src/bitmessageqt/specialaddressbehavior.py similarity index 100% rename from src/specialaddressbehavior.py rename to src/bitmessageqt/specialaddressbehavior.py diff --git a/src/specialaddressbehavior.ui b/src/bitmessageqt/specialaddressbehavior.ui similarity index 100% rename from src/specialaddressbehavior.ui rename to src/bitmessageqt/specialaddressbehavior.ui diff --git a/src/bitmessageqt/wanlan.ui b/src/bitmessageqt/wanlan.ui new file mode 100644 index 00000000..156a111f --- /dev/null +++ b/src/bitmessageqt/wanlan.ui @@ -0,0 +1,217 @@ + + + Dialog + + + true + + + + 0 + 0 + 338 + 225 + + + + Dialog + + + + + + Connect on the Internet with everyone else + + + true + + + + + + + Ignore Internet nodes. Only try to connect to these hosts: + + + + + + + false + + + example.domain.local:8444 + + + + + + + false + + + 10.244.30.70:8080 + + + + + + + false + + + Note that you can still receive incoming connections from anyone unless they are blocked by a firewall. + + + true + + + + + + + false + + + Store network objects for two months rather than two days + + + + + + + false + + + Forgo the proof of work + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + Dialog + accept() + + + 227 + 201 + + + 157 + 218 + + + + + buttonBox + rejected() + Dialog + reject() + + + 295 + 207 + + + 286 + 218 + + + + + radioButton_2 + toggled(bool) + checkBox + setEnabled(bool) + + + 127 + 40 + + + 93 + 146 + + + + + radioButton_2 + toggled(bool) + checkBox_2 + setEnabled(bool) + + + 160 + 38 + + + 135 + 169 + + + + + radioButton_2 + toggled(bool) + lineEdit + setEnabled(bool) + + + 63 + 41 + + + 68 + 74 + + + + + radioButton_2 + toggled(bool) + lineEdit_2 + setEnabled(bool) + + + 43 + 38 + + + 50 + 98 + + + + + radioButton_2 + toggled(bool) + label + setEnabled(bool) + + + 161 + 44 + + + 160 + 120 + + + + + -- 2.45.1 From 9d7a869cb95e64f6a1c09a3de8e65cb7833d4193 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 19 Jun 2013 00:51:31 -0400 Subject: [PATCH 42/42] Prevent proofOfWork pool threads from returning any data if shut down before finished with a POW --- src/proofofwork.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/proofofwork.py b/src/proofofwork.py index b8369087..f65c127f 100644 --- a/src/proofofwork.py +++ b/src/proofofwork.py @@ -58,7 +58,8 @@ def _doFastPoW(target, initialHash): while True: if shared.shutdown: pool.terminate() - pool.join() #Don't return anything (doing so will cause exceptions because we'll return an unusable response). Sit here and wait for this thread to close. + while True: + time.sleep(10) # Don't let this thread return here; it will return nothing and cause an exception in bitmessagemain.py return for i in range(pool_size): if result[i].ready(): -- 2.45.1