(re)implemented zoom and reload

3 files changed, 6 insertions, 25 deletions

diff --git a/NOTES b/NOTES
index 06366cd..1ac2c5a 100644
--- a/NOTES
+++ b/NOTES
@@ -1,7 +1,7 @@
 work on a WebKit based browser for the XO
 
-requires pywebkitgtk and WebKit-gtk:
-sudo yum install pywebkitgtk WebKit-gtk
+requires pywebkitgtk, gnome-python2-gconf and WebKit-gtk:
+sudo yum install pywebkitgtk WebKit-gtk gnome-python2-gconf
 (maybe I can wrap this into the ./setup.py dist_xo packaging step.)
 
 The code for downloading just got merged into webkit (r41401), probably
diff --git a/browser.py b/browser.py
index 0bb2346..8ac4624 100644
--- a/browser.py
+++ b/browser.py
@@ -170,22 +170,6 @@ class Browser(WebView):
         uri = self.web_navigation.currentURI            
         persist.saveURI(uri, self.doc_shell, None, None, None, local_file)
 
-    def zoom_in(self):
-        contentViewer = self.doc_shell.queryInterface( \
-                interfaces.nsIDocShell).contentViewer
-        if contentViewer is not None:
-            markupDocumentViewer = contentViewer.queryInterface( \
-                    interfaces.nsIMarkupDocumentViewer)
-            markupDocumentViewer.fullZoom += _ZOOM_AMOUNT
-
-    def zoom_out(self):
-        contentViewer = self.doc_shell.queryInterface( \
-                interfaces.nsIDocShell).contentViewer
-        if contentViewer is not None:
-            markupDocumentViewer = contentViewer.queryInterface( \
-                    interfaces.nsIMarkupDocumentViewer)
-            markupDocumentViewer.fullZoom -= _ZOOM_AMOUNT
-
 class PopupDialog(gtk.Window):
     def __init__(self):
         gtk.Window.__init__(self)
diff --git a/webtoolbar.py b/webtoolbar.py
index 4b1dee2..72cf8ab 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -334,13 +334,10 @@ class WebToolbar(gtk.Toolbar):
         self._set_title(embed.props.title)
 
     def _stop_and_reload_cb(self, button):
-        #if self._loading:
-        #    self._browser.web_navigation.stop( \
-        #            interfaces.nsIWebNavigation.STOP_ALL)
-        #else:
-        #    flags = interfaces.nsIWebNavigation.LOAD_FLAGS_NONE
-        #    self._browser.web_navigation.reload(flags)
-        pass
+        if self._loading:
+            self._browser.stop_loading()
+        else:
+            self._browser.reload()
 
     def _set_loading(self, loading):
         self._loading = loading