From cd2c55dd2da9ed5a41812e9bd42aeb31cea6dd50 Mon Sep 17 00:00:00 2001 From: sendiulo Date: Sat, 21 Sep 2013 14:49:30 +0200 Subject: [PATCH] removed bug: sent icon wrongly put into column 0 instead of 1 --- src/bitmessageqt/__init__.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 5895c98f..7dd19764 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -112,9 +112,6 @@ def identiconize(address): idcon = QtGui.QIcon() idcon.addPixmap(pix, QtGui.QIcon.Normal, QtGui.QIcon.Off) return idcon - elif identicon_lib == 'empty': - idcon = QtGui.QIcon(":/newPrefix/images/no_identicons.png") - return idcon elif identicon_lib in ['False', 'false', 'None', 'none']: idcon = QtGui.QIcon() return idcon @@ -174,9 +171,6 @@ def avatarize(address, fallBackToIdenticon = False): except: # default to no identicons identicon_lib = False - if identicon_lib == 'empty': - idcon = QtGui.QIcon(":/newPrefix/images/no_identicons.png") - return idcon return idcon class MyForm(QtGui.QMainWindow): @@ -1690,7 +1684,7 @@ class MyForm(QtGui.QMainWindow): self.ui.tableWidgetSent.item( i, 1).setText(unicode(fromLabel, 'utf-8')) self.ui.tableWidgetSent.item( - i, 0).setIcon(avatarize(fromAddress, True)) + i, 1).setIcon(avatarize(fromAddress, True)) def rerenderSentToLabels(self): for i in range(self.ui.tableWidgetSent.rowCount()): @@ -3358,8 +3352,7 @@ class settingsDialog(QtGui.QDialog): curr_index = languages.index('other') self.ui.languageComboBox.setCurrentIndex(curr_index) - ### - self.ui.comboBoxIdenticonStyle.addItem(QIcon(":/newPrefix/images/no_identicons.png"), _translate("settingsDialog", "None"), "none") + self.ui.comboBoxIdenticonStyle.addItem(_translate("settingsDialog", "None"), "none") self.ui.comboBoxIdenticonStyle.addItem(QIcon(":/newPrefix/images/qidenticon.png"), _translate("settingsDialog", "QIdenticon"), "qidenticon") self.ui.comboBoxIdenticonStyle.addItem(QIcon(":/newPrefix/images/qidenticon_x.png"), _translate("settingsDialog", "QIdenticon (transparent)"), "qidenticon_x") self.ui.comboBoxIdenticonStyle.addItem(QIcon(":/newPrefix/images/qidenticon_two.png"), _translate("settingsDialog", "QIdenticon two"), "qidenticon_two")