From 726c279562f1baba0ff5d124ba81cac30cd24ab5 Mon Sep 17 00:00:00 2001
From: DrFrasierCrane <yagood@o2.pl>
Date: Tue, 1 Jan 2008 20:58:17 +0100
Subject: [PATCH] Removed LinkButton usage in feed properties dialog
 (LinkButton requires PyGTK >= 2.10).

---
 data/feed-properties.glade | 52 +++++++++++++++++++++++++++++++++-------------
 straw/feedproperties.py    | 13 +++++++-----
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/data/feed-properties.glade b/data/feed-properties.glade
index a20c6d6..a30161c 100644
--- a/data/feed-properties.glade
+++ b/data/feed-properties.glade
@@ -109,15 +109,15 @@
                                   </widget>
                                 </child>
                                 <child>
-                                  <widget class="GtkLinkButton" id="location_link">
+                                  <widget class="GtkButton" id="location_button">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="relief">GTK_RELIEF_NONE</property>
-                                    <property name="image_position">GTK_POS_TOP</property>
+                                    <property name="focus_on_click">False</property>
                                     <property name="response_id">0</property>
-                                    <property name="uri">http://glade.gnome.org</property>
+                                    <signal name="clicked" handler="on_location_button_clicked"/>
                                     <child>
                                       <widget class="GtkImage" id="image1">
                                         <property name="visible">True</property>
@@ -130,6 +130,7 @@
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="padding">6</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -163,18 +164,41 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLinkButton" id="website_link">
+                              <widget class="GtkHBox" id="hbox9">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="relief">GTK_RELIEF_NONE</property>
-                                <property name="use_underline">True</property>
-                                <property name="focus_on_click">False</property>
-                                <property name="response_id">0</property>
-                                <property name="uri">http://glade.gnome.org</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <child>
-                                  <placeholder/>
+                                  <widget class="GtkEntry" id="website_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">False</property>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="website_button">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="relief">GTK_RELIEF_NONE</property>
+                                    <property name="focus_on_click">False</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="on_website_button_clicked"/>
+                                    <child>
+                                      <widget class="GtkImage" id="image4">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="stock">gtk-index</property>
+                                        <property name="icon_size">2</property>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">6</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </widget>
                               <packing>
diff --git a/straw/feedproperties.py b/straw/feedproperties.py
index 683e3ec..6d2c4af 100644
--- a/straw/feedproperties.py
+++ b/straw/feedproperties.py
@@ -47,6 +47,7 @@ class FeedPropertyView(MVP.GladeView):
 
         self._title_entry = self._widget.get_widget('title_entry')
         self._location_entry = self._widget.get_widget('location_entry')
+        self._website_entry = self._widget.get_widget('website_entry')
         self._description_label = self._widget.get_widget('description_label')
         self._copyright_label = self._widget.get_widget('copyright_label')
 
@@ -61,7 +62,6 @@ class FeedPropertyView(MVP.GladeView):
         self._articles_spin = self._widget.get_widget('properties_articles_spin')
         self._refresh_default_check = self._widget.get_widget('properties_keep_refresh_default')
         self._articles_default_check = self._widget.get_widget('properties_keep_articles_default')
-        self._website_link = self._widget.get_widget('website_link')
 
     def set_feed(self, feed):
         self._feed = feed
@@ -84,6 +84,12 @@ class FeedPropertyView(MVP.GladeView):
         self.hide()
         return
 
+    def _on_location_button_clicked(self, *args):
+        helpers.url_show(self._location_entry.get_text())
+
+    def _on_website_button_clicked(self, *args):
+        helpers.url_show(self._website_entry.get_text())
+
     def display_properties(self):
         self._window.set_title(_("%s Properties") % self._feed.title)
 
@@ -92,10 +98,7 @@ class FeedPropertyView(MVP.GladeView):
         self._description_label.set_text(self._feed.description)
         self._copyright_label.set_text(self._feed.copyright)
 
-        self._website_link.set_label(self._feed.link)
-        self._website_link.set_uri(self._feed.link)
-
-        gtk.link_button_set_uri_hook(self._load_uri)
+        self._website_entry.set_text(self._feed.link)
 
         """self._defaults['title'] = self._feed.title
         loc, un, pw = "", "", ""#self._feed.access_info
-- 
2.11.4.GIT