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

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

Browse Source
This commit is contained in:
Florian Bruhin 2017-10-15 00:20:47 +02:00
commit 69d4bb6c6a
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/config/configdata.yml
View File

@ -1504,6 +1504,16 @@ colors.completion.match.fg:
type: QssColor type: QssColor
desc: Foreground color of the matched text in the completion. desc: Foreground color of the matched text in the completion.
colors.statusbar.passthrough.fg:
default: white
type: QssColor
desc: Foreground color of the statusbar in passthrough mode.
colors.statusbar.passthrough.bg:
default: darkblue
type: QssColor
desc: Background color of the statusbar in passthrough mode.
colors.completion.scrollbar.fg: colors.completion.scrollbar.fg:
default: white default: white
type: QssColor type: QssColor

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

@ -43,6 +43,7 @@ class ColorFlags:
command: If we're currently in command mode. command: If we're currently in command mode.
mode: The current caret mode (CaretMode.off/.on/.selection). mode: The current caret mode (CaretMode.off/.on/.selection).
private: Whether this window is in private browsing mode. private: Whether this window is in private browsing mode.
passthrough: If we're currently in passthrough-mode
""" """
CaretMode = usertypes.enum('CaretMode', ['off', 'on', 'selection']) CaretMode = usertypes.enum('CaretMode', ['off', 'on', 'selection'])
@ -51,6 +52,7 @@ class ColorFlags:
command = attr.ib(False) command = attr.ib(False)
caret = attr.ib(CaretMode.off) caret = attr.ib(CaretMode.off)
private = attr.ib(False) private = attr.ib(False)
passthrough = attr.ib(False)
def to_stringlist(self): def to_stringlist(self):
"""Get a string list of set flags used in the stylesheet. """Get a string list of set flags used in the stylesheet.
@ -66,6 +68,8 @@ class ColorFlags:
strings.append('command') strings.append('command')
if self.private: if self.private:
strings.append('private') strings.append('private')
if self.passthrough:
strings.append('passthrough')
if self.private and self.command: if self.private and self.command:
strings.append('private-command') strings.append('private-command')
@ -88,6 +92,7 @@ def _generate_stylesheet():
('prompt', 'prompts'), ('prompt', 'prompts'),
('insert', 'statusbar.insert'), ('insert', 'statusbar.insert'),
('command', 'statusbar.command'), ('command', 'statusbar.command'),
('passthrough', 'statusbar.passthrough'),
('private-command', 'statusbar.command.private'), ('private-command', 'statusbar.command.private'),
] ]
stylesheet = """ stylesheet = """
@ -244,6 +249,9 @@ class StatusBar(QWidget):
if mode == usertypes.KeyMode.insert: if mode == usertypes.KeyMode.insert:
log.statusbar.debug("Setting insert flag to {}".format(val)) log.statusbar.debug("Setting insert flag to {}".format(val))
self._color_flags.insert = val self._color_flags.insert = val
if mode == usertypes.KeyMode.passthrough:
log.statusbar.debug("Setting passthrough flag to {}".format(val))
self._color_flags.passthrough = val
if mode == usertypes.KeyMode.command: if mode == usertypes.KeyMode.command:
log.statusbar.debug("Setting command flag to {}".format(val)) log.statusbar.debug("Setting command flag to {}".format(val))
self._color_flags.command = val self._color_flags.command = val
@ -307,7 +315,8 @@ class StatusBar(QWidget):
usertypes.KeyMode.command, usertypes.KeyMode.command,
usertypes.KeyMode.caret, usertypes.KeyMode.caret,
usertypes.KeyMode.prompt, usertypes.KeyMode.prompt,
usertypes.KeyMode.yesno]: usertypes.KeyMode.yesno,
usertypes.KeyMode.passthrough]:
self.set_mode_active(mode, True) self.set_mode_active(mode, True)
@pyqtSlot(usertypes.KeyMode, usertypes.KeyMode) @pyqtSlot(usertypes.KeyMode, usertypes.KeyMode)
@ -324,7 +333,8 @@ class StatusBar(QWidget):
usertypes.KeyMode.command, usertypes.KeyMode.command,
usertypes.KeyMode.caret, usertypes.KeyMode.caret,
usertypes.KeyMode.prompt, usertypes.KeyMode.prompt,
usertypes.KeyMode.yesno]: usertypes.KeyMode.yesno,
usertypes.KeyMode.passthrough]:
self.set_mode_active(old_mode, False) self.set_mode_active(old_mode, False)
@pyqtSlot(browsertab.AbstractTab) @pyqtSlot(browsertab.AbstractTab)