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

V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Conversation 0 Commits 399 Files Changed 133 +14 -9
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d86f7a699 - Show all commits

7
src/bitmessageqt/foldertree.py
View File

@ -132,7 +132,10 @@ class Ui_AddressWidget(QtGui.QTreeWidgetItem):
reverse = False reverse = False
if self.treeWidget().header().sortIndicatorOrder() == QtCore.Qt.DescendingOrder: if self.treeWidget().header().sortIndicatorOrder() == QtCore.Qt.DescendingOrder:
reverse = True reverse = True
if shared.config.getboolean(self.address, 'enabled') == shared.config.getboolean(other.address, 'enabled'): if shared.config.getboolean(self.address, 'enabled') == \
shared.config.getboolean(other.address, 'enabled'):
if shared.safeConfigGetBoolean(self.address, 'mailinglist') == \
shared.safeConfigGetBoolean(other.address, 'mailinglist'):
if shared.config.get(self.address, 'label'): if shared.config.get(self.address, 'label'):
x = shared.config.get(self.address, 'label').decode('utf-8').lower() x = shared.config.get(self.address, 'label').decode('utf-8').lower()
else: else:
@ -142,6 +145,8 @@ class Ui_AddressWidget(QtGui.QTreeWidgetItem):
else: else:
y = other.address.decode('utf-8').lower() y = other.address.decode('utf-8').lower()
return x < y return x < y
else:
return (reverse if shared.safeConfigGetBoolean(self.address, 'mailinglist') else not reverse)
# else: # else:
return (not reverse if shared.config.getboolean(self.address, 'enabled') else reverse) return (not reverse if shared.config.getboolean(self.address, 'enabled') else reverse)