Merge branch 'release/0.28.3-1'0.28.3-1

1 files changed, 45 insertions, 80 deletions

diff --git a/ui/printing_widget.ui b/ui/printing_widget.ui
index 02b452e..86f215d 100644
--- a/ui/printing_widget.ui
+++ b/ui/printing_widget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
 <interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.18"/>
   <template class="CustomPrintTab" parent="GtkBox">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -15,7 +15,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="margin_top">4</property>
         <property name="label" translatable="yes">&lt;b&gt;Printed Image Size&lt;/b&gt;</property>
         <property name="use_markup">True</property>
       </object>
@@ -26,11 +25,14 @@
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="box2">
+      <object class="GtkGrid" id="box2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
+        <property name="margin_left">12</property>
         <property name="margin_top">2</property>
+        <property name="row_spacing">6</property>
+        <property name="column_spacing">6</property>
+        <property name="row_homogeneous">True</property>
         <child>
           <object class="GtkRadioButton" id="standard_size_radio">
             <property name="label" translatable="yes">Use a _standard size:</property>
@@ -44,37 +46,20 @@
             <property name="group">custom_size_radio</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBoxText" id="standard_sizes_combo">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">20</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="padding">6</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
-        <property name="margin_top">2</property>
         <child>
           <object class="GtkRadioButton" id="custom_size_radio">
             <property name="label" translatable="yes">Use a c_ustom size:</property>
@@ -87,21 +72,19 @@
             <property name="draw_indicator">True</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">19</property>
+            <property name="spacing">4</property>
             <child>
               <object class="GtkEntry" id="custom_width_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="margin_right">3</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">10</property>
               </object>
@@ -127,7 +110,6 @@
               <object class="GtkEntry" id="custom_height_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="margin_left">3</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">10</property>
               </object>
@@ -155,43 +137,25 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">14</property>
-            <property name="position">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="aspect_ratio_check">
+            <property name="label" translatable="yes">_Match photo aspect ratio</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="halign">start</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="aspect_ratio_check">
-        <property name="label" translatable="yes">_Match photo aspect ratio</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="halign">start</property>
-        <property name="margin_left">210</property>
-        <property name="use_underline">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
-        <property name="margin_top">2</property>
-        <property name="margin_bottom">12</property>
         <child>
           <object class="GtkRadioButton" id="image_per_page_radio">
             <property name="label" translatable="yes">_Autosize:</property>
@@ -205,28 +169,29 @@
             <property name="group">custom_size_radio</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBoxText" id="image_per_page_combo">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">95</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">4</property>
+        <property name="padding">6</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
@@ -240,14 +205,14 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">5</property>
+        <property name="position">2</property>
       </packing>
     </child>
     <child>
       <object class="GtkBox" id="box6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
+        <property name="margin_left">12</property>
         <property name="margin_top">2</property>
         <child>
           <object class="GtkCheckButton" id="title_print_check">
@@ -285,7 +250,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">6</property>
+        <property name="position">3</property>
       </packing>
     </child>
     <child>
@@ -300,14 +265,14 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">7</property>
+        <property name="position">4</property>
       </packing>
     </child>
     <child>
       <object class="GtkBox" id="box7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
+        <property name="margin_left">12</property>
         <property name="margin_top">2</property>
         <child>
           <object class="GtkLabel" id="lbl_OutputPhotoAt">
@@ -367,7 +332,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">8</property>
+        <property name="position">5</property>
       </packing>
     </child>
   </template>