BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle openalias properly in contacts tab 

- Filter out of block explorer URLs
- Make them uneditable
This commit is contained in:
Neil Booth 2015-08-29 21:55:17 +09:00
parent 62fe37a863
commit 32c1b9cd59
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gui/qt/main_window.py
View File

@ -1507,7 +1507,7 @@ class ElectrumWindow(QMainWindow):
return self.create_list_tab(l) return self.create_list_tab(l)
def create_contacts_tab(self): def create_contacts_tab(self):
l = MyTreeWidget(self, self.create_contact_menu, [_('Name'), _('Address'), _('Type')], 1, [0, 1]) l = MyTreeWidget(self, self.create_contact_menu, [_('Name'), _('Value'), _('Type')], 1, [0, 1])
l.setSelectionMode(QAbstractItemView.ExtendedSelection) l.setSelectionMode(QAbstractItemView.ExtendedSelection)
l.item_edited = self.contact_edited l.item_edited = self.contact_edited
self.contacts_list = l self.contacts_list = l
@ -1685,12 +1685,15 @@ class ElectrumWindow(QMainWindow):
else: else:
labels = [unicode(item.text(0)) for item in selected] labels = [unicode(item.text(0)) for item in selected]
addrs = [unicode(item.text(1)) for item in selected] addrs = [unicode(item.text(1)) for item in selected]
types = [unicode(item.text(2)) for item in selected]
menu.addAction(_("Copy to Clipboard"), lambda: menu.addAction(_("Copy to Clipboard"), lambda:
self.app.clipboard().setText('\n'.join(labels))) self.app.clipboard().setText('\n'.join(labels)))
menu.addAction(_("Pay to"), lambda: self.payto_contacts(labels)) menu.addAction(_("Pay to"), lambda: self.payto_contacts(labels))
menu.addAction(_("Delete"), lambda: self.delete_contacts(labels)) menu.addAction(_("Delete"), lambda: self.delete_contacts(labels))
URLs = [URL for URL in [block_explorer_URL(self.config, 'addr', addr) URLs = []
for addr in addrs] if URL is not None] for (addr, _type) in zip(addrs, types):
if _type == 'address':
URLs.append(block_explorer_URL(self.config, 'addr', addr))
if URLs: if URLs:
menu.addAction(_("View on block explorer"), menu.addAction(_("View on block explorer"),
lambda: map(webbrowser.open, URLs)) lambda: map(webbrowser.open, URLs))
@ -1826,7 +1829,10 @@ class ElectrumWindow(QMainWindow):
l.clear() l.clear()
for key in sorted(self.contacts.keys()): for key in sorted(self.contacts.keys()):
_type, value = self.contacts[key] _type, value = self.contacts[key]
if _type == 'address':
item = EditableItem([key, value, _type]) item = EditableItem([key, value, _type])
else: # openalias items shouldn't be editable
item = QTreeWidgetItem([key, value, _type])
item.setData(0, Qt.UserRole, key) item.setData(0, Qt.UserRole, key)
l.addTopLevelItem(item) l.addTopLevelItem(item)
if key == current_key: if key == current_key: