[gthumb/gthumb-3-4] print dialog: expand the options side to make the zoom slider visible

[Paolo Bacchilega <paobac src gnome org>]

commit 12cd0501b2be636160e3f51c4407d572682d7516
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Aug 17 17:39:41 2016 +0200

    print dialog: expand the options side to make the zoom slider visible
    
    attempt to fix bug #767111:
    
    Print plugin's scale slider is unusable due to the spinbutton widgets
    taking all the space

 extensions/image_print/data/ui/print-layout.ui |  211 ++++++++++++------------
 1 files changed, 105 insertions(+), 106 deletions(-)
---
diff --git a/extensions/image_print/data/ui/print-layout.ui b/extensions/image_print/data/ui/print-layout.ui
index 76d0b60..c79686a 100644
--- a/extensions/image_print/data/ui/print-layout.ui
+++ b/extensions/image_print/data/ui/print-layout.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="align_liststore">
     <columns>
       <!-- column-name Name -->
@@ -62,6 +63,81 @@
       </row>
     </data>
   </object>
+  <object class="GtkAdjustment" id="rows_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">100</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="scale_adjustment">
+    <property name="lower">0.01</property>
+    <property name="upper">1</property>
+    <property name="value">1</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">0.10000000000000001</property>
+  </object>
+  <object class="GtkListStore" id="size_liststore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name value -->
+      <column type="gint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">1</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0">2</col>
+        <col id="1">2</col>
+      </row>
+      <row>
+        <col id="0">4</col>
+        <col id="1">3</col>
+      </row>
+      <row>
+        <col id="0">8</col>
+        <col id="1">4</col>
+      </row>
+      <row>
+        <col id="0">16</col>
+        <col id="1">5</col>
+      </row>
+      <row>
+        <col id="0">32</col>
+        <col id="1">6</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkAdjustment" id="top_adjustment">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="unit_liststore">
+    <columns>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">pixels</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">millimeters</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">inches</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkAdjustment" id="width_adjustment">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkHBox" id="print_layout">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -81,13 +157,16 @@
             <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
             <child>
+              <placeholder/>
+            </child>
+            <child>
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Header:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">header_entry</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
@@ -98,10 +177,10 @@
               <object class="GtkLabel" id="label12">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Footer:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">footer_entry</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -151,9 +230,9 @@
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="label">%p</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0.49000000953674316</property>
-                    <property name="label">%p</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -168,8 +247,8 @@
                   <object class="GtkLabel" id="label13">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">%P</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -184,8 +263,8 @@
                   <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">The current page number</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -202,8 +281,8 @@
                   <object class="GtkLabel" id="label15">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">The total number of pages</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -220,8 +299,8 @@
                   <object class="GtkLabel" id="label16">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Special code</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                       <attribute name="size" value="8000"/>
@@ -235,8 +314,8 @@
                   <object class="GtkLabel" id="label17">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Description</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                       <attribute name="size" value="8000"/>
@@ -252,8 +331,8 @@
                   <object class="GtkLabel" id="label18">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" comments="translate only the text in the curly 
brackets">%D{ format }</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -268,8 +347,8 @@
                   <object class="GtkLabel" id="label20">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">The current date</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -286,8 +365,8 @@
                   <object class="GtkLabel" id="label21">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">%F</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -302,8 +381,8 @@
                   <object class="GtkLabel" id="label22">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label">%E</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -318,8 +397,8 @@
                   <object class="GtkLabel" id="label23">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">The total number of files</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -336,8 +415,8 @@
                   <object class="GtkLabel" id="label24">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">The event description</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="size" value="8000"/>
                     </attributes>
@@ -359,9 +438,6 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -383,9 +459,9 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Layout</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -459,9 +535,9 @@
                           <object class="GtkLabel" id="label11">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Columns:</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="top_attach">1</property>
@@ -474,9 +550,9 @@
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Rows:</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
@@ -515,8 +591,8 @@
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Caption</property>
+                <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -584,9 +660,9 @@
                   <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Image</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -626,8 +702,8 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Position:</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
@@ -701,8 +777,8 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Size:</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="top_attach">1</property>
@@ -807,9 +883,9 @@
                           <object class="GtkLabel" id="label19">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Rotation:</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="top_attach">2</property>
@@ -866,8 +942,8 @@
                               <object class="GtkLabel" id="label1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Unit:</property>
+                                <property name="xalign">0</property>
                               </object>
                             </child>
                           </object>
@@ -903,7 +979,7 @@
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
+        <property name="expand">True</property>
         <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
@@ -920,8 +996,8 @@
             <child>
               <object class="GtkLabel" id="label7">
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Preview</property>
+                <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -964,7 +1040,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="relief">none</property>
                             <child>
                               <object class="GtkImage" id="image4">
@@ -988,7 +1063,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="relief">none</property>
                             <child>
                               <object class="GtkImage" id="image5">
@@ -1059,79 +1133,4 @@
       </packing>
     </child>
   </object>
-  <object class="GtkAdjustment" id="rows_adjustment">
-    <property name="lower">1</property>
-    <property name="upper">100</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="scale_adjustment">
-    <property name="lower">0.01</property>
-    <property name="upper">1</property>
-    <property name="value">1</property>
-    <property name="step_increment">0.10000000000000001</property>
-    <property name="page_increment">0.10000000000000001</property>
-  </object>
-  <object class="GtkListStore" id="size_liststore">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name value -->
-      <column type="gint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">1</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0">2</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0">4</col>
-        <col id="1">3</col>
-      </row>
-      <row>
-        <col id="0">8</col>
-        <col id="1">4</col>
-      </row>
-      <row>
-        <col id="0">16</col>
-        <col id="1">5</col>
-      </row>
-      <row>
-        <col id="0">32</col>
-        <col id="1">6</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkAdjustment" id="top_adjustment">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkListStore" id="unit_liststore">
-    <columns>
-      <!-- column-name Name -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">pixels</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">millimeters</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">inches</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkAdjustment" id="width_adjustment">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>