Improve presentation options layout

* Sort presentations options, put similiar options next to each other.
* Move non-document option (Navigation bar) to "Display" area.

Also improve wording a little bit for more clarity

Change-Id: I18de6b95ea26033ef78709845db40e428a1d6c84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158831
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>

1 files changed, 35 insertions, 33 deletions

diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui
index 96746b44f80a..a6b97b886932 100644
--- a/sd/uiconfig/simpress/ui/presentationdialog.ui
+++ b/sd/uiconfig/simpress/ui/presentationdialog.ui
@@ -268,7 +268,7 @@
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <child>
-                      <!-- n-columns=2 n-rows=2 -->
+                      <!-- n-columns=2 n-rows=3 -->
                       <object class="GtkGrid" id="grid8">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
@@ -337,6 +337,22 @@
                             <property name="top-attach">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkCheckButton" id="shownavigationbutton">
+                            <property name="label" translatable="yes" context="presentationdialog|shownavigationbutton">Show navigation bar</property>
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">False</property>
+                            <property name="tooltip-text" translatable="yes" context="presentationdialog|shownavigationbutton|tooltip_text">Show navigation bar at the bottom of the presentation</property>
+                            <property name="use-underline">True</property>
+                            <property name="draw-indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="left-attach">0</property>
@@ -399,7 +415,7 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" context="presentationdialog|label3">Multiple Displays</property>
+                    <property name="label" translatable="yes" context="presentationdialog|label3">Display</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -570,7 +586,7 @@
                     <property name="label-xalign">0</property>
                     <property name="shadow-type">none</property>
                     <child>
-                      <!-- n-columns=1 n-rows=7 -->
+                      <!-- n-columns=1 n-rows=6 -->
                       <object class="GtkGrid" id="grid4">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
@@ -581,7 +597,7 @@
                         <property name="row-spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="manualslides">
-                            <property name="label" translatable="yes" context="presentationdialog|manualslides">Change slides _manually</property>
+                            <property name="label" translatable="yes" context="presentationdialog|manualslides">Disable auto_matic change of slides</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
@@ -614,7 +630,7 @@
                           </object>
                           <packing>
                             <property name="left-attach">0</property>
-                            <property name="top-attach">1</property>
+                            <property name="top-attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -633,50 +649,50 @@
                           </object>
                           <packing>
                             <property name="left-attach">0</property>
-                            <property name="top-attach">2</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="animationsallowed">
-                            <property name="label" translatable="yes" context="presentationdialog|animationsallowed">_Animations allowed</property>
+                          <object class="GtkCheckButton" id="changeslidesbyclick">
+                            <property name="label" translatable="yes" context="presentationdialog|changeslidesbyclick">Change slides by clic_king on background</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="draw-indicator">True</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="animationsallowed-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|animationsallowed">Displays all frames of animated GIF files during the slide show.</property>
+                              <object class="AtkObject" id="changeslidesbyclick-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|changeslidesbyclick">Advances to the next slide when you click on the background of a slide.</property>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="left-attach">0</property>
-                            <property name="top-attach">4</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="changeslidesbyclick">
-                            <property name="label" translatable="yes" context="presentationdialog|changeslidesbyclick">Change slides by clic_king on background</property>
+                          <object class="GtkCheckButton" id="animationsallowed">
+                            <property name="label" translatable="yes" context="presentationdialog|animationsallowed">Enable _animated images</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="draw-indicator">True</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="changeslidesbyclick-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|changeslidesbyclick">Advances to the next slide when you click on the background of a slide.</property>
+                              <object class="AtkObject" id="animationsallowed-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="presentationdialog|extended_tip|animationsallowed">Displays all frames of animated GIF files during the slide show.</property>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="left-attach">0</property>
-                            <property name="top-attach">5</property>
+                            <property name="top-attach">4</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="alwaysontop">
-                            <property name="label" translatable="yes" context="presentationdialog|alwaysontop">Presentation always _on top</property>
+                            <property name="label" translatable="yes" context="presentationdialog|alwaysontop">Keep Presentation always _on top</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
@@ -690,21 +706,7 @@
                           </object>
                           <packing>
                             <property name="left-attach">0</property>
-                            <property name="top-attach">6</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="shownavigationbutton">
-                            <property name="label" translatable="yes" context="presentationdialog|shownavigationbutton">Show navigation panel</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="draw-indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">3</property>
+                            <property name="top-attach">5</property>
                           </packing>
                         </child>
                       </object>
@@ -713,7 +715,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="label" translatable="yes" context="presentationdialog|label4">Options</property>
+                        <property name="label" translatable="yes" context="presentationdialog|label4">Presentation Options</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>