From 4966a2db4c3add44fc23e141fff61f438786c0ca Mon Sep 17 00:00:00 2001 From: Ariel Calzada Date: Tue, 08 Jan 2013 12:58:59 +0000 Subject: issue dxo #310 and #2769 Custom start/homepage for Browse --- diff --git a/.gitignore b/.gitignore index 13eb198..9f0cb8a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ py-compile *.pyc *.xo *~ +patches diff --git a/activity/activity.info b/activity/activity.info index 293c2ea..a0e949f 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Browse -activity_version = 149 +activity_version = 149.5 bundle_id = org.laptop.WebActivity icon = activity-web exec = sugar-activity webactivity.WebActivity -s diff --git a/browser.py b/browser.py index 7419d2d..47be4c6 100644 --- a/browser.py +++ b/browser.py @@ -340,14 +340,38 @@ class TabbedView(BrowserNotebook): def load_homepage(self): browser = self.current_browser - if os.path.isfile(_LIBRARY_PATH): + if os.path.isfile(activity.get_bundle_path() + "/data/homepage.conf"): + confFile = os.path.join(activity.get_bundle_path(),"data/homepage.conf") + f = open(confFile,"r") + contents = f.read().strip() + f.close() + + if contents != "": + default_page = contents + else: + default_page = os.path.join(activity.get_bundle_path(),"data/index.html") + + browser.load_uri(default_page) + elif os.path.isfile(_LIBRARY_PATH): browser.load_uri('file://' + _LIBRARY_PATH) else: default_page = os.path.join(activity.get_bundle_path(), "data/index.html") browser.load_uri('file://' + default_page) + browser.grab_focus() + def change_homepage(self): + """ Change data/homepage.conf with current URL + """ + confFile = os.path.join(activity.get_bundle_path(),"data/homepage.conf") + index = self.get_current_page() + ui_uri = self.get_nth_page(index).browser.get_uri() + + f = open ( confFile,"w") + f.write(ui_uri) + f.close() + def _get_current_browser(self): if self.get_n_pages(): return self.get_nth_page(self.get_current_page()).browser diff --git a/data/homepage.conf b/data/homepage.conf new file mode 100644 index 0000000..f693ef6 --- /dev/null +++ b/data/homepage.conf @@ -0,0 +1 @@ +http://www.google.com.co/ \ No newline at end of file diff --git a/hometoolbar.py b/hometoolbar.py new file mode 100644 index 0000000..3d5e6a6 --- /dev/null +++ b/hometoolbar.py @@ -0,0 +1,45 @@ +# Copyright (C) 2007, One Laptop Per Child +# Copyright (C) 2012, Ariel Calzada +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +from gettext import gettext as _ +from gi.repository import Gtk +from sugar3.graphics.toolbutton import ToolButton + +class HomeToolbar(Gtk.Toolbar): + def __init__(self, activity): + Gtk.Toolbar.__init__(self) + + self._activity = activity + + self.gohome = ToolButton('browse-go-homepage') + self.gohome.set_tooltip(_('Go to home page')) + self.gohome.connect('clicked', self.__gohome_clicked_cb) + self.insert(self.gohome, -1) + self.gohome.show() + + self.changehome = ToolButton('browse-change-homepage') + self.changehome.set_tooltip(_('Set current page as home page')) + self.changehome.connect('clicked', self.__changehome_clicked_cb) + self.insert(self.changehome, -1) + self.changehome.show() + + def __changehome_clicked_cb(self, button): + self._activity._change_home_button_cb(button) + + def __gohome_clicked_cb(self, button): + self._activity._go_home_button_cb(button) + diff --git a/icons/browse-change-homepage.svg b/icons/browse-change-homepage.svg new file mode 100644 index 0000000..c79c6d9 --- /dev/null +++ b/icons/browse-change-homepage.svg @@ -0,0 +1,11 @@ + + + +]> + + + + + + diff --git a/icons/browse-go-homepage.svg b/icons/browse-go-homepage.svg new file mode 100644 index 0000000..a4fd762 --- /dev/null +++ b/icons/browse-go-homepage.svg @@ -0,0 +1,11 @@ + + + +]> + + + + + + diff --git a/locale/af/activity.linfo b/locale/af/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/af/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ak/activity.linfo b/locale/ak/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ak/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/am/activity.linfo b/locale/am/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/am/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ar/activity.linfo b/locale/ar/activity.linfo new file mode 100644 index 0000000..f1351c5 --- /dev/null +++ b/locale/ar/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = تصفّح diff --git a/locale/ayc/activity.linfo b/locale/ayc/activity.linfo new file mode 100644 index 0000000..61ff690 --- /dev/null +++ b/locale/ayc/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Internet taypita yatiña diff --git a/locale/aym/activity.linfo b/locale/aym/activity.linfo new file mode 100644 index 0000000..61ff690 --- /dev/null +++ b/locale/aym/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Internet taypita yatiña diff --git a/locale/be/activity.linfo b/locale/be/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/be/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/be@latin/activity.linfo b/locale/be@latin/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/be@latin/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/bg/activity.linfo b/locale/bg/activity.linfo new file mode 100644 index 0000000..ee23742 --- /dev/null +++ b/locale/bg/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Разглеждане diff --git a/locale/bi/activity.linfo b/locale/bi/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/bi/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/bn/activity.linfo b/locale/bn/activity.linfo new file mode 100644 index 0000000..0a2f930 --- /dev/null +++ b/locale/bn/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = ব্রাউজ করো diff --git a/locale/bn_IN/activity.linfo b/locale/bn_IN/activity.linfo new file mode 100644 index 0000000..0a2f930 --- /dev/null +++ b/locale/bn_IN/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = ব্রাউজ করো diff --git a/locale/br/activity.linfo b/locale/br/activity.linfo new file mode 100644 index 0000000..a1fe5cd --- /dev/null +++ b/locale/br/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Merdeiñ diff --git a/locale/bs/activity.linfo b/locale/bs/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/bs/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ca/activity.linfo b/locale/ca/activity.linfo new file mode 100644 index 0000000..e4b5c75 --- /dev/null +++ b/locale/ca/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Navegar diff --git a/locale/cpp/activity.linfo b/locale/cpp/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/cpp/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/cs/activity.linfo b/locale/cs/activity.linfo new file mode 100644 index 0000000..9648a70 --- /dev/null +++ b/locale/cs/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Procházet diff --git a/locale/cy/activity.linfo b/locale/cy/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/cy/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/da/activity.linfo b/locale/da/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/da/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/de/activity.linfo b/locale/de/activity.linfo new file mode 100644 index 0000000..278475f --- /dev/null +++ b/locale/de/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browser diff --git a/locale/dz/activity.linfo b/locale/dz/activity.linfo new file mode 100644 index 0000000..d2ef92b --- /dev/null +++ b/locale/dz/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = ཕབ་ལེན། diff --git a/locale/el/activity.linfo b/locale/el/activity.linfo new file mode 100644 index 0000000..3c9bd29 --- /dev/null +++ b/locale/el/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Περιήγηση diff --git a/locale/en/activity.linfo b/locale/en/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/en/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/en_GB/activity.linfo b/locale/en_GB/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/en_GB/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/en_US/activity.linfo b/locale/en_US/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/en_US/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/es/activity.linfo b/locale/es/activity.linfo new file mode 100644 index 0000000..e4b5c75 --- /dev/null +++ b/locale/es/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Navegar diff --git a/locale/fa/activity.linfo b/locale/fa/activity.linfo new file mode 100644 index 0000000..f4f96d7 --- /dev/null +++ b/locale/fa/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = مرور diff --git a/locale/fa_AF/activity.linfo b/locale/fa_AF/activity.linfo new file mode 100644 index 0000000..fa50622 --- /dev/null +++ b/locale/fa_AF/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = جستجو diff --git a/locale/ff/activity.linfo b/locale/ff/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ff/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/fi/activity.linfo b/locale/fi/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/fi/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/fil/activity.linfo b/locale/fil/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/fil/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/fr/activity.linfo b/locale/fr/activity.linfo new file mode 100644 index 0000000..aaff8f4 --- /dev/null +++ b/locale/fr/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Naviguer diff --git a/locale/gl/activity.linfo b/locale/gl/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/gl/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/gn/activity.linfo b/locale/gn/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/gn/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/gom/activity.linfo b/locale/gom/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/gom/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/gom@latin/activity.linfo b/locale/gom@latin/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/gom@latin/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/gu/activity.linfo b/locale/gu/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/gu/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ha/activity.linfo b/locale/ha/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ha/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/he/activity.linfo b/locale/he/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/he/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/hi/activity.linfo b/locale/hi/activity.linfo new file mode 100644 index 0000000..70d617f --- /dev/null +++ b/locale/hi/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = विचरण diff --git a/locale/hr/activity.linfo b/locale/hr/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/hr/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ht/activity.linfo b/locale/ht/activity.linfo new file mode 100644 index 0000000..48d2e6f --- /dev/null +++ b/locale/ht/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Navige diff --git a/locale/hu/activity.linfo b/locale/hu/activity.linfo new file mode 100644 index 0000000..60bc626 --- /dev/null +++ b/locale/hu/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Böngészés diff --git a/locale/hus/activity.linfo b/locale/hus/activity.linfo new file mode 100644 index 0000000..eb5f2c2 --- /dev/null +++ b/locale/hus/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Aliy diff --git a/locale/hy/activity.linfo b/locale/hy/activity.linfo new file mode 100644 index 0000000..373a86b --- /dev/null +++ b/locale/hy/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Զննել diff --git a/locale/id/activity.linfo b/locale/id/activity.linfo new file mode 100644 index 0000000..2c1be69 --- /dev/null +++ b/locale/id/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Ramban diff --git a/locale/ig/activity.linfo b/locale/ig/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ig/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/is/activity.linfo b/locale/is/activity.linfo new file mode 100644 index 0000000..509a7fb --- /dev/null +++ b/locale/is/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Flakka diff --git a/locale/it/activity.linfo b/locale/it/activity.linfo new file mode 100644 index 0000000..2afd383 --- /dev/null +++ b/locale/it/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Naviga diff --git a/locale/ja/activity.linfo b/locale/ja/activity.linfo new file mode 100644 index 0000000..f4341d7 --- /dev/null +++ b/locale/ja/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = ブラウズ diff --git a/locale/km/activity.linfo b/locale/km/activity.linfo new file mode 100644 index 0000000..5a14f9d --- /dev/null +++ b/locale/km/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = រក​មើល diff --git a/locale/kn/activity.linfo b/locale/kn/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/kn/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ko/activity.linfo b/locale/ko/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ko/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/kos/activity.linfo b/locale/kos/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/kos/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ku/activity.linfo b/locale/ku/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ku/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ky/activity.linfo b/locale/ky/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ky/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/lg/activity.linfo b/locale/lg/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/lg/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/lt/activity.linfo b/locale/lt/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/lt/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/lv/activity.linfo b/locale/lv/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/lv/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/mg/activity.linfo b/locale/mg/activity.linfo new file mode 100644 index 0000000..3da6525 --- /dev/null +++ b/locale/mg/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Tetezo diff --git a/locale/mi/activity.linfo b/locale/mi/activity.linfo new file mode 100644 index 0000000..79ce140 --- /dev/null +++ b/locale/mi/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Tirotiro diff --git a/locale/mk/activity.linfo b/locale/mk/activity.linfo new file mode 100644 index 0000000..0cc0421 --- /dev/null +++ b/locale/mk/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Разгледај diff --git a/locale/ml/activity.linfo b/locale/ml/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ml/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/mn/activity.linfo b/locale/mn/activity.linfo new file mode 100644 index 0000000..97c490c --- /dev/null +++ b/locale/mn/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Интэрнэт diff --git a/locale/mr/activity.linfo b/locale/mr/activity.linfo new file mode 100644 index 0000000..7ff9016 --- /dev/null +++ b/locale/mr/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = वेब भटकंती diff --git a/locale/ms/activity.linfo b/locale/ms/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ms/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/mvo/activity.linfo b/locale/mvo/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/mvo/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/na/activity.linfo b/locale/na/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/na/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/nah/activity.linfo b/locale/nah/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/nah/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/nb/activity.linfo b/locale/nb/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/nb/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ne/activity.linfo b/locale/ne/activity.linfo new file mode 100644 index 0000000..6b75ec0 --- /dev/null +++ b/locale/ne/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = ब्राउज diff --git a/locale/niu/activity.linfo b/locale/niu/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/niu/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/nl/activity.linfo b/locale/nl/activity.linfo new file mode 100644 index 0000000..cd1e90d --- /dev/null +++ b/locale/nl/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Surfen diff --git a/locale/nn/activity.linfo b/locale/nn/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/nn/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/or/activity.linfo b/locale/or/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/or/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/pa/activity.linfo b/locale/pa/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/pa/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/pap/activity.linfo b/locale/pap/activity.linfo new file mode 100644 index 0000000..e68f609 --- /dev/null +++ b/locale/pap/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Nabegá diff --git a/locale/pbs/activity.linfo b/locale/pbs/activity.linfo new file mode 100644 index 0000000..bfbae95 --- /dev/null +++ b/locale/pbs/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Manjui' manad-eú diff --git a/locale/pl/activity.linfo b/locale/pl/activity.linfo new file mode 100644 index 0000000..ca41c07 --- /dev/null +++ b/locale/pl/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Internet diff --git a/locale/ps/activity.linfo b/locale/ps/activity.linfo new file mode 100644 index 0000000..18db16e --- /dev/null +++ b/locale/ps/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = لټول diff --git a/locale/pt/activity.linfo b/locale/pt/activity.linfo new file mode 100644 index 0000000..e4b5c75 --- /dev/null +++ b/locale/pt/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Navegar diff --git a/locale/pt_BR/activity.linfo b/locale/pt_BR/activity.linfo new file mode 100644 index 0000000..e4b5c75 --- /dev/null +++ b/locale/pt_BR/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Navegar diff --git a/locale/quy/activity.linfo b/locale/quy/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/quy/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/quz/activity.linfo b/locale/quz/activity.linfo new file mode 100644 index 0000000..b6e532f --- /dev/null +++ b/locale/quz/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Wayp'uq diff --git a/locale/ro/activity.linfo b/locale/ro/activity.linfo new file mode 100644 index 0000000..45f600b --- /dev/null +++ b/locale/ro/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Navighează diff --git a/locale/ru/activity.linfo b/locale/ru/activity.linfo new file mode 100644 index 0000000..9b6be8f --- /dev/null +++ b/locale/ru/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Смотреть diff --git a/locale/rw/activity.linfo b/locale/rw/activity.linfo new file mode 100644 index 0000000..bf79953 --- /dev/null +++ b/locale/rw/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Shakisha diff --git a/locale/sd/activity.linfo b/locale/sd/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/sd/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/si/activity.linfo b/locale/si/activity.linfo new file mode 100644 index 0000000..d1656d1 --- /dev/null +++ b/locale/si/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = සැරිසරන්න diff --git a/locale/sk/activity.linfo b/locale/sk/activity.linfo new file mode 100644 index 0000000..cd022cf --- /dev/null +++ b/locale/sk/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Prezerať diff --git a/locale/sl/activity.linfo b/locale/sl/activity.linfo new file mode 100644 index 0000000..2d33205 --- /dev/null +++ b/locale/sl/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Prebrskaj diff --git a/locale/sm/activity.linfo b/locale/sm/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/sm/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/son/activity.linfo b/locale/son/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/son/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/sq/activity.linfo b/locale/sq/activity.linfo new file mode 100644 index 0000000..20ca65a --- /dev/null +++ b/locale/sq/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Shfleto diff --git a/locale/sr/activity.linfo b/locale/sr/activity.linfo new file mode 100644 index 0000000..d54fc01 --- /dev/null +++ b/locale/sr/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Прегледај diff --git a/locale/st/activity.linfo b/locale/st/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/st/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/sv/activity.linfo b/locale/sv/activity.linfo new file mode 100644 index 0000000..9232dbf --- /dev/null +++ b/locale/sv/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Surfa diff --git a/locale/sw/activity.linfo b/locale/sw/activity.linfo new file mode 100644 index 0000000..e733328 --- /dev/null +++ b/locale/sw/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Kuvinjari diff --git a/locale/ta/activity.linfo b/locale/ta/activity.linfo new file mode 100644 index 0000000..77809b4 --- /dev/null +++ b/locale/ta/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = உவாவு diff --git a/locale/te/activity.linfo b/locale/te/activity.linfo new file mode 100644 index 0000000..a0f8783 --- /dev/null +++ b/locale/te/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = వెబ్ చూడు diff --git a/locale/th/activity.linfo b/locale/th/activity.linfo new file mode 100644 index 0000000..8838502 --- /dev/null +++ b/locale/th/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = เรียกดู diff --git a/locale/to/activity.linfo b/locale/to/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/to/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/tr/activity.linfo b/locale/tr/activity.linfo new file mode 100644 index 0000000..87e9a0a --- /dev/null +++ b/locale/tr/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = göz atmak diff --git a/locale/tvl/activity.linfo b/locale/tvl/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/tvl/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/tyv/activity.linfo b/locale/tyv/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/tyv/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/tzm/activity.linfo b/locale/tzm/activity.linfo new file mode 100644 index 0000000..5e8d7d9 --- /dev/null +++ b/locale/tzm/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = ⵉⵏⵉⴳ diff --git a/locale/tzo/activity.linfo b/locale/tzo/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/tzo/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ug/activity.linfo b/locale/ug/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/ug/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/uk/activity.linfo b/locale/uk/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/uk/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/ur/activity.linfo b/locale/ur/activity.linfo new file mode 100644 index 0000000..8d9f2ec --- /dev/null +++ b/locale/ur/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = براؤز diff --git a/locale/vi/activity.linfo b/locale/vi/activity.linfo new file mode 100644 index 0000000..6d05dbd --- /dev/null +++ b/locale/vi/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Duyệt diff --git a/locale/wa/activity.linfo b/locale/wa/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/wa/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/wo/activity.linfo b/locale/wo/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/wo/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/yo/activity.linfo b/locale/yo/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/yo/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/zh_CN/activity.linfo b/locale/zh_CN/activity.linfo new file mode 100644 index 0000000..dfefeb4 --- /dev/null +++ b/locale/zh_CN/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = 浏览 diff --git a/locale/zh_HK/activity.linfo b/locale/zh_HK/activity.linfo new file mode 100644 index 0000000..0b2e50b --- /dev/null +++ b/locale/zh_HK/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = Browse diff --git a/locale/zh_TW/activity.linfo b/locale/zh_TW/activity.linfo new file mode 100644 index 0000000..8a1e81c --- /dev/null +++ b/locale/zh_TW/activity.linfo @@ -0,0 +1,2 @@ +[Activity] +name = 瀏覽 diff --git a/webactivity.py b/webactivity.py index a94c7fa..2dfb8ff 100644 --- a/webactivity.py +++ b/webactivity.py @@ -133,6 +133,7 @@ from browser import ZOOM_ORIGINAL from webtoolbar import PrimaryToolbar from edittoolbar import EditToolbar from viewtoolbar import ViewToolbar +from hometoolbar import HomeToolbar import downloadmanager # TODO: make the registration clearer SL #3087 @@ -188,11 +189,10 @@ class WebActivity(activity.Activity): self._primary_toolbar = PrimaryToolbar(self._tabbed_view, self) self._edit_toolbar = EditToolbar(self) self._view_toolbar = ViewToolbar(self) + self._home_toolbar = HomeToolbar(self) self._primary_toolbar.connect('add-link', self._link_add_button_cb) - self._primary_toolbar.connect('go-home', self._go_home_button_cb) - self._edit_toolbar_button = ToolbarButton( page=self._edit_toolbar, icon_name='toolbar-edit') @@ -205,6 +205,11 @@ class WebActivity(activity.Activity): icon_name='toolbar-view') self._primary_toolbar.toolbar.insert( view_toolbar_button, 2) + home_toolbar_button = ToolbarButton( + page=self._home_toolbar, + icon_name='go-home') + self._primary_toolbar.toolbar.insert( + home_toolbar_button, 3) self._primary_toolbar.show_all() self.set_toolbar_box(self._primary_toolbar) @@ -492,6 +497,9 @@ class WebActivity(activity.Activity): def _go_home_button_cb(self, button): self._tabbed_view.load_homepage() + def _change_home_button_cb(self, button): + self._tabbed_view.change_homepage() + def _key_press_cb(self, widget, event): key_name = Gdk.keyval_name(event.keyval) browser = self._tabbed_view.props.current_browser diff --git a/webtoolbar.py b/webtoolbar.py index dc0b3de..35a699a 100644 --- a/webtoolbar.py +++ b/webtoolbar.py @@ -252,9 +252,6 @@ class PrimaryToolbar(ToolbarBase): 'add-link': (GObject.SignalFlags.RUN_FIRST, None, ([])), - 'go-home': (GObject.SignalFlags.RUN_FIRST, - None, - ([])), } def __init__(self, tabbed_view, act): @@ -270,12 +267,6 @@ class PrimaryToolbar(ToolbarBase): activity_button = ActivityToolbarButton(self._activity) toolbar.insert(activity_button, 0) - self._go_home = ToolButton('go-home') - self._go_home.set_tooltip(_('Home page')) - self._go_home.connect('clicked', self._go_home_cb) - toolbar.insert(self._go_home, -1) - self._go_home.show() - self.entry = WebEntry() self.entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY, 'browse-dialog-cancel') @@ -451,7 +442,7 @@ class PrimaryToolbar(ToolbarBase): is_webkit_browser = isinstance(self._browser, Browser) self._link_add.props.sensitive = is_webkit_browser - self._go_home.props.sensitive = is_webkit_browser + #self._go_home.props.sensitive = is_webkit_browser if is_webkit_browser: self._reload_session_history() @@ -463,9 +454,6 @@ class PrimaryToolbar(ToolbarBase): self.entry.props.address = effective_url self._browser.grab_focus() - def _go_home_cb(self, button): - self.emit('go-home') - def _go_back_cb(self, button): self._browser.go_back() -- cgit v0.9.1