V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit 1d86f7a699 - Show all commits

View File

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