diff options
-rw-r--r-- | browser.py | 13 | ||||
-rw-r--r-- | downloadmanager.py | 8 | ||||
-rw-r--r-- | palettes.py | 3 | ||||
-rw-r--r-- | webtoolbar.py | 1 |
4 files changed, 14 insertions, 11 deletions
@@ -136,7 +136,7 @@ class TabLabel(gtk.HBox): gobject.GObject.__init__(self) self._browser = browser - self._browser.connect('load-finished', self.__browser_is_setup_cb) + self._browser.connect('notify::load-status', self.__browser_loaded_cb) self._label = gtk.Label('') self.pack_start(self._label) @@ -158,9 +158,10 @@ class TabLabel(gtk.HBox): def __button_clicked_cb(self, button): self.emit('tab-close', self._browser) - def __browser_is_setup_cb(self, browser, load_status): - browser.connect('notify::uri', self.__location_changed_cb) - browser.connect('notify::title', self.__title_changed_cb) + def __browser_loaded_cb(self, browser, load_status): + if load_status == webkit.LOAD_FINISHED: + browser.connect('notify::uri', self.__location_changed_cb) + browser.connect('notify::title', self.__title_changed_cb) def __location_changed_cb(self, browser, uri): sefl._label.set_text(uri) @@ -190,12 +191,12 @@ class Browser(webkit.WebView): def __download_requested_cb(self, download, user_data): #TODO download ui - downloadmanager.save_link(download, user_data) + user_download = downloadmanager.UserDownload(download) return True def get_source(self, async_cb, async_err_cb): - if self.props.load_status == webkit.LOAD_FINISHED: + if self.props.load_status != webkit.LOAD_FINISHED: async_err_cb() else: diff --git a/downloadmanager.py b/downloadmanager.py index 1c6d10c..56ad241 100644 --- a/downloadmanager.py +++ b/downloadmanager.py @@ -63,7 +63,7 @@ def remove_all_downloads(): datastore.delete(download.dl_jobject.object_id) download.cleanup_datastore_write() -class Download(object): +class UserDownload(object): def __init__(self, download): self._download = download self._source = download.get_uri() @@ -219,6 +219,6 @@ class Download(object): self.cancel() _active_downloads.remove(self) -def save_link(download, user_data): - - dl = Download(download)
\ No newline at end of file +def save_link(uri, title, owner_doc): + #TODO + pass diff --git a/palettes.py b/palettes.py index 47009f9..02329be 100644 --- a/palettes.py +++ b/palettes.py @@ -50,6 +50,7 @@ class ContentInvoker(Invoker): return None def handleEvent(self, event): + #TODO rewrite if event.button != 2: return @@ -79,6 +80,7 @@ class ContentInvoker(Invoker): class LinkPalette(Palette): + #TODO rewrite def __init__(self, browser, title, url, owner_document): Palette.__init__(self) @@ -147,7 +149,6 @@ class LinkPalette(Palette): def __download_activate_cb(self, menu_item): downloadmanager.save_link(self._url, self._title, self._owner_document) - class ImagePalette(Palette): diff --git a/webtoolbar.py b/webtoolbar.py index a241f6b..fa27a63 100644 --- a/webtoolbar.py +++ b/webtoolbar.py @@ -406,6 +406,7 @@ class PrimaryToolbar(ToolbarBox): self._stop_and_reload.set_tooltip(_('Reload')) def _reload_session_history(self, current_page_index=None): + #TODO rewrite browser = self._tabbed_view.props.current_browser history = browser.get_back_forward_list() |