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

Merge branch 'rikn00-master' (#214)

Browse Source
This commit is contained in:
Florian Bruhin 2014-10-27 06:52:00 +01:00
commit cc5a8d3f6d
4 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.asciidoc
View File

@ -233,6 +233,7 @@ Contributors, sorted by the number of commits in descending order:
// QUTE_AUTHORS_START
* Florian Bruhin
* Claude
* rikn00
* Peter Vilim
// QUTE_AUTHORS_END

22
doc/help/settings.asciidoc
View File

@ -162,7 +162,9 @@
|<<colors-statusbar.url.fg.error,statusbar.url.fg.error>>|Foreground color of the URL in the statusbar on error.
|<<colors-statusbar.url.fg.warn,statusbar.url.fg.warn>>|Foreground color of the URL in the statusbar when there's a warning.
|<<colors-statusbar.url.fg.hover,statusbar.url.fg.hover>>|Foreground color of the URL in the statusbar for hovered links.
|<<colors-tab.fg,tab.fg>>|Foreground color of tabs.
|<<colors-tab.fg.odd,tab.fg.odd>>|Foreground color of unselected odd tabs.
|<<colors-tab.fg.even,tab.fg.even>>|Foreground color of unselected even tabs.
|<<colors-tab.fg.selected,tab.fg.selected>>|Foreground color of selected tabs.
|<<colors-tab.bg.odd,tab.bg.odd>>|Background color of unselected odd tabs.
|<<colors-tab.bg.even,tab.bg.even>>|Background color of unselected even tabs.
|<<colors-tab.bg.selected,tab.bg.selected>>|Background color of selected tabs.
@ -990,9 +992,21 @@ Foreground color of the URL in the statusbar for hovered links.
Default: +pass:[aqua]+
[[colors-tab.fg]]
=== tab.fg
Foreground color of tabs.
[[colors-tab.fg.odd]]
=== tab.fg.odd
Foreground color of unselected odd tabs.
Default: +pass:[white]+
[[colors-tab.fg.even]]
=== tab.fg.even
Foreground color of unselected even tabs.
Default: +pass:[white]+
[[colors-tab.fg.selected]]
=== tab.fg.selected
Foreground color of selected tabs.
Default: +pass:[white]+

12
qutebrowser/config/configdata.py
View File

@ -645,9 +645,17 @@ DATA = collections.OrderedDict([
SettingValue(typ.QssColor(), 'aqua'),
"Foreground color of the URL in the statusbar for hovered links."),
('tab.fg',
('tab.fg.odd',
SettingValue(typ.QtColor(), 'white'),
"Foreground color of tabs."),
"Foreground color of unselected odd tabs."),
('tab.fg.even',
SettingValue(typ.QtColor(), 'white'),
"Foreground color of unselected even tabs."),
('tab.fg.selected',
SettingValue(typ.QtColor(), 'white'),
"Foreground color of selected tabs."),
('tab.bg.odd',
SettingValue(typ.QtColor(), 'grey'),

14
qutebrowser/widgets/tabwidget.py
View File

@ -228,14 +228,16 @@ class TabBar(QTabBar):
for idx in range(self.count()):
self.initStyleOption(tab, idx)
if idx == selected:
color = config.get('colors', 'tab.bg.selected')
bg_color = config.get('colors', 'tab.bg.selected')
fg_color = config.get('colors', 'tab.fg.selected')
elif idx % 2:
color = config.get('colors', 'tab.bg.odd')
bg_color = config.get('colors', 'tab.bg.odd')
fg_color = config.get('colors', 'tab.fg.odd')
else:
color = config.get('colors', 'tab.bg.even')
tab.palette.setColor(QPalette.Window, color)
tab.palette.setColor(QPalette.WindowText,
config.get('colors', 'tab.fg'))
bg_color = config.get('colors', 'tab.bg.even')
fg_color = config.get('colors', 'tab.fg.even')
tab.palette.setColor(QPalette.Window, bg_color)
tab.palette.setColor(QPalette.WindowText, fg_color)
indicator_color = self.tabData(idx)
if indicator_color is None:
indicator_color = QColor()