new Button widgets

plugins/btchipwallet.py

@@ -9,7 +9,6 @@ from base64 import b64encode, b64decode
 
 import electrum
 from electrum_gui.qt.password_dialog import make_password_dialog, run_password_dialog
-from electrum_gui.qt.util import ok_cancel_buttons
 from electrum.account import BIP32_Account
 from electrum.bitcoin import EncodeBase58Check, DecodeBase58Check, public_key_to_bc_address, bc_address_to_hash_160
 from electrum.i18n import _

plugins/openalias.py

@@ -15,14 +15,15 @@
 # Version: 0.1
 # Todo: optionally use OA resolvers; add DNSCrypt support
 
-from electrum_gui.qt.util import EnterButton
-from electrum.plugins import BasePlugin, hook
-from electrum.util import print_error
-from electrum.i18n import _
+import re
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
-import re
+from electrum_gui.qt.util import *
+from electrum.plugins import BasePlugin, hook
+from electrum.util import print_error
+from electrum.i18n import _
+
 
 # Import all of the rdtypes, as py2app and similar get confused with the dnspython
 # autoloader and won't include all the rdatatypes
@@ -182,7 +183,7 @@ class Plugin(BasePlugin):
         grid.addWidget(line1, 1, 1)
 
         vbox.addLayout(grid)
-        vbox.addLayout(ok_cancel_buttons(d))
+        vbox.addLayout(Buttons(CancelButton(d), OkButton(d)))
 
         if not d.exec_():
             return
@@ -224,7 +225,7 @@ class Plugin(BasePlugin):
         grid2.addWidget(QLabel(address), 4, 1)
 
         vbox2.addLayout(grid2)
-        vbox2.addLayout(ok_cancel_buttons(d2))
+        vbox2.addLayout(Buttons(CancelButton(d2), OkButton(d2)))
 
         if not d2.exec_():
             return

plugins/trezor.py

@@ -16,7 +16,7 @@ from electrum.transaction import deserialize
 from electrum.wallet import BIP32_HD_Wallet
 from electrum.util import print_error
 
-from electrum_gui.qt.util import ok_cancel_buttons, EnterButton
+from electrum_gui.qt.util import *
 
 try:
     from trezorlib.client import types
@@ -519,7 +519,7 @@ class TrezorQtGuiMixin(object):
         vbox = QVBoxLayout()
         vbox.addWidget(QLabel(msg))
         vbox.addWidget(matrix)
-        vbox.addLayout(ok_cancel_buttons(d))
+        vbox.addLayout(Buttons(CancelButton(d), OkButton(d)))
         d.setLayout(vbox)
 
         if not d.exec_(): return

plugins/trustedcoin.py

@@ -38,9 +38,8 @@ from electrum.wallet import Wallet_2of3
 from electrum.i18n import _
 from electrum.plugins import BasePlugin, run_hook, hook
 
-from electrum_gui.qt.util import text_dialog, EnterButton, WaitingDialog
+from electrum_gui.qt.util import *
 from electrum_gui.qt.qrcodewidget import QRCodeWidget
-from electrum_gui.qt import ok_cancel_buttons, ok_cancel_buttons2, close_button
 from electrum_gui.qt.amountedit import AmountEdit
 from electrum_gui.qt.main_window import StatusBarButton
 
@@ -532,7 +531,7 @@ class Plugin(BasePlugin):
         grid.addWidget(QLabel(_('Code')), 1, 0)
         grid.addWidget(pw, 1, 1)
         vbox.addLayout(grid)
-        vbox.addLayout(ok_cancel_buttons(d))
+        vbox.addLayout(Buttons(CancelButton(d), OkButton(d)))
         if not d.exec_(): 
             return
         return pw.get_amount()
@@ -617,7 +616,7 @@ class Plugin(BasePlugin):
 
         #grid.addWidget(QLabel(_("Next Billing Address:")), i, 0)
         #grid.addWidget(QLabel(self.billing_info['billing_address']), i, 1)
-        vbox.addLayout(close_button(d))
+        vbox.addLayout(Buttons(CloseButton(d)))
         d.exec_()
 
 
@@ -642,9 +641,9 @@ class Plugin(BasePlugin):
         email_e = QLineEdit()
         vbox.addWidget(email_e)
         vbox.addStretch()
-        hbox, accept_button = ok_cancel_buttons2(window, _('Accept'))
+        accept_button = OkButton(window, _('Accept'))
         accept_button.setEnabled(False)
-        vbox.addLayout(hbox)
+        vbox.addLayout(Buttons(CancelButton(window), accept_button))
 
         def request_TOS():
             tos = server.get_terms_of_service()
@@ -688,9 +687,9 @@ class Plugin(BasePlugin):
         hbox.addStretch(1)
         vbox.addLayout(hbox)
 
-        hbox, b = ok_cancel_buttons2(window, _('Next'))
+        b = OkButton(window, _('Next'))
         b.setEnabled(False)
-        vbox.addLayout(hbox)
+        vbox.addLayout(Buttons(CancelButton(window), b))
         pw.textChanged.connect(lambda: b.setEnabled(len(pw.text())==6))
 
         window.exec_()