[Libreoffice-commits] core.git: 5 commits - sd/source sd/uiconfig sd/UIConfig_simpress.mk
Katarina Behrens
bubli at bubli.org
Tue Aug 13 02:01:10 PDT 2013
sd/UIConfig_simpress.mk | 4
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 329 ++++----------
sd/source/ui/animations/CustomAnimationDialog.hxx | 3
sd/source/ui/animations/CustomAnimationPane.cxx | 1
sd/uiconfig/simpress/ui/customanimationcreatetab.ui | 7
sd/uiconfig/simpress/ui/customanimationeffecttab.ui | 368 ++++++++++++++++
sd/uiconfig/simpress/ui/customanimationproperties.ui | 135 +++++
sd/uiconfig/simpress/ui/customanimationspanel.ui | 7
sd/uiconfig/simpress/ui/customanimationtexttab.ui | 129 +++++
sd/uiconfig/simpress/ui/customanimationtimingtab.ui | 250 ++++++++++
11 files changed, 1000 insertions(+), 237 deletions(-)
New commits:
commit 48a1b767b183acdc703cd7e5a4c6d492da237daa
Author: Katarina Behrens <bubli at bubli.org>
Date: Tue Aug 13 10:59:56 2013 +0200
Unused private variables
Change-Id: Ic7c51b9943a3d6485d41df50a9b35282bf0d999a
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 53574e8..67a3ce4 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1134,8 +1134,6 @@ private:
FixedText* mpFTProperty1;
PropertyControl* mpLBProperty1;
VclHBox* mpPlaceholderBox;
- FixedText* mpFTProperty2;
- PropertyControl* mpLBProperty2;
CheckBox* mpCBSmoothStart;
CheckBox* mpCBSmoothEnd;
commit 466b64b68cecaa82837c4aede3e9a485c45bd1d4
Author: Katarina Behrens <bubli at bubli.org>
Date: Tue Aug 13 00:45:30 2013 +0200
Preserve entry data from combobox items
use old school strings from .src file as we need the entry data and
can't really define them in .ui <item>
Change-Id: I669675edb321dcb60f3785c7f28cecbbc2edc982
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index e9d7079..813ff4e 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -66,6 +66,8 @@ const int MISCEFFECTS = 4;
// --------------------------------------------------------------------
+extern void fillDurationComboBox( ListBox* pBox );
+
class CategoryListBox : public ListBox
{
public:
@@ -248,6 +250,8 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus
get( mpCBSpeed, "effect_speed_list" );
get( mpCBXPReview, "auto_preview" );
+ fillDurationComboBox(mpCBSpeed);
+
String sMotionPathLabel( SdResId( STR_CUSTOMANIMATION_USERPATH ) );
sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index bcf2e7b..53574e8 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -92,8 +92,8 @@ using ::com::sun::star::beans::XPropertySet;
namespace sd {
-extern void fillRepeatComboBox( ComboBox* pBox );
-extern void fillDurationComboBox( ComboBox* pBox );
+extern void fillRepeatComboBox( ListBox* pBox );
+extern void fillDurationComboBox( ListBox* pBox );
extern OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText = true );
extern OUString getPropertyName( sal_Int32 nPropertyType );
@@ -1746,8 +1746,8 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
get(mpRBInteractive, "rb_interactive" );
get(mpLBTrigger, "trigger_list");
- //fillRepeatComboBox( mpCBRepeat.get() );
- //fillDurationComboBox( mpCBDuration.get() );
+ fillRepeatComboBox( mpCBRepeat );
+ fillDurationComboBox( mpCBDuration );
mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
mpLBTrigger->SetSelectHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 1fa1753..58ef5c6 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -195,6 +195,7 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas
maStrProperty = mpFTProperty->GetText();
+ fillDurationComboBox( mpCBSpeed );
mpPBMoveUp->SetSymbol( SYMBOL_ARROW_UP );
mpPBMoveDown->SetSymbol( SYMBOL_ARROW_DOWN );
diff --git a/sd/uiconfig/simpress/ui/customanimationcreatetab.ui b/sd/uiconfig/simpress/ui/customanimationcreatetab.ui
index 4de5a0d..c51a926 100644
--- a/sd/uiconfig/simpress/ui/customanimationcreatetab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationcreatetab.ui
@@ -44,13 +44,6 @@
<object class="GtkComboBoxText" id="effect_speed_list">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <items>
- <item translatable="yes">Very slow</item>
- <item translatable="yes">Slow</item>
- <item translatable="yes">Normal</item>
- <item translatable="yes">Fast</item>
- <item translatable="yes">Very fast</item>
- </items>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index eb887ef..6350703 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -215,13 +215,6 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<property name="hexpand">True</property>
- <items>
- <item translatable="yes">Very slow</item>
- <item translatable="yes">Slow</item>
- <item translatable="yes">Normal</item>
- <item translatable="yes">Fast</item>
- <item translatable="yes">Very fast</item>
- </items>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
index a530570..d5f3892 100644
--- a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
@@ -110,13 +110,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <items>
- <item translatable="yes">Very slow</item>
- <item translatable="yes">Slow</item>
- <item translatable="yes">Normal</item>
- <item translatable="yes">Fast</item>
- <item translatable="yes">Very fast</item>
- </items>
</object>
<packing>
<property name="left_attach">1</property>
commit 094cda40d29985d1920ba6ddd1d1854cd5946053
Author: Katarina Behrens <bubli at bubli.org>
Date: Mon Aug 12 20:51:24 2013 +0200
Removed unused widgets, were Hide=True in orig .src file
and never ever Show()-n
Change-Id: I8cadc75dda6798ac617977d6b4ae0fc52fb3dc0b
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 70b417a..bcf2e7b 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1138,7 +1138,6 @@ private:
PropertyControl* mpLBProperty2;
CheckBox* mpCBSmoothStart;
CheckBox* mpCBSmoothEnd;
- CheckBox* mpCBAutoRestart;
FixedText* mpFTSound;
ListBox* mpLBSound;
@@ -1163,7 +1162,6 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
get(mpPlaceholderBox, "placeholder" );
get(mpCBSmoothStart, "smooth_start" );
get(mpCBSmoothEnd, "smooth_end" );
- get(mpCBAutoRestart, "auto_restart" );
get(mpFTSound, "sound_label");
get(mpLBSound, "sound_list" );
get(mpPBSoundPreview, "sound_preview" );
diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
index f48a734..be07ceb 100644
--- a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
@@ -103,23 +103,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="auto_restart">
- <property name="label" translatable="yes">Reverse automatically</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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
commit e37f50f700b3f41b4c31d091623136f74f4aabb8
Author: Katarina Behrens <bubli at bubli.org>
Date: Mon Aug 12 20:10:20 2013 +0200
Removed dead (mostly widget-placing) code
Change-Id: I91b96d1e9f7638d3278ab43188da83865efe59ed
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 1002370..70b417a 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1155,22 +1155,11 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
};
-
-static void move_down( Control* pControl, int nOffsetX, int nOffsetY )
-{
- Point aPos( pControl->GetPosPixel() );
- aPos.X() += nOffsetX;
- aPos.Y() += nOffsetY;
- pControl->SetPosPixel( aPos );
-}
-
CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, const STLPropertySet* pSet )
: TabPage( pParent, "EffectTab", "modules/simpress/ui/customanimationeffecttab.ui" ), mbHasText( sal_False ), mpSet(pSet )
{
get(mpFTProperty1, "prop_label1" );
get(mpLBProperty1, "prop_list1" );
- //get(mpFTProperty2, "prop_label2" );
- //get(mpLBProperty2, "prop_list2" );
get(mpPlaceholderBox, "placeholder" );
get(mpCBSmoothStart, "smooth_start" );
get(mpCBSmoothEnd, "smooth_end" );
@@ -1187,8 +1176,6 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
get(mpMFTextDelay,"text_delay" );
get(mpFTTextDelay,"text_delay_label" );
- //FreeResource();
-
// fill the soundbox
fillSoundListBox();
@@ -1219,14 +1206,6 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
mpCLBDimColor->SetUpdateMode( sal_True );
- //
- // init settings controls
- //
- int nOffsetY = 0;
- int nOffsetX = 0;
-
- Size aSpace( LogicToPixel( Size( 3, 3 ), MAP_APPFONT ) );
-
// only show settings if all selected effects have the same preset-id
if( pSet->getPropertyState( nHandlePresetId ) != STLPropertyState_AMBIGUOUS )
{
@@ -1252,8 +1231,6 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
mpFTProperty1->Show();
mpLBProperty1->Show();
- //nOffsetY += mpLBProperty1->GetSizePixel().Height() + aSpace.Height();
-
mpFTProperty1->SetText( aPropertyName );
}
@@ -1277,11 +1254,6 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
mpCBSmoothStart->Show();
mpCBSmoothEnd->Show();
- //move_down( mpCBSmoothStart, nOffsetX, nOffsetY );
- //move_down( mpCBSmoothEnd, nOffsetX, nOffsetY );
-
- nOffsetY += mpCBSmoothStart->GetSizePixel().Height() + aSpace.Height();
-
double fTemp = 0.0;
pSet->getPropertyValue( nHandleAccelerate ) >>= fTemp;
mpCBSmoothStart->Check( fTemp > 0.0 );
@@ -1289,41 +1261,8 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
pSet->getPropertyValue( nHandleDecelerate ) >>= fTemp;
mpCBSmoothEnd->Check( fTemp > 0.0 );
}
-
- //
- // auto reverse
- //
-
-
- /*if( nOffsetY )
- {
- nOffsetY += mpFLSettings->GetSizePixel().Height() + aSpace.Height();
- mpFLSettings->Show();
-
- mpFLEnhancements->Show();
- move_down( mpFLEnhancements, nOffsetX, nOffsetY );
-
- nOffsetY += mpFLEnhancements->GetSizePixel().Height() + aSpace.Height();
-
- nOffsetX = 2* aSpace.Width();
- }*/
}
- /*if( (nOffsetY != 0) || (nOffsetX != 0) )
- {
- move_down( mpFTSound, nOffsetX, nOffsetY );
- move_down( mpLBSound, nOffsetX, nOffsetY );
- move_down( mpPBSoundPreview, nOffsetX, nOffsetY );
- move_down( mpFTAfterEffect, nOffsetX, nOffsetY );
- move_down( mpLBAfterEffect, nOffsetX, nOffsetY );
- move_down( mpFTDimColor, nOffsetX, nOffsetY );
- move_down( mpCLBDimColor, nOffsetX, nOffsetY );
- move_down( mpFTTextAnim, nOffsetX, nOffsetY );
- move_down( mpLBTextAnim, nOffsetX, nOffsetY );
- move_down( mpMFTextDelay, nOffsetX, nOffsetY );
- move_down( mpFTTextDelay, nOffsetX, nOffsetY );
- }*/
-
//
// init after effect controls
//
@@ -1453,9 +1392,6 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
updateControlStates();
- //Size aSize( GetSizePixel() );
- //aSize.Height() += mpMFTextDelay->GetPosPixel().X() + GetSizePixel().Height() + aSpace.Height();
- //SetSizePixel( aSize );
}
CustomAnimationEffectTabPage::~CustomAnimationEffectTabPage()
@@ -1526,17 +1462,6 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
pSet->setPropertyValue( nHandleProperty1Value, aNewValue );
}
- /*if( mpLBProperty2->getSubControl() )
- {
- Any aNewValue( mpLBProperty2->getSubControl()->getValue() );
- Any aOldValue;
- if( mpSet->getPropertyState( nHandleProperty2Value ) != STLPropertyState_AMBIGUOUS)
- aOldValue = mpSet->getPropertyValue( nHandleProperty2Value );
-
- if( aOldValue != aNewValue )
- pSet->setPropertyValue( nHandleProperty2Value, aNewValue );
- }*/
-
if( mpCBSmoothStart->IsVisible() )
{
// set selected value for accelerate if different then in original set
@@ -1826,8 +1751,6 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
//fillRepeatComboBox( mpCBRepeat.get() );
//fillDurationComboBox( mpCBDuration.get() );
- //FreeResource();
-
mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
mpLBTrigger->SetSelectHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
@@ -2381,8 +2304,6 @@ CustomAnimationDialog::~CustomAnimationDialog()
delete mpDurationTabPage;
delete mpTextAnimTabPage;
- /*delete mpTabControl;*/
-
delete mpSet;
delete mpResultSet;
}
commit 14d05d3f0c4f41a74a7414258531912410060e5b
Author: Katarina Behrens <bubli at bubli.org>
Date: Mon Aug 12 19:58:06 2013 +0200
Converted custom animation property dialog to .ui
Change-Id: Ifd1e745867ca80dd65619a0b54df97931d3044a7
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 5485eff..075223c 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -73,6 +73,10 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/customanimationcreatedialog \
sd/uiconfig/simpress/ui/customanimationcreatetab \
sd/uiconfig/simpress/ui/customanimationspanel \
+ sd/uiconfig/simpress/ui/customanimationproperties \
+ sd/uiconfig/simpress/ui/customanimationeffecttab \
+ sd/uiconfig/simpress/ui/customanimationtimingtab \
+ sd/uiconfig/simpress/ui/customanimationtexttab \
sd/uiconfig/simpress/ui/customslideshows \
sd/uiconfig/simpress/ui/definecustomslideshow \
sd/uiconfig/simpress/ui/masterlayoutdlg \
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 0ce986c..1002370 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -42,6 +42,7 @@
#include <vcl/svapp.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
+#include <vcl/layout.hxx>
#include <vcl/field.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/decoview.hxx>
@@ -1111,7 +1112,7 @@ Control* FontStylePropertyBox::getControl()
class CustomAnimationEffectTabPage : public TabPage
{
public:
- CustomAnimationEffectTabPage( Window* pParent, const ResId& rResId, const STLPropertySet* pSet );
+ CustomAnimationEffectTabPage( Window* pParent, const STLPropertySet* pSet );
~CustomAnimationEffectTabPage();
void update( STLPropertySet* pSet );
@@ -1130,16 +1131,15 @@ private:
sal_Bool mbHasText;
const STLPropertySet* mpSet;
- FixedLine* mpFLSettings;
FixedText* mpFTProperty1;
PropertyControl* mpLBProperty1;
+ VclHBox* mpPlaceholderBox;
FixedText* mpFTProperty2;
PropertyControl* mpLBProperty2;
CheckBox* mpCBSmoothStart;
CheckBox* mpCBSmoothEnd;
CheckBox* mpCBAutoRestart;
- FixedLine* mpFLEnhancements;
FixedText* mpFTSound;
ListBox* mpLBSound;
PushButton* mpPBSoundPreview;
@@ -1164,31 +1164,30 @@ static void move_down( Control* pControl, int nOffsetX, int nOffsetY )
pControl->SetPosPixel( aPos );
}
-CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, const ResId& rResId, const STLPropertySet* pSet )
-: TabPage( pParent, rResId ), mbHasText( sal_False ), mpSet(pSet )
-{
- mpFLSettings = new FixedLine( this, SdResId( FL_SETTINGS ) );
- mpFTProperty1 = new FixedText( this, SdResId( FT_PROPERTY_1 ) );
- mpLBProperty1 = new PropertyControl( this, SdResId( LB_PROPERTY_1 ) );
- mpFTProperty2 = new FixedText( this, SdResId( FT_PROPERTY_2 ) );
- mpLBProperty2 = new PropertyControl( this, SdResId( LB_PROPERTY_2 ) );
- mpCBSmoothStart = new CheckBox( this, SdResId( CB_SMOOTH_START ) );
- mpCBSmoothEnd = new CheckBox( this, SdResId( CB_SMOOTH_END ) );
- mpCBAutoRestart = new CheckBox( this, SdResId( CB_AUTORESTART ) );
- mpFLEnhancements = new FixedLine( this, SdResId( FL_ENHANCEMENTS ) );
- mpFTSound = new FixedText( this, SdResId( FT_SOUND ) );
- mpLBSound = new ListBox( this, SdResId( LB_SOUND ) );
- mpPBSoundPreview = new PushButton( this, SdResId( PB_SOUND_PREVIEW ) );
- mpFTAfterEffect = new FixedText( this, SdResId( FT_AFTER_EFFECT ) );
- mpLBAfterEffect = new ListBox( this, SdResId( LB_AFTER_EFFECT ) );
- mpFTDimColor = new FixedText( this, SdResId( FT_DIMCOLOR ) );
- mpCLBDimColor = new ColorListBox( this, SdResId( CLB_DIMCOLOR ) );
- mpFTTextAnim = new FixedText( this, SdResId( FT_TEXT_ANIM ) );
- mpLBTextAnim = new ListBox( this, SdResId( LB_TEXT_ANIM ) );
- mpMFTextDelay = new MetricField( this, SdResId( MF_TEXT_DELAY ) );
- mpFTTextDelay = new FixedText( this, SdResId( FT_TEXT_DELAY ) );
-
- FreeResource();
+CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, const STLPropertySet* pSet )
+: TabPage( pParent, "EffectTab", "modules/simpress/ui/customanimationeffecttab.ui" ), mbHasText( sal_False ), mpSet(pSet )
+{
+ get(mpFTProperty1, "prop_label1" );
+ get(mpLBProperty1, "prop_list1" );
+ //get(mpFTProperty2, "prop_label2" );
+ //get(mpLBProperty2, "prop_list2" );
+ get(mpPlaceholderBox, "placeholder" );
+ get(mpCBSmoothStart, "smooth_start" );
+ get(mpCBSmoothEnd, "smooth_end" );
+ get(mpCBAutoRestart, "auto_restart" );
+ get(mpFTSound, "sound_label");
+ get(mpLBSound, "sound_list" );
+ get(mpPBSoundPreview, "sound_preview" );
+ get(mpFTAfterEffect, "aeffect_label" );
+ get(mpLBAfterEffect, "aeffect_list" );
+ get(mpFTDimColor, "dim_color_label" );
+ get(mpCLBDimColor, "dim_color_list" );
+ get(mpFTTextAnim, "text_animation_label" );
+ get(mpLBTextAnim, "text_animation_list" );
+ get(mpMFTextDelay,"text_delay" );
+ get(mpFTTextDelay,"text_delay_label" );
+
+ //FreeResource();
// fill the soundbox
fillSoundListBox();
@@ -1253,7 +1252,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
mpFTProperty1->Show();
mpLBProperty1->Show();
- nOffsetY += mpLBProperty1->GetSizePixel().Height() + aSpace.Height();
+ //nOffsetY += mpLBProperty1->GetSizePixel().Height() + aSpace.Height();
mpFTProperty1->SetText( aPropertyName );
}
@@ -1263,7 +1262,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
Link aModifyLink;
// create property sub control
- mpLBProperty1->setSubControl( PropertySubControl::create( nType, this, aValue, aPresetId, aModifyLink ));
+ mpLBProperty1->setSubControl( PropertySubControl::create( nType, mpPlaceholderBox, aValue, aPresetId, aModifyLink ));
}
}
@@ -1278,8 +1277,8 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
mpCBSmoothStart->Show();
mpCBSmoothEnd->Show();
- move_down( mpCBSmoothStart, nOffsetX, nOffsetY );
- move_down( mpCBSmoothEnd, nOffsetX, nOffsetY );
+ //move_down( mpCBSmoothStart, nOffsetX, nOffsetY );
+ //move_down( mpCBSmoothEnd, nOffsetX, nOffsetY );
nOffsetY += mpCBSmoothStart->GetSizePixel().Height() + aSpace.Height();
@@ -1296,7 +1295,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
//
- if( nOffsetY )
+ /*if( nOffsetY )
{
nOffsetY += mpFLSettings->GetSizePixel().Height() + aSpace.Height();
mpFLSettings->Show();
@@ -1307,10 +1306,10 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
nOffsetY += mpFLEnhancements->GetSizePixel().Height() + aSpace.Height();
nOffsetX = 2* aSpace.Width();
- }
+ }*/
}
- if( (nOffsetY != 0) || (nOffsetX != 0) )
+ /*if( (nOffsetY != 0) || (nOffsetX != 0) )
{
move_down( mpFTSound, nOffsetX, nOffsetY );
move_down( mpLBSound, nOffsetX, nOffsetY );
@@ -1323,7 +1322,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
move_down( mpLBTextAnim, nOffsetX, nOffsetY );
move_down( mpMFTextDelay, nOffsetX, nOffsetY );
move_down( mpFTTextDelay, nOffsetX, nOffsetY );
- }
+ }*/
//
// init after effect controls
@@ -1454,36 +1453,14 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
updateControlStates();
- Size aSize( GetSizePixel() );
- aSize.Height() += mpMFTextDelay->GetPosPixel().X() + GetSizePixel().Height() + aSpace.Height();
- SetSizePixel( aSize );
+ //Size aSize( GetSizePixel() );
+ //aSize.Height() += mpMFTextDelay->GetPosPixel().X() + GetSizePixel().Height() + aSpace.Height();
+ //SetSizePixel( aSize );
}
CustomAnimationEffectTabPage::~CustomAnimationEffectTabPage()
{
clearSoundListBox();
-
- delete mpFLSettings;
- delete mpFTProperty1;
- delete mpLBProperty1;
- delete mpFTProperty2;
- delete mpLBProperty2;
- delete mpCBSmoothStart;
- delete mpCBSmoothEnd;
- delete mpCBAutoRestart;
-
- delete mpFLEnhancements;
- delete mpFTSound;
- delete mpLBSound;
- delete mpPBSoundPreview;
- delete mpFTAfterEffect;
- delete mpLBAfterEffect;
- delete mpFTDimColor;
- delete mpCLBDimColor;
- delete mpFTTextAnim;
- delete mpLBTextAnim;
- delete mpMFTextDelay;
- delete mpFTTextDelay;
}
void CustomAnimationEffectTabPage::updateControlStates()
@@ -1549,7 +1526,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
pSet->setPropertyValue( nHandleProperty1Value, aNewValue );
}
- if( mpLBProperty2->getSubControl() )
+ /*if( mpLBProperty2->getSubControl() )
{
Any aNewValue( mpLBProperty2->getSubControl()->getValue() );
Any aOldValue;
@@ -1558,7 +1535,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
if( aOldValue != aNewValue )
pSet->setPropertyValue( nHandleProperty2Value, aNewValue );
- }
+ }*/
if( mpCBSmoothStart->IsVisible() )
{
@@ -1806,7 +1783,7 @@ void CustomAnimationEffectTabPage::onSoundPreview()
class CustomAnimationDurationTabPage : public TabPage
{
public:
- CustomAnimationDurationTabPage( Window* pParent, const ResId& rResId, const STLPropertySet* pSet );
+ CustomAnimationDurationTabPage( Window* pParent, const STLPropertySet* pSet );
~CustomAnimationDurationTabPage();
void update( STLPropertySet* pSet );
@@ -1816,42 +1793,40 @@ public:
private:
const STLPropertySet* mpSet;
- boost::shared_ptr< FixedText > mpFTStart;
- boost::shared_ptr< ListBox > mpLBStart;
- boost::shared_ptr< FixedText > mpFTStartDelay;
- boost::shared_ptr< MetricField > mpMFStartDelay;
- boost::shared_ptr< FixedText > mpFTDuration;
- boost::shared_ptr< ComboBox > mpCBDuration;
- boost::shared_ptr< FixedText > mpFTRepeat;
- boost::shared_ptr< ComboBox > mpCBRepeat;
- boost::shared_ptr< CheckBox > mpCBXRewind;
- boost::shared_ptr< FixedLine > mpFLTrigger;
- boost::shared_ptr< RadioButton > mpRBClickSequence;
- boost::shared_ptr< RadioButton > mpRBInteractive;
- boost::shared_ptr< ListBox > mpLBTrigger;
+ FixedText* mpFTStart;
+ ListBox* mpLBStart;
+ FixedText* mpFTStartDelay;
+ MetricField* mpMFStartDelay;
+ FixedText* mpFTDuration;
+ ListBox* mpCBDuration;
+ FixedText* mpFTRepeat;
+ ListBox* mpCBRepeat;
+ CheckBox* mpCBXRewind;
+ RadioButton* mpRBClickSequence;
+ RadioButton* mpRBInteractive;
+ ListBox* mpLBTrigger;
};
-CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, const ResId& rResId, const STLPropertySet* pSet)
-: TabPage( pParent, rResId ), mpSet( pSet )
-{
- mpFTStart.reset( new FixedText( this, SdResId( FT_START ) ) );
- mpLBStart.reset( new ListBox( this, SdResId( LB_START ) ) );
- mpFTStartDelay.reset( new FixedText( this, SdResId( FT_START_DELAY ) ) );
- mpMFStartDelay.reset( new MetricField( this, SdResId( MF_START_DELAY ) ) );
- mpFTDuration.reset( new FixedText( this, SdResId( FT_DURATION ) ) );
- mpCBDuration.reset( new ComboBox( this, SdResId( CB_DURATION ) ) );
- mpFTRepeat.reset( new FixedText( this, SdResId( FT_REPEAT ) ) );
- mpCBRepeat.reset( new ComboBox( this, SdResId( CB_REPEAT ) ) );
- mpCBXRewind.reset( new CheckBox( this, SdResId( CBX_REWIND ) ) );
- mpFLTrigger.reset( new FixedLine( this, SdResId( FL_TRIGGER ) ) );
- mpRBClickSequence.reset( new RadioButton( this, SdResId( RB_CLICKSEQUENCE ) ) );
- mpRBInteractive.reset( new RadioButton( this, SdResId( RB_INTERACTIVE ) ) );
- mpLBTrigger.reset( new ListBox( this, SdResId( LB_TRIGGER ) ) );
+CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, const STLPropertySet* pSet)
+: TabPage( pParent, "TimingTab", "modules/simpress/ui/customanimationtimingtab.ui" ), mpSet( pSet )
+{
+ get(mpFTStart,"start_label" );
+ get(mpLBStart, "start_list" );
+ get(mpFTStartDelay, "delay_label" );
+ get(mpMFStartDelay, "delay_value" );
+ get(mpFTDuration, "duration_label" );
+ get(mpCBDuration, "duration_list" );
+ get(mpFTRepeat, "repeat_label" );
+ get(mpCBRepeat, "repeat_list" );
+ get(mpCBXRewind, "rewind" );
+ get(mpRBClickSequence, "rb_click_sequence" );
+ get(mpRBInteractive, "rb_interactive" );
+ get(mpLBTrigger, "trigger_list");
//fillRepeatComboBox( mpCBRepeat.get() );
//fillDurationComboBox( mpCBDuration.get() );
- FreeResource();
+ //FreeResource();
mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
mpLBTrigger->SetSelectHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
@@ -2012,7 +1987,7 @@ CustomAnimationDurationTabPage::~CustomAnimationDurationTabPage()
IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl )
{
- if( pControl == mpLBTrigger.get() )
+ if( pControl == mpLBTrigger )
{
mpRBClickSequence->Check( sal_False );
mpRBInteractive->Check( sal_True );
@@ -2184,7 +2159,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
class CustomAnimationTextAnimTabPage : public TabPage
{
public:
- CustomAnimationTextAnimTabPage( Window* pParent, const ResId& rResId, const STLPropertySet* pSet );
+ CustomAnimationTextAnimTabPage( Window* pParent, const STLPropertySet* pSet );
void update( STLPropertySet* pSet );
@@ -2192,38 +2167,37 @@ public:
DECL_LINK(implSelectHdl, void *);
private:
- FixedText maFTGroupText;
- ListBox maLBGroupText;
- CheckBox maCBXGroupAuto;
- MetricField maMFGroupAuto;
- CheckBox maCBXAnimateForm;
- CheckBox maCBXReverse;
+ FixedText* maFTGroupText;
+ ListBox* maLBGroupText;
+ CheckBox* maCBXGroupAuto;
+ MetricField* maMFGroupAuto;
+ CheckBox* maCBXAnimateForm;
+ CheckBox* maCBXReverse;
const STLPropertySet* mpSet;
bool mbHasVisibleShapes;
};
-CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, const ResId& rResId, const STLPropertySet* pSet)
-: TabPage( pParent, rResId ),
- maFTGroupText( this, SdResId( FT_GROUP_TEXT ) ),
- maLBGroupText( this, SdResId( LB_GROUP_TEXT ) ),
- maCBXGroupAuto( this, SdResId( CBX_GROUP_AUTO ) ),
- maMFGroupAuto( this, SdResId( MF_GROUP_AUTO ) ),
- maCBXAnimateForm( this, SdResId( CBX_ANIMATE_FORM ) ),
- maCBXReverse( this, SdResId( CBX_REVERSE ) ),
+CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, const STLPropertySet* pSet)
+: TabPage( pParent, "TextAnimationTab", "modules/simpress/ui/customanimationtexttab.ui" ),
mpSet( pSet ),
mbHasVisibleShapes(true)
{
- FreeResource();
+ get( maFTGroupText, "group_text_label" );
+ get( maLBGroupText, "group_text_list" );
+ get( maCBXGroupAuto, "auto_after" );
+ get( maMFGroupAuto, "auto_after_value" );
+ get( maCBXAnimateForm, "animate_shape" );
+ get( maCBXReverse, "reverse_order" );
- maLBGroupText.SetSelectHdl( LINK( this, CustomAnimationTextAnimTabPage, implSelectHdl ) );
+ maLBGroupText->SetSelectHdl( LINK( this, CustomAnimationTextAnimTabPage, implSelectHdl ) );
if( pSet->getPropertyState( nHandleTextGrouping ) != STLPropertyState_AMBIGUOUS )
{
sal_Int32 nTextGrouping = 0;
if( pSet->getPropertyValue( nHandleTextGrouping ) >>= nTextGrouping )
- maLBGroupText.SelectEntryPos( (sal_uInt16)(nTextGrouping + 1) );
+ maLBGroupText->SelectEntryPos( (sal_uInt16)(nTextGrouping + 1) );
}
if( pSet->getPropertyState( nHandleHasVisibleShape ) != STLPropertyState_AMBIGUOUS )
@@ -2234,37 +2208,37 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
double fTextGroupingAuto = 0.0;
if( pSet->getPropertyValue( nHandleTextGroupingAuto ) >>= fTextGroupingAuto )
{
- maCBXGroupAuto.Check( fTextGroupingAuto >= 0.0 );
+ maCBXGroupAuto->Check( fTextGroupingAuto >= 0.0 );
if( fTextGroupingAuto >= 0.0 )
- maMFGroupAuto.SetValue( (long)(fTextGroupingAuto*10) );
+ maMFGroupAuto->SetValue( (long)(fTextGroupingAuto*10) );
}
}
else
{
- maCBXGroupAuto.SetState( STATE_DONTKNOW );
+ maCBXGroupAuto->SetState( STATE_DONTKNOW );
}
- maCBXAnimateForm.SetState( STATE_DONTKNOW );
+ maCBXAnimateForm->SetState( STATE_DONTKNOW );
if( pSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS )
{
sal_Bool bAnimateForm = sal_False;
if( pSet->getPropertyValue( nHandleAnimateForm ) >>= bAnimateForm )
{
- maCBXAnimateForm.Check( bAnimateForm );
+ maCBXAnimateForm->Check( bAnimateForm );
}
}
else
{
- maCBXAnimateForm.Enable( sal_False );
+ maCBXAnimateForm->Enable( sal_False );
}
- maCBXReverse.SetState( STATE_DONTKNOW );
+ maCBXReverse->SetState( STATE_DONTKNOW );
if( pSet->getPropertyState( nHandleTextReverse ) != STLPropertyState_AMBIGUOUS )
{
sal_Bool bTextReverse = sal_False;
if( pSet->getPropertyValue( nHandleTextReverse ) >>= bTextReverse )
{
- maCBXReverse.Check( bTextReverse );
+ maCBXReverse->Check( bTextReverse );
}
}
@@ -2277,7 +2251,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
sal_Int32 nPos = 6;
while( (nPos > 2) && (nPos > nMaxParaDepth) )
{
- maLBGroupText.RemoveEntry( (sal_uInt16)nPos );
+ maLBGroupText->RemoveEntry( (sal_uInt16)nPos );
nPos--;
}
}
@@ -2287,7 +2261,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
{
- sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos();
+ sal_uInt16 nPos = maLBGroupText->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
sal_Int32 nTextGrouping = nPos - 1;
@@ -2302,7 +2276,7 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
if( nPos > 0 )
{
- sal_Bool bTextReverse = maCBXReverse.IsChecked();
+ sal_Bool bTextReverse = maCBXReverse->IsChecked();
sal_Bool bOldTextReverse = !bTextReverse;
if(mpSet->getPropertyState( nHandleTextReverse ) != STLPropertyState_AMBIGUOUS)
@@ -2313,7 +2287,7 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
if( nPos > 1 )
{
- double fTextGroupingAuto = maCBXGroupAuto.IsChecked() ? maMFGroupAuto.GetValue() / 10.0 : -1.0;
+ double fTextGroupingAuto = maCBXGroupAuto->IsChecked() ? maMFGroupAuto->GetValue() / 10.0 : -1.0;
double fOldTextGroupingAuto = -2.0;
if(mpSet->getPropertyState( nHandleTextGroupingAuto ) != STLPropertyState_AMBIGUOUS)
@@ -2326,9 +2300,9 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
//#i120049# impress crashes when modifying the "Random effects" animation
//effect's trigger condition to "Start effect on click of".
//If this control is disabled, we should ignore its value
- if (maCBXAnimateForm.IsEnabled())
+ if (maCBXAnimateForm->IsEnabled())
{
- sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
+ sal_Bool bAnimateForm = maCBXAnimateForm->IsChecked();
sal_Bool bOldAnimateForm = !bAnimateForm;
if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS)
@@ -2341,20 +2315,20 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
void CustomAnimationTextAnimTabPage::updateControlStates()
{
- sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos();
+ sal_uInt16 nPos = maLBGroupText->GetSelectEntryPos();
- maCBXGroupAuto.Enable( nPos > 1 );
- maMFGroupAuto.Enable( nPos > 1 );
- maCBXReverse.Enable( nPos > 0 );
+ maCBXGroupAuto->Enable( nPos > 1 );
+ maMFGroupAuto->Enable( nPos > 1 );
+ maCBXReverse->Enable( nPos > 0 );
if( !mbHasVisibleShapes && nPos > 0 )
{
- maCBXAnimateForm.Check(sal_False);
- maCBXAnimateForm.Enable(sal_False);
+ maCBXAnimateForm->Check(sal_False);
+ maCBXAnimateForm->Enable(sal_False);
}
else
{
- maCBXAnimateForm.Enable(sal_True);
+ maCBXAnimateForm->Enable(sal_True);
}
}
@@ -2367,19 +2341,20 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl)
// --------------------------------------------------------------------
CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, sal_uInt16 nPage /* = 0 */ )
-: TabDialog( pParent, SdResId( DLG_CUSTOMANIMATION ) ), mpSet( pSet ), mpResultSet( 0 )
+: TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui")
+, mpSet( pSet )
+, mpResultSet( 0 )
{
- mpTabControl = new TabControl( this, SdResId( 1 ) );
- mpOKButton = new OKButton(this, SdResId( 1 ) ) ;
- mpCancelButton = new CancelButton(this, SdResId( 1 ) );
- mpHelpButton = new HelpButton(this, SdResId( 1 ) );
+ get(mpTabControl, "tabs");
- FreeResource();
+ sal_uInt16 mnEffectId = mpTabControl->GetPageId("effect");
+ sal_uInt16 mnTimingId = mpTabControl->GetPageId("timing");
+ sal_uInt16 mnTextAnimId = mpTabControl->GetPageId("textanim");
- mpEffectTabPage = new CustomAnimationEffectTabPage( mpTabControl, SdResId( RID_TP_CUSTOMANIMATION_EFFECT ), mpSet );
- mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_EFFECT, mpEffectTabPage );
- mpDurationTabPage = new CustomAnimationDurationTabPage( mpTabControl, SdResId( RID_TP_CUSTOMANIMATION_DURATION ), mpSet );
- mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_DURATION, mpDurationTabPage );
+ mpEffectTabPage = new CustomAnimationEffectTabPage( mpTabControl, mpSet );
+ mpTabControl->SetTabPage( mnEffectId, mpEffectTabPage );
+ mpDurationTabPage = new CustomAnimationDurationTabPage( mpTabControl, mpSet );
+ mpTabControl->SetTabPage( mnTimingId, mpDurationTabPage );
sal_Bool bHasText = sal_False;
if( pSet->getPropertyState( nHandleHasText ) != STLPropertyState_AMBIGUOUS )
@@ -2387,13 +2362,13 @@ CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* p
if( bHasText )
{
- mpTextAnimTabPage = new CustomAnimationTextAnimTabPage( mpTabControl, SdResId( RID_TP_CUSTOMANIMATION_TEXT ), mpSet );
- mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_TEXT, mpTextAnimTabPage );
+ mpTextAnimTabPage = new CustomAnimationTextAnimTabPage( mpTabControl, mpSet );
+ mpTabControl->SetTabPage( mnTextAnimId, mpTextAnimTabPage );
}
else
{
mpTextAnimTabPage = 0;
- mpTabControl->RemovePage( RID_TP_CUSTOMANIMATION_TEXT );
+ mpTabControl->RemovePage( mnTextAnimId );
}
if( nPage )
@@ -2406,10 +2381,7 @@ CustomAnimationDialog::~CustomAnimationDialog()
delete mpDurationTabPage;
delete mpTextAnimTabPage;
- delete mpTabControl;
- delete mpOKButton;
- delete mpCancelButton;
- delete mpHelpButton;
+ /*delete mpTabControl;*/
delete mpSet;
delete mpResultSet;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 2ac374c..4d531c8 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -165,9 +165,6 @@ private:
CustomAnimationEffectPtr mpEffect;
TabControl* mpTabControl;
- OKButton* mpOKButton;
- CancelButton* mpCancelButton;
- HelpButton* mpHelpButton;
CustomAnimationDurationTabPage* mpDurationTabPage;
CustomAnimationEffectTabPage* mpEffectTabPage;
diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
new file mode 100644
index 0000000..f48a734
--- /dev/null
+++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="EffectTab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="prop_label1">
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Direction:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="placeholder">
+ <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>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="auto_restart">
+ <property name="label" translatable="yes">Reverse automatically</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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Settings</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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>
+ <child>
+ <object class="GtkLabel" id="aeffect_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">A_fter animation:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sound_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Sound:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="text_animation_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Text animation:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="dim_color_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Di_m color:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="sound_list">
+ <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>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </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="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>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </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>
+ <child>
+ <object class="GtkSpinButton" id="text_delay:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="text_delay_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">delay between characters</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Enhancement</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff --git a/sd/uiconfig/simpress/ui/customanimationproperties.ui b/sd/uiconfig/simpress/ui/customanimationproperties.ui
new file mode 100644
index 0000000..9b0a5b9
--- /dev/null
+++ b/sd/uiconfig/simpress/ui/customanimationproperties.ui
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="CustomAnimationProperties">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <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="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="tabs">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="effect">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Effect</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="timing">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Timing</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="textanim">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Text Animation</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/sd/uiconfig/simpress/ui/customanimationtexttab.ui b/sd/uiconfig/simpress/ui/customanimationtexttab.ui
new file mode 100644
index 0000000..f772d60
--- /dev/null
+++ b/sd/uiconfig/simpress/ui/customanimationtexttab.ui
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="TextAnimationTab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">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="columnt_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="group_text_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">_Group text:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </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">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ </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="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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff --git a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
new file mode 100644
index 0000000..a530570
--- /dev/null
+++ b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="TimingTab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="start_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Start:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="delay_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Delay:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="duration_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">S_peed:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="repeat_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Repeat:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="start_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes">On click</item>
+ <item translatable="yes">With previous</item>
+ <item translatable="yes">After previous</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="delay_value:0">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </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="GtkComboBox" id="duration_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes">Very slow</item>
+ <item translatable="yes">Slow</item>
+ <item translatable="yes">Normal</item>
+ <item translatable="yes">Fast</item>
+ <item translatable="yes">Very fast</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="repeat_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </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>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <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>
+ <property name="draw_indicator">True</property>
+ <property name="group">rb_interactive</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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>
+ <property name="draw_indicator">True</property>
+ <property name="group">rb_interactive</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="trigger_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Trigger</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list