StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make the initial screen a bit more comprehensible

This commit is contained in:
Michael Hudson-Doyle 2017-04-11 14:08:36 +12:00
parent 5c3f12aac9
commit 3a85200765
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
subiquity/models/welcome.py
View File

@ -23,13 +23,10 @@ class WelcomeModel(object):
""" Model representing language selection """ Model representing language selection
""" """
supported_languages = ['English', supported_languages = ['English']
'Belgian',
'German',
'Italian']
selected_language = None selected_language = None
def get_menu(self): def get_languages(self):
return self.supported_languages return self.supported_languages
def __repr__(self): def __repr__(self):

18
subiquity/ui/views/welcome.py
View File

@ -19,7 +19,7 @@ Welcome provides user with language selection
""" """
import logging import logging
from urwid import BoxAdapter from urwid import BoxAdapter, Text
from subiquitycore.ui.lists import SimpleList from subiquitycore.ui.lists import SimpleList
from subiquitycore.ui.buttons import menu_btn, ok_btn from subiquitycore.ui.buttons import menu_btn, ok_btn
from subiquitycore.ui.container import ListBox, Pile from subiquitycore.ui.container import ListBox, Pile
@ -34,13 +34,10 @@ class WelcomeView(BaseView):
def __init__(self, model, controller): def __init__(self, model, controller):
self.model = model self.model = model
self.controller = controller self.controller = controller
self.items = [] super().__init__(ListBox([
# Padding.center_50(self._build_model_inputs()), Padding.center_50(self._build_model_inputs()),
self.body = [ Text(""),
Padding.line_break(""), Padding.center_79(Text("(More language choices will appear in time)"))]))
Padding.fixed_10(self._build_buttons())
]
super().__init__(ListBox(self.body))
def _build_buttons(self): def _build_buttons(self):
self.buttons = [ self.buttons = [
@ -50,11 +47,10 @@ class WelcomeView(BaseView):
def _build_model_inputs(self): def _build_model_inputs(self):
sl = [] sl = []
for lang in self.model.get_menu(): for lang in self.model.get_languages():
sl.append(Color.menu_button(menu_btn(label=lang, on_press=self.confirm))) sl.append(Color.menu_button(menu_btn(label=lang, on_press=self.confirm)))
return BoxAdapter(SimpleList(sl), return BoxAdapter(SimpleList(sl), height=len(sl))
height=len(sl))
def confirm(self, result): def confirm(self, result):
self.model.selected_language = result.label self.model.selected_language = result.label