From af31a44d9b5247d56a7a468102369d3314e1a2a3 Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Fri, 28 Sep 2012 13:18:48 +0000
Subject: Button to clear the url entry SL #3499

Added an 'X' to clear the url entry easily. This button is shown when
the url entry has focus and the user is not reading a .pdf
webpage. When the focus is left the icon changes again to the correct
one (reload, stop loading or none)

Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
Acked-by: Manuel Quiñones <manuq@laptop.org>
---
diff --git a/browser.py b/browser.py
index fab8012..53acb7a 100644
--- a/browser.py
+++ b/browser.py
@@ -344,6 +344,11 @@ class TabbedView(BrowserNotebook):
                 self._append_tab(browser)
                 browser.set_history(tab_history)
 
+    def is_current_page_pdf(self):
+        index = self.get_current_page()
+        current_page = self.get_nth_page(index)
+        return isinstance(current_page, PDFTabPage)
+
 
 Gtk.rc_parse_string('''
     style "browse-tab-close" {
diff --git a/pdfviewer.py b/pdfviewer.py
index 5f607bf..6ce4fcf 100644
--- a/pdfviewer.py
+++ b/pdfviewer.py
@@ -270,6 +270,12 @@ class DummyBrowser(GObject.GObject):
     def reload(self):
         pass
 
+    def load_uri(self, uri):
+        pass
+
+    def grab_focus(self):
+        pass
+
 
 class PDFTabPage(Gtk.HBox):
     """Shows a basic PDF viewer, download the file first if the PDF is
diff --git a/webtoolbar.py b/webtoolbar.py
index 442c78a..6350dfb 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -237,6 +237,8 @@ class PrimaryToolbar(ToolbarBase):
                                       'browse-dialog-cancel')
         self.entry.connect('icon-press', self._stop_and_reload_cb)
         self.entry.connect('activate', self._entry_activate_cb)
+        self.entry.connect('focus-in-event', self.__focus_in_event_cb)
+        self.entry.connect('focus-out-event', self.__focus_out_event_cb)
 
         entry_item = Gtk.ToolItem()
         entry_item.set_expand(True)
@@ -345,6 +347,21 @@ class PrimaryToolbar(ToolbarBase):
         else:
             self.entry.props.address = uri
 
+    def __focus_in_event_cb(self, entry, event):
+        if not self._tabbed_view.is_current_page_pdf():
+            self.entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY,
+                                          'dialog-cancel')
+
+    def __focus_out_event_cb(self, entry, event):
+        if self._loading:
+            self._show_stop_icon()
+        else:
+            if not self._tabbed_view.is_current_page_pdf():
+                self._show_reload_icon()
+
+    def _show_no_icon(self):
+        self.entry.remove_icon(iconentry.ICON_ENTRY_SECONDARY)
+
     def _show_stop_icon(self):
         self.entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY,
                                       'browse-dialog-cancel')
@@ -389,10 +406,15 @@ class PrimaryToolbar(ToolbarBase):
         filepicker.cleanup_temp_files()
 
     def _stop_and_reload_cb(self, entry, icon_pos, button):
-        if self._loading:
-            self._browser.stop_loading()
+        if entry.has_focus() and \
+                not self._tabbed_view.is_current_page_pdf():
+            entry.set_text('')
         else:
             self._browser.reload()
+            if self._loading:
+                self._browser.stop_loading()
+            else:
+                self._browser.reload()
 
     def _set_loading(self, loading):
         self._loading = loading
@@ -400,7 +422,10 @@ class PrimaryToolbar(ToolbarBase):
         if self._loading:
             self._show_stop_icon()
         else:
-            self._show_reload_icon()
+            if not self._tabbed_view.is_current_page_pdf():
+                self._show_reload_icon()
+            else:
+                self._show_no_icon()
 
     def _reload_session_history(self):
         back_forward_list = self._browser.get_back_forward_list()
--
cgit v0.9.1