-trying to fix open-by-uri dialog, not quite right still

1 files changed, 18 insertions, 15 deletions

diff --git a/contrib/gnunet_fs_gtk_open_url_dialog.glade b/contrib/gnunet_fs_gtk_open_url_dialog.glade
index 4717ef9e..139cec30 100644
--- a/contrib/gnunet_fs_gtk_open_url_dialog.glade
+++ b/contrib/gnunet_fs_gtk_open_url_dialog.glade
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
@@ -7,16 +7,15 @@
     <property name="stock">gtk-execute</property>
   </object>
   <object class="GtkAdjustment" id="GNUNET_GTK_open_url_anonymity_adjustment">
-    <property name="upper">100000</property>
     <property name="value">1</property>
+    <property name="upper">100000</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkDialog" id="GNUNET_GTK_open_url_dialog">
-    <property name="width_request">500</property>
-    <property name="height_request">100</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Download from URI</property>
+    <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">dialog-password</property>
@@ -27,6 +26,7 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_query_hbox">
@@ -34,14 +34,18 @@
             <child>
               <object class="GtkLabel" id="GNUNET_GTK_open_url_dialog_url_label">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="double_buffered">False</property>
                 <property name="label" translatable="yes">_URI:</property>
                 <property name="use_underline">True</property>
-                <property name="selectable">True</property>
                 <property name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_entry</property>
+                <property name="single_line_mode">True</property>
+                <property name="track_visited_links">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="padding">5</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -49,13 +53,13 @@
               <object class="GtkEntry" id="GNUNET_GTK_open_url_dialog_url_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
+                <property name="max_length">250</property>
+                <property name="invisible_char">&#x25CF;</property>
                 <property name="activates_default">True</property>
+                <property name="width_chars">50</property>
                 <property name="caps_lock_warning">False</property>
-                <property name="primary_icon_stock">gtk-dialog-authentication</property>
-                <property name="primary_icon_tooltip_text" translatable="yes">Separate multiple keywords with spaces, prefix mandatory keywords with "+"</property>
-                <signal name="changed" handler="GNUNET_GTK_open_url_dialog_url_entry_changed_cb" swapped="no"/>
-                <signal name="activate" handler="GNUNET_GTK_search_dialog_search_button_clicked_cb" swapped="no"/>
+                <signal name="changed" handler="GNUNET_GTK_open_url_dialog_url_entry_changed_cb"/>
+                <signal name="activate" handler="GNUNET_GTK_search_dialog_search_button_clicked_cb"/>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -66,12 +70,13 @@
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Anonymity:</property>
                 <property name="use_underline">True</property>
-                <property name="selectable">True</property>
                 <property name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_spin_button</property>
+                <property name="track_visited_links">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="padding">5</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -79,12 +84,12 @@
               <object class="GtkSpinButton" id="GNUNET_GTK_open_url_dialog_anonymity_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
+                <property name="invisible_char">&#x25CF;</property>
                 <property name="caps_lock_warning">False</property>
                 <property name="adjustment">GNUNET_GTK_open_url_anonymity_adjustment</property>
                 <property name="climb_rate">1</property>
                 <property name="numeric">True</property>
-                <signal name="value-changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
+                <signal name="value_changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -110,7 +115,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -126,7 +130,6 @@
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="image">execute_stock_image</property>
                 <property name="use_underline">True</property>
               </object>