AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of git://github.com/spesmilo/electrum

Browse Source
This commit is contained in:
ThomasV
2015-09-04 15:26:31 +02:00
parent 2f8574f7d7 317582e9a7
commit fb79f50366
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/qt/main_window.py
View File

@@ -1172,7 +1172,7 @@ class ElectrumWindow(QMainWindow):
def do_send(self):
if run_hook('before_send', window):
if run_hook('before_send', self):
return
r = self.read_send_tab()
if not r:
@@ -1470,10 +1470,6 @@ class ElectrumWindow(QMainWindow):
self.update_account_selector()
def create_receive_menu(self, position):
# fixme: this function apparently has a side effect.
# if it is not called the menu pops up several times
#self.address_list.selectedIndexes()
selected = self.address_list.selectedItems()
multi_select = len(selected) > 1
addrs = [unicode(item.text(0)) for item in selected]
@@ -1494,7 +1490,7 @@ class ElectrumWindow(QMainWindow):
if not multi_select:
menu.addAction(_("Copy to clipboard"), lambda: self.app.clipboard().setText(addr))
menu.addAction(_("Request payment"), lambda: self.receive_at(addr))
menu.addAction(_("Edit label"), lambda: self.address_list.edit_label(item))
menu.addAction(_("Edit label"), lambda: self.address_list.editItem(item, self.address_list.editable_columns[0]))
menu.addAction(_('History'), lambda: self.show_address(addr))
menu.addAction(_('Public Keys'), lambda: self.show_public_keys(addr))
if self.wallet.can_export():