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

Fix namespace and continue config structure.

Browse Source
This commit is contained in:
Florian Bruhin 2014-02-24 19:00:59 +01:00
parent 395acffdc4
commit 5f6cc7b05a
1 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
qutebrowser/config/config.py
View File

@ -26,7 +26,7 @@ from configparser import (ConfigParser, ExtendedInterpolation, NoSectionError,
NoOptionError) NoOptionError)
from qutebrowser.utils.misc import read_file from qutebrowser.utils.misc import read_file
from qutebrowser.config.options import * import qutebrowser.config.options as opt
config = None config = None
state = None state = None
@ -53,38 +53,70 @@ class ConfigStructure:
def __init__(self): def __init__(self):
self.config = OrderedDict([ self.config = OrderedDict([
('general', KeyValueSection( ('general', KeyValueSection(
('show_completion', ShowCompletion()), ('show_completion', opt.ShowCompletion()),
('completion_height', CompletionHeight()), ('completion_height', opt.CompletionHeight()),
('ignorecase', IgnoreCase()), ('ignorecase', opt.IgnoreCase()),
('wrapsearch', WrapSearch()), ('wrapsearch', opt.WrapSearch()),
('startpage', StartPage()), ('startpage', opt.StartPage()),
('auto_search', AutoSearch()), ('auto_search', opt.AutoSearch()),
('zoomlevels', ZoomLevels()), ('zoomlevels', opt.ZoomLevels()),
('defaultzoom', DefaultZoom()), ('defaultzoom', opt.DefaultZoom()),
)), )),
('tabbar', KeyValueSection( ('tabbar', KeyValueSection(
('movable', Movable()), ('movable', opt.Movable()),
('closebuttons', CloseButtons()), ('closebuttons', opt.CloseButtons()),
('scrollbuttons', ScrollButtons()), ('scrollbuttons', opt.ScrollButtons()),
('position', Position()), ('position', opt.Position()),
('select_on_remove', SelectOnRemove()), ('select_on_remove', opt.SelectOnRemove()),
('last_close', LastClose()), ('last_close', opt.LastClose()),
)), )),
('searchengines', ValueListSection( ('searchengines', ValueListSection(
SearchEngineKeyValue() opt.SearchEngineKeyValue()
)), )),
('keybind', ValueListSection( ('keybind', ValueListSection(
KeybindKeyValue() opt.KeybindKeyValue()
)), )),
('aliases', ValueListSection( ('aliases', ValueListSection(
AliasKeyValue() opt.AliasKeyValue()
)), )),
('colors', KeyValueSection( ('colors', KeyValueSection(
('completion.fg', CompletionFgColor()), ('completion.fg', opt.CompletionFgColor()),
('completion.item.bg', CompletionItemBgColor()), ('completion.item.bg', opt.CompletionItemBgColor()),
# FIXME ... ('completion.category.bg', opt.CompletionCategoryBgColor()),
('completion.category.border.top',
opt.CompletionCategoryTopBorderColor()),
('completion.category.border.bottom',
opt.CompletionCategoryBottomBorderColor()),
('completion.item.selected.fg',
opt.CompletionItemSelectedFgColor()),
('completion.item.selected.bg',
opt.CompletionItemSelectedBgColor()),
('completion.item.selected.border.top',
opt.CompletionItemSelectedTopBorderColor()),
('completion.item.selected.border.bottom',
opt.CompletionCategoryBottomBorderColor()),
('completion.match.fg',
opt.CompletionMatchFgColor()),
('statusbar.bg', opt.StatusbarBgColor()),
('statusbar.fg', opt.StatusbarFgColor()),
('statusbar.bg.error', opt.StatusbarBgErrorColor()),
('statusbar.fg.error', opt.StatusbarFgErrorColor()),
('statusbar.progress.pg', opt.StatusbarProgressBgColor()),
('statusbar.url.fg', opt.StatusbarUrlFgColor()),
('statusbar.url.fg.success', opt.StatusbarUrlHoverFgColor()),
('statusbar.url.fg.error', opt.StatusbarUrlErrorFgColor()),
('statusbar.url.fg.warn', opt.StatusbarUrlWarnFgColor()),
('statusbar.url.fg.hover', opt.StatusbarUrlHoverFgColor()),
('tab.fg', opt.TabFgColor()),
('tab.bg', opt.TabBgColor()),
('tab.bg.selected', opt.TabSelectedBgColor()),
('tab.seperator', opt.TabSeperatorColor()),
)), )),
('fonts', KeyValueSection( ('fonts', KeyValueSection(
('_monospace', opt.MonospaceFonts()),
('completion', opt.CompletionFont()),
('tabbar', opt.TabbarFont()),
('statusbar', opt.StatusbarFont()),
)), )),
]) ])