From 2f184ce9a65a2cad197bcaa9f43f906936def553 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 13 Jun 2018 14:02:40 +1200 Subject: [PATCH] fix display of install progress in footer --- subiquity/controllers/installprogress.py | 3 ++- subiquitycore/ui/frame.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/subiquity/controllers/installprogress.py b/subiquity/controllers/installprogress.py index 31f0ebee..116e1c75 100644 --- a/subiquity/controllers/installprogress.py +++ b/subiquity/controllers/installprogress.py @@ -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), diff --git a/subiquitycore/ui/frame.py b/subiquitycore/ui/frame.py index 2c54ad95..4189e219 100644 --- a/subiquitycore/ui/frame.py +++ b/subiquitycore/ui/frame.py @@ -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 - self.set_footer(_(widget.footer)) + if self.auto_footer: + self.set_footer(_(widget.footer))