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

Connect load_status_changed signal correctly

Browse Source
This commit is contained in:
Florian Bruhin 2014-05-16 07:11:39 +02:00
parent e41d8f1e46
commit 7bd6302d13
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/app.py
View File

@ -410,6 +410,7 @@ class QuteBrowser(QApplication):
tabs.currentChanged.connect(status.url.on_tab_changed) tabs.currentChanged.connect(status.url.on_tab_changed)
tabs.cur_url_text_changed.connect(status.url.set_url) tabs.cur_url_text_changed.connect(status.url.set_url)
tabs.cur_link_hovered.connect(status.url.set_hover_url) tabs.cur_link_hovered.connect(status.url.set_hover_url)
tabs.cur_load_status_changed.connect(status.url.on_load_status_changed)
# command input / completion # command input / completion
self.modeman.left.connect(tabs.on_mode_left) self.modeman.left.connect(tabs.on_mode_left)

8
qutebrowser/widgets/_tabbedbrowser.py
View File

@ -67,6 +67,7 @@ class TabbedBrowser(TabWidget):
cur_scroll_perc_changed: Scroll percentage of current tab changed. cur_scroll_perc_changed: Scroll percentage of current tab changed.
arg 1: x-position in %. arg 1: x-position in %.
arg 2: y-position in %. arg 2: y-position in %.
cur_load_status_changed: Loading status of current tab changed.
hint_strings_updated: Hint strings were updated. hint_strings_updated: Hint strings were updated.
arg: A list of hint strings. arg: A list of hint strings.
shutdown_complete: The shuttdown is completed. shutdown_complete: The shuttdown is completed.
@ -83,6 +84,7 @@ class TabbedBrowser(TabWidget):
cur_url_text_changed = pyqtSignal(str) cur_url_text_changed = pyqtSignal(str)
cur_link_hovered = pyqtSignal(str, str, str) cur_link_hovered = pyqtSignal(str, str, str)
cur_scroll_perc_changed = pyqtSignal(int, int) cur_scroll_perc_changed = pyqtSignal(int, int)
cur_load_status_changed = pyqtSignal(str)
hint_strings_updated = pyqtSignal(list) hint_strings_updated = pyqtSignal(list)
shutdown_complete = pyqtSignal() shutdown_complete = pyqtSignal()
quit = pyqtSignal() quit = pyqtSignal()
@ -137,8 +139,6 @@ class TabbedBrowser(TabWidget):
tab.linkHovered.connect(self._filter.create(self.cur_link_hovered)) tab.linkHovered.connect(self._filter.create(self.cur_link_hovered))
tab.loadProgress.connect(self._filter.create(self.cur_progress)) tab.loadProgress.connect(self._filter.create(self.cur_progress))
tab.loadFinished.connect(self._filter.create(self.cur_load_finished)) tab.loadFinished.connect(self._filter.create(self.cur_load_finished))
tab.page().mainFrame().loadStarted.connect(partial(
self.on_load_started, tab))
tab.loadStarted.connect(self._filter.create(self.cur_load_started)) tab.loadStarted.connect(self._filter.create(self.cur_load_started))
tab.statusBarMessage.connect( tab.statusBarMessage.connect(
self._filter.create(self.cur_statusbar_message)) self._filter.create(self.cur_statusbar_message))
@ -147,12 +147,16 @@ class TabbedBrowser(TabWidget):
tab.url_text_changed.connect( tab.url_text_changed.connect(
self._filter.create(self.cur_url_text_changed)) self._filter.create(self.cur_url_text_changed))
tab.url_text_changed.connect(self.on_url_text_changed) tab.url_text_changed.connect(self.on_url_text_changed)
tab.load_status_changed.connect(
self._filter.create(self.cur_load_status_changed))
# hintmanager # hintmanager
tab.hintmanager.hint_strings_updated.connect(self.hint_strings_updated) tab.hintmanager.hint_strings_updated.connect(self.hint_strings_updated)
tab.hintmanager.openurl.connect(self.cur.openurl_slot) tab.hintmanager.openurl.connect(self.cur.openurl_slot)
# misc # misc
tab.titleChanged.connect(self.on_title_changed) tab.titleChanged.connect(self.on_title_changed)
tab.iconChanged.connect(self.on_icon_changed) tab.iconChanged.connect(self.on_icon_changed)
tab.page().mainFrame().loadStarted.connect(partial(
self.on_load_started, tab))
def _close_tab(self, tab_or_idx): def _close_tab(self, tab_or_idx):
"""Close a tab with either index or tab given. """Close a tab with either index or tab given.