Bitmessage/PyBitmessage-2024-11-30
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

OS X Build script and 'add subscription from address book' option #225

Merged
Atheros1 merged 14 commits from master into master 2013-06-19 19:16:58 +02:00
Conversation 0 Commits 14 Files Changed 7 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7378cffcc - Show all commits

4
src/bitmessageqt/__init__.py
View File

@ -1382,6 +1382,7 @@ class MyForm(QtGui.QMainWindow):
self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.")) self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want."))
else: else:
self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "The address you entered was invalid. Ignoring it.")) self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "The address you entered was invalid. Ignoring it."))
def addSubscription(self, label, address): def addSubscription(self, label, address):
address = addBMIfNotPresent(address) address = addBMIfNotPresent(address)
#This should be handled outside of this function, for error displaying and such, but it must also be checked here. #This should be handled outside of this function, for error displaying and such, but it must also be checked here.
@ -1894,7 +1895,8 @@ class MyForm(QtGui.QMainWindow):
addressAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,1).text() addressAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,1).text()
# Then subscribe to it... provided it's not already in the address book # Then subscribe to it... provided it's not already in the address book
if shared.isAddressInMySubscriptionsList(addressAtCurrentRow): if shared.isAddressInMySubscriptionsList(addressAtCurrentRow):
continue # maybe set the status bar or something self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want."))
continue
labelAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,0).text() labelAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,0).text()
self.addSubscription(labelAtCurrentRow, addressAtCurrentRow) self.addSubscription(labelAtCurrentRow, addressAtCurrentRow)
def on_context_menuAddressBook(self, point): def on_context_menuAddressBook(self, point):