tMerge pull request #1320 from kyuupichan/button_split - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 6afb7b21d06b7b3039f176ca294e86f605fe8da8
DIR parent 3a9bf8430e403845e2b3e290d48a0ddc139ef118
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Sat, 27 Jun 2015 16:09:15 +0200
Merge pull request #1320 from kyuupichan/button_split
Split tx dialog buttons
Diffstat:
M gui/qt/transaction_dialog.py | 9 +++++++--
M plugins/cosigner_pool.py | 2 +-
M plugins/greenaddress_instant.py | 4 ++--
3 files changed, 10 insertions(+), 5 deletions(-)
---
DIR diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py
t@@ -97,10 +97,15 @@ class TxDialog(QWidget):
self.copy_button = CopyButton(lambda: str(self.tx), self.parent.app)
- self.buttons = [self.copy_button, self.qr_button, self.sign_button, self.broadcast_button, self.save_button, self.cancel_button]
+ # Action buttons
+ self.buttons = [self.sign_button, self.broadcast_button, self.cancel_button]
run_hook('transaction_dialog', self)
- vbox.addLayout(Buttons(*self.buttons))
+ hbox = QHBoxLayout()
+ hbox.addLayout(Buttons(self.copy_button, self.qr_button, self.save_button))
+ hbox.addStretch(1)
+ hbox.addLayout(Buttons(*self.buttons))
+ vbox.addLayout(hbox)
self.update()
def do_broadcast(self):
DIR diff --git a/plugins/cosigner_pool.py b/plugins/cosigner_pool.py
t@@ -115,7 +115,7 @@ class Plugin(BasePlugin):
def transaction_dialog(self, d):
self.send_button = b = QPushButton(_("Send to cosigner"))
b.clicked.connect(lambda: self.do_send(d.tx))
- d.buttons.insert(2, b)
+ d.buttons.insert(0, b)
self.transaction_dialog_update(d)
@hook
DIR diff --git a/plugins/greenaddress_instant.py b/plugins/greenaddress_instant.py
t@@ -36,7 +36,7 @@ class Plugin(BasePlugin):
button_label = _("Verify GA instant")
- @hook
+ @hook
def init_qt(self, gui):
self.win = gui.main_window
t@@ -45,7 +45,7 @@ class Plugin(BasePlugin):
self.wallet = d.wallet
self.verify_button = b = QPushButton(self.button_label)
b.clicked.connect(lambda: self.do_verify(d.tx))
- d.buttons.insert(1, b)
+ d.buttons.insert(0, b)
self.transaction_dialog_update(d)
def get_my_addr(self, tx):