tseparate labels and aliases - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 6abda697117d578130df92c8883f338be94a16f9 DIR parent 2df4d6de5ac089485c2aae7c198348e9f4208154 HTML Author: thomasv <thomasv@gitorious> Date: Fri, 20 Apr 2012 11:50:19 +0200 separate labels and aliases Diffstat: M client/gui_qt.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- DIR diff --git a/client/gui_qt.py b/client/gui_qt.py t@@ -298,6 +298,9 @@ class ElectrumWindow(QMainWindow): def address_label_clicked(self, item, column, l): if column==1 and item.isSelected(): + addr = unicode( item.text(0) ) + if addr in map(lambda x:x[1], self.wallet.aliases.values()): + return item.setFlags(Qt.ItemIsEditable|Qt.ItemIsSelectable | Qt.ItemIsUserCheckable | Qt.ItemIsEnabled | Qt.ItemIsDragEnabled) l.editItem( item, column ) item.setFlags(Qt.ItemIsSelectable | Qt.ItemIsUserCheckable | Qt.ItemIsEnabled | Qt.ItemIsDragEnabled) t@@ -594,8 +597,7 @@ class ElectrumWindow(QMainWindow): self.contacts_list.clear() for alias, v in self.wallet.aliases.items(): s, target = v - label = self.wallet.labels.get(alias,'') - item = QTreeWidgetItem( [ alias, label, '-'] ) + item = QTreeWidgetItem( [ target, alias, '-'] ) self.contacts_list.addTopLevelItem(item) for address in self.wallet.addressbook: