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 bccc2406a2 - Show all commits

View File

@ -915,15 +915,15 @@ class MyForm(settingsmixin.SMainWindow):
queryreturn = sqlQuery("SELECT COUNT(*) FROM inbox WHERE read = 0") queryreturn = sqlQuery("SELECT COUNT(*) FROM inbox WHERE read = 0")
for row in queryreturn: for row in queryreturn:
item.setUnreadCount(int(row[0])) item.setUnreadCount(int(row[0]))
if isinstance(item, Ui_AddressWidget): if isinstance(item, Ui_AddressWidget) and item.type == AccountMixin.ALL:
self.drawTrayIcon(self.currentTrayIconFileName, self.findInboxUnreadCount()) self.drawTrayIcon(self.currentTrayIconFileName, self.findInboxUnreadCount())
elif type == 1: elif type == 1:
item.setUnreadCount(item.unreadCount + 1) item.setUnreadCount(item.unreadCount + 1)
if isinstance(item, Ui_AddressWidget): if isinstance(item, Ui_AddressWidget) and item.type == AccountMixin.ALL:
self.drawTrayIcon(self.currentTrayIconFileName, self.findInboxUnreadCount(self.unreadCount + 1)) self.drawTrayIcon(self.currentTrayIconFileName, self.findInboxUnreadCount(self.unreadCount + 1))
elif type == -1: elif type == -1:
item.setUnreadCount(item.unreadCount - 1) item.setUnreadCount(item.unreadCount - 1)
if isinstance(item, Ui_AddressWidget): if isinstance(item, Ui_AddressWidget) and item.type == AccountMixin.ALL:
self.drawTrayIcon(self.currentTrayIconFileName, self.findInboxUnreadCount(self.unreadCount -1)) self.drawTrayIcon(self.currentTrayIconFileName, self.findInboxUnreadCount(self.unreadCount -1))
widgets = [self.ui.treeWidgetYourIdentities, self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans] widgets = [self.ui.treeWidgetYourIdentities, self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans]