From c35485c1c21d11b3dc067d5e8afaedd3827c0ce0 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Sat, 27 Jun 2015 11:48:27 +0900
Subject: [PATCH] Split tx dialog buttons

The "actions" (sign, broadcast, send to cosigner, verify GA instant)
go on the RHS next to the "Cancel" button.

Copy, QR code and save go on the left.
---
 gui/qt/transaction_dialog.py    | 9 +++++++--
 plugins/cosigner_pool.py        | 2 +-
 plugins/greenaddress_instant.py | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py
index 37377e262..357d77631 100644
--- a/gui/qt/transaction_dialog.py
+++ b/gui/qt/transaction_dialog.py
@@ -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):
diff --git a/plugins/cosigner_pool.py b/plugins/cosigner_pool.py
index 5cd0859ff..f2ab6d5cf 100644
--- a/plugins/cosigner_pool.py
+++ b/plugins/cosigner_pool.py
@@ -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
diff --git a/plugins/greenaddress_instant.py b/plugins/greenaddress_instant.py
index eed9c1595..dd67c905e 100644
--- a/plugins/greenaddress_instant.py
+++ b/plugins/greenaddress_instant.py
@@ -36,7 +36,7 @@ class Plugin(BasePlugin):
 
     button_label = _("Verify GA instant")
 
-    @hook 
+    @hook
     def init_qt(self, gui):
         self.win = gui.main_window
 
@@ -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):