[nautilus-actions] Add a padding to GtkFileChoosers

[Pierre Wieser <pwieser src gnome org>]

commit 0d7aa51b173bd52f5bd6c541de951f069971559d
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Dec 13 21:44:58 2011 +0100

    Add a padding to GtkFileChoosers

 ChangeLog                                |    3 ++
 src/nact/nact-assistant-export.ui        |   22 +++--------
 src/nact/nautilus-actions-config-tool.ui |   58 ++++++++++--------------------
 3 files changed, 28 insertions(+), 55 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 98c4e3b..d05e280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-13 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/nautilus-actions-config-tool.ui:
+	* src/nact/nact-assistant-export.ui: Add a padding to GtkFileChoosers.
+
 	* src/nact/nautilus-actions-config-tool.ui: Let a page be scrolled.
 
 	* src/nact/nact-assistant-export.ui: Remove useless placeholder.
diff --git a/src/nact/nact-assistant-export.ui b/src/nact/nact-assistant-export.ui
index 6d2503a..007f9c3 100644
--- a/src/nact/nact-assistant-export.ui
+++ b/src/nact/nact-assistant-export.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.20 -->
+  <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="liststore1"/>
   <object class="GtkAssistant" id="ExportAssistant">
@@ -10,6 +10,9 @@
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child>
+      <placeholder/>
+    </child>
+    <child>
       <object class="GtkLabel" id="label20">
         <property name="visible">True</property>
         <property name="label" translatable="yes">This assistant will guide you through the process of exporting actions.</property>
@@ -25,7 +28,6 @@
         <child>
           <object class="GtkVBox" id="vbox16">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
               <object class="GtkLabel" id="ActionsListLabel">
                 <property name="visible">True</property>
@@ -83,7 +85,7 @@ You may use Ctrl and Shift keys to extend the selection.</property>
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox2">
+      <object class="GtkVBox" id="vbox5">
         <property name="visible">True</property>
         <child>
           <object class="GtkFileChooserWidget" id="ExportFolderChooser">
@@ -94,6 +96,7 @@ You may use Ctrl and Shift keys to extend the selection.</property>
             <property name="local_only">False</property>
           </object>
           <packing>
+            <property name="padding">10</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -106,12 +109,10 @@ You may use Ctrl and Shift keys to extend the selection.</property>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="border_width">10</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <property name="spacing">10</property>
             <child>
               <object class="GtkLabel" id="label1">
@@ -136,11 +137,9 @@ You may use Ctrl and Shift keys to extend the selection.</property>
                 <child>
                   <object class="GtkViewport" id="viewport1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkVBox" id="AssistantExportFormatVBox">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
                         <property name="spacing">10</property>
                         <child>
                           <placeholder/>
@@ -151,8 +150,6 @@ You may use Ctrl and Shift keys to extend the selection.</property>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -175,7 +172,6 @@ You may use Ctrl and Shift keys to extend the selection.</property>
     <child>
       <object class="GtkVBox" id="vbox3">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="AssistantExportConfirmLabel">
             <property name="visible">True</property>
@@ -200,7 +196,6 @@ You may use Ctrl and Shift keys to extend the selection.</property>
     <child>
       <object class="GtkVBox" id="vbox4">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow2">
             <property name="visible">True</property>
@@ -236,17 +231,14 @@ You may use Ctrl and Shift keys to extend the selection.</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkVBox" id="vbox37">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkVBox" id="vbox39">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="ExportAskLabel1">
@@ -280,7 +272,6 @@ You may use Ctrl and Shift keys to extend the selection.</property>
             <child>
               <object class="GtkVBox" id="ExportFormatAskVBox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -302,7 +293,6 @@ You may use Ctrl and Shift keys to extend the selection.</property>
             <child>
               <object class="GtkVBox" id="vbox40">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkCheckButton" id="AskKeepChoiceButton">
                     <property name="label" translatable="yes">Re_member my choice in future export operations</property>
diff --git a/src/nact/nautilus-actions-config-tool.ui b/src/nact/nautilus-actions-config-tool.ui
index 6b9b472..994363f 100644
--- a/src/nact/nautilus-actions-config-tool.ui
+++ b/src/nact/nautilus-actions-config-tool.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.20 -->
+  <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="MainWindow">
     <child>
@@ -252,9 +252,6 @@ In this case, the defined conditions will be applied to the current displayed fo
                                             <child>
                                               <placeholder/>
                                             </child>
-                                            <child>
-                                              <placeholder/>
-                                            </child>
                                           </object>
                                           <packing>
                                             <property name="position">0</property>
@@ -333,9 +330,6 @@ In this case, the defined conditions will be applied to the current folder, and
                                             <child>
                                               <placeholder/>
                                             </child>
-                                            <child>
-                                              <placeholder/>
-                                            </child>
                                           </object>
                                           <packing>
                                             <property name="position">2</property>
@@ -903,12 +897,6 @@ An acceptable fallback is running in the standard terminal.</property>
                                         <child>
                                           <placeholder/>
                                         </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
                                       </object>
                                     </child>
                                   </object>
@@ -2302,9 +2290,6 @@ This may be used for example for testing the presence of a prerequisite daemon.<
                                         <child>
                                           <placeholder/>
                                         </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
                                       </object>
                                     </child>
                                   </object>
@@ -2676,6 +2661,9 @@ There may be multiple reasons for why an item cannot be edited. See your User's
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child>
+      <placeholder/>
+    </child>
+    <child>
       <object class="GtkLabel" id="label3">
         <property name="visible">True</property>
         <property name="label" translatable="yes">This assistant will guide you through the process of importing items, actions or menus.</property>
@@ -2691,12 +2679,13 @@ There may be multiple reasons for why an item cannot be edited. See your User's
         <child>
           <object class="GtkFileChooserWidget" id="ImportFileChooser">
             <property name="visible">True</property>
-            <property name="local_only">False</property>
+            <property name="use_preview_label">False</property>
             <property name="preview_widget_active">False</property>
+            <property name="local_only">False</property>
             <property name="select_multiple">True</property>
-            <property name="use_preview_label">False</property>
           </object>
           <packing>
+            <property name="padding">10</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -2737,7 +2726,6 @@ There may be multiple reasons for why an item cannot be edited. See your User's
                 <child>
                   <object class="GtkViewport" id="viewport1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkVBox" id="vbox21">
                         <property name="visible">True</property>
@@ -2923,8 +2911,6 @@ Be warned: this mode may be dangerous. You will not be prompted another time.</p
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -2958,9 +2944,6 @@ Be warned: this mode may be dangerous. You will not be prompted another time.</p
         <child>
           <placeholder/>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="page_type">confirm</property>
@@ -2994,9 +2977,6 @@ Be warned: this mode may be dangerous. You will not be prompted another time.</p
         <child>
           <placeholder/>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="page_type">summary</property>
@@ -3788,39 +3768,39 @@ Be warned: this mode may be dangerous. You will not be prompted another time.</p
   </object>
   <object class="GtkSizeGroup" id="CommandLabelSizeGroup">
     <widgets>
-      <widget name="label4"/>
-      <widget name="CommandParametersLabel"/>
-      <widget name="CommandPathLabel"/>
       <widget name="ProfileLabelLabel"/>
+      <widget name="CommandPathLabel"/>
+      <widget name="CommandParametersLabel"/>
+      <widget name="label4"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="CommandButtonSizeGroup">
     <widgets>
-      <widget name="CommandLegendButton"/>
       <widget name="CommandPathButton"/>
+      <widget name="CommandLegendButton"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="ActionLabelSizeGroup">
     <widgets>
-      <widget name="ActionMenuLabelLabel"/>
-      <widget name="ActionToolbarLabelLabel"/>
-      <widget name="ActionTooltipLabel"/>
       <widget name="ActionIconLabel"/>
+      <widget name="ActionTooltipLabel"/>
+      <widget name="ActionToolbarLabelLabel"/>
+      <widget name="ActionMenuLabelLabel"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="ExecutionModeSizeGroup">
     <widgets>
-      <widget name="label43"/>
-      <widget name="label44"/>
       <widget name="label45"/>
+      <widget name="label44"/>
+      <widget name="label43"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="PropertiesLabelSizeGroup">
     <widgets>
-      <widget name="label18"/>
-      <widget name="label39"/>
-      <widget name="label49"/>
       <widget name="label19"/>
+      <widget name="label49"/>
+      <widget name="label39"/>
+      <widget name="label18"/>
     </widgets>
   </object>
 </interface>