Impress Options Dialog Print update

Change-Id: I401562e96c05a6c2af0bbe928bd92f7e611cced6
Reviewed-on: https://gerrit.libreoffice.org/82111
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>

1 files changed, 145 insertions, 144 deletions

diff --git a/sd/uiconfig/simpress/ui/prntopts.ui b/sd/uiconfig/simpress/ui/prntopts.ui
index 4d5c81345f7e..aad5a13ca704 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -12,34 +12,34 @@
       <object class="GtkBox" id="prntandpgoptbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="spacing">12</property>
+        <property name="spacing">24</property>
         <child>
-          <object class="GtkFrame" id="printframe">
+          <object class="GtkFrame" id="frame3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment2">
+              <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="grid2">
+                  <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="GtkCheckButton" id="pagenmcb">
-                        <property name="label" translatable="yes" context="prntopts|pagenmcb">_Page name</property>
+                      <object class="GtkRadioButton" id="pagedefaultrb">
+                        <property name="label" translatable="yes" context="prntopts|pagedefaultrb">Default</property>
                         <property name="visible">True</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="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -48,14 +48,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="datecb">
-                        <property name="label" translatable="yes" context="prntopts|datecb">D_ate</property>
+                      <object class="GtkRadioButton" id="fittopgrb">
+                        <property name="label" translatable="yes" context="prntopts|fittopgrb">_Fit to page</property>
                         <property name="visible">True</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">pagedefaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -63,14 +64,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="timecb">
-                        <property name="label" translatable="yes" context="prntopts|timecb">Ti_me</property>
+                      <object class="GtkRadioButton" id="tilepgrb">
+                        <property name="label" translatable="yes" context="prntopts|tilepgrb">_Tile pages</property>
                         <property name="visible">True</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">pagedefaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -78,8 +80,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="hiddenpgcb">
-                        <property name="label" translatable="yes" context="prntopts|hiddenpgcb">H_idden pages</property>
+                      <object class="GtkCheckButton" id="papertryfrmprntrcb">
+                        <property name="label" translatable="yes" context="prntopts|papertryfrmprntrcb">Paper tray from printer s_ettings</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -89,18 +91,91 @@
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
+                        <property name="top_attach">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="brouchrb">
+                        <property name="label" translatable="yes" context="prntopts|brouchrb">B_rochure</property>
+                        <property name="visible">True</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">pagedefaultrb</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">3</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkAlignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">18</property>
+                        <child>
+                          <object class="GtkBox" id="box4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="frontcb">
+                                <property name="label" translatable="yes" context="prntopts|frontcb">Fr_ont</property>
+                                <property name="visible">True</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>
+                                <accessibility>
+                                  <relation type="labelled-by" target="brouchrb"/>
+                                </accessibility>
+                              </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" context="prntopts|backcb">Ba_ck</property>
+                                <property name="visible">True</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>
+                                <accessibility>
+                                  <relation type="labelled-by" target="brouchrb"/>
+                                </accessibility>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="printlbl">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="prntopts|printlbl">Print</property>
+                <property name="label" translatable="yes" context="prntopts|label3">Page Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -114,33 +189,31 @@
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="frame3">
+          <object class="GtkFrame" id="printframe">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment3">
+              <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="grid3">
+                  <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="GtkRadioButton" id="pagedefaultrb">
-                        <property name="label" translatable="yes" context="prntopts|pagedefaultrb">Default</property>
+                      <object class="GtkCheckButton" id="pagenmcb">
+                        <property name="label" translatable="yes" context="prntopts|pagenmcb">_Page name</property>
                         <property name="visible">True</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="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -149,15 +222,14 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="fittopgrb">
-                        <property name="label" translatable="yes" context="prntopts|fittopgrb">_Fit to page</property>
+                      <object class="GtkCheckButton" id="datecb">
+                        <property name="label" translatable="yes" context="prntopts|datecb">D_ate</property>
                         <property name="visible">True</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">pagedefaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -165,15 +237,14 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="tilepgrb">
-                        <property name="label" translatable="yes" context="prntopts|tilepgrb">_Tile pages</property>
+                      <object class="GtkCheckButton" id="timecb">
+                        <property name="label" translatable="yes" context="prntopts|timecb">Ti_me</property>
                         <property name="visible">True</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">pagedefaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -181,96 +252,29 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="brouchrb">
-                        <property name="label" translatable="yes" context="prntopts|brouchrb">B_rochure</property>
+                      <object class="GtkCheckButton" id="hiddenpgcb">
+                        <property name="label" translatable="yes" context="prntopts|hiddenpgcb">H_idden pages</property>
                         <property name="visible">True</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">pagedefaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">3</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="papertryfrmprntrcb">
-                        <property name="label" translatable="yes" context="prntopts|papertryfrmprntrcb">Paper tray from printer s_ettings</property>
-                        <property name="visible">True</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>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</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" context="prntopts|frontcb">Fr_ont</property>
-                            <property name="visible">True</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>
-                            <accessibility>
-                              <relation type="labelled-by" target="brouchrb"/>
-                            </accessibility>
-                          </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" context="prntopts|backcb">Ba_ck</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</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>
-                            <accessibility>
-                              <relation type="labelled-by" target="brouchrb"/>
-                            </accessibility>
-                          </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>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label3">
+              <object class="GtkLabel" id="printlbl">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="prntopts|label3">Page Options</property>
+                <property name="label" translatable="yes" context="prntopts|printlbl">Print</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -280,7 +284,6 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="padding">16</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -295,33 +298,33 @@
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="spacing">12</property>
+        <property name="spacing">24</property>
         <child>
-          <object class="GtkFrame" id="contentframe">
+          <object class="GtkFrame" id="qualityframe">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hexpand">True</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="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkGrid" id="grid1">
+                  <object class="GtkGrid" id="grid4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <object class="GtkCheckButton" id="drawingcb">
-                        <property name="label" translatable="yes" context="prntopts|drawingcb">Drawing</property>
+                      <object class="GtkRadioButton" id="defaultrb">
+                        <property name="label" translatable="yes" context="prntopts|defaultrb">Default</property>
                         <property name="visible">True</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="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -330,14 +333,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="notecb">
-                        <property name="label" translatable="yes" context="prntopts|notecb">Notes</property>
+                      <object class="GtkRadioButton" id="grayscalerb">
+                        <property name="label" translatable="yes" context="prntopts|grayscalerb">Gra_yscale</property>
                         <property name="visible">True</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">defaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -345,44 +349,31 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="handoutcb">
-                        <property name="label" translatable="yes" context="prntopts|handoutcb">Handouts</property>
+                      <object class="GtkRadioButton" id="blackwhiterb">
+                        <property name="label" translatable="yes" context="prntopts|blackwhiterb">Black &amp; _white</property>
                         <property name="visible">True</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">defaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="outlinecb">
-                        <property name="label" translatable="yes" context="prntopts|outlinecb">Outline</property>
-                        <property name="visible">True</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>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="contentlbl">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="prntopts|contentlbl">Content</property>
+                <property name="label" translatable="yes" context="prntopts|label2">Quality</property>
+                <property name="use_underline">True</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -396,32 +387,30 @@
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="qualityframe">
+          <object class="GtkFrame" id="contentframe">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment4">
+              <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="grid4">
+                  <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <object class="GtkRadioButton" id="defaultrb">
-                        <property name="label" translatable="yes" context="prntopts|defaultrb">Default</property>
+                      <object class="GtkCheckButton" id="drawingcb">
+                        <property name="label" translatable="yes" context="prntopts|drawingcb">Drawing</property>
                         <property name="visible">True</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="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -430,15 +419,14 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="grayscalerb">
-                        <property name="label" translatable="yes" context="prntopts|grayscalerb">Gra_yscale</property>
+                      <object class="GtkCheckButton" id="notecb">
+                        <property name="label" translatable="yes" context="prntopts|notecb">Notes</property>
                         <property name="visible">True</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">defaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -446,31 +434,44 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="blackwhiterb">
-                        <property name="label" translatable="yes" context="prntopts|blackwhiterb">Black &amp; _white</property>
+                      <object class="GtkCheckButton" id="handoutcb">
+                        <property name="label" translatable="yes" context="prntopts|handoutcb">Handouts</property>
                         <property name="visible">True</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">defaultrb</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkCheckButton" id="outlinecb">
+                        <property name="label" translatable="yes" context="prntopts|outlinecb">Outline</property>
+                        <property name="visible">True</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>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="contentlbl">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="prntopts|label2">Quality</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="yes" context="prntopts|contentlbl">Content</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>