electrum

commit 6e660f562f63afc32556b76249f940f59ba4ddf3
parent a7028176cddb475f51939384648d7e453d373115
Author: Neil Booth <kyuupichan@gmail.com>
Date:   Sun,  3 Jan 2016 10:39:44 +0900

Change inheritance order in installwizard.py

Also put back set_layout.  This is causing two things:

a) on MacOSX the next / cancel buttons vanish if in one position
b) on all O/Ses the Next button is not the default

We're obviously abusing StackedLayout in an unintended way.

Diffstat:
M
gui/qt/installwizard.py
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
@@ -54,8 +54,8 @@ class CosignWidget(QWidget):
         qp.end()
 
 
-
-class InstallWizard(WindowModalDialog, WizardBase):
+# WizardBase must come first as we override show_error
+class InstallWizard(WizardBase, WindowModalDialog):
 
     def __init__(self, config, app, plugins):
         title = 'Electrum  -  ' + _('Install Wizard')
@@ -192,10 +192,9 @@ class InstallWizard(WindowModalDialog, WizardBase):
             if i==0:
                 button.setChecked(True)
 
-        self.set_layout(vbox)
         vbox.addStretch(1)
         vbox.addLayout(Buttons(CancelButton(self), OkButton(self, _('Next'))))
-        self.show()
+        self.set_layout(vbox)
         self.raise_()
 
         if not self.exec_():