set mnemonic widgets and other HIG tweaks

and restore some list box contents

Change-Id: I0b5a3699eda917796803c401f4af9584fdbdbfb3

5 files changed, 138 insertions, 121 deletions

diff --git a/sd/uiconfig/simpress/ui/customanimationcreatedialog.ui b/sd/uiconfig/simpress/ui/customanimationcreatedialog.ui
index ca082369c2e7..e0bf9f1e88a0 100644
--- a/sd/uiconfig/simpress/ui/customanimationcreatedialog.ui
+++ b/sd/uiconfig/simpress/ui/customanimationcreatedialog.ui
@@ -19,6 +19,8 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
index be07ceb161f9..38763e0dd9e9 100644
--- a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="EffectTab">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="border_width">6</property>
     <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
     <child>
-      <object class="GtkFrame" id="frame1">
-        <property name="visible">True</property>
+      <object class="GtkFrame" id="settings">
         <property name="can_focus">False</property>
+        <property name="no_show_all">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
           <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="GtkBox" id="box1">
@@ -26,13 +30,14 @@
                   <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
+                    <property name="spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="prop_label1">
-                        <property name="visible">False</property>
+                        <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Direction:</property>
                         <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">prop_list1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -45,10 +50,15 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                            <object class="sdlo-PropertyControl" id="prop_list1">
-                              <property name="visible">False</property>
-                              <property name="can_focus">False</property>
-                            </object>
+                          <object class="sdlo-PropertyControl" id="prop_list1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -69,14 +79,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
+                    <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkCheckButton" id="smooth_start">
                         <property name="label" translatable="yes">Accelerated start</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -89,11 +97,8 @@
                     <child>
                       <object class="GtkCheckButton" id="smooth_end">
                         <property name="label" translatable="yes">Decelerated end</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">False</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -141,15 +146,16 @@
           <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">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">6</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="aeffect_label">
                     <property name="visible">True</property>
@@ -157,6 +163,7 @@
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">A_fter animation:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">aeffect_list</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -172,6 +179,7 @@
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">_Sound:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">sound_list</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -187,6 +195,7 @@
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">_Text animation:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">text_animation_list</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -202,6 +211,7 @@
                     <property name="halign">end</property>
                     <property name="label" translatable="yes">Di_m color:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">dim_color_list</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -219,6 +229,7 @@
                       <object class="GtkComboBox" id="sound_list">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="valign">center</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -229,11 +240,9 @@
                     <child>
                       <object class="GtkButton" id="sound_preview">
                         <property name="label">gtk-media-play</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                       </object>
                       <packing>
@@ -251,24 +260,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" id="aeffect_list">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <items>
-                       <item translatable="yes">Don't dim</item>
-                       <item translatable="yes">Dim with color</item>
-                       <item translatable="yes">Hide after animation</item>
-                       <item translatable="yes">Hide on next animation</item>
-                    </items>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="svtlo-ColorListBox" id="dim_color_list">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -281,32 +272,16 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" id="text_animation_list">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <items>
-                       <item translatable="yes">All at once</item>
-                       <item translatable="yes">Word by word</item>
-                       <item translatable="yes">Letter by letter</item>
-                    </items>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkBox" id="box5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
+                    <property name="spacing">12</property>
                     <child>
-                      <object class="GtkSpinButton" id="text_delay:0%">
+                      <object class="GtkSpinButton" id="text_delay:0.0%">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">●</property>
+                        <property name="digits">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -335,10 +310,43 @@
                   </packing>
                 </child>
                 <child>
-                  <placeholder/>
+                  <object class="GtkComboBoxText" id="aeffect_list">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="entry_text_column">0</property>
+                    <property name="id_column">1</property>
+                    <items>
+                      <item translatable="yes">Don't dim</item>
+                      <item translatable="yes">Dim with color</item>
+                      <item translatable="yes">Hide after animation</item>
+                      <item translatable="yes">Hide on next animation</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
                 </child>
                 <child>
-                  <placeholder/>
+                  <object class="GtkComboBoxText" id="text_animation_list">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="entry_text_column">0</property>
+                    <property name="id_column">1</property>
+                    <items>
+                      <item translatable="yes">All at once</item>
+                      <item translatable="yes">Word by word</item>
+                      <item translatable="yes">Letter by letter</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
                 </child>
                 <child>
                   <placeholder/>
diff --git a/sd/uiconfig/simpress/ui/customanimationproperties.ui b/sd/uiconfig/simpress/ui/customanimationproperties.ui
index 9b0a5b9ea2a9..a75798c64473 100644
--- a/sd/uiconfig/simpress/ui/customanimationproperties.ui
+++ b/sd/uiconfig/simpress/ui/customanimationproperties.ui
@@ -4,6 +4,7 @@
   <object class="GtkDialog" id="CustomAnimationProperties">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
+    <property name="title" translatable="yes">Effect Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -17,11 +18,11 @@
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -33,11 +34,9 @@
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -49,11 +48,9 @@
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -77,7 +74,7 @@
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <child>
-               <placeholder/>
+              <placeholder/>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="effect">
@@ -90,7 +87,7 @@
               </packing>
             </child>
             <child>
-               <placeholder/>
+              <placeholder/>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="timing">
@@ -104,7 +101,7 @@
               </packing>
             </child>
             <child>
-               <placeholder/>
+              <placeholder/>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="textanim">
diff --git a/sd/uiconfig/simpress/ui/customanimationtexttab.ui b/sd/uiconfig/simpress/ui/customanimationtexttab.ui
index f772d60f6043..ef297d0ad187 100644
--- a/sd/uiconfig/simpress/ui/customanimationtexttab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationtexttab.ui
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">999.99000000000001</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkBox" id="TextAnimationTab">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="border_width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
@@ -11,7 +17,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="row_spacing">6</property>
-        <property name="columnt_spacing">6</property>
+        <property name="column_spacing">12</property>
         <child>
           <object class="GtkLabel" id="group_text_label">
             <property name="visible">True</property>
@@ -19,6 +25,7 @@
             <property name="halign">start</property>
             <property name="label" translatable="yes">_Group text:</property>
             <property name="use_underline">True</property>
+            <property name="mnemonic_widget">group_text_list</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -28,33 +35,14 @@
           </packing>
         </child>
         <child>
-          <object class="GtkComboBox" id="group_text_list">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <items>
-              <item translatable="yes">As one object</item>
-              <item translatable="yes">All paragraphs at once</item>
-              <item translatable="yes">By 1st level paragraphs</item>
-              <item translatable="yes">By 2nd level paragraphs</item>
-              <item translatable="yes">By 3rd level paragraphs</item>
-              <item translatable="yes">By 4th level paragraphs</item>
-              <item translatable="yes">By 5th level paragraphs</item>
-            </items>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="auto_after_value:0">
+          <object class="GtkSpinButton" id="auto_after_value:0.0sec">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="halign">start</property>
             <property name="hexpand">True</property>
             <property name="invisible_char">●</property>
+            <property name="adjustment">adjustment1</property>
+            <property name="digits">1</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -66,11 +54,9 @@
         <child>
           <object class="GtkCheckButton" id="auto_after">
             <property name="label" translatable="yes">_Automatically after:</property>
-            <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
-            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
@@ -82,6 +68,29 @@
             <property name="height">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkComboBoxText" id="group_text_list">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="entry_text_column">0</property>
+            <property name="id_column">1</property>
+            <items>
+              <item translatable="yes">As one object</item>
+              <item translatable="yes">All paragraphs at once</item>
+              <item translatable="yes">By 1st level paragraphs</item>
+              <item translatable="yes">By 2nd level paragraphs</item>
+              <item translatable="yes">By 3rd level paragraphs</item>
+              <item translatable="yes">By 4th level paragraphs</item>
+              <item translatable="yes">By 5th level paragraphs</item>
+            </items>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -92,11 +101,9 @@
     <child>
       <object class="GtkCheckButton" id="animate_shape">
         <property name="label" translatable="yes">Animate attached _shape</property>
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
@@ -110,11 +117,9 @@
     <child>
       <object class="GtkCheckButton" id="reverse_order">
         <property name="label" translatable="yes">_In reverse order</property>
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
diff --git a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
index d5f38929d2bc..f7e8f748ccc5 100644
--- a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">999.99000000000001</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkBox" id="TimingTab">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="border_width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
@@ -13,7 +19,7 @@
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="row_spacing">6</property>
-        <property name="column_spacing">6</property>
+        <property name="column_spacing">12</property>
         <child>
           <object class="GtkLabel" id="start_label">
             <property name="visible">True</property>
@@ -93,10 +99,13 @@
           </packing>
         </child>
         <child>
-          <object class="GtkSpinButton" id="delay_value:0">
+          <object class="GtkSpinButton" id="delay_value:0.0sec">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">start</property>
             <property name="hexpand">True</property>
+            <property name="adjustment">adjustment1</property>
+            <property name="digits">1</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -131,6 +140,23 @@
             <property name="height">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkCheckButton" id="rewind">
+            <property name="label" translatable="yes">Rewind _when done playing</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">4</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -139,24 +165,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="rewind">
-        <property name="label" translatable="yes">Rewind _when done playing</property>
-        <property name="use_action_appearance">False</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="use_action_appearance">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">1</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkFrame" id="frame3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -166,6 +174,7 @@
           <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="GtkBox" id="box6">
@@ -176,11 +185,9 @@
                 <child>
                   <object class="GtkRadioButton" id="rb_click_sequence">
                     <property name="label" translatable="yes">_Animate as part of click sequence</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
@@ -196,11 +203,9 @@
                 <child>
                   <object class="GtkRadioButton" id="rb_interactive">
                     <property name="label" translatable="yes">Start _effect on click of</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
@@ -243,7 +248,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </object>