Browse Source

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.
283
Neil Booth 10 years ago
parent
commit
c35485c1c2
  1. 9
      gui/qt/transaction_dialog.py
  2. 2
      plugins/cosigner_pool.py
  3. 4
      plugins/greenaddress_instant.py

9
gui/qt/transaction_dialog.py

@ -97,10 +97,15 @@ class TxDialog(QWidget):
self.copy_button = CopyButton(lambda: str(self.tx), self.parent.app) 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) 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() self.update()
def do_broadcast(self): def do_broadcast(self):

2
plugins/cosigner_pool.py

@ -115,7 +115,7 @@ class Plugin(BasePlugin):
def transaction_dialog(self, d): def transaction_dialog(self, d):
self.send_button = b = QPushButton(_("Send to cosigner")) self.send_button = b = QPushButton(_("Send to cosigner"))
b.clicked.connect(lambda: self.do_send(d.tx)) b.clicked.connect(lambda: self.do_send(d.tx))
d.buttons.insert(2, b) d.buttons.insert(0, b)
self.transaction_dialog_update(d) self.transaction_dialog_update(d)
@hook @hook

4
plugins/greenaddress_instant.py

@ -36,7 +36,7 @@ class Plugin(BasePlugin):
button_label = _("Verify GA instant") button_label = _("Verify GA instant")
@hook @hook
def init_qt(self, gui): def init_qt(self, gui):
self.win = gui.main_window self.win = gui.main_window
@ -45,7 +45,7 @@ class Plugin(BasePlugin):
self.wallet = d.wallet self.wallet = d.wallet
self.verify_button = b = QPushButton(self.button_label) self.verify_button = b = QPushButton(self.button_label)
b.clicked.connect(lambda: self.do_verify(d.tx)) b.clicked.connect(lambda: self.do_verify(d.tx))
d.buttons.insert(1, b) d.buttons.insert(0, b)
self.transaction_dialog_update(d) self.transaction_dialog_update(d)
def get_my_addr(self, tx): def get_my_addr(self, tx):

Loading…
Cancel
Save