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

Attach pin information to tabwidget

Browse Source 
Simple access to pin information on tab widget.
Some change for the fmt_pin to not use fields as cheap trick
This commit is contained in:
thuck 2016-11-08 21:12:20 +01:00
parent d8b5ca295e
commit 6f8aaccc2b
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/browser/commands.py
View File

@ -284,6 +284,7 @@ class CommandDispatcher:
index = self._count() if index is None else int(index) index = self._count() if index is None else int(index)
self.tab_move(index) self.tab_move(index)
self._tabbed_browser.set_tab_pinned(self._current_index(), tab.data.pinned)
@cmdutils.register(instance='command-dispatcher', name='open', @cmdutils.register(instance='command-dispatcher', name='open',
maxsplit=0, scope='window') maxsplit=0, scope='window')

26
qutebrowser/mainwindow/tabwidget.py
View File

@ -91,6 +91,17 @@ class TabWidget(QTabWidget):
bar.set_tab_data(idx, 'indicator-color', color) bar.set_tab_data(idx, 'indicator-color', color)
bar.update(bar.tabRect(idx)) bar.update(bar.tabRect(idx))
def set_tab_pinned(self, idx, pinned):
"""Set the tab status as pinned.
Args:
idx: The tab index.
pinned: Pinned tab state.
"""
bar = self.tabBar()
bar.set_tab_data(idx, 'pinned',pinned)
bar.update(bar.tabRect(idx))
def set_page_title(self, idx, title): def set_page_title(self, idx, title):
"""Set the tab title user data.""" """Set the tab title user data."""
self.tabBar().set_tab_data(idx, 'page-title', title) self.tabBar().set_tab_data(idx, 'page-title', title)
@ -102,6 +113,7 @@ class TabWidget(QTabWidget):
def update_tab_title(self, idx): def update_tab_title(self, idx):
"""Update the tab text for the given tab.""" """Update the tab text for the given tab."""
tab = self.widget(idx)
fields = self.get_tab_fields(idx) fields = self.get_tab_fields(idx)
fields['title'] = fields['title'].replace('&', '&&') fields['title'] = fields['title'].replace('&', '&&')
fields['index'] = idx + 1 fields['index'] = idx + 1
@ -109,8 +121,8 @@ class TabWidget(QTabWidget):
fmt = config.get('tabs', 'title-format') fmt = config.get('tabs', 'title-format')
fmt_pinned = config.get('tabs', 'title-format-pinned') fmt_pinned = config.get('tabs', 'title-format-pinned')
if fields['pinned']: if tab.data.pinned:
title = fmt_pinned.format(**fields) title = '' if fmt_pinned is None else fmt_pinned.format(**fields)
else: else:
title = '' if fmt is None else fmt.format(**fields) title = '' if fmt is None else fmt.format(**fields)
@ -126,7 +138,10 @@ class TabWidget(QTabWidget):
fields['title'] = page_title fields['title'] = page_title
fields['title_sep'] = ' - ' if page_title else '' fields['title_sep'] = ' - ' if page_title else ''
fields['perc_raw'] = tab.progress() fields['perc_raw'] = tab.progress()
fields['pinned'] = tab.data.pinned
#TODO: Move this to a proper place
if tab.data.pinned:
self.set_tab_pinned(idx, tab.data.pinned)
if tab.load_status() == usertypes.LoadStatus.loading: if tab.load_status() == usertypes.LoadStatus.loading:
fields['perc'] = '[{}%] '.format(tab.progress()) fields['perc'] = '[{}%] '.format(tab.progress())
@ -454,12 +469,11 @@ class TabBar(QTabBar):
else: else:
#TODO: relative size and/or configured one #TODO: relative size and/or configured one
try: try:
tab = objreg.get('tab', scope='tab', pinned = self.tab_data(index, 'pinned')
window=self._win_id, tab=index)
except KeyError: except KeyError:
pass pass
else: else:
if tab.data.pinned: if pinned:
size = QSize(40, height) size = QSize(40, height)
qtutils.ensure_valid(size) qtutils.ensure_valid(size)
return size return size