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

On "Reply", "Reply to Chan" or "Send another message" (anything using on_action_NewDraft):

Browse Source 
- properly set the FROM combobox
This commit is contained in:
sendiulo 2013-09-07 11:11:26 +02:00
parent cbef2b7c22
commit ddb6e3bf05
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/bitmessageqt/__init__.py
View File

@ -2500,8 +2500,30 @@ class MyForm(QtGui.QMainWindow):
newSubject = 'Re: ' + newSubject newSubject = 'Re: ' + newSubject
self.on_action_NewDraft(newFromAddress, [newToAddress], newSubject, newContent) self.on_action_NewDraft(newFromAddress, [newToAddress], newSubject, newContent)
def on_action_NewDraft(self, newFromAddress=False,newToAddressList=[False],newSubject=False,newContent=False, switch=True): # def set_comboBoxSendFrom_to_address(self, newFromAddress):
# self.ui.comboBoxSendFrom.setCurrentIndex(0)
# self.ui.labelFrom.setText('')
# self.setBroadcastEnablementDependingOnWhetherThisIsAChanAddress(False)
# if newFromAddress != False:
# for index in range(self.ui.comboBoxSendFrom.count()):
# if self.ui.comboBoxSendFrom.itemData(index).toPyObject() == newFromAddress:
# self.ui.comboBoxSendFrom.setCurrentIndex(index)
# self.ui.labelFrom.setText(newFromAddress)
# self.setBroadcastEnablementDependingOnWhetherThisIsAChanAddress(newFromAddress)
# return
def set_comboBoxSendFrom_to_address(self, newFromAddress):
self.redrawLabelFrom(0)
if newFromAddress != False:
for index in range(self.ui.comboBoxSendFrom.count()):
if self.ui.comboBoxSendFrom.itemData(index).toPyObject() == newFromAddress:
self.ui.comboBoxSendFrom.setCurrentIndex(index)
self.redrawLabelFrom(index)
return
def on_action_NewDraft(self, newFromAddress=False,newToAddressList=[False],newSubject=False,newContent=False):
if newContent != False: if newContent != False:
# only ask if message body would be overwritten
current_text = str( current_text = str(
self.ui.textEditMessage.document().toPlainText().toUtf8()) self.ui.textEditMessage.document().toPlainText().toUtf8())
if len(current_text) > 0: if len(current_text) > 0:
@ -2517,29 +2539,24 @@ class MyForm(QtGui.QMainWindow):
# switch back to where you were # switch back to where you were
self.ui.tabWidget.setCurrentIndex(current_index) self.ui.tabWidget.setCurrentIndex(current_index)
return return
###
# check from address # check from address
if newFromAddress==False: if newFromAddress==False:
# keep the current from address # keep the current from address
pass pass
elif newFromAddress == self.str_broadcast_subscribers: elif newFromAddress == self.str_broadcast_subscribers:
self.ui.labelFrom.setText('') self.set_comboBoxSendFrom_to_address(False)
elif not shared.config.has_section(newFromAddress): elif not shared.config.has_section(newFromAddress):
QtGui.QMessageBox.information(self, _translate("MainWindow", "Address is gone"), _translate( QtGui.QMessageBox.information(self, _translate("MainWindow", "Address is gone"), _translate(
"MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(newFromAddress), QMessageBox.Ok) "MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(newFromAddress), QMessageBox.Ok)
self.ui.labelFrom.setText('') self.set_comboBoxSendFrom_to_address(False)
switch = False
elif not shared.config.getboolean(newFromAddress, 'enabled'): elif not shared.config.getboolean(newFromAddress, 'enabled'):
QtGui.QMessageBox.information(self, _translate("MainWindow", "Address disabled"), _translate( QtGui.QMessageBox.information(self, _translate("MainWindow", "Address disabled"), _translate(
"MainWindow", "Error: The address from which you are trying to send is disabled. You\'ll have to enable it on the \'Your Identities\' tab before using it."), QMessageBox.Ok) "MainWindow", "Error: The address from which you are trying to send is disabled. You\'ll have to enable it on the \'Your Identities\' tab before using it."), QMessageBox.Ok)
self.ui.labelFrom.setText('') self.set_comboBoxSendFrom_to_address(False)
switch = False
else: else:
self.ui.labelFrom.setText(newFromAddress) self.ui.labelFrom.setText(newFromAddress)
self.setBroadcastEnablementDependingOnWhetherThisIsAChanAddress(newFromAddress) self.set_comboBoxSendFrom_to_address(newFromAddress)
self.ui.comboBoxSendFrom.setCurrentIndex(0) # self.ui.comboBoxSendFrom.setEditText(str(here.item(currentRow,0).text))
# self.ui.comboBoxSendFrom.setEditText(str(here.item(currentRow,0).text))
# check recipient addresses # check recipient addresses
if False in newToAddressList: if False in newToAddressList:
newToAddressList.remove(False) newToAddressList.remove(False)
@ -2577,8 +2594,7 @@ class MyForm(QtGui.QMainWindow):
# check radio button "Send to one or more specific people" # check radio button "Send to one or more specific people"
self.ui.radioButtonSpecific.setChecked(True) self.ui.radioButtonSpecific.setChecked(True)
# switch to "Send" Tab # switch to "Send" Tab
if switch: self.ui.tabWidget.setCurrentIndex(1)
self.ui.tabWidget.setCurrentIndex(1)
def on_action_SentAddRecipientToAddressBook(self): def on_action_SentAddRecipientToAddressBook(self):
thisTableWidget = self.ui.tableWidgetSent thisTableWidget = self.ui.tableWidgetSent
@ -2925,7 +2941,6 @@ class MyForm(QtGui.QMainWindow):
self.ui.tabWidget.setCurrentIndex(1) self.ui.tabWidget.setCurrentIndex(1)
def on_action_YourIdentitiesSendFromAddress(self): def on_action_YourIdentitiesSendFromAddress(self):
###
here = self.ui.tableWidgetYourIdentities here = self.ui.tableWidgetYourIdentities
newFromAddressColumn = 1 newFromAddressColumn = 1
currentRow = here.currentRow() currentRow = here.currentRow()