citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

added error handling to previous commit: populate 'from' combo box when replying

This commit is contained in:
Jonathan Warren 2013-12-25 01:30:39 -05:00
parent 519a0a4779
commit 3c00a443ae
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bitmessageqt/__init__.py
View File

@ -2655,24 +2655,29 @@ class MyForm(QtGui.QMainWindow):
AllItems = [str(self.ui.comboBoxSendFrom.itemText(i)) for i in range(self.ui.comboBoxSendFrom.count())] listOfLabelsInComboBoxSendFrom = [str(self.ui.comboBoxSendFrom.itemText(i)) for i in range(self.ui.comboBoxSendFrom.count())]
AllItems_address = [str(self.ui.comboBoxSendFrom.itemData(i).toPyObject()) for i in range(self.ui.comboBoxSendFrom.count())] listOfAddressesInComboBoxSendFrom = [str(self.ui.comboBoxSendFrom.itemData(i).toPyObject()) for i in range(self.ui.comboBoxSendFrom.count())]
"""
isPresent_Label = False isPresent_Label = False
for item in AllItems: for item in listOfLabelsInComboBoxSendFrom:
if toAddressAtCurrentInboxRow_label == item: if toAddressAtCurrentInboxRow_label == item:
isPresent_Label = True isPresent_Label = True
break; break;
if(isPresent_Label == True): """
currentIndex = AllItems.index(toAddressAtCurrentInboxRow_label) #if isPresent_Label:
if toAddressAtCurrentInboxRow_label in listOfLabelsInComboBoxSendFrom:
currentIndex = listOfLabelsInComboBoxSendFrom.index(toAddressAtCurrentInboxRow_label)
self.ui.comboBoxSendFrom.setCurrentIndex(currentIndex) self.ui.comboBoxSendFrom.setCurrentIndex(currentIndex)
else: else:
currentIndex = AllItems_address.index(toAddressAtCurrentInboxRow) try:
self.ui.comboBoxSendFrom.setCurrentIndex(currentIndex) currentIndex = listOfAddressesInComboBoxSendFrom.index(toAddressAtCurrentInboxRow)
self.ui.comboBoxSendFrom.setCurrentIndex(currentIndex)
except:
#self.ui.comboBoxSendFrom.setCurrentIndex(0) # The toAddressAtCurrentInboxRow isn't in our combo box which can happen if
# we are replying to a broadcast address or if the address is disabled.
self.ui.comboBoxSendFrom.setCurrentIndex(0)
self.ui.textEditMessage.setText('\n\n------------------------------------------------------\n' + unicode(messageAtCurrentInboxRow, 'utf-8)')) self.ui.textEditMessage.setText('\n\n------------------------------------------------------\n' + unicode(messageAtCurrentInboxRow, 'utf-8)'))
if self.ui.tableWidgetInbox.item(currentInboxRow, 2).text()[0:3] in ['Re:', 'RE:']: if self.ui.tableWidgetInbox.item(currentInboxRow, 2).text()[0:3] in ['Re:', 'RE:']:
self.ui.lineEditSubject.setText( self.ui.lineEditSubject.setText(