Merge pull request #26 from Atheros1/ecc
fixed UI issue: Two radio buttons on the new-address dialog box were not properly grouped
This commit is contained in:
commit
7323e5e20c
|
@ -290,3 +290,4 @@ if __name__ == "__main__":
|
||||||
print 'addressVersionNumber', addressVersionNumber
|
print 'addressVersionNumber', addressVersionNumber
|
||||||
print 'streamNumber', streamNumber
|
print 'streamNumber', streamNumber
|
||||||
print 'length of data(the ripe hash):', len(data)
|
print 'length of data(the ripe hash):', len(data)
|
||||||
|
|
||||||
|
|
|
@ -2232,7 +2232,7 @@ class singleWorker(QThread):
|
||||||
headerData = headerData + pack('>L',len(payload))
|
headerData = headerData + pack('>L',len(payload))
|
||||||
headerData = headerData + hashlib.sha512(payload).digest()[:4]
|
headerData = headerData + hashlib.sha512(payload).digest()[:4]
|
||||||
printLock.acquire()
|
printLock.acquire()
|
||||||
print 'broadcasting inv with hash:', hash.encode('hex')
|
print 'broadcasting inv with hash:', inventoryHash.encode('hex')
|
||||||
printLock.release()
|
printLock.release()
|
||||||
broadcastToSendDataQueues((streamNumber, 'send', headerData + payload))
|
broadcastToSendDataQueues((streamNumber, 'send', headerData + payload))
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'newaddressdialog.ui'
|
# Form implementation generated from reading ui file 'newaddressdialog.ui'
|
||||||
#
|
#
|
||||||
# Created: Fri Jan 18 13:48:49 2013
|
# Created: Fri Jan 25 13:05:18 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!
|
||||||
|
@ -44,9 +44,13 @@ class Ui_NewAddressDialog(object):
|
||||||
self.radioButtonRandomAddress = QtGui.QRadioButton(NewAddressDialog)
|
self.radioButtonRandomAddress = QtGui.QRadioButton(NewAddressDialog)
|
||||||
self.radioButtonRandomAddress.setChecked(True)
|
self.radioButtonRandomAddress.setChecked(True)
|
||||||
self.radioButtonRandomAddress.setObjectName(_fromUtf8("radioButtonRandomAddress"))
|
self.radioButtonRandomAddress.setObjectName(_fromUtf8("radioButtonRandomAddress"))
|
||||||
|
self.buttonGroup = QtGui.QButtonGroup(NewAddressDialog)
|
||||||
|
self.buttonGroup.setObjectName(_fromUtf8("buttonGroup"))
|
||||||
|
self.buttonGroup.addButton(self.radioButtonRandomAddress)
|
||||||
self.formLayout.setWidget(5, QtGui.QFormLayout.SpanningRole, self.radioButtonRandomAddress)
|
self.formLayout.setWidget(5, QtGui.QFormLayout.SpanningRole, self.radioButtonRandomAddress)
|
||||||
self.radioButtonDeterministicAddress = QtGui.QRadioButton(NewAddressDialog)
|
self.radioButtonDeterministicAddress = QtGui.QRadioButton(NewAddressDialog)
|
||||||
self.radioButtonDeterministicAddress.setObjectName(_fromUtf8("radioButtonDeterministicAddress"))
|
self.radioButtonDeterministicAddress.setObjectName(_fromUtf8("radioButtonDeterministicAddress"))
|
||||||
|
self.buttonGroup.addButton(self.radioButtonDeterministicAddress)
|
||||||
self.formLayout.setWidget(6, QtGui.QFormLayout.LabelRole, self.radioButtonDeterministicAddress)
|
self.formLayout.setWidget(6, QtGui.QFormLayout.LabelRole, self.radioButtonDeterministicAddress)
|
||||||
self.checkBoxEighteenByteRipe = QtGui.QCheckBox(NewAddressDialog)
|
self.checkBoxEighteenByteRipe = QtGui.QCheckBox(NewAddressDialog)
|
||||||
self.checkBoxEighteenByteRipe.setObjectName(_fromUtf8("checkBoxEighteenByteRipe"))
|
self.checkBoxEighteenByteRipe.setObjectName(_fromUtf8("checkBoxEighteenByteRipe"))
|
||||||
|
@ -145,6 +149,16 @@ class Ui_NewAddressDialog(object):
|
||||||
QtCore.QObject.connect(self.radioButtonDeterministicAddress, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBoxDeterministic.setShown)
|
QtCore.QObject.connect(self.radioButtonDeterministicAddress, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBoxDeterministic.setShown)
|
||||||
QtCore.QObject.connect(self.radioButtonRandomAddress, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBox.setShown)
|
QtCore.QObject.connect(self.radioButtonRandomAddress, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBox.setShown)
|
||||||
QtCore.QMetaObject.connectSlotsByName(NewAddressDialog)
|
QtCore.QMetaObject.connectSlotsByName(NewAddressDialog)
|
||||||
|
NewAddressDialog.setTabOrder(self.radioButtonRandomAddress, self.radioButtonDeterministicAddress)
|
||||||
|
NewAddressDialog.setTabOrder(self.radioButtonDeterministicAddress, self.newaddresslabel)
|
||||||
|
NewAddressDialog.setTabOrder(self.newaddresslabel, self.radioButtonMostAvailable)
|
||||||
|
NewAddressDialog.setTabOrder(self.radioButtonMostAvailable, self.radioButtonExisting)
|
||||||
|
NewAddressDialog.setTabOrder(self.radioButtonExisting, self.comboBoxExisting)
|
||||||
|
NewAddressDialog.setTabOrder(self.comboBoxExisting, self.lineEditPassphrase)
|
||||||
|
NewAddressDialog.setTabOrder(self.lineEditPassphrase, self.lineEditPassphraseAgain)
|
||||||
|
NewAddressDialog.setTabOrder(self.lineEditPassphraseAgain, self.spinBoxNumberOfAddressesToMake)
|
||||||
|
NewAddressDialog.setTabOrder(self.spinBoxNumberOfAddressesToMake, self.checkBoxEighteenByteRipe)
|
||||||
|
NewAddressDialog.setTabOrder(self.checkBoxEighteenByteRipe, self.buttonBox)
|
||||||
|
|
||||||
def retranslateUi(self, NewAddressDialog):
|
def retranslateUi(self, NewAddressDialog):
|
||||||
NewAddressDialog.setWindowTitle(QtGui.QApplication.translate("NewAddressDialog", "Create new Address", None, QtGui.QApplication.UnicodeUTF8))
|
NewAddressDialog.setWindowTitle(QtGui.QApplication.translate("NewAddressDialog", "Create new Address", None, QtGui.QApplication.UnicodeUTF8))
|
||||||
|
|
|
@ -68,6 +68,9 @@ The 'Random Number' option is selected by default but deterministic addresses ha
|
||||||
<property name="checked">
|
<property name="checked">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<attribute name="buttonGroup">
|
||||||
|
<string notr="true">buttonGroup</string>
|
||||||
|
</attribute>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="6" column="0">
|
<item row="6" column="0">
|
||||||
|
@ -75,6 +78,9 @@ The 'Random Number' option is selected by default but deterministic addresses ha
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Use a passpharase to make addresses</string>
|
<string>Use a passpharase to make addresses</string>
|
||||||
</property>
|
</property>
|
||||||
|
<attribute name="buttonGroup">
|
||||||
|
<string notr="true">buttonGroup</string>
|
||||||
|
</attribute>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="9" column="0" colspan="2">
|
<item row="9" column="0" colspan="2">
|
||||||
|
@ -398,4 +404,7 @@ The 'Random Number' option is selected by default but deterministic addresses ha
|
||||||
</hints>
|
</hints>
|
||||||
</connection>
|
</connection>
|
||||||
</connections>
|
</connections>
|
||||||
|
<buttongroups>
|
||||||
|
<buttongroup name="buttonGroup"/>
|
||||||
|
</buttongroups>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user