Fixed github issue 63: Manage keys action triggered twice. #64
3
about.py
3
about.py
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'about.ui'
|
# 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
|
# by: PyQt4 UI code generator 4.9.4
|
||||||
#
|
#
|
||||||
# WARNING! All changes made in this file will be lost!
|
# 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 = QtGui.QLabel(aboutDialog)
|
||||||
self.label_3.setGeometry(QtCore.QRect(20, 200, 331, 71))
|
self.label_3.setGeometry(QtCore.QRect(20, 200, 331, 71))
|
||||||
self.label_3.setWordWrap(True)
|
self.label_3.setWordWrap(True)
|
||||||
|
self.label_3.setOpenExternalLinks(True)
|
||||||
self.label_3.setObjectName(_fromUtf8("label_3"))
|
self.label_3.setObjectName(_fromUtf8("label_3"))
|
||||||
self.label_5 = QtGui.QLabel(aboutDialog)
|
self.label_5 = QtGui.QLabel(aboutDialog)
|
||||||
self.label_5.setGeometry(QtCore.QRect(10, 180, 341, 20))
|
self.label_5.setGeometry(QtCore.QRect(10, 180, 341, 20))
|
||||||
|
|
3
about.ui
3
about.ui
|
@ -95,6 +95,9 @@
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="openExternalLinks">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QLabel" name="label_5">
|
<widget class="QLabel" name="label_5">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
|
|
|
@ -2311,9 +2311,8 @@ class singleCleaner(QThread):
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
time.sleep(300)
|
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()
|
sqlLock.acquire()
|
||||||
|
self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),"Doing housekeeping (Flushing inventory in memory to disk...)")
|
||||||
for hash, storedValue in inventory.items():
|
for hash, storedValue in inventory.items():
|
||||||
objectType, streamNumber, payload, receivedTime = storedValue
|
objectType, streamNumber, payload, receivedTime = storedValue
|
||||||
if int(time.time())- 3600 > receivedTime:
|
if int(time.time())- 3600 > receivedTime:
|
||||||
|
@ -2322,6 +2321,7 @@ class singleCleaner(QThread):
|
||||||
sqlSubmitQueue.put(t)
|
sqlSubmitQueue.put(t)
|
||||||
sqlReturnQueue.get()
|
sqlReturnQueue.get()
|
||||||
del inventory[hash]
|
del inventory[hash]
|
||||||
|
self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"),"")
|
||||||
sqlLock.release()
|
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.
|
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:
|
if timeWeLastClearedInventoryAndPubkeysTables < int(time.time()) - 7380:
|
||||||
|
@ -3292,7 +3292,6 @@ class MyForm(QtGui.QMainWindow):
|
||||||
QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL("triggered()"), self.close)
|
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.actionManageKeys, QtCore.SIGNAL("triggered()"), self.click_actionManageKeys)
|
||||||
QtCore.QObject.connect(self.ui.actionRegenerateDeterministicAddresses, QtCore.SIGNAL("triggered()"), self.click_actionRegenerateDeterministicAddresses)
|
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.pushButtonNewAddress, QtCore.SIGNAL("clicked()"), self.click_NewAddressDialog)
|
||||||
QtCore.QObject.connect(self.ui.comboBoxSendFrom, QtCore.SIGNAL("activated(int)"),self.redrawLabelFrom)
|
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.pushButtonAddAddressBook, QtCore.SIGNAL("clicked()"), self.click_pushButtonAddAddressBook)
|
||||||
|
|
3
help.py
3
help.py
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'help.ui'
|
# 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
|
# by: PyQt4 UI code generator 4.9.4
|
||||||
#
|
#
|
||||||
# WARNING! All changes made in this file will be lost!
|
# 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 = QtGui.QFormLayout(helpDialog)
|
||||||
self.formLayout.setObjectName(_fromUtf8("formLayout"))
|
self.formLayout.setObjectName(_fromUtf8("formLayout"))
|
||||||
self.labelHelpURI = QtGui.QLabel(helpDialog)
|
self.labelHelpURI = QtGui.QLabel(helpDialog)
|
||||||
|
self.labelHelpURI.setOpenExternalLinks(True)
|
||||||
self.labelHelpURI.setObjectName(_fromUtf8("labelHelpURI"))
|
self.labelHelpURI.setObjectName(_fromUtf8("labelHelpURI"))
|
||||||
self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.labelHelpURI)
|
self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.labelHelpURI)
|
||||||
self.label = QtGui.QLabel(helpDialog)
|
self.label = QtGui.QLabel(helpDialog)
|
||||||
|
|
3
help.ui
3
help.ui
|
@ -19,6 +19,9 @@
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><a href="http://Bitmessage.org/wiki/PyBitmessage_Help">http://Bitmessage.org/wiki/PyBitmessage_Help</a></string>
|
<string><a href="http://Bitmessage.org/wiki/PyBitmessage_Help">http://Bitmessage.org/wiki/PyBitmessage_Help</a></string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="openExternalLinks">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="0" colspan="2">
|
<item row="0" column="0" colspan="2">
|
||||||
|
|
Reference in New Issue
Block a user