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

Fix: do not update account name from folder name

Browse Source 
Last commit caused changes in unread count of folder to change the
account name. This is now fixed.
This commit is contained in:
mailchuck 2015-10-04 10:57:14 +02:00 committed by Peter Surda
parent 80afc489d8
commit ccae351e65
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/bitmessageqt/__init__.py
View File

@ -535,7 +535,6 @@ class MyForm(QtGui.QMainWindow):
j += 1 j += 1
widget.setUnreadCount(unread) widget.setUnreadCount(unread)
if (tab == 'messages'): if (tab == 'messages'):
print "setting %s editable" % (toAddress)
widget.setFlags (widget.flags() | QtCore.Qt.ItemIsEditable) widget.setFlags (widget.flags() | QtCore.Qt.ItemIsEditable)
i += 1 i += 1
@ -3469,19 +3468,29 @@ more work your computer must do to send the message. A Time-To-Live of four or f
self.loadMessagelist(messagelist, account, folder) self.loadMessagelist(messagelist, account, folder)
def treeWidgetItemChanged(self, item, column): def treeWidgetItemChanged(self, item, column):
widget = self.getCurrentTreeWidget() # only for manual edits. automatic edits (setText) are ignored
if item.address == widget.currentItem().address: if column != 0:
newLabel = str(item.text(0)) return
newLabel = newLabel.replace("(" + str(item.address) + ")", '') # only account names
newLabel = newLabel.rstrip() if not isinstance(item, Ui_AddressWidget):
oldLabel = shared.config.get(str(item.address), 'label') return
oldLabel = oldLabel.replace("(" + str(item.address) + ")", '') # only currently selected item
oldLabel = oldLabel.rstrip() if item.address != self.getCurrentTreeWidget().currentItem().address:
if newLabel == oldLabel: return
return
shared.config.set(str(item.address), 'label', newLabel) newLabel = str(item.text(0))
item.updateText() newLabel = newLabel.replace("(" + str(item.address) + ")", '')
shared.writeKeysFile() newLabel = newLabel.rstrip()
oldLabel = shared.config.get(str(item.address), 'label')
oldLabel = oldLabel.replace("(" + str(item.address) + ")", '')
oldLabel = oldLabel.rstrip()
# unchanged, do not do anything either
if newLabel == oldLabel:
return
shared.config.set(str(item.address), 'label', newLabel)
item.updateText()
shared.writeKeysFile()
def tableWidgetInboxItemClicked(self): def tableWidgetInboxItemClicked(self):
folder = self.getCurrentFolder() folder = self.getCurrentFolder()