Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--browser.py7
-rw-r--r--po/en.po86
-rw-r--r--po/en_US.po87
-rw-r--r--webactivity.py26
-rw-r--r--webtoolbar.py1
5 files changed, 118 insertions, 89 deletions
diff --git a/browser.py b/browser.py
index 649a71e..e93bac5 100644
--- a/browser.py
+++ b/browser.py
@@ -287,7 +287,6 @@ class Browser(WebView):
def do_setup(self):
WebView.do_setup(self)
-
listener = xpcom.server.WrapObject(ContentInvoker(self),
interfaces.nsIDOMEventListener)
self.window_root.addEventListener('click', listener, False)
@@ -357,6 +356,12 @@ class Browser(WebView):
interfaces.nsIMarkupDocumentViewer)
markupDocumentViewer.fullZoom -= _ZOOM_AMOUNT
+ def get_history_index(self):
+ return self.web_navigation.sessionHistory.index
+
+ def set_history_index(self, index):
+ self.web_navigation.gotoIndex(index)
+
class PopupDialog(gtk.Window):
def __init__(self):
diff --git a/po/en.po b/po/en.po
index b77e6f5..743b8d6 100644
--- a/po/en.po
+++ b/po/en.po
@@ -10,46 +10,47 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 00:31-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-06-13 00:32-0400\n"
+"PO-Revision-Date: 2011-06-14 04:36+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
-#: activity/activity.info:2
+#: activity/activity.info:2 webactivity.py:267
msgid "Browse"
msgstr "Browse"
-#: downloadmanager.py:160
+#: downloadmanager.py:164
msgid "Download started"
msgstr "Download started"
-#: downloadmanager.py:173
+#: downloadmanager.py:179
msgid "Download completed"
msgstr "Download completed"
-#: downloadmanager.py:177
+#: downloadmanager.py:183
msgid "Show in Journal"
msgstr "Show in Journal"
-#: downloadmanager.py:180
+#: downloadmanager.py:186
msgid "Ok"
msgstr "Ok"
-#: downloadmanager.py:187
+#: downloadmanager.py:193
#, python-format
msgid "From: %s"
msgstr "From: %s"
-#: downloadmanager.py:316
+#: downloadmanager.py:335
#, python-format
msgid ""
"Downloading %s from \n"
@@ -70,23 +71,23 @@ msgstr "Next"
msgid "Remove"
msgstr "Remove"
-#: palettes.py:142
+#: palettes.py:143
msgid "Keep link"
msgstr "Keep link"
-#: palettes.py:150
+#: palettes.py:151
msgid "Copy link"
msgstr "Copy link"
-#: palettes.py:158
+#: palettes.py:159
msgid "Follow link"
msgstr "Follow link"
-#: palettes.py:208
+#: palettes.py:209
msgid "Keep image"
msgstr "Keep image"
-#: palettes.py:216
+#: palettes.py:217
msgid "Copy image"
msgstr "Copy image"
@@ -110,42 +111,59 @@ msgstr "Show Tray"
msgid "Hide Tray"
msgstr "Hide Tray"
-#: webactivity.py:598
-msgid "Download in progress"
-msgstr "Download in progress"
-
-#: webactivity.py:599
-msgid "Stopping now will cancel your download"
-msgstr "Stopping now will cancel your download"
+#: webactivity.py:264
+msgid "Edit"
+msgstr "Edit"
-#: webactivity.py:601
-msgid "Cancel"
-msgstr "Cancel"
+#: webactivity.py:270
+msgid "View"
+msgstr "View"
-#: webactivity.py:603 webtoolbar.py:437
+#: webactivity.py:654
+msgid "Download in progress"
+msgid_plural "Downloads in progress"
+msgstr[0] "Download in progress"
+msgstr[1] "Downloads in progress"
+
+#: webactivity.py:657
+msgid "Stopping now will erase your download"
+msgid_plural "Stopping now will erase your downloads"
+msgstr[0] "Stopping now will erase your download"
+msgstr[1] "Stopping now will erase your downloads"
+
+#: webactivity.py:662
+msgid "Continue download"
+msgid_plural "Continue downloads"
+msgstr[0] "Continue download"
+msgstr[1] "Continue downloads"
+
+#: webactivity.py:666 webtoolbar.py:449
msgid "Stop"
msgstr "Stop"
-#: webtoolbar.py:247
+#: webtoolbar.py:259
msgid "Home page"
msgstr "Home page"
-#: webtoolbar.py:269
+#: webtoolbar.py:281
msgid "Back"
msgstr "Back"
-#: webtoolbar.py:276
+#: webtoolbar.py:288
msgid "Forward"
msgstr "Forward"
-#: webtoolbar.py:284
+#: webtoolbar.py:296
msgid "Add a tab"
msgstr "Add a tab"
-#: webtoolbar.py:291
+#: webtoolbar.py:303
msgid "Bookmark"
msgstr "Bookmark"
-#: webtoolbar.py:440
+#: webtoolbar.py:452
msgid "Reload"
msgstr "Reload"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel"
diff --git a/po/en_US.po b/po/en_US.po
index 072eebd..524f2dd 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 00:31-0400\n"
-"PO-Revision-Date: 2010-12-19 06:13+0200\n"
+"POT-Creation-Date: 2011-06-13 00:32-0400\n"
+"PO-Revision-Date: 2011-06-14 04:34+0200\n"
"Last-Translator: Chris <cjl@laptop.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: en_US\n"
@@ -23,34 +23,34 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.3\n"
+"X-Generator: Pootle 2.0.1\n"
-#: activity/activity.info:2
+#: activity/activity.info:2 webactivity.py:267
msgid "Browse"
msgstr "Browse"
-#: downloadmanager.py:160
+#: downloadmanager.py:164
msgid "Download started"
msgstr "Download started"
-#: downloadmanager.py:173
+#: downloadmanager.py:179
msgid "Download completed"
msgstr "Download completed"
-#: downloadmanager.py:177
+#: downloadmanager.py:183
msgid "Show in Journal"
msgstr "Show in Journal"
-#: downloadmanager.py:180
+#: downloadmanager.py:186
msgid "Ok"
msgstr "Ok"
-#: downloadmanager.py:187
+#: downloadmanager.py:193
#, python-format
msgid "From: %s"
msgstr "From: %s"
-#: downloadmanager.py:316
+#: downloadmanager.py:335
#, python-format
msgid ""
"Downloading %s from \n"
@@ -71,23 +71,23 @@ msgstr "Next"
msgid "Remove"
msgstr "Remove"
-#: palettes.py:142
+#: palettes.py:143
msgid "Keep link"
msgstr "Keep link"
-#: palettes.py:150
+#: palettes.py:151
msgid "Copy link"
msgstr "Copy link"
-#: palettes.py:158
+#: palettes.py:159
msgid "Follow link"
msgstr "Follow link"
-#: palettes.py:208
+#: palettes.py:209
msgid "Keep image"
msgstr "Keep image"
-#: palettes.py:216
+#: palettes.py:217
msgid "Copy image"
msgstr "Copy image"
@@ -111,46 +111,63 @@ msgstr "Show Tray"
msgid "Hide Tray"
msgstr "Hide Tray"
-#: webactivity.py:598
-msgid "Download in progress"
-msgstr "Download in progress"
-
-#: webactivity.py:599
-msgid "Stopping now will cancel your download"
-msgstr "Stopping now will cancel your download"
+#: webactivity.py:264
+msgid "Edit"
+msgstr "Edit"
-#: webactivity.py:601
-msgid "Cancel"
-msgstr "Cancel"
+#: webactivity.py:270
+msgid "View"
+msgstr "View"
-#: webactivity.py:603 webtoolbar.py:437
+#: webactivity.py:654
+msgid "Download in progress"
+msgid_plural "Downloads in progress"
+msgstr[0] "Download in progress"
+msgstr[1] "Downloads in progress"
+
+#: webactivity.py:657
+msgid "Stopping now will erase your download"
+msgid_plural "Stopping now will erase your downloads"
+msgstr[0] "Stopping now will erase your download"
+msgstr[1] "Stopping now will erase your downloads"
+
+#: webactivity.py:662
+msgid "Continue download"
+msgid_plural "Continue downloads"
+msgstr[0] "Continue download"
+msgstr[1] "Continue downloads"
+
+#: webactivity.py:666 webtoolbar.py:449
msgid "Stop"
msgstr "Stop"
-#: webtoolbar.py:247
+#: webtoolbar.py:259
msgid "Home page"
msgstr "Home page"
-#: webtoolbar.py:269
+#: webtoolbar.py:281
msgid "Back"
msgstr "Back"
-#: webtoolbar.py:276
+#: webtoolbar.py:288
msgid "Forward"
msgstr "Forward"
-#: webtoolbar.py:284
+#: webtoolbar.py:296
msgid "Add a tab"
msgstr "Add a tab"
-#: webtoolbar.py:291
+#: webtoolbar.py:303
msgid "Bookmark"
msgstr "Bookmark"
-#: webtoolbar.py:440
+#: webtoolbar.py:452
msgid "Reload"
msgstr "Reload"
+#~ msgid "Cancel"
+#~ msgstr "Cancel"
+
#, python-format
#~ msgid "%s"
#~ msgstr "%s"
@@ -168,12 +185,6 @@ msgstr "Reload"
#~ msgid "Download image"
#~ msgstr "Download image"
-#~ msgid "Edit"
-#~ msgstr "Edit"
-
-#~ msgid "View"
-#~ msgstr "View"
-
#~ msgid "blank"
#~ msgstr "blank"
diff --git a/webactivity.py b/webactivity.py
index fc9e913..dade56a 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -459,6 +459,10 @@ class WebActivity(activity.Activity):
link['owner'], -1, link['hash'])
logging.debug('########## reading %s', data)
self._tabbed_view.set_session(self.model.data['history'])
+ for number, tab in enumerate(self.model.data['currents']):
+ browser = self._tabbed_view.get_nth_page(number)
+ browser.set_history_index(tab['history_index'])
+
self._tabbed_view.set_current_page(self.model.data['current_tab'])
elif self.metadata['mime_type'] == 'text/uri-list':
data = self._get_data_from_file_path(file_path)
@@ -470,19 +474,6 @@ class WebActivity(activity.Activity):
'list of multiple uris by now.')
else:
self._tabbed_view.props.current_browser.load_uri(file_path)
- self._load_urls()
-
- def _load_urls(self):
- if self.model.data['currents'] != None:
- first = True
- for current_tab in self.model.data['currents']:
- if first:
- browser = self._tabbed_view.current_browser
- first = False
- else:
- browser = Browser()
- self._tabbed_view._append_tab(browser)
- browser.load_uri(current_tab['url'])
def write_file(self, file_path):
if not self.metadata['mime_type']:
@@ -504,9 +495,12 @@ class WebActivity(activity.Activity):
for n in range(0, self._tabbed_view.get_n_pages()):
n_browser = self._tabbed_view.get_nth_page(n)
if n_browser != None:
- nsiuri = browser.progress.location
- ui_uri = browser.get_url_from_nsiuri(nsiuri)
- info = {'title': browser.props.title, 'url': ui_uri}
+ nsiuri = n_browser.progress.location
+ ui_uri = n_browser.get_url_from_nsiuri(nsiuri)
+ history_index = n_browser.get_history_index()
+ info = {'title': n_browser.props.title, 'url': ui_uri,
+ 'history_index': history_index}
+
self.model.data['currents'].append(info)
f = open(file_path, 'w')
diff --git a/webtoolbar.py b/webtoolbar.py
index 8b0e108..6cb3ee7 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -355,6 +355,7 @@ class PrimaryToolbar(ToolbarBase):
self._history = browser.history
self._session_history_changed_hid = self._history.connect(
'session-history-changed', self._session_history_changed_cb)
+ self._reload_session_history()
if self._browser is not None:
self._browser.disconnect(self._title_changed_hid)