make language and disk selection buttons use the done style

This commit is contained in:
Michael Hudson-Doyle 2017-11-24 11:19:01 +13:00
parent 61a31cc263
commit b5c07497e8
3 changed files with 5 additions and 4 deletions

View File

@ -21,7 +21,7 @@ from subiquitycore.ui.utils import button_pile, Padding
from subiquitycore.ui.buttons import (
back_btn,
cancel_btn,
menu_btn,
forward_btn,
ok_btn,
)
from subiquitycore.ui.container import ListBox, Pile
@ -68,7 +68,7 @@ class GuidedDiskSelectionView(BaseView):
cancel = cancel_btn("Cancel", on_press=self.cancel)
disks = []
for disk in self.model.all_disks():
disk_btn = menu_btn(
disk_btn = forward_btn(
"%-40s %s"%(disk.serial, humanize_size(disk.size).rjust(9)),
on_press=self.choose_disk, user_arg=disk)
disks.append(disk_btn)

View File

@ -21,7 +21,7 @@ Welcome provides user with language selection
import logging
from urwid import Text
from subiquitycore.ui.lists import SimpleList
from subiquitycore.ui.buttons import menu_btn
from subiquitycore.ui.buttons import forward_btn
from subiquitycore.ui.container import Pile
from subiquitycore.ui.utils import Padding
from subiquitycore.view import BaseView
@ -43,7 +43,7 @@ class WelcomeView(BaseView):
def _build_model_inputs(self):
sl = []
for code, label, native in self.model.get_languages():
sl.append(menu_btn(label=native, on_press=self.confirm, user_arg=code))
sl.append(forward_btn(label=native, on_press=self.confirm, user_arg=code))
return SimpleList(sl)

View File

@ -30,6 +30,7 @@ def action_button(style):
return _stylized_button('[', ']', style)
menu_btn = _stylized_button("", ">", "menu")
forward_btn = _stylized_button("", ">", "done")
done_btn = action_button("done")
danger_btn = action_button("danger")
other_btn = action_button("other")