AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy wizard: script type dialog now uses toggle buttons

Browse Source
This commit is contained in:
SomberNight
2019-08-13 20:12:27 +02:00
parent bcbd52d752
commit bf7beba60c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
electrum/gui/kivy/uix/dialogs/installwizard.py
View File

@@ -9,6 +9,7 @@ from kivy.lang import Builder
from kivy.properties import ObjectProperty, StringProperty, OptionProperty from kivy.properties import ObjectProperty, StringProperty, OptionProperty
from kivy.core.window import Window from kivy.core.window import Window
from kivy.uix.button import Button from kivy.uix.button import Button
from kivy.uix.togglebutton import ToggleButton
from kivy.utils import platform from kivy.utils import platform
from kivy.uix.widget import Widget from kivy.uix.widget import Widget
from kivy.core.window import Window from kivy.core.window import Window
@@ -554,7 +555,7 @@ Builder.load_string('''
SeedLabel: SeedLabel:
text: root.message2 text: root.message2
TextInput: TextInput:
id: passphrase_input id: text_input
multiline: False multiline: False
size_hint: 1, None size_hint: 1, None
height: '48dp' height: '48dp'
@@ -785,7 +786,7 @@ class LineDialog(WizardDialog):
def get_params(self, b): def get_params(self, b):
return (self.ids.passphrase_input.text,) return (self.ids.passphrase_input.text,)
class CLButton(Button): class CLButton(ToggleButton):
def on_release(self): def on_release(self):
self.root.script_type = self.script_type self.root.script_type = self.script_type
self.root.set_text(self.value) self.root.set_text(self.value)
@@ -801,23 +802,24 @@ class ChoiceLineDialog(ChoiceDialog):
self.message1 = kwargs.get('message1', '') self.message1 = kwargs.get('message1', '')
self.message2 = kwargs.get('message2', '') self.message2 = kwargs.get('message2', '')
self.choices = kwargs.get('choices', []) self.choices = kwargs.get('choices', [])
default_choice_idx = kwargs.get('default_choice_idx', 0)
self.ids.next.disabled = False self.ids.next.disabled = False
layout = self.ids.choices layout = self.ids.choices
layout.bind(minimum_height=layout.setter('height')) layout.bind(minimum_height=layout.setter('height'))
for script_type, title, text in self.choices: for idx, (script_type, title, text) in enumerate(self.choices):
b = CLButton(text=title, height='30dp') b = CLButton(text=title, height='30dp', group=self.title, allow_no_selection=False)
b.script_type = script_type b.script_type = script_type
b.root = self b.root = self
b.value = text b.value = text
layout.add_widget(b) layout.add_widget(b)
# last one is default if idx == default_choice_idx:
b.on_release() b.trigger_action(duration=0)
def set_text(self, value): def set_text(self, value):
self.ids.passphrase_input.text = value self.ids.text_input.text = value
def get_params(self, b): def get_params(self, b):
return (self.ids.passphrase_input.text, self.script_type) return (self.ids.text_input.text, self.script_type)
class ShowSeedDialog(WizardDialog): class ShowSeedDialog(WizardDialog):
seed_text = StringProperty('') seed_text = StringProperty('')