tBring query_choice into the new framework. - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit cb8bc4ec73548bdb5dbd2dac710ac5adb97943e8
DIR parent ef1f649d58f79478b294cc3be1735b3a701d6912
HTML Author: Neil Booth <kyuupichan@gmail.com>
Date: Wed, 13 Jan 2016 19:49:58 +0900
Bring query_choice into the new framework.
Diffstat:
M gui/qt/installwizard.py | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -107,6 +107,8 @@ class InstallWizard(WindowModalDialog, WizardBase):
outer_vbox.addLayout(hbox)
outer_vbox.addLayout(Buttons(self.cancel_button, self.next_button))
self.set_icon(':icons/electrum.png')
+ self.show()
+ self.raise_()
def set_icon(self, filename):
prior_filename, self.icon_filename = self.icon_filename, filename
t@@ -120,9 +122,6 @@ class InstallWizard(WindowModalDialog, WizardBase):
prior_layout = self.main_widget.layout()
if prior_layout:
QWidget().setLayout(prior_layout)
- else:
- self.show()
- self.raise_()
self.main_widget.setLayout(layout)
self.cancel_button.setEnabled(True)
self.next_button.setEnabled(True)
t@@ -328,14 +327,8 @@ class InstallWizard(WindowModalDialog, WizardBase):
def query_choice(self, msg, choices):
clayout = ChoicesLayout(msg, choices)
- next_button = OkButton(self, _('Next'))
- next_button.setEnabled(bool(choices))
- layout = clayout.layout()
- layout.addStretch(1)
- layout.addLayout(Buttons(CancelButton(self), next_button))
- self.set_layout(layout)
- if not self.exec_():
- raise UserCancelled
+ self.next_button.setEnabled(bool(choices))
+ self.set_main_layout(clayout.layout())
return clayout.selected_index()
def query_multisig(self, action):