From 45eb98e2653e8ee02be9fb43157b2ead38c5a7f9 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Mon, 11 Mar 2013 12:02:11 -0400 Subject: [PATCH 1/2] Fixed github issue 63: Manage keys action triggered twice. --- about.py | 3 ++- about.ui | 3 +++ bitmessagemain.py | 1 - help.py | 3 ++- help.ui | 3 +++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/about.py b/about.py index 3c933e1b..3ede6a15 100644 --- a/about.py +++ b/about.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'about.ui' # -# Created: Thu Jan 31 13:35:03 2013 +# Created: Mon Mar 11 11:19:35 2013 # by: PyQt4 UI code generator 4.9.4 # # WARNING! All changes made in this file will be lost! @@ -41,6 +41,7 @@ class Ui_aboutDialog(object): self.label_3 = QtGui.QLabel(aboutDialog) self.label_3.setGeometry(QtCore.QRect(20, 200, 331, 71)) self.label_3.setWordWrap(True) + self.label_3.setOpenExternalLinks(True) self.label_3.setObjectName(_fromUtf8("label_3")) self.label_5 = QtGui.QLabel(aboutDialog) self.label_5.setGeometry(QtCore.QRect(10, 180, 341, 20)) diff --git a/about.ui b/about.ui index 9dc2c37e..58a0bc36 100644 --- a/about.ui +++ b/about.ui @@ -95,6 +95,9 @@ true + + true + diff --git a/bitmessagemain.py b/bitmessagemain.py index 60143931..6fd078c3 100755 --- a/bitmessagemain.py +++ b/bitmessagemain.py @@ -3292,7 +3292,6 @@ class MyForm(QtGui.QMainWindow): QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL("triggered()"), self.close) QtCore.QObject.connect(self.ui.actionManageKeys, QtCore.SIGNAL("triggered()"), self.click_actionManageKeys) QtCore.QObject.connect(self.ui.actionRegenerateDeterministicAddresses, QtCore.SIGNAL("triggered()"), self.click_actionRegenerateDeterministicAddresses) - QtCore.QObject.connect(self.ui.actionManageKeys, QtCore.SIGNAL("triggered()"), self.click_actionManageKeys) 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) diff --git a/help.py b/help.py index 1124ff7d..f8cc0fe9 100644 --- a/help.py +++ b/help.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'help.ui' # -# Created: Wed Dec 19 15:53:53 2012 +# Created: Mon Mar 11 11:20:54 2013 # by: PyQt4 UI code generator 4.9.4 # # WARNING! All changes made in this file will be lost! @@ -21,6 +21,7 @@ class Ui_helpDialog(object): self.formLayout = QtGui.QFormLayout(helpDialog) self.formLayout.setObjectName(_fromUtf8("formLayout")) self.labelHelpURI = QtGui.QLabel(helpDialog) + self.labelHelpURI.setOpenExternalLinks(True) self.labelHelpURI.setObjectName(_fromUtf8("labelHelpURI")) self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.labelHelpURI) self.label = QtGui.QLabel(helpDialog) diff --git a/help.ui b/help.ui index e53e3ff9..ae0ff0f5 100644 --- a/help.ui +++ b/help.ui @@ -19,6 +19,9 @@ <a href="http://Bitmessage.org/wiki/PyBitmessage_Help">http://Bitmessage.org/wiki/PyBitmessage_Help</a> + + true + From 3d78ece84ed5c499971c800e97451c89f7182f26 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Mon, 11 Mar 2013 12:37:01 -0400 Subject: [PATCH 2/2] Show 'doing housekeeping' status bar when flushing inventory --- bitmessagemain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitmessagemain.py b/bitmessagemain.py index 6fd078c3..952cbc6f 100755 --- a/bitmessagemain.py +++ b/bitmessagemain.py @@ -2311,9 +2311,8 @@ class singleCleaner(QThread): while True: time.sleep(300) - #Clear the status bar in case a message has been sitting there for a while. - self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),"") sqlLock.acquire() + self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),"Doing housekeeping (Flushing inventory in memory to disk...)") for hash, storedValue in inventory.items(): objectType, streamNumber, payload, receivedTime = storedValue if int(time.time())- 3600 > receivedTime: @@ -2322,6 +2321,7 @@ class singleCleaner(QThread): sqlSubmitQueue.put(t) sqlReturnQueue.get() del inventory[hash] + self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),"") sqlLock.release() 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 timeWeLastClearedInventoryAndPubkeysTables < int(time.time()) - 7380: