From afe45f99707dac6aca9efb7d9f058b1afd0f19fb Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 18 Oct 2014 16:42:06 +0200 Subject: [PATCH] puschschsch --- qutebrowser/app.py | 3 --- qutebrowser/models/completion.py | 3 +++ qutebrowser/utils/completer.py | 2 +- qutebrowser/widgets/mainwindow.py | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 7038e0c08..6d10d6b6b 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -343,9 +343,6 @@ class Application(QApplication): self.lastWindowClosed.connect(self.shutdown) config_obj.style_changed.connect(style.get_stylesheet.cache_clear) self.focusChanged.connect(self.on_focus_changed) - quickmark_model = objreg.get('completer').models[usertypes.Completion.quickmark] - quickmark_manager = objreg.get('quickmark-manager') - quickmark_manager.changed.connect(quickmark_model.on_quickmarks.changed) def _get_widgets(self): """Get a string list of all widgets.""" diff --git a/qutebrowser/models/completion.py b/qutebrowser/models/completion.py index fe9bf6bb1..a5974ec04 100644 --- a/qutebrowser/models/completion.py +++ b/qutebrowser/models/completion.py @@ -203,6 +203,9 @@ class QuickmarkCompletionModel(basecompletion.BaseCompletionModel): def __init__(self, parent=None): super().__init__(parent) + self._on_quickmarks_changed(self) + + def _on_quickmarks_changed(self, parent=None): qmlist = [] for qm_name, qm_url in objreg.get('quickmark-manager').marks.items(): diff --git a/qutebrowser/utils/completer.py b/qutebrowser/utils/completer.py index 0515119aa..510ad3cd4 100644 --- a/qutebrowser/utils/completer.py +++ b/qutebrowser/utils/completer.py @@ -186,7 +186,7 @@ class Completer(QObject): self._ignore_change = True self.change_completed_part.emit(data, False) - @pyqtSlot(str, list, int) + @pyqtSlot() def on_quickmarks_changed(self): self.clear() self._init_quickmark_completions() diff --git a/qutebrowser/widgets/mainwindow.py b/qutebrowser/widgets/mainwindow.py index c565cbec9..613809560 100644 --- a/qutebrowser/widgets/mainwindow.py +++ b/qutebrowser/widgets/mainwindow.py @@ -119,6 +119,10 @@ class MainWindow(QWidget): config.on_change(self.resize_completion, 'completion', 'height') config.on_change(self.resize_completion, 'completion', 'shrink') + quickmark_model = self._get_object('completer').models[usertypes.Completion.quickmark] + quickmark_manager = objreg.get('quickmark-manager') + quickmark_manager.changed.connect(quickmark_model.srcmodel.on_quickmarks_changed) + #self.retranslateUi(MainWindow) #self.tabWidget.setCurrentIndex(0) #QtCore.QMetaObject.connectSlotsByName(MainWindow)