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

Remove obsolete tabbar options

Browse Source
This commit is contained in:
Florian Bruhin 2014-07-13 22:38:44 +02:00
parent 90adc100a2
commit ef237bc081
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qutebrowser/config/configdata.py
View File

@ -409,10 +409,6 @@ DATA = OrderedDict([
SettingValue(types.Bool(), 'false'), SettingValue(types.Bool(), 'false'),
"Whether tabs should have close-buttons."), "Whether tabs should have close-buttons."),
('scroll-buttons',
SettingValue(types.Bool(), 'true'),
"Whether there should be scroll buttons if there are too many tabs."),
('position', ('position',
SettingValue(types.Position(), 'north'), SettingValue(types.Position(), 'north'),
"The position of the tab bar."), "The position of the tab bar."),
@ -429,22 +425,9 @@ DATA = OrderedDict([
SettingValue(types.Bool(), 'true'), SettingValue(types.Bool(), 'true'),
"Whether to wrap when changing tabs."), "Whether to wrap when changing tabs."),
('min-tab-width',
SettingValue(types.Int(minval=1), '100'),
"The minimum width of a tab."),
('max-tab-width',
SettingValue(types.Int(minval=1), '200'),
"The maximum width of a tab."),
('show-favicons', ('show-favicons',
SettingValue(types.Bool(), 'true'), SettingValue(types.Bool(), 'true'),
"Whether to show favicons in the tab bar."), "Whether to show favicons in the tab bar."),
('expand',
SettingValue(types.Bool(), 'false'),
"Whether to expand tabs to use the full window width."),
)), )),
('storage', sect.KeyValue( ('storage', sect.KeyValue(

6
qutebrowser/widgets/tabwidget.py
View File

@ -72,8 +72,6 @@ class TabWidget(QTabWidget):
{color[tab.bg]} {color[tab.bg]}
{color[tab.fg]} {color[tab.fg]}
border-right: 2px solid {color[tab.seperator]}; border-right: 2px solid {color[tab.seperator]};
min-width: {config[tabbar][min-tab-width]}px;
max-width: {config[tabbar][max-tab-width]}px;
margin: 0px; margin: 0px;
}} }}
@ -108,7 +106,6 @@ class TabWidget(QTabWidget):
} }
self.setMovable(config.get('tabbar', 'movable')) self.setMovable(config.get('tabbar', 'movable'))
self.setTabsClosable(config.get('tabbar', 'close-buttons')) self.setTabsClosable(config.get('tabbar', 'close-buttons'))
self.setUsesScrollButtons(config.get('tabbar', 'scroll-buttons'))
posstr = config.get('tabbar', 'position') posstr = config.get('tabbar', 'position')
selstr = config.get('tabbar', 'select-on-remove') selstr = config.get('tabbar', 'select-on-remove')
self.setTabPosition(position_conv[posstr]) self.setTabPosition(position_conv[posstr])
@ -177,11 +174,8 @@ class TabBar(QTabBar):
https://wiki.python.org/moin/PyQt/Customising%20tab%20bars https://wiki.python.org/moin/PyQt/Customising%20tab%20bars
""" """
if config.get('tabbar', 'expand'):
height = super().tabSizeHint(index).height() height = super().tabSizeHint(index).height()
size = QSize(self.width() / self.count(), height) size = QSize(self.width() / self.count(), height)
else:
size = super().tabSizeHint(index)
qt_ensure_valid(size) qt_ensure_valid(size)
return size return size