From 94cc8742c7a225a6fac49edc0cff08e5e51cb10f Mon Sep 17 00:00:00 2001
From: Jonathan Warren <git@jonwarren.org>
Date: Fri, 25 Jan 2013 13:16:03 -0500
Subject: [PATCH] fixed UI issue: First two radio buttons on the new-address
 dialog box were not properly grouped

---
 addresses.py        |  1 +
 bitmessagemain.py   |  2 +-
 newaddressdialog.py | 16 +++++++++++++++-
 newaddressdialog.ui |  9 +++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/addresses.py b/addresses.py
index f2e8de60..97d1ab95 100644
--- a/addresses.py
+++ b/addresses.py
@@ -290,3 +290,4 @@ if __name__ == "__main__":
     print 'addressVersionNumber', addressVersionNumber
     print 'streamNumber', streamNumber
     print 'length of data(the ripe hash):', len(data)
+
diff --git a/bitmessagemain.py b/bitmessagemain.py
index 498c14f4..04470ec9 100644
--- a/bitmessagemain.py
+++ b/bitmessagemain.py
@@ -2232,7 +2232,7 @@ class singleWorker(QThread):
         headerData = headerData + pack('>L',len(payload))
         headerData = headerData + hashlib.sha512(payload).digest()[:4]
         printLock.acquire()
-        print 'broadcasting inv with hash:', hash.encode('hex')
+        print 'broadcasting inv with hash:', inventoryHash.encode('hex')
         printLock.release()
         broadcastToSendDataQueues((streamNumber, 'send', headerData + payload))
 
diff --git a/newaddressdialog.py b/newaddressdialog.py
index 7a1284e7..e7c1ad71 100644
--- a/newaddressdialog.py
+++ b/newaddressdialog.py
@@ -2,7 +2,7 @@
 
 # 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
 #
 # 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.setChecked(True)
         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.radioButtonDeterministicAddress = QtGui.QRadioButton(NewAddressDialog)
         self.radioButtonDeterministicAddress.setObjectName(_fromUtf8("radioButtonDeterministicAddress"))
+        self.buttonGroup.addButton(self.radioButtonDeterministicAddress)
         self.formLayout.setWidget(6, QtGui.QFormLayout.LabelRole, self.radioButtonDeterministicAddress)
         self.checkBoxEighteenByteRipe = QtGui.QCheckBox(NewAddressDialog)
         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.radioButtonRandomAddress, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBox.setShown)
         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):
         NewAddressDialog.setWindowTitle(QtGui.QApplication.translate("NewAddressDialog", "Create new Address", None, QtGui.QApplication.UnicodeUTF8))
diff --git a/newaddressdialog.ui b/newaddressdialog.ui
index 4f8dd4af..7f9e13af 100644
--- a/newaddressdialog.ui
+++ b/newaddressdialog.ui
@@ -68,6 +68,9 @@ The 'Random Number' option is selected by default but deterministic addresses ha
      <property name="checked">
       <bool>true</bool>
      </property>
+     <attribute name="buttonGroup">
+      <string notr="true">buttonGroup</string>
+     </attribute>
     </widget>
    </item>
    <item row="6" column="0">
@@ -75,6 +78,9 @@ The 'Random Number' option is selected by default but deterministic addresses ha
      <property name="text">
       <string>Use a passpharase to make addresses</string>
      </property>
+     <attribute name="buttonGroup">
+      <string notr="true">buttonGroup</string>
+     </attribute>
     </widget>
    </item>
    <item row="9" column="0" colspan="2">
@@ -398,4 +404,7 @@ The 'Random Number' option is selected by default but deterministic addresses ha
    </hints>
   </connection>
  </connections>
+ <buttongroups>
+  <buttongroup name="buttonGroup"/>
+ </buttongroups>
 </ui>
-- 
2.45.1