From 3a85200765882a5d642ff653def2a9b3f21aeb7a Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 11 Apr 2017 14:08:36 +1200 Subject: [PATCH] make the initial screen a bit more comprehensible --- subiquity/models/welcome.py | 7 ++----- subiquity/ui/views/welcome.py | 18 +++++++----------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/subiquity/models/welcome.py b/subiquity/models/welcome.py index fba585a4..8af4b459 100644 --- a/subiquity/models/welcome.py +++ b/subiquity/models/welcome.py @@ -23,13 +23,10 @@ class WelcomeModel(object): """ Model representing language selection """ - supported_languages = ['English', - 'Belgian', - 'German', - 'Italian'] + supported_languages = ['English'] selected_language = None - def get_menu(self): + def get_languages(self): return self.supported_languages def __repr__(self): diff --git a/subiquity/ui/views/welcome.py b/subiquity/ui/views/welcome.py index cfb1c274..c506641d 100644 --- a/subiquity/ui/views/welcome.py +++ b/subiquity/ui/views/welcome.py @@ -19,7 +19,7 @@ Welcome provides user with language selection """ import logging -from urwid import BoxAdapter +from urwid import BoxAdapter, Text from subiquitycore.ui.lists import SimpleList from subiquitycore.ui.buttons import menu_btn, ok_btn from subiquitycore.ui.container import ListBox, Pile @@ -34,13 +34,10 @@ class WelcomeView(BaseView): def __init__(self, model, controller): self.model = model self.controller = controller - self.items = [] - # Padding.center_50(self._build_model_inputs()), - self.body = [ - Padding.line_break(""), - Padding.fixed_10(self._build_buttons()) - ] - super().__init__(ListBox(self.body)) + super().__init__(ListBox([ + Padding.center_50(self._build_model_inputs()), + Text(""), + Padding.center_79(Text("(More language choices will appear in time)"))])) def _build_buttons(self): self.buttons = [ @@ -50,11 +47,10 @@ class WelcomeView(BaseView): def _build_model_inputs(self): 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))) - return BoxAdapter(SimpleList(sl), - height=len(sl)) + return BoxAdapter(SimpleList(sl), height=len(sl)) def confirm(self, result): self.model.selected_language = result.label