AaronFiore/electrum
1
0
Fork 0
Code Activity

Change inheritance order in installwizard.py

Browse Source 
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.
This commit is contained in:
Neil Booth
2016-01-03 10:39:44 +09:00
parent a7028176cd
commit 6e660f562f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/qt/installwizard.py
View File

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