From 3ab48c2fe36d1eeb71f6e39682f5482dff0fc679 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 7 May 2013 16:25:01 -0400 Subject: [PATCH 1/5] Upon incoming connection, start the sendData thread before the receiveData thread --- src/bitmessagemain.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index f781b774..47631cfc 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -210,20 +210,20 @@ class singleListener(threading.Thread): print 'incoming connection is from a host in shared.connectedHostsList (we are already connected to it). Ignoring it.' a.close() a,(HOST,PORT) = sock.accept()""" - rd = receiveDataThread() - rd.daemon = True # close the main program even if there are threads left - #self.emit(SIGNAL("passObjectThrough(PyQt_PyObject)"),rd) objectsOfWhichThisRemoteNodeIsAlreadyAware = {} - rd.setup(a,HOST,PORT,-1,objectsOfWhichThisRemoteNodeIsAlreadyAware) - shared.printLock.acquire() - print self, 'connected to', HOST,'during INCOMING request.' - shared.printLock.release() - rd.start() sd = sendDataThread() 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.start() + + shared.printLock.acquire() + 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). class receiveDataThread(threading.Thread): From 38ae186a931e505514a62c938e1aeaed98b1ccc7 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Tue, 7 May 2013 16:31:18 -0400 Subject: [PATCH 2/5] added several printLocks to improve console output --- src/bitmessagemain.py | 3 ++- src/bitmessageqt/__init__.py | 2 ++ src/shared.py | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 47631cfc..c11f7013 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -297,7 +297,9 @@ class receiveDataThread(threading.Thread): try: del shared.connectedHostsList[self.HOST] except Exception, err: + shared.printLock.acquire() print 'Could not delete', self.HOST, 'from shared.connectedHostsList.', err + shared.printLock.release() shared.UISignalQueue.put(('updateNetworkStatusTab','no data')) shared.printLock.acquire() print 'The size of the connectedHostsList is now:', len(shared.connectedHostsList) @@ -2046,7 +2048,6 @@ class sendDataThread(threading.Thread): shared.printLock.release() self.versionSent = 1 - def run(self): while True: deststream,command,data = self.mailbox.get() diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 52dba18a..3c013ace 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1315,7 +1315,9 @@ class MyForm(QtGui.QMainWindow): self.trayIcon.hide() self.statusBar().showMessage('All done. Closing user interface...') event.accept() + shared.printLock.acquire() print 'Done. (passed event.accept())' + shared.printLock.release() os._exit(0) def on_action_InboxMessageForceHtml(self): diff --git a/src/shared.py b/src/shared.py index 0eb7fa18..ed1baf22 100644 --- a/src/shared.py +++ b/src/shared.py @@ -149,7 +149,9 @@ def doCleanShutdown(): print 'Completed pickle.dump. Closing output...' output.close() knownNodesLock.release() + printLock.acquire() print 'Finished closing knownnodes.dat output file.' + printLock.release() UISignalQueue.put(('updateStatusBar','Done saving the knownNodes list of peers to disk.')) broadcastToSendDataQueues((0, 'shutdown', 'all')) @@ -165,8 +167,10 @@ def doCleanShutdown(): sqlSubmitQueue.put('SELECT address FROM subscriptions') sqlSubmitQueue.put('') sqlReturnQueue.get() - sqlLock.release() + sqlLock.release() + printLock.acquire() print 'Finished flushing inventory.' + printLock.release() sqlSubmitQueue.put('exit') if safeConfigGetBoolean('bitmessagesettings','daemon'): From 70f09095d905379dc6b8fd1032ddd3f27f8e2fe6 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 8 May 2013 13:59:30 -0400 Subject: [PATCH 3/5] Support setting user-defined difficulty through the API --- src/api client.py | 6 ++-- src/bitmessagemain.py | 75 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 62 insertions(+), 19 deletions(-) diff --git a/src/api client.py b/src/api client.py index 474cd065..b823a75a 100644 --- a/src/api client.py +++ b/src/api client.py @@ -25,12 +25,12 @@ print jsonAddresses print 'Now that we have our address data in a nice Python data structure, let\'s look at the first address (index 0) and print its label:' print jsonAddresses['addresses'][0]['label'] -print 'Uncomment the next two lines to create a new random address.' +print 'Uncomment the next two lines to create a new random address with slightly a slightly higher difficulty setting than normal.' #addressLabel = 'new address label'.encode('base64') -#print api.createRandomAddress(addressLabel) +#print api.createRandomAddress(addressLabel,False,1.05,1.1111) print 'Uncomment these next four lines to create new deterministic addresses.' -#passphrase = 'asdfasdfqwer'.encode('base64') +#passphrase = 'asdfasdfqwser'.encode('base64') #jsonDeterministicAddresses = api.createDeterministicAddresses(passphrase, 2, 3, 1, False) #print jsonDeterministicAddresses #print json.loads(jsonDeterministicAddresses) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index c11f7013..d28c5bf1 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -3202,13 +3202,27 @@ class addressGenerator(threading.Thread): def run(self): while True: - addressVersionNumber,streamNumber,label,numberOfAddressesToMake,deterministicPassphrase,eighteenByteRipe = shared.addressGeneratorQueue.get() + queueValue = shared.addressGeneratorQueue.get() + nonceTrialsPerByte = 0 + payloadLengthExtraBytes = 0 + if len(queueValue) == 6: + addressVersionNumber,streamNumber,label,numberOfAddressesToMake,deterministicPassphrase,eighteenByteRipe = queueValue + elif len(queueValue) == 8: + 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) 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 version', addressVersionNumber,' addresses which it cannot do.\n') - if 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) + if nonceTrialsPerByte == 0: + nonceTrialsPerByte = shared.config.getint('bitmessagesettings','defaultnoncetrialsperbyte') + if nonceTrialsPerByte < shared.networkDefaultProofOfWorkNonceTrialsPerByte: + nonceTrialsPerByte = shared.networkDefaultProofOfWorkNonceTrialsPerByte + if payloadLengthExtraBytes == 0: + payloadLengthExtraBytes = shared.config.getint('bitmessagesettings','defaultpayloadlengthextrabytes') + if payloadLengthExtraBytes < shared.networkDefaultPayloadLengthExtraBytes: + payloadLengthExtraBytes = shared.networkDefaultPayloadLengthExtraBytes + if addressVersionNumber == 3: #currently the only one supported. if deterministicPassphrase == "": - #statusbar = 'Generating one new address' - #self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),statusbar) 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, @@ -3237,7 +3251,6 @@ class addressGenerator(threading.Thread): 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()) - #self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),'Finished generating address. Writing to keys.dat') #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 @@ -3255,8 +3268,8 @@ class addressGenerator(threading.Thread): shared.config.set(address,'label',label) shared.config.set(address,'enabled','true') shared.config.set(address,'decoy','false') - shared.config.set(address,'noncetrialsperbyte',shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte')) - shared.config.set(address,'payloadlengthextrabytes',shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes')) + 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: @@ -3329,8 +3342,8 @@ class addressGenerator(threading.Thread): shared.config.set(address,'label',label) shared.config.set(address,'enabled','true') shared.config.set(address,'decoy','false') - shared.config.set(address,'noncetrialsperbyte',shared.config.get('bitmessagesettings','defaultnoncetrialsperbyte')) - shared.config.set(address,'payloadlengthextrabytes',shared.config.get('bitmessagesettings','defaultpayloadlengthextrabytes')) + 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: @@ -3445,7 +3458,6 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): return a+b elif method == 'statusBar': message, = params - #apiSignalQueue.put(('updateStatusBar',message)) shared.UISignalQueue.put(('updateStatusBar',message)) elif method == 'listAddresses': data = '{"addresses":[' @@ -3465,13 +3477,26 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): elif len(params) == 1: label, = params eighteenByteRipe = False + 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') + elif len(params) == 3: + label, eighteenByteRipe, totalDifficulty = params + 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) + else: + return 'API Error 0000: Too many parameters!' label = label.decode('base64') apiAddressGeneratorReturnQueue.queue.clear() streamNumberForAddress = 1 - #apiSignalQueue.put(('createRandomAddress',(label, eighteenByteRipe))) #params should be a twopul which equals (eighteenByteRipe, label) - shared.addressGeneratorQueue.put((3,streamNumberForAddress,label,1,"",eighteenByteRipe)) + shared.addressGeneratorQueue.put((3,streamNumberForAddress,label,1,"",eighteenByteRipe,nonceTrialsPerByte,payloadLengthExtraBytes)) return apiAddressGeneratorReturnQueue.get() elif method == 'createDeterministicAddresses': if len(params) == 0: @@ -3482,20 +3507,40 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): addressVersionNumber = 0 streamNumber = 0 eighteenByteRipe = False + 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') elif len(params) == 3: passphrase, numberOfAddresses, addressVersionNumber = params streamNumber = 0 eighteenByteRipe = False + 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') elif len(params) == 5: passphrase, numberOfAddresses, addressVersionNumber, streamNumber, eighteenByteRipe = params + 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') + elif len(params) == 7: + passphrase, numberOfAddresses, addressVersionNumber, streamNumber, eighteenByteRipe, totalDifficulty, smallMessageDifficulty = params + 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') @@ -3513,8 +3558,7 @@ 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.' - #apiSignalQueue.put(('createDeterministicAddresses',(passphrase, numberOfAddresses, addressVersionNumber, streamNumber, eighteenByteRipe))) - shared.addressGeneratorQueue.put((addressVersionNumber,streamNumber,'unused API address',numberOfAddresses,passphrase,eighteenByteRipe)) + shared.addressGeneratorQueue.put((addressVersionNumber,streamNumber,'unused API address',numberOfAddresses,passphrase,eighteenByteRipe,nonceTrialsPerByte,payloadLengthExtraBytes)) data = '{"addresses":[' queueReturn = apiAddressGeneratorReturnQueue.get() for item in queueReturn: @@ -3548,7 +3592,6 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): shared.sqlReturnQueue.get() shared.sqlSubmitQueue.put('commit') shared.sqlLock.release() - #apiSignalQueue.put(('updateStatusBar','Per API: Trashed message (assuming message existed). UI not updated.')) shared.UISignalQueue.put(('updateStatusBar','Per API: Trashed message (assuming message existed). UI not updated.')) return 'Trashed message (assuming message existed). UI not updated. To double check, run getAllInboxMessages to see that the message disappeared, or restart Bitmessage and look in the normal Bitmessage GUI.' elif method == 'sendMessage': From 1b810667fddd5f0a58c1ea371cf91fe16e6fce1b Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 8 May 2013 16:42:28 -0400 Subject: [PATCH 4/5] Got appIndicator working on Windows. Surly needs to be retested on Linux and OSX. --- src/bitmessageqt/__init__.py | 134 +++++++++++++++++------------------ 1 file changed, 65 insertions(+), 69 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 88a3d644..c2b9e23d 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -424,10 +424,6 @@ class MyForm(QtGui.QMainWindow): self.numberOfBroadcastsProcessed = 0 self.numberOfPubkeysProcessed = 0 -#Below this point, it would be good if all of the necessary global data structures were initialized. - - self.rerenderComboBoxSendFrom() - 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) @@ -442,67 +438,62 @@ class MyForm(QtGui.QMainWindow): QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL("setStatusIcon(PyQt_PyObject)"), self.setStatusIcon) self.UISignalThread.start() - #self.connectToStream(1) +#Below this point, it would be good if all of the necessary global data structures were initialized. - #self.singleListenerThread = singleListener() - #self.singleListenerThread.start() - #QtCore.QObject.connect(self.singleListenerThread, QtCore.SIGNAL("passObjectThrough(PyQt_PyObject)"), self.connectObjectToSignals) + self.rerenderComboBoxSendFrom() - - #self.singleCleanerThread = singleCleaner() - #self.singleCleanerThread.start() - #QtCore.QObject.connect(self.singleCleanerThread, QtCore.SIGNAL("updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByHash) - #QtCore.QObject.connect(self.singleCleanerThread, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) - - #self.workerThread = singleWorker() - #self.workerThread.start() - #QtCore.QObject.connect(self.workerThread, QtCore.SIGNAL("updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByHash) - #QtCore.QObject.connect(self.workerThread, QtCore.SIGNAL("updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByAckdata) - #QtCore.QObject.connect(self.workerThread, QtCore.SIGNAL("updateStatusBar(PyQt_PyObject)"), self.updateStatusBar) - - # an appindicator action which indicates the connection status - actionStatus = None - - # an appindicator action which shows of hides the program window - actionShow = None - - # show the application window - def appIndicatorShow(self): - if self.actionShow == None: - return - self.actionShow.setChecked(True) - self.show() - self.setWindowState(self.windowState() & QtCore.Qt.WindowMaximized) - - # application indicator show or hide - def appIndicatorShowBitmessage(self): - if self.actionShow == None: - return + #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() - self.setWindowState(self.windowState() & QtCore.Qt.WindowMinimized) else: - self.show() - self.setWindowState(self.windowState() & QtCore.Qt.WindowMaximized) + if sys.platform[0:3] == 'win': + self.setWindowFlags(Qt.Window) + self.show() + self.setWindowState(self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive) + self.activateWindow() + else: + self.show() + self.setWindowState(self.windowState() & QtCore.Qt.WindowMaximized) + #Here is what I believe might be required for darwin: + #self.setWindowState(self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive) + #self.activateWindow() + + """# application indicator show or hide + def appIndicatorShowBitmessage(self): + #if self.actionShow == None: + # return + print self.actionShow.isChecked() + if not self.actionShow.isChecked(): + self.hide() + #self.setWindowState(self.windowState() & QtCore.Qt.WindowMinimized) + else: + self.appIndicatorShowOrHideWindow()""" # Show the program window and select send tab def appIndicatorSend(self): - self.appIndicatorShow() + self.actionShow.setChecked(True) + self.appIndicatorShowOrHideWindow() self.ui.tabWidget.setCurrentIndex(1) # Show the program window and select subscriptions tab def appIndicatorSubscribe(self): - self.appIndicatorShow() + self.actionShow.setChecked(True) + self.appIndicatorShowOrHideWindow() self.ui.tabWidget.setCurrentIndex(4) # Show the program window and select the address book tab def appIndicatorAddressBook(self): - self.appIndicatorShow() + self.actionShow.setChecked(True) + self.appIndicatorShowOrHideWindow() self.ui.tabWidget.setCurrentIndex(5) # create application indicator def createAppIndicator(self,app): - app.tray = QSystemTrayIcon(QtGui.QIcon("images/can-icon-24px.png"), app) + self.tray = QSystemTrayIcon(QtGui.QIcon("images/can-icon-24px.png"), app) + if sys.platform[0:3] == 'win': + traySignal = "activated(QSystemTrayIcon::ActivationReason)" + QtCore.QObject.connect(self.tray, QtCore.SIGNAL(traySignal), self.__icon_activated) m = QMenu() self.actionStatus = QtGui.QAction('Not Connected',m,checkable=False) @@ -516,8 +507,9 @@ class MyForm(QtGui.QMainWindow): # show bitmessage self.actionShow = QtGui.QAction('Show Bitmessage',m,checkable=True) self.actionShow.setChecked(True) - self.actionShow.triggered.connect(self.appIndicatorShowBitmessage) - m.addAction(self.actionShow) + self.actionShow.triggered.connect(self.appIndicatorShowOrHideWindow) + if not sys.platform[0:3] == 'win': + m.addAction(self.actionShow) # Send actionSend = QtGui.QAction('Send',m,checkable=False) @@ -541,8 +533,12 @@ class MyForm(QtGui.QMainWindow): # Quit m.addAction("Quit", self.close) - app.tray.setContextMenu(m) - app.tray.show() + self.tray.setContextMenu(m) + self.tray.show() + if shared.config.getboolean('bitmessagesettings', 'startintray'): + self.hide() + #myapp.trayIcon.show()#This option seems to have been obsoleted by https://github.com/Bitmessage/PyBitmessage/pull/133/files + self.actionShow.setChecked(False) def tableWidgetInboxKeyPressEvent(self,event): if event.key() == QtCore.Qt.Key_Delete: @@ -591,11 +587,15 @@ class MyForm(QtGui.QMainWindow): os.startfile(shared.appdata + 'keys.dat') def changeEvent(self, event): + if event.type() == QtCore.QEvent.WindowStateChange: + if self.windowState() & QtCore.Qt.WindowMinimized: + self.actionShow.setChecked(False) if shared.config.getboolean('bitmessagesettings', 'minimizetotray') and not 'darwin' in sys.platform: if event.type() == QtCore.QEvent.WindowStateChange: if self.windowState() & QtCore.Qt.WindowMinimized: self.hide() - self.trayIcon.show() + + #self.trayIcon.show() #This may have been obsoleted by https://github.com/Bitmessage/PyBitmessage/issues/135 #self.hidden = True if 'win32' in sys.platform or 'win64' in sys.platform: self.setWindowFlags(Qt.ToolTip) @@ -606,7 +606,10 @@ class MyForm(QtGui.QMainWindow): def __icon_activated(self, reason): if reason == QtGui.QSystemTrayIcon.Trigger: - if 'linux' in sys.platform: + self.actionShow.setChecked(not self.actionShow.isChecked()) + self.appIndicatorShowOrHideWindow() + + """if 'linux' in sys.platform: self.trayIcon.hide() self.setWindowFlags(Qt.Window) self.show() @@ -621,7 +624,7 @@ class MyForm(QtGui.QMainWindow): #self.setWindowFlags(Qt.Window) #self.show() self.setWindowState(self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive) - self.activateWindow() + self.activateWindow()""" def incrementNumberOfMessagesProcessed(self): self.numberOfMessagesProcessed += 1 @@ -685,22 +688,22 @@ class MyForm(QtGui.QMainWindow): if color == 'red': self.ui.pushButtonStatusIcon.setIcon(QIcon(":/newPrefix/images/redicon.png")) shared.statusIconColor = 'red' - if self.actionStatus != None: - self.actionStatus.setText('Not Connected') + #if self.actionStatus != None: + self.actionStatus.setText('Not Connected') 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")) shared.statusIconColor = 'yellow' - if self.actionStatus != None: - self.actionStatus.setText('Connection Ok') + #if self.actionStatus != None: + self.actionStatus.setText('Connected') 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")) shared.statusIconColor = 'green' - if self.actionStatus != None: - self.actionStatus.setText('Connection Good') + #if self.actionStatus != None: + self.actionStatus.setText('Connected') def updateSentItemStatusByHash(self,toRipe,textToDisplay): for i in range(self.ui.tableWidgetSent.rowCount()): @@ -1402,7 +1405,8 @@ class MyForm(QtGui.QMainWindow): else: event.ignore()''' shared.doCleanShutdown() - self.trayIcon.hide() + #self.trayIcon.hide() + self.tray.hide() self.statusBar().showMessage('All done. Closing user interface...') event.accept() shared.printLock.acquire() @@ -2037,20 +2041,12 @@ class UISignaler(QThread): sys.stderr.write('Command sent to UISignaler not recognized: %s\n' % command) - def run(): app = QtGui.QApplication(sys.argv) app.setStyleSheet("QStatusBar::item { border: 0px solid black }") myapp = MyForm() myapp.show() - if shared.config.getboolean('bitmessagesettings', 'startintray'): - myapp.hide() - myapp.trayIcon.show() - #self.hidden = True - #self.setWindowState(self.windowState() & QtCore.Qt.WindowMinimized) - #self.hide() - if 'win32' in sys.platform or 'win64' in sys.platform: - myapp.setWindowFlags(Qt.ToolTip) + if sys.platform[0:3] == 'win': + myapp.setWindowFlags(Qt.ToolTip) myapp.createAppIndicator(app) - sys.exit(app.exec_()) From 364e952de8b37b99930352badce744425a95da36 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 8 May 2013 17:11:16 -0400 Subject: [PATCH 5/5] use only 9 half open connections for windows but 32 for everyone else --- src/bitmessagemain.py | 7 +++++-- src/bitmessageqt/__init__.py | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index d28c5bf1..f91d2195 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -2223,8 +2223,11 @@ def signal_handler(signal, frame): def connectToStream(streamNumber): selfInitiatedConnections[streamNumber] = {} - - for i in range(32): + if sys.platform[0:3] == 'win': + maximumNumberOfHalfOpenConnections = 9 + else: + maximumNumberOfHalfOpenConnections = 32 + for i in range(maximumNumberOfHalfOpenConnections): a = outgoingSynSender() a.setup(streamNumber) a.start() diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index c2b9e23d..f9bb9e5f 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -472,20 +472,23 @@ class MyForm(QtGui.QMainWindow): # Show the program window and select send tab def appIndicatorSend(self): - self.actionShow.setChecked(True) - self.appIndicatorShowOrHideWindow() + if not self.actionShow.isChecked(): + self.actionShow.setChecked(True) + self.appIndicatorShowOrHideWindow() self.ui.tabWidget.setCurrentIndex(1) # Show the program window and select subscriptions tab def appIndicatorSubscribe(self): - self.actionShow.setChecked(True) - self.appIndicatorShowOrHideWindow() + if not self.actionShow.isChecked(): + self.actionShow.setChecked(True) + self.appIndicatorShowOrHideWindow() self.ui.tabWidget.setCurrentIndex(4) # Show the program window and select the address book tab def appIndicatorAddressBook(self): - self.actionShow.setChecked(True) - self.appIndicatorShowOrHideWindow() + if not self.actionShow.isChecked(): + self.actionShow.setChecked(True) + self.appIndicatorShowOrHideWindow() self.ui.tabWidget.setCurrentIndex(5) # create application indicator @@ -536,9 +539,11 @@ class MyForm(QtGui.QMainWindow): self.tray.setContextMenu(m) self.tray.show() if shared.config.getboolean('bitmessagesettings', 'startintray'): - self.hide() #myapp.trayIcon.show()#This option seems to have been obsoleted by https://github.com/Bitmessage/PyBitmessage/pull/133/files self.actionShow.setChecked(False) + self.appIndicatorShowOrHideWindow() + #if sys.platform[0:3] == 'win': + # myapp.setWindowFlags(Qt.ToolTip) def tableWidgetInboxKeyPressEvent(self,event): if event.key() == QtCore.Qt.Key_Delete: @@ -2045,8 +2050,7 @@ def run(): app = QtGui.QApplication(sys.argv) app.setStyleSheet("QStatusBar::item { border: 0px solid black }") myapp = MyForm() - myapp.show() - if sys.platform[0:3] == 'win': - myapp.setWindowFlags(Qt.ToolTip) + if not shared.config.getboolean('bitmessagesettings', 'startintray'): + myapp.show() myapp.createAppIndicator(app) sys.exit(app.exec_())