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

Merge pull request #117 from CanonicalLtd/on_finish_add_quit_button 

Make exiting installer easier
This commit is contained in:
Ryan Harper 2015-11-03 13:18:34 -06:00
parent c6b5322c77 6ab9f7a58b
commit bc30e87e4c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
subiquity/controllers/installprogress.py
View File

@ -104,6 +104,10 @@ class InstallProgressController(ControllerPolicy):
self.kitt_pos += 1 self.kitt_pos += 1
def reboot(self): def reboot(self):
if self.opts.dry_run:
log.debug('dry-run enabled, skipping reboot, quiting instead')
self.signal.emit_signal('quit')
curtin_reboot() curtin_reboot()
@coroutine @coroutine

14
subiquity/ui/views/installprogress.py
View File

@ -32,7 +32,8 @@ class ProgressView(ViewPolicy):
self.signal = signal self.signal = signal
self.text = Text("Wait for it ...", align="center") self.text = Text("Wait for it ...", align="center")
self.body = [ self.body = [
Padding.center_79(self.text) Padding.center_79(self.text),
Padding.line_break(""),
] ]
self.pile = Pile(self.body) self.pile = Pile(self.body)
super().__init__(Filler(self.pile, valign="middle")) super().__init__(Filler(self.pile, valign="middle"))
@ -43,8 +44,17 @@ class ProgressView(ViewPolicy):
on_press=self.reboot), on_press=self.reboot),
focus_map='button focus')) focus_map='button focus'))
z = Padding.center_20(
Color.button(confirm_btn(label="Quit Installer",
on_press=self.quit),
focus_map='button focus'))
self.pile.contents.append((w, self.pile.options())) self.pile.contents.append((w, self.pile.options()))
self.pile.focus_position = 1 self.pile.contents.append((z, self.pile.options()))
self.pile.focus_position = 2
def reboot(self, btn): def reboot(self, btn):
self.signal.emit_signal('installprogress:curtin-reboot') self.signal.emit_signal('installprogress:curtin-reboot')
def quit(self, btn):
self.signal.emit_signal('quit')