diff options
| author | Katarina Behrens <bubli@bubli.org> | 2013-06-19 23:08:26 +0200 |
|---|---|---|
| committer | Katarina Behrens <bubli@bubli.org> | 2013-07-31 21:02:26 +0200 |
| commit | aa98c3060e133d785c0ed2d30da3b32cdb745750 (patch) | |
| tree | a433c4195294b5c281f3377a59fefce6a1860ac4 /sd | |
| parent | ffa2dab31e794f5bd11af798191d57a8e5b0f74f (diff) | |
sidebar: Feeble attempt to resurrect setting frame label
( putting effect name into it )
Change-Id: If8561ab55a59790bd54646c173adab225e346026
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.hxx | 1 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/customanimationspanel.ui | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 382f9d3b5953..9c5e36d27d0d 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -169,6 +169,8 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas get(mpPBChangeEffect, "change_effect"); get(mpPBRemoveEffect, "remove_effect"); + get(mpFTEffect, "effect_label"); + get(mpFTStart, "start_effect"); get(mpLBStart, "start_effect_list"); get(mpFTProperty, "effect_property"); @@ -192,7 +194,6 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas maStrProperty = mpFTProperty->GetText(); - fillDurationComboBox( mpCBSpeed ); mpPBMoveUp->SetSymbol( SYMBOL_ARROW_UP ); mpPBMoveDown->SetSymbol( SYMBOL_ARROW_DOWN ); @@ -208,7 +209,7 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas mpPBSlideShow->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); mpCBAutoPreview->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); - //maStrModify = mpFLEffect->GetText(); + maStrModify = mpFTEffect->GetText(); // get current controller and initialize listeners try @@ -529,6 +530,7 @@ void CustomAnimationPane::updateControls() { aTemp += OUString( (sal_Unicode)' ' ); aTemp += aUIName; + mpFTEffect->SetText( aTemp ); } CustomAnimationPresetPtr pDescriptor = getPresets().getEffectDescriptor( pEffect->getPresetId() ); @@ -629,6 +631,7 @@ void CustomAnimationPane::updateControls() mpFTChangeOrder->Enable( sal_False ); mpLBStart->SetNoSelection(); mpCBSpeed->SetNoSelection(); + mpFTEffect->SetText( maStrModify ); } bool bEnableUp = true; diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 6b0685e22884..ed8cc569cc12 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -129,6 +129,7 @@ private: PushButton* mpPBAddEffect; PushButton* mpPBChangeEffect; PushButton* mpPBRemoveEffect; + FixedText* mpFTEffect; FixedText* mpFTStart; ListBox* mpLBStart; FixedText* mpFTProperty; diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index 068af803efb9..81f6b5e76a83 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -308,7 +308,7 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="effect_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Effect</property> |