From e5f7042d00e2c90994cbe22ef9bf06089b6fcfe9 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sat, 18 May 2013 16:06:17 +0100
Subject: [PATCH] GTKUI: Asthetic updates to new path chooser options dialog

---
 deluge/ui/gtkui/glade/path_combo_chooser.ui | 280 +++++++++++++-------
 1 file changed, 178 insertions(+), 102 deletions(-)

diff --git a/deluge/ui/gtkui/glade/path_combo_chooser.ui b/deluge/ui/gtkui/glade/path_combo_chooser.ui
index 330579f69..af98c4a6a 100644
--- a/deluge/ui/gtkui/glade/path_combo_chooser.ui
+++ b/deluge/ui/gtkui/glade/path_combo_chooser.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.18"/>
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAction" id="action1"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -38,50 +38,36 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <object class="GtkAlignment" id="alignment4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="top_padding">2</property>
+                <property name="bottom_padding">3</property>
+                <property name="left_padding">15</property>
+                <property name="right_padding">10</property>
                 <child>
-                  <object class="GtkTable" id="table1">
+                  <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="n_rows">3</property>
-                    <property name="n_columns">2</property>
-                    <property name="row_spacing">5</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="show_filechooser_checkbutton">
-                        <property name="label" translatable="yes">Show file chooser</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="on_show_filechooser_checkbutton_toggled" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkLabel" id="visible_rows_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Max drop down rows</property>
                       </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkSpinButton" id="visible_rows_spinbutton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="max_length">2</property>
-                        <property name="invisible_char">•</property>
-                        <property name="invisible_char_set">True</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
                         <property name="primary_icon_sensitive">True</property>
@@ -92,39 +78,9 @@
                         <signal name="value-changed" handler="on_visible_rows_spinbutton_value_changed" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="x_options">GTK_EXPAND</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="show_path_entry_checkbutton">
-                        <property name="label" translatable="yes">Show path entry</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="on_show_path_entry_checkbutton_toggled" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="show_folder_name_on_button_checkbutton">
-                        <property name="label" translatable="yes">Show folder name</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="on_show_folder_name_on_button_checkbutton_toggled" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
@@ -146,34 +102,98 @@
             <property name="position">0</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+        <child>
+          <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="label_xalign">0</property>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkButton" id="config_dialog_button_close">
-                <property name="label" translatable="yes">Close</property>
+              <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" handler="on_config_dialog_button_close_clicked" swapped="no"/>
+                <property name="can_focus">False</property>
+                <property name="top_padding">2</property>
+                <property name="bottom_padding">3</property>
+                <property name="left_padding">12</property>
+                <property name="right_padding">5</property>
+                <child>
+                  <object class="GtkVBox" id="vbox4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkCheckButton" id="show_path_entry_checkbutton">
+                        <property name="label" translatable="yes">Show path entry</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_show_path_entry_checkbutton_toggled" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="show_filechooser_checkbutton">
+                        <property name="label" translatable="yes">Show file chooser</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_show_filechooser_checkbutton_toggled" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">10</property>
+                        <child>
+                          <object class="GtkCheckButton" id="show_folder_name_on_button_checkbutton">
+                            <property name="label" translatable="yes">Show folder name</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_show_folder_name_on_button_checkbutton_toggled" swapped="no"/>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label15">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Path Chooser Type</property>
+                <property name="use_markup">True</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -185,7 +205,10 @@
               <object class="GtkAlignment" id="alignment2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="top_padding">2</property>
+                <property name="bottom_padding">3</property>
                 <property name="left_padding">12</property>
+                <property name="right_padding">5</property>
                 <child>
                   <object class="GtkTable" id="table2">
                     <property name="visible">True</property>
@@ -194,12 +217,10 @@
                     <property name="n_columns">2</property>
                     <property name="column_spacing">5</property>
                     <property name="row_spacing">5</property>
-                    <child>
-                      <placeholder/>
-                    </child>
                     <child>
                       <object class="GtkCheckButton" id="enable_auto_completion_checkbutton">
-                        <property name="label" translatable="yes">Enable  auto completion</property>
+                        <property name="label" translatable="yes">Enable  autocomplete</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -210,6 +231,7 @@
                     <child>
                       <object class="GtkToggleButton" id="set_completion_accelerator_button">
                         <property name="label" translatable="yes">Set new key</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -225,6 +247,7 @@
                     <child>
                       <object class="GtkCheckButton" id="show_hidden_files_checkbutton">
                         <property name="label" translatable="yes">Show hidden files</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -237,6 +260,9 @@
                         <property name="bottom_attach">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -245,8 +271,10 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Auto completion&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Autocomplete</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
             </child>
           </object>
@@ -266,9 +294,10 @@
               <object class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">5</property>
-                <property name="bottom_padding">7</property>
-                <property name="left_padding">23</property>
+                <property name="top_padding">4</property>
+                <property name="bottom_padding">5</property>
+                <property name="left_padding">15</property>
+                <property name="right_padding">5</property>
                 <child>
                   <object class="GtkTable" id="table3">
                     <property name="visible">True</property>
@@ -281,7 +310,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Auto-complete accelerator</property>
+                        <property name="label" translatable="yes">Autocomplete</property>
                       </object>
                     </child>
                     <child>
@@ -289,7 +318,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Save selected entry</property>
+                        <property name="label" translatable="yes">Save path</property>
                       </object>
                       <packing>
                         <property name="top_attach">1</property>
@@ -301,7 +330,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Edit selected entry</property>
+                        <property name="label" translatable="yes">Edit path</property>
                       </object>
                       <packing>
                         <property name="top_attach">2</property>
@@ -313,8 +342,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="yalign">0.019999999552965164</property>
-                        <property name="label" translatable="yes">Remove selected entry</property>
+                        <property name="yalign">0.51999998092651367</property>
+                        <property name="label" translatable="yes">Remove path</property>
                       </object>
                       <packing>
                         <property name="top_attach">3</property>
@@ -326,7 +355,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Toggle display hidden files</property>
+                        <property name="label" translatable="yes">Toggle hidden files</property>
                       </object>
                       <packing>
                         <property name="top_attach">4</property>
@@ -337,7 +366,8 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">CTRL-s</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Ctrl+S</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -350,6 +380,7 @@
                       <object class="GtkLabel" id="completion_accelerator_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -360,7 +391,8 @@
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">CTRL-e</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Ctrl+E</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -373,7 +405,8 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">CTRL-r</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Ctrl+R</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -386,7 +419,8 @@
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">CTRL-h</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Ctrl+H</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -400,7 +434,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Set default text in entry</property>
+                        <property name="label" translatable="yes">Default path</property>
                       </object>
                       <packing>
                         <property name="top_attach">5</property>
@@ -411,7 +445,8 @@
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">CTRL-d</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Ctrl+D</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -428,8 +463,10 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Short cuts&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Shortcuts</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
             </child>
           </object>
@@ -439,6 +476,34 @@
             <property name="position">3</property>
           </packing>
         </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="config_dialog_button_close">
+                <property name="label" translatable="yes">Close</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <signal name="clicked" handler="on_config_dialog_button_close_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
       </object>
     </child>
     <action-widgets>
@@ -541,6 +606,7 @@
             <child>
               <object class="GtkButton" id="filechooser_button_cancel">
                 <property name="label" translatable="yes">Cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -554,6 +620,7 @@
             <child>
               <object class="GtkButton" id="filechooser_button_open">
                 <property name="label" translatable="yes">Open</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -669,6 +736,7 @@
                 <child>
                   <object class="GtkButton" id="button_add">
                     <property name="label" translatable="yes">Add</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -684,6 +752,7 @@
                 <child>
                   <object class="GtkButton" id="button_edit">
                     <property name="label" translatable="yes">Edit</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -699,6 +768,7 @@
                 <child>
                   <object class="GtkButton" id="button_remove">
                     <property name="label" translatable="yes">Remove</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -714,6 +784,7 @@
                 <child>
                   <object class="GtkButton" id="button_up">
                     <property name="label" translatable="yes">Up</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -729,6 +800,7 @@
                 <child>
                   <object class="GtkButton" id="button_down">
                     <property name="label" translatable="yes">Down</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -744,6 +816,7 @@
                 <child>
                   <object class="GtkButton" id="button_default">
                     <property name="label" translatable="yes">Default</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
@@ -759,6 +832,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="button_properties">
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -825,6 +899,7 @@
         </child>
         <child>
           <object class="GtkButton" id="button_open_dialog">
+            <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -894,6 +969,7 @@
         </child>
         <child>
           <object class="GtkToggleButton" id="button_toggle_dropdown">
+            <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>