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

Clean up statusbar caret handling.

Browse Source
This commit is contained in:
Florian Bruhin 2015-05-13 22:44:37 +02:00
parent 947dcd556b
commit d992caf8fc
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ from qutebrowser.mainwindow.statusbar import text as textwidget
PreviousWidget = usertypes.enum('PreviousWidget', ['none', 'prompt', PreviousWidget = usertypes.enum('PreviousWidget', ['none', 'prompt',
'command']) 'command'])
Severity = usertypes.enum('Severity', ['normal', 'warning', 'error']) Severity = usertypes.enum('Severity', ['normal', 'warning', 'error'])
CaretMode = usertypes.enum('CaretMode', ['off', 'on', 'selection'])
class StatusBar(QWidget): class StatusBar(QWidget):
@ -77,6 +78,11 @@ class StatusBar(QWidget):
For some reason we need to have this as class attribute For some reason we need to have this as class attribute
so pyqtProperty works correctly. so pyqtProperty works correctly.
_caret_mode: The current caret mode (off/on/selection).
For some reason we need to have this as class attribute
so pyqtProperty works correctly.
Signals: Signals:
resized: Emitted when the statusbar has resized, so the completion resized: Emitted when the statusbar has resized, so the completion
widget can adjust its size to it. widget can adjust its size to it.
@ -91,8 +97,7 @@ class StatusBar(QWidget):
_severity = None _severity = None
_prompt_active = False _prompt_active = False
_insert_active = False _insert_active = False
_caret_active = False _caret_mode = CaretMode.off
_caret_selection_active = False
STYLESHEET = """ STYLESHEET = """
QWidget#StatusBar { QWidget#StatusBar {
@ -103,11 +108,11 @@ class StatusBar(QWidget):
{{ color['statusbar.bg.insert'] }} {{ color['statusbar.bg.insert'] }}
} }
QWidget#StatusBar[caret_active="true"] { QWidget#StatusBar[caret_mode="on"] {
{{ color['statusbar.bg.caret'] }} {{ color['statusbar.bg.caret'] }}
} }
QWidget#StatusBar[caret_selection_active="true"] { QWidget#StatusBar[caret_mode="selection"] {
{{ color['statusbar.bg.caret-selection'] }} {{ color['statusbar.bg.caret-selection'] }}
} }
@ -263,15 +268,10 @@ class StatusBar(QWidget):
"""Getter for self.insert_active, so it can be used as Qt property.""" """Getter for self.insert_active, so it can be used as Qt property."""
return self._insert_active return self._insert_active
@pyqtProperty(bool) @pyqtProperty(str)
def caret_active(self): def caret_mode(self):
"""Getter for self.caret_active, so it can be used as Qt property.""" """Getter for self._caret_mode, so it can be used as Qt property."""
return self._caret_active return self._caret_mode.name
@pyqtProperty(bool)
def caret_selection_active(self):
"""Getter for caret_selection_active, so it can be used as property."""
return self._caret_selection_active
def set_mode_active(self, mode, val): def set_mode_active(self, mode, val):
"""Setter for self.{insert,caret}_active. """Setter for self.{insert,caret}_active.
@ -283,19 +283,19 @@ class StatusBar(QWidget):
log.statusbar.debug("Setting insert_active to {}".format(val)) log.statusbar.debug("Setting insert_active to {}".format(val))
self._insert_active = val self._insert_active = val
elif mode == usertypes.KeyMode.caret: elif mode == usertypes.KeyMode.caret:
log.statusbar.debug("Setting caret_active to {}".format(val))
webview = objreg.get("tabbed-browser", scope="window", webview = objreg.get("tabbed-browser", scope="window",
window=self._win_id).currentWidget() window=self._win_id).currentWidget()
if val and webview.selection_enabled: log.statusbar.debug("Setting caret_mode - val {}, selection "
self._set_mode_text("{} selection".format(mode.name)) "{}".format(val, webview.selection_enabled))
self._caret_selection_active = val if val:
self._caret_active = False if webview.selection_enabled:
else: self._set_mode_text("{} selection".format(mode.name))
if val: self._caret_mode = CaretMode.selection
else:
self._set_mode_text(mode.name) self._set_mode_text(mode.name)
self._caret_active = val self._caret_mode = CaretMode.on
self._caret_selection_active = False else:
self._caret_mode = CaretMode.off
self.setStyleSheet(style.get_stylesheet(self.STYLESHEET)) self.setStyleSheet(style.get_stylesheet(self.STYLESHEET))
def _set_mode_text(self, mode): def _set_mode_text(self, mode):