Use object registry for app.

This commit is contained in:
Florian Bruhin 2014-09-23 22:06:46 +02:00
parent a32ed36ba6
commit 37dbfde6ac

View File

@ -90,6 +90,7 @@ class Application(QApplication):
self.meta_registry = utypes.ObjectRegistry() self.meta_registry = utypes.ObjectRegistry()
self.registry = utypes.ObjectRegistry() self.registry = utypes.ObjectRegistry()
self.meta_registry['global'] = self.registry self.meta_registry['global'] = self.registry
self.registry['app'] = self
self._shutting_down = False self._shutting_down = False
self._keyparsers = None self._keyparsers = None
self._crashdlg = None self._crashdlg = None
@ -611,7 +612,7 @@ class Application(QApplication):
self._destroy_crashlogfile() self._destroy_crashlogfile()
sys.exit(1) sys.exit(1)
@cmdutils.register(instance='', ignore_args=True) @cmdutils.register(instance='app', ignore_args=True)
def restart(self, shutdown=True, pages=None): def restart(self, shutdown=True, pages=None):
"""Restart qutebrowser while keeping existing tabs open.""" """Restart qutebrowser while keeping existing tabs open."""
# We don't use _recover_pages here as it's too forgiving when # We don't use _recover_pages here as it's too forgiving when
@ -647,7 +648,7 @@ class Application(QApplication):
if shutdown: if shutdown:
self.shutdown() self.shutdown()
@cmdutils.register(instance='', split=False, debug=True) @cmdutils.register(instance='app', split=False, debug=True)
def debug_pyeval(self, s): def debug_pyeval(self, s):
"""Evaluate a python string and display the results as a webpage. """Evaluate a python string and display the results as a webpage.
@ -668,7 +669,7 @@ class Application(QApplication):
self.registry['tabbedbrowser'].openurl( self.registry['tabbedbrowser'].openurl(
QUrl('qute:pyeval'), newtab=True) QUrl('qute:pyeval'), newtab=True)
@cmdutils.register(instance='') @cmdutils.register(instance='app')
def report(self): def report(self):
"""Report a bug in qutebrowser.""" """Report a bug in qutebrowser."""
pages = self._recover_pages() pages = self._recover_pages()
@ -677,7 +678,7 @@ class Application(QApplication):
self._crashdlg = crash.ReportDialog(pages, history, objects) self._crashdlg = crash.ReportDialog(pages, history, objects)
self._crashdlg.show() self._crashdlg.show()
@cmdutils.register(instance='', debug=True, name='debug-console') @cmdutils.register(instance='app', debug=True, name='debug-console')
def show_debugconsole(self): def show_debugconsole(self):
"""Show the debugging console.""" """Show the debugging console."""
self._debugconsole.show() self._debugconsole.show()