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

Use object registry for url_stack.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-24 07:32:05 +02:00
parent 387622623d
commit fd9c4b860a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/browser/commands.py
View File

@ -531,8 +531,9 @@ class CommandDispatcher:
@cmdutils.register(instance='command-dispatcher') @cmdutils.register(instance='command-dispatcher')
def undo(self): def undo(self):
"""Re-open a closed tab (optionally skipping [count] closed tabs).""" """Re-open a closed tab (optionally skipping [count] closed tabs)."""
if self._tabs.url_stack: url_stack = objreg.get('url-stack', None)
self._tabs.tabopen(self._tabs.url_stack.pop()) if url_stack:
self._tabs.tabopen(url_stack.pop())
else: else:
raise cmdexc.CommandError("Nothing to undo!") raise cmdexc.CommandError("Nothing to undo!")

7
qutebrowser/widgets/tabbedbrowser.py
View File

@ -53,7 +53,7 @@ class TabbedBrowser(tabwidget.TabWidget):
_tab_insert_idx_left: Where to insert a new tab with _tab_insert_idx_left: Where to insert a new tab with
tabbar -> new-tab-position set to 'left'. tabbar -> new-tab-position set to 'left'.
_tab_insert_idx_right: Same as above, for 'right'. _tab_insert_idx_right: Same as above, for 'right'.
url_stack: Stack of URLs of closed tabs. _url_stack: Stack of URLs of closed tabs.
Signals: Signals:
cur_progress: Progress of the current tab changed (loadProgress). cur_progress: Progress of the current tab changed (loadProgress).
@ -106,7 +106,8 @@ class TabbedBrowser(tabwidget.TabWidget):
self.currentChanged.connect(self.on_current_changed) self.currentChanged.connect(self.on_current_changed)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
self._tabs = [] self._tabs = []
self.url_stack = [] self._url_stack = []
objreg.register('url-stack', self._url_stack)
self._filter = signalfilter.SignalFilter(self) self._filter = signalfilter.SignalFilter(self)
dispatcher = commands.CommandDispatcher(self) dispatcher = commands.CommandDispatcher(self)
objreg.register('command-dispatcher', dispatcher) objreg.register('command-dispatcher', dispatcher)
@ -265,7 +266,7 @@ class TabbedBrowser(tabwidget.TabWidget):
objreg.delete('last-focused-tab') objreg.delete('last-focused-tab')
if not tab.cur_url.isEmpty(): if not tab.cur_url.isEmpty():
qtutils.ensure_valid(tab.cur_url) qtutils.ensure_valid(tab.cur_url)
self.url_stack.append(tab.cur_url) self._url_stack.append(tab.cur_url)
tab.shutdown() tab.shutdown()
self._tabs.remove(tab) self._tabs.remove(tab)
self.removeTab(idx) self.removeTab(idx)