trename WizardChoiceDialog (ambiguous) - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 9c454726f47368d9fad2614bf6dfb640ac0bf93c
DIR parent bffc2a1d4b6a547e312dc5a5efaab26f02bca52c
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 20 Aug 2019 09:02:33 +0200
rename WizardChoiceDialog (ambiguous)
Diffstat:
M electrum/gui/kivy/uix/dialogs/choi… | 1 -
M electrum/gui/kivy/uix/dialogs/inst… | 10 +++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
---
DIR diff --git a/electrum/gui/kivy/uix/dialogs/choice_dialog.py b/electrum/gui/kivy/uix/dialogs/choice_dialog.py
t@@ -46,7 +46,6 @@ class ChoiceDialog(Factory.Popup):
def __init__(self, title, choices, key, callback, keep_choice_order=False):
Factory.Popup.__init__(self)
- print(choices, type(choices))
if keep_choice_order:
orig_index = {choice: i for (i, choice) in enumerate(choices)}
sort_key = lambda x: orig_index[x[0]]
DIR diff --git a/electrum/gui/kivy/uix/dialogs/installwizard.py b/electrum/gui/kivy/uix/dialogs/installwizard.py
t@@ -151,7 +151,7 @@ Builder.load_string('''
value: 2
-<ChoiceDialog>
+<WizardChoiceDialog>
message : ''
Widget:
size_hint: 1, 1
t@@ -744,10 +744,10 @@ class WizardConfirmDialog(WizardDialog):
return (True,)
-class ChoiceDialog(WizardDialog):
+class WizardChoiceDialog(WizardDialog):
def __init__(self, wizard, **kwargs):
- super(ChoiceDialog, self).__init__(wizard, **kwargs)
+ super(WizardChoiceDialog, self).__init__(wizard, **kwargs)
self.title = kwargs.get('message', '')
self.message = kwargs.get('message', '')
choices = kwargs.get('choices', [])
t@@ -791,7 +791,7 @@ class CLButton(ToggleButton):
self.root.script_type = self.script_type
self.root.set_text(self.value)
-class ChoiceLineDialog(ChoiceDialog):
+class ChoiceLineDialog(WizardChoiceDialog):
title = StringProperty('')
message1 = StringProperty('')
message2 = StringProperty('')
t@@ -1094,7 +1094,7 @@ class InstallWizard(BaseWizard, Widget):
def choice_dialog(self, **kwargs):
choices = kwargs['choices']
if len(choices) > 1:
- ChoiceDialog(self, **kwargs).open()
+ WizardChoiceDialog(self, **kwargs).open()
else:
f = kwargs['run_next']
f(choices[0][0])