Move Progress' enable/disable logic to separate class

qutebrowser/mainwindow/mainwindow.py

@@ -518,9 +518,9 @@ def _connect_signals(self):
             self.status.on_tab_changed)
 
         self.tabbed_browser.cur_progress.connect(
-            self.status.prog.on_load_progress)
+            self.status.prog.widget.on_load_progress)
         self.tabbed_browser.cur_load_started.connect(
-            self.status.prog.on_load_started)
+            self.status.prog.widget.on_load_started)
 
         self.tabbed_browser.cur_scroll_perc_changed.connect(
             self.status.percentage.set_perc)

qutebrowser/mainwindow/statusbar/bar.py

@@ -186,7 +186,7 @@ def __init__(self, *, win_id, private, parent=None):
         self.backforward = backforward.Backforward(widget=backforward.BackforwardWidget())
         self.tabindex = tabindex.TabIndex()
         self.keystring = keystring.KeyString()
-        self.prog = progress.Progress(self)
+        self.prog = progress.Progress(widget=progress.ProgressWidget(self))
         self.clock = clock.Clock()
         self._text_widgets = []
         self._draw_widgets()
@@ -245,7 +245,8 @@ def _draw_widgets(self):
 
             # FIXME(pylbrecht): temporary workaround until we have StatusBarItem
             # instances for all widgets.
-            if isinstance(widget, (url.UrlText, backforward.Backforward)):
+            if isinstance(widget, (url.UrlText, backforward.Backforward,
+                                   progress.Progress)):
                 widget = widget.widget
 
             self._hbox.addWidget(widget)
@@ -276,9 +277,9 @@ def _clear_widgets(self):
         # Start with widgets hidden and show them when needed
         for widget in [self.url.widget, self.percentage,
                        self.backforward.widget, self.tabindex,
-                       self.keystring, self.prog, self.clock, *self._text_widgets]:
+                       self.keystring, self.prog.widget, self.clock, *self._text_widgets]:
             assert isinstance(widget, QWidget)
-            if widget in [self.prog, self.backforward.widget]:
+            if widget in [self.prog.widget, self.backforward.widget]:
                 widget.enabled = False  # type: ignore[attr-defined]
             widget.hide()
             self._hbox.removeWidget(widget)
@@ -423,7 +424,7 @@ def on_mode_left(self, old_mode, new_mode):
     def on_tab_changed(self, tab):
         """Notify sub-widgets when the tab has been changed."""
         self.url.widget.on_tab_changed(tab)
-        self.prog.on_tab_changed(tab)
+        self.prog.widget.on_tab_changed(tab)
         self.percentage.on_tab_changed(tab)
         self.backforward.widget.on_tab_changed(tab)
         self.maybe_hide()

qutebrowser/mainwindow/statusbar/progress.py

@@ -11,7 +11,7 @@
 from qutebrowser.utils import utils, usertypes
 
 
-class Progress(QProgressBar):
+class ProgressWidget(QProgressBar):
 
     """The progress bar part of the status bar."""
 
@@ -74,3 +74,14 @@ def sizeHint(self):
 
     def minimumSizeHint(self):
         return self.sizeHint()
+
+
+class Progress:
+    def __init__(self, widget: ProgressWidget):
+        self.widget = widget
+
+    def enable(self):
+        self.widget.enabled = True
+
+    def disable(self):
+        self.widget.enabled = False

tests/unit/mainwindow/statusbar/test_progress.py

@@ -13,7 +13,7 @@
 @pytest.fixture
 def progress_widget(qtbot, config_stub):
     """Create a Progress widget and checks its initial state."""
-    widget = progress.Progress()
+    widget = progress.ProgressWidget()
     widget.enabled = True
     qtbot.add_widget(widget)
     assert not widget.isVisible()