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

Added command mode color configuration options.

Browse Source 
Including necessary tracker variable _command_active.
This commit is contained in:
Austin Anderson 2015-05-11 22:27:21 -04:00
parent 244d2753df
commit 1a2a57d59e
2 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/config/configdata.py
View File

@ -832,6 +832,14 @@ def data(readonly=False):
SettingValue(typ.QssColor(), 'darkgreen'),
"Background color of the statusbar in insert mode."),
('statusbar.fg.command',
SettingValue(typ.QssColor(), '${statusbar.fg}'),
"Foreground color of the statusbar in command mode."),
('statusbar.bg.command',
SettingValue(typ.QssColor(), '${statusbar.bg}'),
"Background color of the statusbar in command mode."),
('statusbar.progress.bg',
SettingValue(typ.QssColor(), 'white'),
"Background color of the progress bar."),

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

@ -77,6 +77,10 @@ class StatusBar(QWidget):
For some reason we need to have this as class attribute
so pyqtProperty works correctly.
_command_active: If we're currently in command mode.
For some reason we need to have this as class attribute
so pyqtProperty works correctly.
Signals:
resized: Emitted when the statusbar has resized, so the completion
widget can adjust its size to it.
@ -91,6 +95,7 @@ class StatusBar(QWidget):
_severity = None
_prompt_active = False
_insert_active = False
_command_active = False
STYLESHEET = """
QWidget#StatusBar {
@ -101,12 +106,8 @@ class StatusBar(QWidget):
{{ color['statusbar.fg'] }}
}
QWidget#StatusBar[insert_active="true"] {
{{ color['statusbar.bg.insert'] }}
}
QWidget#StatusBar[insert_active="true"] QLabel {
{{ color['statusbar.fg.insert'] }}
QWidget#StatusBar QLineEdit {
{{ color['statusbar.fg.command'] }}
}
QWidget#StatusBar[prompt_active="true"] {
@ -117,6 +118,22 @@ class StatusBar(QWidget):
{{ color['statusbar.fg.prompt'] }}
}
QWidget#StatusBar[insert_active="true"] {
{{ color['statusbar.bg.insert'] }}
}
QWidget#StatusBar[insert_active="true"] QLabel {
{{ color['statusbar.fg.insert'] }}
}
QWidget#StatusBar[command_active="true"] QLabel {
{{ color['statusbar.fg.command'] }}
}
QWidget#StatusBar[command_active="true"] {
{{ color['statusbar.bg.command'] }}
}
QWidget#StatusBar[severity="error"] {
{{ color['statusbar.bg.error'] }}
}
@ -134,7 +151,6 @@ class StatusBar(QWidget):
}
QLabel, QLineEdit {
{{ color['statusbar.fg'] }}
{{ font['statusbar'] }}
}
@ -269,6 +285,21 @@ class StatusBar(QWidget):
self._prompt_active = val
self.setStyleSheet(style.get_stylesheet(self.STYLESHEET))
@pyqtProperty(bool)
def command_active(self):
"""Getter for self.command_active, so it can be used as Qt property."""
return self._command_active
def _set_command_active(self, val):
"""Setter for self._command_active.
Re-set the stylesheet after setting the value, so everything gets
updated by Qt properly.
"""
log.statusbar.debug("Setting command_active to {}".format(val))
self._command_active = val
self.setStyleSheet(style.get_stylesheet(self.STYLESHEET))
@pyqtProperty(bool)
def insert_active(self):
"""Getter for self.insert_active, so it can be used as Qt property."""
@ -461,6 +492,8 @@ class StatusBar(QWidget):
self._set_mode_text(mode.name)
if mode == usertypes.KeyMode.insert:
self._set_insert_active(True)
if mode == usertypes.KeyMode.command:
self._set_command_active(True)
@pyqtSlot(usertypes.KeyMode, usertypes.KeyMode)
def on_mode_left(self, old_mode, new_mode):
@ -474,6 +507,8 @@ class StatusBar(QWidget):
self.txt.set_text(self.txt.Text.normal, '')
if old_mode == usertypes.KeyMode.insert:
self._set_insert_active(False)
if old_mode == usertypes.KeyMode.command:
self._set_command_active(False)
@config.change_filter('ui', 'message-timeout')
def set_pop_timer_interval(self):