diff --git a/qutebrowser/utils/config.py b/qutebrowser/utils/config.py index c46d95dfd..eac5a1a2e 100644 --- a/qutebrowser/utils/config.py +++ b/qutebrowser/utils/config.py @@ -98,7 +98,6 @@ completion.item.selected.border.top = #f2f2c0 completion.item.selected.border.bottom = #e6e680 completion.match.fg = red statusbar.progress.bg = white -statusbar.progress.bg.error = red statusbar.bg = black statusbar.fg = white statusbar.bg.error = red diff --git a/qutebrowser/widgets/mainwindow.py b/qutebrowser/widgets/mainwindow.py index 55a399f31..36869a67a 100644 --- a/qutebrowser/widgets/mainwindow.py +++ b/qutebrowser/widgets/mainwindow.py @@ -59,7 +59,8 @@ class MainWindow(QWidget): self.status.resized.connect(self.completion.resize_to_bar) self.status.moved.connect(self.completion.move_to_bar) self.tabs.cur_progress.connect(self.status.prog.setValue) - self.tabs.cur_load_finished.connect(self.status.prog.load_finished) + self.tabs.cur_load_finished.connect(lambda *args: + self.status.prog.hide()) self.tabs.cur_load_finished.connect( self.status.url.on_loading_finished) self.tabs.cur_load_started.connect(self.status.prog.on_load_started) diff --git a/qutebrowser/widgets/statusbar.py b/qutebrowser/widgets/statusbar.py index db6c88110..049080f91 100644 --- a/qutebrowser/widgets/statusbar.py +++ b/qutebrowser/widgets/statusbar.py @@ -304,7 +304,6 @@ class Progress(QProgressBar): """The progress bar part of the status bar.""" statusbar = None - _error = False # FIXME for some reason, margin-left is not shown _stylesheet = """ QProgressBar {{ @@ -314,13 +313,9 @@ class Progress(QProgressBar): background-color: transparent; }} - QProgressBar[error="false"]::chunk {{ + QProgressBar::chunk {{ {color[statusbar.progress.bg]} }} - - QProgressBar[error="true"]::chunk {{ - {color[statusbar.progress.bg.error]} - }} """ def __init__(self, statusbar): @@ -331,39 +326,11 @@ class Progress(QProgressBar): self.setTextVisible(False) self.hide() - @pyqtProperty(bool) - def error(self): - """Getter for self.error, so it can be used as Qt property.""" - # pylint: disable=method-hidden - return self._error - - @error.setter - def error(self, val): - """Setter for self.error, so it can be used as Qt property. - - Re-sets the stylesheet after setting the value, so everything gets - updated by Qt properly. - - """ - self._error = val - self.setStyleSheet(config.get_stylesheet(self._stylesheet)) - def on_load_started(self): """Clear old error and show progress, used as slot to loadStarted.""" self.setValue(0) - self.error = False self.show() - def load_finished(self, ok): - """Hide the progress bar or color it red, depending on ok. - - Slot for the loadFinished signal of a QWebView. - - """ - self.error = not ok - if ok: - self.hide() - class TextBase(QLabel):