final tweaks

This commit is contained in:
Michael Hudson-Doyle 2017-09-15 11:09:03 +12:00
parent ef54021b21
commit 7d3ff81486
2 changed files with 4 additions and 8 deletions

View File

@ -70,10 +70,6 @@ STYLES_MONO = [
('menu_button focus', '', '', '', white, ''), ('menu_button focus', '', '', '', white, ''),
('button', white, black, '', '', ''), ('button', white, black, '', '', ''),
('button focus', white, black, '', '', ''), ('button focus', white, black, '', '', ''),
('redbutton', white, black, '', '', ''),
('redbutton focus', white, black, '', '', ''),
('amberbutton', white, black, '', '', ''),
('amberbutton focus', white, black, '', '', ''),
('string_input', '', '', '', white, ''), ('string_input', '', '', '', white, ''),
('string_input focus', '', '', '', white, ''), ('string_input focus', '', '', '', white, ''),
('progress_incomplete', '', '', '', '', black), ('progress_incomplete', '', '', '', '', black),

View File

@ -21,9 +21,9 @@ from urwid import (
) )
from subiquitycore.view import BaseView from subiquitycore.view import BaseView
from subiquitycore.ui.buttons import confirm_btn from subiquitycore.ui.buttons import cancel_btn, confirm_btn
from subiquitycore.ui.container import ListBox, Pile from subiquitycore.ui.container import ListBox, Pile
from subiquitycore.ui.utils import Padding, Color from subiquitycore.ui.utils import Padding
log = logging.getLogger("subiquity.views.installprogress") log = logging.getLogger("subiquity.views.installprogress")
@ -62,10 +62,10 @@ class ProgressView(BaseView):
def show_complete(self): def show_complete(self):
w = Padding.fixed_20( w = Padding.fixed_20(
Color.button(confirm_btn(label="Reboot Now", on_press=self.reboot))) confirm_btn(label="Reboot Now", on_press=self.reboot))
z = Padding.fixed_20( z = Padding.fixed_20(
Color.amberbutton(confirm_btn(label="Quit Installer", on_press=self.quit))) cancel_btn(label="Quit Installer", on_press=self.quit))
new_focus = len(self.pile.contents) new_focus = len(self.pile.contents)
self.pile.contents.append((w, self.pile.options('pack'))) self.pile.contents.append((w, self.pile.options('pack')))