Bitmessage/PyBitmessage-2025-02-02
Archived
2
0
Fork 0
Code Issues 167 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

- Allow adding plain addresses (for security, the label will be blank)

Browse Source
This commit is contained in:
sendiulo 2013-09-10 10:58:03 +02:00
parent ebd567c712
commit 6b6f3a67c8
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/bitmessageqt/__init__.py
View File

@ -2580,7 +2580,7 @@ class MyForm(QtGui.QMainWindow):
def on_comboboxFindAddress_change(self, int): def on_comboboxFindAddress_change(self, int):
self.ui.comboboxFindLabel.setCurrentIndex(int) self.ui.comboboxFindLabel.setCurrentIndex(int)
def on_comboboxFindLabel_enter(self, event): def on_comboboxFindLabel_enter(self, event):
if (event.key() == QtCore.Qt.Key_Enter) | (event.key() == QtCore.Qt.Key_Return): if (event.key() == QtCore.Qt.Key_Enter) | (event.key() == QtCore.Qt.Key_Return):
index = self.ui.comboboxFindLabel.currentIndex() index = self.ui.comboboxFindLabel.currentIndex()
@ -2617,6 +2617,16 @@ class MyForm(QtGui.QMainWindow):
# no matching contact # no matching contact
self.ui.comboboxFindLabel.setCurrentIndex(0) # set the label to "" self.ui.comboboxFindLabel.setCurrentIndex(0) # set the label to ""
self.ui.comboboxFindAddress.setEditText(text) # otherwise you will lose the text on enter self.ui.comboboxFindAddress.setEditText(text) # otherwise you will lose the text on enter
# but maybe the address is valid?
# random address for testing: BM-2DAArASbJckBdn3HvTt7kHAbPA5tGxc2R1
status, a, b, c = decodeAddress(str(text))
if status == 'success':
# valid address
print _translate("MainWindow", "Address is valid.")
self.on_addRecipient_submit()
else:
# not valid
print 'sorry, invalid address'
return QtGui.QComboBox.keyPressEvent(self.ui.comboboxFindAddress, event) return QtGui.QComboBox.keyPressEvent(self.ui.comboboxFindAddress, event)
def on_addRecipient_submit(self): def on_addRecipient_submit(self):
@ -2625,27 +2635,32 @@ class MyForm(QtGui.QMainWindow):
labelText = self.ui.comboboxFindLabel.currentText() labelText = self.ui.comboboxFindLabel.currentText()
addressIndex = self.ui.comboboxFindAddress.currentIndex() addressIndex = self.ui.comboboxFindAddress.currentIndex()
addressText = self.ui.comboboxFindAddress.currentText() addressText = self.ui.comboboxFindAddress.currentText()
if (labelIndex == addressIndex) & (self.ui.comboboxFindLabel.itemText(index) == labelText) & (self.ui.comboboxFindAddress.itemText(index) == addressText): status, a, b, c = decodeAddress(str(addressText))
addToBottom = False if ((labelIndex == addressIndex) & (self.ui.comboboxFindLabel.itemText(index) == labelText) & (self.ui.comboboxFindAddress.itemText(index) == addressText)):
rowIndex = self.ui.tableWidgetRecipients.rowCount()-1 if addToBottom else 1 pass
self.ui.tableWidgetRecipients.insertRow(rowIndex) elif ((labelIndex <= 0) & (status == 'success')):
newItem = QtGui.QTableWidgetItem(unicode(labelText, 'utf-8')) labelText = _translate("MainWindow", "--unknown Address--")
newItem.setFlags( index = -1
QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.tableWidgetRecipients.setItem(rowIndex, 0, newItem)
newItem = QtGui.QTableWidgetItem(unicode(addressText, 'utf-8'))
newItem.setFlags(
QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.tableWidgetRecipients.setItem(rowIndex, 1, newItem)
# clean up so we won't add it again
self.ui.comboboxFindAddress.removeItem(index)
self.ui.comboboxFindLabel.removeItem(index)
# jump to the first item
self.ui.comboboxFindAddress.setCurrentIndex(0)
self.ui.comboboxFindLabel.setCurrentIndex(0)
else: else:
print 'how did you get here?!' print 'how did you get here?!'
return return
addToBottom = False
rowIndex = self.ui.tableWidgetRecipients.rowCount()-1 if addToBottom else 1
self.ui.tableWidgetRecipients.insertRow(rowIndex)
newItem = QtGui.QTableWidgetItem(unicode(labelText, 'utf-8'))
newItem.setFlags(
QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.tableWidgetRecipients.setItem(rowIndex, 0, newItem)
newItem = QtGui.QTableWidgetItem(unicode(addressText, 'utf-8'))
newItem.setFlags(
QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.ui.tableWidgetRecipients.setItem(rowIndex, 1, newItem)
# clean up so we won't add it again
self.ui.comboboxFindAddress.removeItem(index)
self.ui.comboboxFindLabel.removeItem(index)
# jump to the first item
self.ui.comboboxFindAddress.setCurrentIndex(0)
self.ui.comboboxFindLabel.setCurrentIndex(0)
# Group of functions for the Address Book dialog box # Group of functions for the Address Book dialog box
def on_action_AddressBookNew(self): def on_action_AddressBookNew(self):