lets put the row that has the optional column at the bottom

Rather than have an incomplete first row and a complete second row, have the
opposite. Looks more balanced. Two clicks required post .ui conversion two days
required pre .ui conversion :-)

Change-Id: I595a17f84dc0988b261d67bccdaa4582f2db6c2a

1 files changed, 154 insertions, 155 deletions

diff --git a/sd/uiconfig/simpress/ui/prntopts.ui b/sd/uiconfig/simpress/ui/prntopts.ui
index ca323d57f19d..d63ab25da9a9 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -8,34 +8,36 @@
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
-      <object class="GtkBox" id="box1">
+      <object class="GtkBox" id="prntandpgoptbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
         <property name="homogeneous">True</property>
         <child>
-          <object class="GtkFrame" id="contentframe">
+          <object class="GtkFrame" id="printframe">
             <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="alignment2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkGrid" id="grid1">
+                  <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkCheckButton" id="drawingcb">
-                        <property name="label" translatable="yes">Drawing</property>
+                      <object class="GtkCheckButton" id="pagenmcb">
+                        <property name="label" translatable="yes">_Page name</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -47,11 +49,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="notecb">
-                        <property name="label" translatable="yes">Notes</property>
+                      <object class="GtkCheckButton" id="datecb">
+                        <property name="label" translatable="yes">D_ate</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -63,11 +66,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="handoutcb">
-                        <property name="label" translatable="yes">Handouts</property>
+                      <object class="GtkCheckButton" id="timecb">
+                        <property name="label" translatable="yes">Ti_me</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -79,11 +83,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="outlinecb">
-                        <property name="label" translatable="yes">Outline</property>
+                      <object class="GtkCheckButton" id="hiddenpgcb">
+                        <property name="label" translatable="yes">H_idden pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -99,10 +104,10 @@
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="contentlbl">
+              <object class="GtkLabel" id="printlbl">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Content</property>
+                <property name="label" translatable="yes">Print</property>
                 <attributes>
                   <attribute name="weight" value="semibold"/>
                 </attributes>
@@ -116,24 +121,25 @@
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="qualityframe">
+          <object class="GtkFrame" id="frame3">
             <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="alignment4">
+              <object class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkGrid" id="grid4">
+                  <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkRadioButton" id="defaultrb">
+                      <object class="GtkRadioButton" id="pagedefaultrb">
                         <property name="label" translatable="yes">Default</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -141,7 +147,7 @@
                         <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">grayscalerb</property>
+                        <property name="group">fittopgrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -151,15 +157,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="grayscalerb">
-                        <property name="label" translatable="yes">Gra_yScale</property>
+                      <object class="GtkRadioButton" id="fittopgrb">
+                        <property name="label" translatable="yes">_Fit to page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="xalign">0.0099999997764825821</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">blackwhiterb</property>
+                        <property name="group">tilepgrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -169,15 +175,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="blackwhiterb">
-                        <property name="label" translatable="yes">Black &amp; _white</property>
+                      <object class="GtkRadioButton" id="tilepgrb">
+                        <property name="label" translatable="yes">_Tile pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">defaultrb</property>
+                        <property name="group">brouchrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -186,16 +192,97 @@
                         <property name="height">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkRadioButton" id="brouchrb">
+                        <property name="label" translatable="yes">B_rochure</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">pagedefaultrb</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="papertryfrmprntrcb">
+                        <property name="label" translatable="yes">Paper tray from printer s_ettings</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">5</property>
+                        <property name="width">1</property>
+                        <property name="height">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">24</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkCheckButton" id="frontcb">
+                            <property name="label" translatable="yes">Fr_ont</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="backcb">
+                            <property name="label" translatable="yes">Ba_ck</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="margin_left">50</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Quality</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">Page options</property>
                 <attributes>
                   <attribute name="weight" value="semibold"/>
                 </attributes>
@@ -205,6 +292,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="padding">16</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -212,40 +300,38 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">0</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="prntandpgoptbox">
+      <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
         <property name="homogeneous">True</property>
         <child>
-          <object class="GtkFrame" id="printframe">
+          <object class="GtkFrame" id="contentframe">
             <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="alignment2">
+              <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkGrid" id="grid2">
+                  <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkCheckButton" id="pagenmcb">
-                        <property name="label" translatable="yes">_Page name</property>
+                      <object class="GtkCheckButton" id="drawingcb">
+                        <property name="label" translatable="yes">Drawing</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -257,12 +343,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="datecb">
-                        <property name="label" translatable="yes">D_ate</property>
+                      <object class="GtkCheckButton" id="notecb">
+                        <property name="label" translatable="yes">Notes</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -274,12 +359,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="timecb">
-                        <property name="label" translatable="yes">Ti_me</property>
+                      <object class="GtkCheckButton" id="handoutcb">
+                        <property name="label" translatable="yes">Handouts</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -291,12 +375,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="hiddenpgcb">
-                        <property name="label" translatable="yes">H_idden pages</property>
+                      <object class="GtkCheckButton" id="outlinecb">
+                        <property name="label" translatable="yes">Outline</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -312,10 +395,10 @@
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="printlbl">
+              <object class="GtkLabel" id="contentlbl">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Print</property>
+                <property name="label" translatable="yes">Content</property>
                 <attributes>
                   <attribute name="weight" value="semibold"/>
                 </attributes>
@@ -329,33 +412,31 @@
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="frame3">
+          <object class="GtkFrame" id="qualityframe">
             <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="alignment3">
+              <object class="GtkAlignment" id="alignment4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkGrid" id="grid3">
+                  <object class="GtkGrid" id="grid4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkRadioButton" id="pagedefaultrb">
+                      <object class="GtkRadioButton" id="defaultrb">
                         <property name="label" translatable="yes">Default</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
-                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">fittopgrb</property>
+                        <property name="group">grayscalerb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -365,15 +446,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="fittopgrb">
-                        <property name="label" translatable="yes">_Fit to page</property>
+                      <object class="GtkRadioButton" id="grayscalerb">
+                        <property name="label" translatable="yes">Gra_yScale</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">tilepgrb</property>
+                        <property name="group">blackwhiterb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -383,15 +464,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="tilepgrb">
-                        <property name="label" translatable="yes">_Tile pages</property>
+                      <object class="GtkRadioButton" id="blackwhiterb">
+                        <property name="label" translatable="yes">Black &amp; _white</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">brouchrb</property>
+                        <property name="group">defaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -400,97 +481,16 @@
                         <property name="height">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkRadioButton" id="brouchrb">
-                        <property name="label" translatable="yes">B_rochure</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">pagedefaultrb</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="papertryfrmprntrcb">
-                        <property name="label" translatable="yes">Paper tray from printer s_ettings</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">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">24</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkCheckButton" id="frontcb">
-                            <property name="label" translatable="yes">Fr_ont</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="backcb">
-                            <property name="label" translatable="yes">Ba_ck</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="margin_left">50</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label3">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Page options</property>
+                <property name="label" translatable="yes">Quality</property>
+                <property name="use_underline">True</property>
                 <attributes>
                   <attribute name="weight" value="semibold"/>
                 </attributes>
@@ -500,7 +500,6 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="padding">16</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -508,7 +507,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">1</property>
+        <property name="position">2</property>
       </packing>
     </child>
   </object>