set mnemonic widgets and other HIG tweaks

and restore some list box contents

Change-Id: I0b5a3699eda917796803c401f4af9584fdbdbfb3

14 files changed, 153 insertions, 762 deletions

diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index c692556b155d..d6c209b7b132 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -382,6 +382,10 @@
                         generic-name="URLBox" parent="VclComboBoxText"
                         icon-name="widget-gtk-comboboxtext"/>
 
+    <glade-widget-class title="PropertyControl" name="sdlo-PropertyControl"
+                        generic-name="PropertyControl" parent="VclComboBoxText"
+                        icon-name="widget-gtk-comboboxtext"/>
+
     <glade-widget-class title="Reference Button" name="foruilo-RefButton"
                         generic-name="Reference Button" parent="GtkButton"
                         icon-name="widget-gtk-button"/>
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index cf72ea4a6044..be1ec6e50ec1 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
     sd/source/core/glob.src \
     sd/source/filter/html/pubdlg.src \
     sd/source/ui/accessibility/accessibility.src \
-    sd/source/ui/animations/CustomAnimationDialog.src \
     sd/source/ui/animations/CustomAnimationPane.src \
     sd/source/ui/animations/CustomAnimation.src \
     sd/source/ui/animations/SlideTransitionPane.src \
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
index 0de453bae98d..38a9f144c01e 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -27,13 +27,9 @@
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 #define DLG_CUSTOMANIMATIONPANE                         RID_CUSTOMANIMATION_START+0
-#define DLG_CUSTOMANIMATION                             RID_CUSTOMANIMATION_START+1
 #define DLG_SLIDE_TRANSITION_PANE                       RID_CUSTOMANIMATION_START+3
 
 #define RID_EFFECT_CONTEXTMENU                          RID_CUSTOMANIMATION_START+0
-#define RID_TP_CUSTOMANIMATION_EFFECT                   RID_CUSTOMANIMATION_START+1
-#define RID_TP_CUSTOMANIMATION_DURATION                 RID_CUSTOMANIMATION_START+2
-#define RID_TP_CUSTOMANIMATION_TEXT                     RID_CUSTOMANIMATION_START+3
 #define RID_CUSTOMANIMATION_ROTATION_POPUP              RID_CUSTOMANIMATION_START+9
 #define RID_CUSTOMANIMATION_FONTSIZE_POPUP              RID_CUSTOMANIMATION_START+10
 #define RID_CUSTOMANIMATION_SCALE_POPUP                 RID_CUSTOMANIMATION_START+11
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 67a3ce40b978..667a0ca19f70 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -65,7 +65,6 @@
 
 #include "glob.hrc"
 #include "CustomAnimationDialog.hxx"
-#include "CustomAnimationDialog.hrc"
 #include "CustomAnimation.hrc"
 #include "STLPropertySet.hxx"
 
@@ -1131,6 +1130,7 @@ private:
     sal_Bool mbHasText;
     const STLPropertySet* mpSet;
 
+    VclFrame*       mpSettings;
     FixedText*      mpFTProperty1;
     PropertyControl* mpLBProperty1;
     VclHBox*        mpPlaceholderBox;
@@ -1155,6 +1155,7 @@ private:
 CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, const STLPropertySet* pSet )
 : TabPage( pParent, "EffectTab", "modules/simpress/ui/customanimationeffecttab.ui" ), mbHasText( sal_False ), mpSet(pSet )
 {
+    get(mpSettings, "settings" );
     get(mpFTProperty1, "prop_label1" );
     get(mpLBProperty1, "prop_list1" );
     get(mpPlaceholderBox, "placeholder" );
@@ -1224,9 +1225,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
 
                 if( !aPropertyName.isEmpty() )
                 {
-                    mpFTProperty1->Show();
-                    mpLBProperty1->Show();
-
+                    mpSettings->Show();
                     mpFTProperty1->SetText( aPropertyName );
                 }
 
@@ -2259,7 +2258,7 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl)
 
 // --------------------------------------------------------------------
 
-CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, sal_uInt16 nPage /* = 0 */  )
+CustomAnimationDialog::CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, OString sPage)
 : TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui")
 , mpSet( pSet )
 , mpResultSet( 0 )
@@ -2290,8 +2289,8 @@ CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* p
         mpTabControl->RemovePage( mnTextAnimId );
     }
 
-    if( nPage )
-        mpTabControl->SelectTabPage( nPage );
+    if (!sPage.isEmpty())
+        mpTabControl->SelectTabPage(mpTabControl->GetPageId(sPage));
 }
 
 CustomAnimationDialog::~CustomAnimationDialog()
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hrc b/sd/source/ui/animations/CustomAnimationDialog.hrc
deleted file mode 100644
index b954355e6ae0..000000000000
--- a/sd/source/ui/animations/CustomAnimationDialog.hrc
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SD_CUSTOMANIMATIONDIALOG_HRC
-#define _SD_CUSTOMANIMATIONDIALOG_HRC
-
-// TabPage RID_TP_CUSTOMANIMATION_EFFECT
-#define FL_SETTINGS                 1
-#define FT_PROPERTY_1               2
-#define LB_PROPERTY_1               3
-#define FT_PROPERTY_2               4
-#define LB_PROPERTY_2               5
-#define CB_SMOOTH_START             6
-#define CB_SMOOTH_END               7
-#define CB_AUTORESTART              8
-#define FL_ENHANCEMENTS             9
-#define FT_SOUND                    10
-#define LB_SOUND                    11
-#define PB_SOUND_PREVIEW            12
-#define FT_AFTER_EFFECT             13
-#define LB_AFTER_EFFECT             14
-#define FT_DIMCOLOR                 15
-#define CLB_DIMCOLOR                16
-#define FT_TEXT_ANIM                17
-#define LB_TEXT_ANIM                18
-#define MF_TEXT_DELAY               19
-#define FT_TEXT_DELAY               20
-#define FL_PLAY                     21
-#define RB_FROM_START               22
-#define RB_FROM_LAST                23
-#define RB_FROM_TIME                24
-#define MF_START_TIME               25
-#define FL_STOP                     26
-#define RB_STOP_ON_CLICK            27
-#define RB_STOP_ON_NEXT_SLIDE       28
-#define RB_STOP_AFTER_N_SLIDES      29
-#define MF_STOP_AFTER_SLIDES        30
-
-// TabPage RID_TP_CUSTOMANIMATION_DURATION
-#define FT_START                    1
-#define LB_START                    2
-#define FT_START_DELAY              3
-#define MF_START_DELAY              4
-#define FT_DURATION                 5
-#define CB_DURATION                 6
-#define FT_REPEAT                   7
-#define CB_REPEAT                   8
-#define CBX_REWIND                  9
-#define FL_TRIGGER                  10
-#define RB_CLICKSEQUENCE            11
-#define RB_INTERACTIVE              12
-#define LB_TRIGGER                  13
-
-// TabPage RID_TP_CUSTOMANIMATION_TEXT
-#define FT_GROUP_TEXT               1
-#define LB_GROUP_TEXT               2
-#define CBX_GROUP_AUTO              3
-#define MF_GROUP_AUTO               4
-#define CBX_ANIMATE_FORM            5
-#define CBX_REVERSE                 6
-
-#endif // _SD_CUSTOMANIMATIONDIALOG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 4d531c871936..4d2662754b06 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -151,7 +151,7 @@ class STLPropertySet;
 class CustomAnimationDialog : public TabDialog
 {
 public:
-    CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, sal_uInt16 nPage = 0 );
+    CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, OString Page = OString());
     ~CustomAnimationDialog();
 
     STLPropertySet* getDefaultSet() { return mpSet; }
diff --git a/sd/source/ui/animations/CustomAnimationDialog.src b/sd/source/ui/animations/CustomAnimationDialog.src
deleted file mode 100644
index ea170a58c632..000000000000
--- a/sd/source/ui/animations/CustomAnimationDialog.src
+++ /dev/null
@@ -1,544 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "CustomAnimationDialog.hrc"
-#include "CustomAnimation.hrc"
-
-#define X0 6
-#define X1 6
-#define X2 73
-#define W0 268
-#define W1 67
-#define W2 100
-#define WIDTH 260
-
-TabDialog DLG_CUSTOMANIMATION
-{
-    Size = MAP_APPFONT ( WIDTH+6 , 200 ) ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Text [ en-US ] = "Effect Options";
-
-    TabControl 1
-    {
-        OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 3 , 3 ) ;
-        Size = MAP_APPFONT ( 240 , 159 ) ;
-        PageList =
-        {
-            PageItem
-            {
-                PageResID = RID_TP_CUSTOMANIMATION_EFFECT ;
-                Identifier = RID_TP_CUSTOMANIMATION_EFFECT ;
-                Text [ en-US ] = "Effect" ;
-            };
-
-            PageItem
-            {
-                PageResID = RID_TP_CUSTOMANIMATION_DURATION;
-                Identifier = RID_TP_CUSTOMANIMATION_DURATION;
-                Text [ en-US ] = "Timing";
-            };
-
-            PageItem
-            {
-                PageResID = RID_TP_CUSTOMANIMATION_TEXT;
-                Identifier = RID_TP_CUSTOMANIMATION_TEXT;
-                Text [ en-US ] = "Text Animation";
-            };
-        };
-    };
-    OKButton 1
-    {
-        Pos = MAP_APPFONT ( 10 , 175 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    CancelButton 1
-    {
-        Pos = MAP_APPFONT ( 64 , 175 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton 1
-    {
-        Pos = MAP_APPFONT ( 119 , 175 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-};
-
-TabPage RID_TP_CUSTOMANIMATION_EFFECT
-{
-    HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_EFFECT";
-    Hide = TRUE;
-    Size = MAP_APPFONT ( WIDTH , 159 );
-    Text [ en-US ] = "Effect";
-
-    FixedLine FL_SETTINGS
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X0 , 3  ) ;
-        Size = MAP_APPFONT( W0, 8 );
-        Hide = TRUE;
-
-        Text [ en-US ] = "Settings";
-    };
-
-    FixedText FT_PROPERTY_1
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X1+6 , 16  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-        Hide = TRUE;
-    };
-
-    ListBox LB_PROPERTY_1
-    {
-        HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_PROPERTY_1";
-        Pos = MAP_APPFONT ( X2+6 , 14  ) ;
-        Size = MAP_APPFONT ( W2, 100 );
-        Hide = TRUE;
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-        ClipChildren = TRUE;
-    };
-
-    FixedText FT_PROPERTY_2
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X1+6 , 16  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-        Hide = TRUE;
-    };
-
-    ListBox LB_PROPERTY_2
-    {
-        HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_PROPERTY_2";
-        Pos = MAP_APPFONT ( X2+6 , 14  ) ;
-        Size = MAP_APPFONT ( W2, 100 );
-        Hide = TRUE;
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    CheckBox CB_SMOOTH_START
-    {
-        HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_START";
-        Pos = MAP_APPFONT( X1+6, 14 );
-        Size = MAP_APPFONT ( (W0 / 2) , 10 ) ;
-        Hide = TRUE;
-
-        Text [ en-US ] = "Accelerated start";
-    };
-
-    CheckBox CB_SMOOTH_END
-    {
-        HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_END";
-        Pos = MAP_APPFONT( X1 + (W0 / 2) + 3, 14 );
-        Size = MAP_APPFONT ( (W0 / 2) , 10 ) ;
-        Hide = TRUE;
-
-        Text [ en-US ] = "Decelerated end";
-    };
-
-    CheckBox CB_AUTORESTART
-    {
-        HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_AUTORESTART";
-        Pos = MAP_APPFONT( X1+6, 14 );
-        Size = MAP_APPFONT ( W0 , 10 ) ;
-        Hide = TRUE;
-
-        Text [ en-US ] = "Reverse automatically";
-    };
-
-    //
-    // common settings
-    //
-
-    FixedLine FL_ENHANCEMENTS
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X0 , 3  ) ;
-        Size = MAP_APPFONT( W0, 8 );
-        Hide = TRUE;
-
-        Text [ en-US ] = "Enhancement";
-    };
-
-    FixedText FT_SOUND
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X1 , 5  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-
-        Text [ en-US ] = "Sound";
-    };
-
-    ListBox LB_SOUND
-    {
-        HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_SOUND";
-        Pos = MAP_APPFONT ( X2 , 3  ) ;
-        Size = MAP_APPFONT ( W2 - 19, 100 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    PushButton PB_SOUND_PREVIEW
-    {
-        HelpID = "sd:PushButton:RID_TP_CUSTOMANIMATION_EFFECT:PB_SOUND_PREVIEW";
-        Pos = MAP_APPFONT ( X2 + W2 - 16 , 2  ) ;
-        Size = MAP_APPFONT( 16, 14 );
-        OutputSize = TRUE;
-        TabStop = TRUE;
-    };
-
-    FixedText FT_AFTER_EFFECT
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X1 , 20  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-
-        Text [ en-US ] = "After animation ";
-    };
-
-    ListBox LB_AFTER_EFFECT
-    {
-        HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_AFTER_EFFECT";
-        Pos = MAP_APPFONT ( X2 , 18  ) ;
-        Size = MAP_APPFONT ( W2, 100 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-
-        StringList [ en-US ] =
-        {
-            < "Don't dim" ; > ;
-            < "Dim with color" ; > ;
-            < "Hide after animation" ; > ;
-            < "Hide on next animation" ; > ;
-        };
-    };
-
-    FixedText FT_DIMCOLOR
-    {
-        Pos = MAP_APPFONT( X1, 35 );
-        Size = MAP_APPFONT( W1, 8 );
-        Text [ en-US ] = "Dim Color";
-    };
-
-    ListBox CLB_DIMCOLOR
-    {
-        HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:CLB_DIMCOLOR";
-        Pos = MAP_APPFONT( X2, 33 );
-        Size = MAP_APPFONT ( W2, 100 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    FixedText FT_TEXT_ANIM
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X1 , 50  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-
-        Text [ en-US ] = "Text animation";
-    };
-
-    ListBox LB_TEXT_ANIM
-    {
-        HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM";
-        Pos = MAP_APPFONT ( X2 , 48  ) ;
-        Size = MAP_APPFONT ( W2, 100 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-
-        StringList [ en-US ] =
-        {
-            < "All at once" ; > ;
-            < "Word by word" ; > ;
-            < "Letter by letter" ; > ;
-        };
-    };
-
-    FixedText FT_TEXT_DELAY
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X2 + 45, 66  ) ;
-        Size = MAP_APPFONT( W0 - X2 - 45, 8 );
-
-        Text [ en-US ] = "delay between characters";
-    };
-
-    MetricField MF_TEXT_DELAY
-    {
-        HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY";
-        Pos = MAP_APPFONT ( X2, 64  ) ;
-        Size = MAP_APPFONT ( 42, 12 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 1024 ;
-        DecimalDigits = 1 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText [ en-US ] = "%";
-        SpinSize = 1 ;
-
-    };
-};
-
-TabPage RID_TP_CUSTOMANIMATION_DURATION
-{
-    HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_DURATION";
-    Hide = TRUE;
-    Size = MAP_APPFONT ( WIDTH , 159 );
-    Text [ en-US ] = "Timing";
-
-    FixedText FT_START
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X0 , 5  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-
-        Text [ en-US ] = "Start";
-    };
-
-    ListBox LB_START
-    {
-        HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_START";
-        Pos = MAP_APPFONT ( X2 , 3  ) ;
-        Size = MAP_APPFONT ( W2, 48 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-
-        StringList [ en-US ] =
-        {
-            < "On click" ; > ;
-            < "With previous" ; > ;
-            < "After previous" ; > ;
-        };
-    };
-
-    FixedText FT_START_DELAY
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X0 , 20  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-
-        Text [ en-US ] = "Delay";
-    };
-
-    MetricField MF_START_DELAY
-    {
-        HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_DURATION:MF_START_DELAY";
-        Pos = MAP_APPFONT ( X2 , 18  ) ;
-        Size = MAP_APPFONT ( W2, 12 );
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        DecimalDigits = 1 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText [ en-US ] = "sec";
-        SpinSize = 5 ;
-    };
-
-    FixedText FT_DURATION
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X0 , 35  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-
-        Text [ en-US ] = "Speed";
-    };
-
-    ComboBox CB_DURATION
-    {
-        HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_DURATION";
-        Pos = MAP_APPFONT ( X2 , 33  ) ;
-        Size = MAP_APPFONT ( W2, 48 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    FixedText FT_REPEAT
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X0 , 50  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-
-        Text [ en-US ] = "Repeat";
-    };
-
-    ComboBox CB_REPEAT
-    {
-        HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_REPEAT";
-        Pos = MAP_APPFONT ( X2 , 48 ) ;
-        Size = MAP_APPFONT ( W2, 48 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    CheckBox CBX_REWIND
-    {
-        HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_DURATION:CBX_REWIND";
-        Pos = MAP_APPFONT ( X0 , 66  ) ;
-        Size = MAP_APPFONT ( W0 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Rewind when done playing" ;
-    };
-
-    FixedLine FL_TRIGGER
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X0 , 79  ) ;
-        Size = MAP_APPFONT( W0, 8 );
-
-        Text [ en-US ] = "Trigger";
-    };
-
-    RadioButton RB_CLICKSEQUENCE
-    {
-        HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_CLICKSEQUENCE";
-        Pos = MAP_APPFONT ( X1+6, 92  ) ;
-        Size = MAP_APPFONT ( W0 , 10 ) ;
-        Text [ en-US ] = "Animate as part of click sequence" ;
-        TabStop = TRUE ;
-    };
-
-    RadioButton RB_INTERACTIVE
-    {
-        HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE";
-        Pos = MAP_APPFONT ( X1+6, 105  ) ;
-        Size = MAP_APPFONT ( W0 , 10 ) ;
-        Text [ en-US ] = "Start effect on click of" ;
-        TabStop = TRUE ;
-    };
-
-    ListBox LB_TRIGGER
-    {
-        HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER";
-        Pos = MAP_APPFONT ( X1+18 , 118  );
-        Size = MAP_APPFONT ( W2, 80 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-    };
-};
-
-TabPage RID_TP_CUSTOMANIMATION_TEXT
-{
-    HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_TEXT";
-    Hide = TRUE;
-    Size = MAP_APPFONT ( WIDTH , 159 );
-    Text [ en-US ] = "Text Animation";
-
-    FixedText FT_GROUP_TEXT
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( X0 , 5  ) ;
-        Size = MAP_APPFONT( W1, 8 );
-
-        Text [ en-US ] = "Group text";
-    };
-
-    ListBox LB_GROUP_TEXT
-    {
-        HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_TEXT:LB_GROUP_TEXT";
-        Pos = MAP_APPFONT ( (WIDTH-W2-65), 3 ) ;
-        Size = MAP_APPFONT ( W2, 48 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-
-        StringList [ en-US ] =
-        {
-            < "As one object" ; > ;
-            < "All paragraphs at once" ; > ;
-            < "By 1st level paragraphs" ; > ;
-            < "By 2nd level paragraphs" ; > ;
-            < "By 3rd level paragraphs" ; > ;
-            < "By 4th level paragraphs" ; > ;
-            < "By 5th level paragraphs" ; > ;
-        };
-    };
-
-    CheckBox CBX_GROUP_AUTO
-    {
-        HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO";
-        Pos = MAP_APPFONT ( X0 , 20  ) ;
-        Size = MAP_APPFONT ( W1  , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Automatically after" ;
-    };
-
-
-    MetricField MF_GROUP_AUTO
-    {
-        HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_TEXT:MF_GROUP_AUTO";
-        Pos = MAP_APPFONT ( (WIDTH-W2-65) , 20 ) ;
-        Size = MAP_APPFONT ( W2, 12 );
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        DecimalDigits = 1 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText [ en-US ] = "sec";
-        SpinSize = 5 ;
-    };
-
-    CheckBox CBX_ANIMATE_FORM
-    {
-        HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_ANIMATE_FORM";
-        Pos = MAP_APPFONT ( X0 , 33  ) ;
-        Size = MAP_APPFONT ( W0 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Animate attached shape" ;
-    };
-
-    CheckBox CBX_REVERSE
-    {
-        HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_REVERSE";
-        Pos = MAP_APPFONT ( X0 , 46  ) ;
-        Size = MAP_APPFONT ( W0 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "In reverse order" ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 58ef5c6cf017..60da3850bb6f 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -808,7 +808,7 @@ void CustomAnimationPane::onContextMenu( sal_uInt16 nSelectedPopupEntry )
     case CM_WITH_PREVIOUS:  onChangeStart( EffectNodeType::WITH_PREVIOUS  ); break;
     case CM_AFTER_PREVIOUS: onChangeStart( EffectNodeType::AFTER_PREVIOUS ); break;
     case CM_OPTIONS:        showOptions(); break;
-    case CM_DURATION:       showOptions(RID_TP_CUSTOMANIMATION_DURATION); break;
+    case CM_DURATION:       showOptions("timing"); break;
     case CM_REMOVE:         onRemove(); break;
     case CM_CREATE:         if( maViewSelection.hasValue() ) onChange( true ); break;
     }
@@ -1572,11 +1572,11 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
     }
 }
 
-void CustomAnimationPane::showOptions( sal_uInt16 nPage /* = 0 */ )
+void CustomAnimationPane::showOptions(OString sPage)
 {
     STLPropertySet* pSet = createSelectionSet();
 
-    CustomAnimationDialog* pDlg = new CustomAnimationDialog( this, pSet, nPage );
+    CustomAnimationDialog* pDlg = new CustomAnimationDialog(this, pSet, sPage);
     if( pDlg->Execute() )
     {
         addUndo();
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index e00d3c50c589..1f1c9b2338ae 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -104,7 +104,7 @@ private:
     void updateMotionPathTags();
     void markShapesFromSelectedEffects();
 
-    void showOptions( sal_uInt16 nPage = 0 );
+    void showOptions(OString sPage = OString());
     void moveSelection( bool bUp );
     void onPreview( bool bForcePreview );
 
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>