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

fixing

Browse Source
This commit is contained in:
Chuck 2013-07-12 16:41:34 +07:00
parent d8da925b8d
commit 08d38ee22b
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/bitmessageqt/__init__.py
View File

@ -167,8 +167,6 @@ class MyForm(QtGui.QMainWindow):
"MainWindow", "Disable"), self.on_action_YourIdentitiesDisable) "MainWindow", "Disable"), self.on_action_YourIdentitiesDisable)
self.actionClipboard = self.ui.addressContextMenuToolbar.addAction(_translate( self.actionClipboard = self.ui.addressContextMenuToolbar.addAction(_translate(
"MainWindow", "Copy address to clipboard"), self.on_action_YourIdentitiesClipboard) "MainWindow", "Copy address to clipboard"), self.on_action_YourIdentitiesClipboard)
self.actionClipboardEmail = self.ui.addressContextMenuToolbar.addAction(_translate(
"MainWindow", "Copy E-Mail formatted address to clipboard"), self.on_action_YourIdentitiesClipboardEmail)
self.actionSpecialAddressBehavior = self.ui.addressContextMenuToolbar.addAction(_translate( self.actionSpecialAddressBehavior = self.ui.addressContextMenuToolbar.addAction(_translate(
"MainWindow", "Special address behavior..."), self.on_action_SpecialAddressBehaviorDialog) "MainWindow", "Special address behavior..."), self.on_action_SpecialAddressBehaviorDialog)
self.ui.tableWidgetYourIdentities.setContextMenuPolicy( self.ui.tableWidgetYourIdentities.setContextMenuPolicy(
@ -179,7 +177,6 @@ class MyForm(QtGui.QMainWindow):
self.popMenu.addAction(self.actionNew) self.popMenu.addAction(self.actionNew)
self.popMenu.addSeparator() self.popMenu.addSeparator()
self.popMenu.addAction(self.actionClipboard) self.popMenu.addAction(self.actionClipboard)
self.popMenu.addAction(self.actionClipboardEmail)
self.popMenu.addSeparator() self.popMenu.addSeparator()
self.popMenu.addAction(self.actionEnable) self.popMenu.addAction(self.actionEnable)
self.popMenu.addAction(self.actionDisable) self.popMenu.addAction(self.actionDisable)
@ -192,8 +189,6 @@ class MyForm(QtGui.QMainWindow):
"MainWindow", "Send message to this address"), self.on_action_AddressBookSend) "MainWindow", "Send message to this address"), self.on_action_AddressBookSend)
self.actionAddressBookClipboard = self.ui.addressBookContextMenuToolbar.addAction(_translate( self.actionAddressBookClipboard = self.ui.addressBookContextMenuToolbar.addAction(_translate(
"MainWindow", "Copy address to clipboard"), self.on_action_AddressBookClipboard) "MainWindow", "Copy address to clipboard"), self.on_action_AddressBookClipboard)
self.actionAddressBookClipboardEmail = self.ui.addressBookContextMenuToolbar.addAction(_translate(
"MainWindow", "Copy E-Mail formatted address to clipboard"), self.on_action_AddressBookClipboardEmail)
self.actionAddressBookSubscribe = self.ui.addressBookContextMenuToolbar.addAction(_translate( self.actionAddressBookSubscribe = self.ui.addressBookContextMenuToolbar.addAction(_translate(
"MainWindow", "Subscribe to this address"), self.on_action_AddressBookSubscribe) "MainWindow", "Subscribe to this address"), self.on_action_AddressBookSubscribe)
self.actionAddressBookNew = self.ui.addressBookContextMenuToolbar.addAction(_translate( self.actionAddressBookNew = self.ui.addressBookContextMenuToolbar.addAction(_translate(
@ -207,7 +202,6 @@ class MyForm(QtGui.QMainWindow):
self.popMenuAddressBook = QtGui.QMenu(self) self.popMenuAddressBook = QtGui.QMenu(self)
self.popMenuAddressBook.addAction(self.actionAddressBookSend) self.popMenuAddressBook.addAction(self.actionAddressBookSend)
self.popMenuAddressBook.addAction(self.actionAddressBookClipboard) self.popMenuAddressBook.addAction(self.actionAddressBookClipboard)
self.popMenuAddressBook.addAction(self.actionAddressBookClipboardEmail)
self.popMenuAddressBook.addAction( self.actionAddressBookSubscribe ) self.popMenuAddressBook.addAction( self.actionAddressBookSubscribe )
self.popMenuAddressBook.addSeparator() self.popMenuAddressBook.addSeparator()
self.popMenuAddressBook.addAction(self.actionAddressBookNew) self.popMenuAddressBook.addAction(self.actionAddressBookNew)
@ -2283,22 +2277,6 @@ class MyForm(QtGui.QMainWindow):
clipboard = QtGui.QApplication.clipboard() clipboard = QtGui.QApplication.clipboard()
clipboard.setText(fullStringOfAddresses) clipboard.setText(fullStringOfAddresses)
def on_action_AddressBookClipboardEmail(self):
fullStringOfAddresses = ''
listOfSelectedRows = {}
for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())):
listOfSelectedRows[
self.ui.tableWidgetAddressBook.selectedIndexes()[i].row()] = 0
for currentRow in listOfSelectedRows:
addressAtCurrentRow = str(self.ui.tableWidgetAddressBook.item(
currentRow, 1).text())
if fullStringOfAddresses == '':
fullStringOfAddresses = '{}@{}'.format(getBase58Capitaliation(addressAtCurrentRow), addressAtCurrentRow)
else:
fullStringOfAddresses += ', ' + '{}@{}'.format(getBase58Capitaliation(addressAtCurrentRow), addressAtCurrentRow)
clipboard = QtGui.QApplication.clipboard()
clipboard.setText(fullStringOfAddresses)
def on_action_AddressBookSend(self): def on_action_AddressBookSend(self):
listOfSelectedRows = {} listOfSelectedRows = {}
for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())): for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())):
@ -2543,13 +2521,6 @@ class MyForm(QtGui.QMainWindow):
clipboard = QtGui.QApplication.clipboard() clipboard = QtGui.QApplication.clipboard()
clipboard.setText(str(addressAtCurrentRow)) clipboard.setText(str(addressAtCurrentRow))
def on_action_YourIdentitiesClipboardEmail(self):
currentRow = self.ui.tableWidgetYourIdentities.currentRow()
addressAtCurrentRow = str(self.ui.tableWidgetYourIdentities.item(
currentRow, 1).text())
clipboard = QtGui.QApplication.clipboard()
clipboard.setText('{}@{}'.format(getBase58Capitaliation(addressAtCurrentRow), addressAtCurrentRow))
def on_context_menuYourIdentities(self, point): def on_context_menuYourIdentities(self, point):
self.popMenu.exec_( self.popMenu.exec_(
self.ui.tableWidgetYourIdentities.mapToGlobal(point)) self.ui.tableWidgetYourIdentities.mapToGlobal(point))
@ -2954,7 +2925,7 @@ class settingsDialog(QtGui.QDialog):
self.ui.labelAccountStatus.setText('Account inaccessible via SMTP/POP3. Set a password to grant access.') self.ui.labelAccountStatus.setText('Account inaccessible via SMTP/POP3. Set a password to grant access.')
self.ui.pushButtonClearPassword.setEnabled(False) self.ui.pushButtonClearPassword.setEnabled(False)
self.ui.lineEditEmailAddress.setText('{}@{}'.format(getBase58Capitaliation(address), address)) self.ui.lineEditEmailAddress.setText('{}@default'.format(address))
def click_ClearPassword(self): def click_ClearPassword(self):
comboBoxIndex = self.ui.comboBoxEmailIdentities.currentIndex() comboBoxIndex = self.ui.comboBoxEmailIdentities.currentIndex()