fix display of install progress in footer
This commit is contained in:
parent
1ab495c0a8
commit
2f184ce9a6
|
@ -110,7 +110,7 @@ class InstallProgressController(BaseController):
|
|||
return
|
||||
if event_type == 'start':
|
||||
message = event.get("CURTIN_MESSAGE", "??")
|
||||
if self.progress_view_showing is not None:
|
||||
if not self.progress_view_showing:
|
||||
self.footer_description.set_text(message)
|
||||
self.progress_view.add_event(self._event_indent + message)
|
||||
self._event_indent += " "
|
||||
|
@ -173,6 +173,7 @@ class InstallProgressController(BaseController):
|
|||
self.progress_view = ProgressView(self)
|
||||
self.footer_spinner = self.progress_view.spinner
|
||||
|
||||
self.ui.auto_footer = False
|
||||
self.ui.set_footer(urwid.Columns(
|
||||
[('pack', urwid.Text(_("Install in progress:"))),
|
||||
(self.footer_description),
|
||||
|
|
|
@ -39,6 +39,9 @@ class SubiquityUI(WidgetWrap):
|
|||
header=self.header, footer=self.footer)
|
||||
self.progress_current = 0
|
||||
self.progress_completion = 0
|
||||
# After the install starts, we want to stop setting the footer
|
||||
# from the body view.
|
||||
self.auto_footer = True
|
||||
super().__init__(Color.body(self.frame))
|
||||
|
||||
def keypress(self, size, key):
|
||||
|
@ -54,4 +57,5 @@ class SubiquityUI(WidgetWrap):
|
|||
def set_body(self, widget):
|
||||
self.set_header(_(widget.title))
|
||||
self.frame.body = widget
|
||||
if self.auto_footer:
|
||||
self.set_footer(_(widget.footer))
|
||||
|
|
Loading…
Reference in New Issue