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

View File

@ -15,7 +15,9 @@ class AccountMixin (object):
return QtGui.QApplication.palette().text().color() return QtGui.QApplication.palette().text().color()
def accountBrush(self): def accountBrush(self):
return QtGui.QBrush(self.accountColor()) brush = QtGui.QBrush(self.accountColor())
brush.setStyle(QtCore.Qt.NoBrush)
return brush
def setAddress(self, address): def setAddress(self, address):
self.address = str(address) self.address = str(address)
@ -129,9 +131,7 @@ class Ui_AddressWidget(QtGui.QTreeWidgetItem, AccountMixin):
self.setFont(0, font) self.setFont(0, font)
#set text color #set text color
brush = self.accountBrush() self.setForeground(0, self.accountBrush())
brush.setStyle(QtCore.Qt.NoBrush)
self.setForeground(0, brush)
self.setIcon(0, avatarize(self.address)) self.setIcon(0, avatarize(self.address))
self.setText(0, text) self.setText(0, text)
@ -212,9 +212,7 @@ class Ui_SubscriptionWidget(Ui_AddressWidget, AccountMixin):
self.setFont(0, font) self.setFont(0, font)
#set text color #set text color
brush = self.accountBrush() self.setForeground(0, self.accountBrush())
brush.setStyle(QtCore.Qt.NoBrush)
self.setForeground(0, brush)
self.setIcon(0, avatarize(self.address)) self.setIcon(0, avatarize(self.address))
self.setText(0, text) self.setText(0, text)
@ -254,9 +252,7 @@ class Ui_AddressBookWidgetItem(QtGui.QTableWidgetItem, AccountMixin):
except: except:
self.type = 0 self.type = 0
self.setEnabled(True) self.setEnabled(True)
brush = self.accountBrush() self.setForeground(self.accountBrush())
brush.setStyle(QtCore.Qt.NoBrush)
self.setForeground(brush)
def __lt__ (self, other): def __lt__ (self, other):
if (isinstance(other, Ui_AddressBookWidgetItem)): if (isinstance(other, Ui_AddressBookWidgetItem)):