rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/3430'

Browse Source
This commit is contained in:
Florian Bruhin 2018-02-10 16:27:41 +01:00
commit 6d750aff8b
8 changed files with 97 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qutebrowser/config/configdata.yml
View File

@ -1171,6 +1171,23 @@ statusbar.position:
default: bottom
desc: Position of the status bar.
statusbar.widgets:
type:
name: List
valtype:
name: String
valid_values:
- url: "Current page URL."
- scroll: "Percentage of the current page position like `10%`."
- scroll_raw: "Raw percentage of the current page position like `10`."
- history: "Display an arrow when possible to go back/forward in history."
- tabs: "Current active tab, e.g. `2`."
- keypress: "Display pressed keys when composing a vi command."
- progress: "Progress bar for the current page loading."
none_ok: true
default: ['keypress', 'url', 'scroll', 'history', 'tabs', 'progress']
desc: List of widgets displayed in the statusbar.
## tabs
tabs.background:

6
qutebrowser/mainwindow/statusbar/backforward.py
View File

@ -26,6 +26,10 @@ class Backforward(textbase.TextBase):
"""Shows navigation indicator (if you can go backward and/or forward)."""
def __init__(self, parent=None):
super().__init__(parent)
self.enabled = False
def on_tab_cur_url_changed(self, tabs):
"""Called on URL changes."""
tab = tabs.currentWidget()
@ -45,4 +49,4 @@ class Backforward(textbase.TextBase):
if text:
text = '[' + text + ']'
self.setText(text)
self.setVisible(bool(text))
self.setVisible(bool(text) and self.enabled)

59
qutebrowser/mainwindow/statusbar/bar.py
View File

@ -182,26 +182,13 @@ class StatusBar(QWidget):
self.cmd.hide_cmd.connect(self._hide_cmd_widget)
self._hide_cmd_widget()
self.keystring = keystring.KeyString()
self._hbox.addWidget(self.keystring)
self.url = url.UrlText()
self._hbox.addWidget(self.url)
self.percentage = percentage.Percentage()
self._hbox.addWidget(self.percentage)
self.backforward = backforward.Backforward()
self._hbox.addWidget(self.backforward)
self.tabindex = tabindex.TabIndex()
self._hbox.addWidget(self.tabindex)
# We add a parent to Progress here because it calls self.show() based
# on some signals, and if that happens before it's added to the layout,
# it will quickly blink up as independent window.
self.keystring = keystring.KeyString()
self.prog = progress.Progress(self)
self._hbox.addWidget(self.prog)
self._draw_widgets()
config.instance.changed.connect(self._on_config_changed)
QTimer.singleShot(0, self.maybe_hide)
@ -215,6 +202,48 @@ class StatusBar(QWidget):
self.maybe_hide()
elif option == 'statusbar.padding':
self._set_hbox_padding()
elif option == 'statusbar.widgets':
self._draw_widgets()
def _draw_widgets(self):
"""Draw statusbar widgets."""
# Start with widgets hidden and show them when needed
for widget in [self.url, self.percentage,
self.backforward, self.tabindex,
self.keystring, self.prog]:
widget.hide()
self._hbox.removeWidget(widget)
tab = self._current_tab()
# Read the list and set widgets accordingly
for segment in config.val.statusbar.widgets:
if segment == 'url':
self._hbox.addWidget(self.url)
self.url.show()
elif segment == 'scroll':
self._hbox.addWidget(self.percentage)
self.percentage.show()
elif segment == 'scroll_raw':
self._hbox.addWidget(self.percentage)
self.percentage.raw = True
self.percentage.show()
elif segment == 'history':
self._hbox.addWidget(self.backforward)
self.backforward.enabled = True
if tab:
self.backforward.on_tab_changed(tab)
elif segment == 'tabs':
self._hbox.addWidget(self.tabindex)
self.tabindex.show()
elif segment == 'keypress':
self._hbox.addWidget(self.keystring)
self.keystring.show()
elif segment == 'progress':
self._hbox.addWidget(self.prog)
self.prog.enabled = True
if tab:
self.prog.on_tab_changed(tab)
@pyqtSlot()
def maybe_hide(self):

4
qutebrowser/mainwindow/statusbar/percentage.py
View File

@ -32,6 +32,7 @@ class Percentage(textbase.TextBase):
"""Constructor. Set percentage to 0%."""
super().__init__(parent)
self.set_perc(0, 0)
self.raw = False
@pyqtSlot(int, int)
def set_perc(self, x, y): # pylint: disable=unused-argument
@ -48,7 +49,8 @@ class Percentage(textbase.TextBase):
elif y is None:
self.setText('[???]')
else:
self.setText('[{:2}%]'.format(y))
text = '[{:02}]' if self.raw else '[{:02}%]'
self.setText(text.format(y))
def on_tab_changed(self, tab):
"""Update scroll position when tab changed."""

5
qutebrowser/mainwindow/statusbar/progress.py
View File

@ -46,6 +46,7 @@ class Progress(QProgressBar):
def __init__(self, parent=None):
super().__init__(parent)
config.set_register_stylesheet(self)
self.enabled = False
self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
self.setTextVisible(False)
self.hide()
@ -57,12 +58,12 @@ class Progress(QProgressBar):
def on_load_started(self):
"""Clear old error and show progress, used as slot to loadStarted."""
self.setValue(0)
self.show()
self.setVisible(self.enabled)
def on_tab_changed(self, tab):
"""Set the correct value when the current tab changed."""
self.setValue(tab.progress())
if tab.load_status() == usertypes.LoadStatus.loading:
if self.enabled and tab.load_status() == usertypes.LoadStatus.loading:
self.show()
else:
self.hide()

9
tests/unit/mainwindow/statusbar/test_backforward.py
View File

@ -45,14 +45,22 @@ def test_backforward_widget(backforward_widget, tabbed_browser_stubs,
tabbed_browser = tabbed_browser_stubs[0]
tabbed_browser.current_index = 1
tabbed_browser.tabs = [tab]
backforward_widget.enabled = True
backforward_widget.on_tab_cur_url_changed(tabbed_browser)
assert backforward_widget.text() == expected_text
assert backforward_widget.isVisible() == bool(expected_text)
# Check that the widget stays hidden if not in the statusbar
backforward_widget.enabled = False
backforward_widget.hide()
backforward_widget.on_tab_cur_url_changed(tabbed_browser)
assert backforward_widget.isHidden()
# Check that the widget gets reset if empty.
if can_go_back and can_go_forward:
tab = fake_web_tab(can_go_back=False, can_go_forward=False)
tabbed_browser.tabs = [tab]
backforward_widget.enabled = True
backforward_widget.on_tab_cur_url_changed(tabbed_browser)
assert backforward_widget.text() == ''
assert not backforward_widget.isVisible()
@ -64,6 +72,7 @@ def test_none_tab(backforward_widget, tabbed_browser_stubs, fake_web_tab):
tabbed_browser = tabbed_browser_stubs[0]
tabbed_browser.current_index = 1
tabbed_browser.tabs = [tab]
backforward_widget.enabled = True
backforward_widget.on_tab_cur_url_changed(tabbed_browser)
assert backforward_widget.text() == '[<>]'

23
tests/unit/mainwindow/statusbar/test_percentage.py
View File

@ -33,15 +33,21 @@ def percentage(qtbot):
return widget
@pytest.mark.parametrize('y, expected', [
(0, '[top]'),
(100, '[bot]'),
(75, '[75%]'),
(25, '[25%]'),
(5, '[ 5%]'),
(None, '[???]'),
@pytest.mark.parametrize('y, raw, expected', [
(0, False, '[top]'),
(100, False, '[bot]'),
(75, False, '[75%]'),
(25, False, '[25%]'),
(5, False, '[05%]'),
(None, False, '[???]'),
(0, True, '[top]'),
(100, True, '[bot]'),
(75, True, '[75]'),
(25, True, '[25]'),
(5, True, '[05]'),
(None, True, '[???]'),
])
def test_percentage_text(percentage, y, expected):
def test_percentage_text(percentage, y, raw, expected):
"""Test text displayed by the widget based on the y position of a page.
Args:
@ -49,6 +55,7 @@ def test_percentage_text(percentage, y, expected):
parametrized.
expected: expected text given y position. parametrized.
"""
percentage.raw = raw
percentage.set_perc(x=None, y=y)
assert percentage.text() == expected

1
tests/unit/mainwindow/statusbar/test_progress.py
View File

@ -30,6 +30,7 @@ from qutebrowser.utils import usertypes
def progress_widget(qtbot, config_stub):
"""Create a Progress widget and checks its initial state."""
widget = Progress()
widget.enabled = True
qtbot.add_widget(widget)
assert not widget.isVisible()
assert not widget.isTextVisible()