diff options
author | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-03-12 02:10:53 +0530 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-04-26 15:36:04 +0000 |
commit | 35aded0e43c74f920dfa6960323506599257264e (patch) | |
tree | 714a6f574460912ae15434cccea293b3a3d98a38 /sd | |
parent | a76c5e21378e5364f1f7554a32d89072feff8b0c (diff) |
tdf#98037 - SIDEBAR: Replacing 'Speed' drop downs with comboboxes (2)
Changed speed dropdowns in CustomAnimationPane and CustomAnimationDialog to Duration combobox.
Used Custom Widget VclComboBoxNumeric with MetricBox class.
Unit set in seconds.
Change-Id: I86e18da77dcdd72d429a2c02d56aa4b1cf5f6c54
Reviewed-on: https://gerrit.libreoffice.org/23157
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/animations/CustomAnimation.hrc | 5 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimation.src | 25 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 68 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 135 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.hxx | 11 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/customanimationspanel.ui | 10 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/customanimationtimingtab.ui | 8 |
7 files changed, 103 insertions, 159 deletions
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc index 297a9f2b725f..fa0cca2f4eec 100644 --- a/sd/source/ui/animations/CustomAnimation.hrc +++ b/sd/source/ui/animations/CustomAnimation.hrc @@ -43,11 +43,6 @@ #define IMG_CUSTOMANIMATION_MEDIA_PAUSE RID_CUSTOMANIMATION_START+8 #define IMG_CUSTOMANIMATION_MEDIA_STOP RID_CUSTOMANIMATION_START+9 -#define STR_CUSTOMANIMATION_DURATION_VERY_SLOW RID_CUSTOMANIMATION_START+0 -#define STR_CUSTOMANIMATION_DURATION_SLOW RID_CUSTOMANIMATION_START+1 -#define STR_CUSTOMANIMATION_DURATION_NORMAL RID_CUSTOMANIMATION_START+2 -#define STR_CUSTOMANIMATION_DURATION_FAST RID_CUSTOMANIMATION_START+3 -#define STR_CUSTOMANIMATION_DURATION_VERY_FAST RID_CUSTOMANIMATION_START+4 #define STR_CUSTOMANIMATION_REPEAT_NONE RID_CUSTOMANIMATION_START+5 #define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK RID_CUSTOMANIMATION_START+6 #define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE RID_CUSTOMANIMATION_START+7 diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src index 3d1317513f38..daa5c65e9cc6 100644 --- a/sd/source/ui/animations/CustomAnimation.src +++ b/sd/source/ui/animations/CustomAnimation.src @@ -199,31 +199,6 @@ Menu RID_CUSTOMANIMATION_FONTSTYLE_POPUP }; }; -String STR_CUSTOMANIMATION_DURATION_VERY_SLOW -{ - Text [ en-US ] = "Very slow"; -}; - -String STR_CUSTOMANIMATION_DURATION_SLOW -{ - Text [ en-US ] = "Slow"; -}; - -String STR_CUSTOMANIMATION_DURATION_NORMAL -{ - Text [ en-US ] = "Medium"; -}; - -String STR_CUSTOMANIMATION_DURATION_FAST -{ - Text [ en-US ] = "Fast"; -}; - -String STR_CUSTOMANIMATION_DURATION_VERY_FAST -{ - Text [ en-US ] = "Very fast"; -}; - String STR_CUSTOMANIMATION_REPEAT_NONE { Text [ en-US ] = "none"; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index b3537296a5e2..800addeb0a60 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -42,6 +42,7 @@ #include <vcl/menubtn.hxx> #include <vcl/svapp.hxx> #include <vcl/fixed.hxx> +#include <vcl/field.hxx> #include <vcl/lstbox.hxx> #include <vcl/layout.hxx> #include <vcl/field.hxx> @@ -1617,6 +1618,7 @@ public: DECL_LINK_TYPED( implControlHdl, ListBox&, void ); DECL_LINK_TYPED( implClickHdl, Button*, void ); + DECL_LINK_TYPED( DurationModifiedHdl, Edit&, void ); void implHdl(Control*); private: @@ -1627,7 +1629,7 @@ private: VclPtr<FixedText> mpFTStartDelay; VclPtr<MetricField> mpMFStartDelay; VclPtr<FixedText> mpFTDuration; - VclPtr<ListBox> mpCBDuration; + VclPtr<MetricBox> mpCBXDuration; VclPtr<FixedText> mpFTRepeat; VclPtr<ListBox> mpCBRepeat; VclPtr<CheckBox> mpCBXRewind; @@ -1644,7 +1646,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar get(mpFTStartDelay, "delay_label" ); get(mpMFStartDelay, "delay_value" ); get(mpFTDuration, "duration_label" ); - get(mpCBDuration, "duration_list" ); + get(mpCBXDuration, "anim_duration" ); get(mpFTRepeat, "repeat_label" ); get(mpCBRepeat, "repeat_list" ); get(mpCBXRewind, "rewind" ); @@ -1654,10 +1656,18 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar mpLBTrigger->set_width_request(approximate_char_width() * 40); fillRepeatComboBox( mpCBRepeat ); - fillDurationComboBox( mpCBDuration ); + + //fillDurationMetricComboBox + mpCBXDuration->InsertValue(50, FUNIT_CUSTOM); + mpCBXDuration->InsertValue(100, FUNIT_CUSTOM); + mpCBXDuration->InsertValue(200, FUNIT_CUSTOM); + mpCBXDuration->InsertValue(300, FUNIT_CUSTOM); + mpCBXDuration->InsertValue(500, FUNIT_CUSTOM); + mpCBXDuration->AdaptDropDownLineCountToMaximum(); mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implClickHdl ) ); mpLBTrigger->SetSelectHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) ); + mpCBXDuration->SetModifyHdl(LINK( this, CustomAnimationDurationTabPage, DurationModifiedHdl)); if( pSet->getPropertyState( nHandleStart ) != STLPropertyState_AMBIGUOUS ) { @@ -1687,30 +1697,14 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar if( fDuration == 0.001 ) { mpFTDuration->Disable(); - mpCBDuration->Disable(); + mpCBXDuration->Disable(); mpFTRepeat->Disable(); mpCBRepeat->Disable(); mpCBXRewind->Disable(); } else { - sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND; - - if( fDuration == 5.0 ) - nPos = 0; - else if( fDuration == 3.0 ) - nPos = 1; - else if( fDuration == 2.0 ) - nPos = 2; - else if( fDuration == 1.0 ) - nPos = 3; - else if( fDuration == 0.5 ) - nPos = 4; - - if( nPos != LISTBOX_ENTRY_NOTFOUND ) - mpCBDuration->SelectEntryPos( nPos ); - else - mpCBDuration->SetText(OUString::number(fDuration)); + mpCBXDuration->SetValue( (fDuration)*100.0 ); } } @@ -1821,7 +1815,7 @@ void CustomAnimationDurationTabPage::dispose() mpFTStartDelay.clear(); mpMFStartDelay.clear(); mpFTDuration.clear(); - mpCBDuration.clear(); + mpCBXDuration.clear(); mpFTRepeat.clear(); mpCBRepeat.clear(); mpCBXRewind.clear(); @@ -1835,11 +1829,24 @@ IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implClickHdl, Button*, pBtn, vo { implHdl(pBtn); } + IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implControlHdl, ListBox&, rListBox, void ) { implHdl(&rListBox); } +IMPL_LINK_NOARG_TYPED(CustomAnimationDurationTabPage, DurationModifiedHdl, Edit&, void) +{ + if(!(mpCBXDuration->GetText()).isEmpty() ) + { + double duration_value = static_cast<double>(mpCBXDuration->GetValue()); + if(duration_value <= 0.0) + { + mpCBXDuration->SetValue(1); + } + } +} + void CustomAnimationDurationTabPage::implHdl( Control* pControl ) { if( pControl == mpLBTrigger ) @@ -1929,18 +1936,13 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) } double fDuration = -1.0; - nPos = mpCBDuration->GetSelectEntryPos(); - if( nPos != LISTBOX_ENTRY_NOTFOUND ) - { - fDuration = *static_cast< const double * >( mpCBDuration->GetEntryData(nPos) ); - } - else + + if(!(mpCBXDuration->GetText()).isEmpty() ) { - OUString aText( mpCBDuration->GetText() ); - if( !aText.isEmpty() ) - { - fDuration = aText.toDouble(); - } + double duration_value = static_cast<double>(mpCBXDuration->GetValue()); + + if(duration_value > 0) + fDuration = duration_value/100.0; } if( fDuration != -1.0 ) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 93ecec1d4dc9..57f632a90169 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -107,30 +107,6 @@ using ::com::sun::star::uno::Exception; namespace sd { -void fillDurationComboBox( ListBox* pBox ) -{ - static const double gdVerySlow = 5.0; - static const double gdSlow = 3.0; - static const double gdNormal = 2.0; - static const double gdFast = 1.0; - static const double gdVeryFast = 0.5; - - OUString aVerySlow( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_VERY_SLOW ) ); - pBox->SetEntryData( pBox->InsertEntry( aVerySlow ), const_cast<double *>(&gdVerySlow) ); - - OUString aSlow( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_SLOW ) ); - pBox->SetEntryData( pBox->InsertEntry( aSlow ), const_cast<double *>(&gdSlow) ); - - OUString aNormal( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_NORMAL ) ); - pBox->SetEntryData( pBox->InsertEntry( aNormal ), const_cast<double *>(&gdNormal) ); - - OUString aFast( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_FAST ) ); - pBox->SetEntryData( pBox->InsertEntry( aFast ), const_cast<double *>(&gdFast) ); - - OUString aVeryFast( SD_RESSTR( STR_CUSTOMANIMATION_DURATION_VERY_FAST ) ); - pBox->SetEntryData( pBox->InsertEntry( aVeryFast ), const_cast<double *>(&gdVeryFast) ); -} - void fillRepeatComboBox( ListBox* pBox ) { OUString aNone( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_NONE ) ); @@ -171,8 +147,8 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, get(mpLBProperty, "effect_property_list"); get(mpPBPropertyMore, "more_properties"); - get(mpFTSpeed, "effect_speed"); - get(mpCBSpeed, "effect_speed_list"); + get(mpFTDuration, "effect_duration"); + get(mpCBXDuration, "anim_duration"); get(mpFTCategory, "categorylabel"); get(mpLBCategory, "categorylb"); get(mpFTAnimation, "effectlabel"); @@ -193,12 +169,19 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, maStrProperty = mpFTProperty->GetText(); - fillDurationComboBox( mpCBSpeed ); + //fillDurationMetricComboBox + mpCBXDuration->InsertValue(50, FUNIT_CUSTOM); + mpCBXDuration->InsertValue(100, FUNIT_CUSTOM); + mpCBXDuration->InsertValue(200, FUNIT_CUSTOM); + mpCBXDuration->InsertValue(300, FUNIT_CUSTOM); + mpCBXDuration->InsertValue(500, FUNIT_CUSTOM); + mpCBXDuration->AdaptDropDownLineCountToMaximum(); + mpPBAddEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); mpPBRemoveEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); mpLBStart->SetSelectHdl( LINK( this, CustomAnimationPane, implControlListBoxHdl ) ); - mpCBSpeed->SetSelectHdl( LINK( this, CustomAnimationPane, implControlListBoxHdl ) ); + mpCBXDuration->SetModifyHdl(LINK( this, CustomAnimationPane, DurationModifiedHdl)); mpPBPropertyMore->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); mpPBMoveUp->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); mpPBMoveDown->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); @@ -256,8 +239,8 @@ void CustomAnimationPane::dispose() mpPlaceholderBox.clear(); mpLBProperty.clear(); mpPBPropertyMore.clear(); - mpFTSpeed.clear(); - mpCBSpeed.clear(); + mpFTDuration.clear(); + mpCBXDuration.clear(); mpCustomAnimationList.clear(); mpPBMoveUp.clear(); mpPBMoveDown.clear(); @@ -484,8 +467,8 @@ OUString getPropertyName( sal_Int32 nPropertyType ) void CustomAnimationPane::updateControls() { - mpFTSpeed->Enable( mxView.is() ); - mpCBSpeed->Enable( mxView.is() ); + mpFTDuration->Enable( mxView.is() ); + mpCBXDuration->Enable( mxView.is() ); mpCustomAnimationList->Enable( mxView.is() ); mpPBPlay->Enable( mxView.is() ); mpCBAutoPreview->Enable( mxView.is() ); @@ -651,25 +634,12 @@ void CustomAnimationPane::updateControls() double fDuration = pEffect->getDuration(); const bool bHasSpeed = fDuration > 0.001; - mpFTSpeed->Enable(bHasSpeed); - mpCBSpeed->Enable(bHasSpeed); + mpFTDuration->Enable(bHasSpeed); + mpCBXDuration->Enable(bHasSpeed); if( bHasSpeed ) { - if( fDuration == 5.0 ) - nPos = 0; - else if( fDuration == 3.0 ) - nPos = 1; - else if( fDuration == 2.0 ) - nPos = 2; - else if( fDuration == 1.0 ) - nPos = 3; - else if( fDuration == 0.5 ) - nPos = 4; - else - nPos = 0xffff; - - mpCBSpeed->SelectEntryPos( nPos ); + mpCBXDuration->SetValue( (fDuration)*100.0 ); } mpPBPropertyMore->Enable(); @@ -680,9 +650,9 @@ void CustomAnimationPane::updateControls() mpFTProperty->Enable( false ); mpLBProperty->Enable( false ); mpPBPropertyMore->Enable( false ); - mpFTSpeed->Enable(false); - mpCBSpeed->Enable(false); - mpCBSpeed->SetNoSelection(); + mpFTDuration->Enable(false); + mpCBXDuration->Enable(false); + mpCBXDuration->SetNoSelection(); mpFTEffect->SetText( maStrModify ); } @@ -913,8 +883,8 @@ void CustomAnimationPane::UpdateLook() mpFTStart->SetBackground(aBackground); if (mpFTProperty != nullptr) mpFTProperty->SetBackground(aBackground); - if (mpFTSpeed != nullptr) - mpFTSpeed->SetBackground(aBackground); + if (mpFTDuration != nullptr) + mpFTDuration->SetBackground(aBackground); } void addValue( STLPropertySet* pSet, sal_Int32 nHandle, const Any& rValue ) @@ -1850,21 +1820,10 @@ void CustomAnimationPane::onAdd() pDescriptor = *static_cast< CustomAnimationPresetPtr* >( pEntryData ); const double fDuration = pDescriptor->getDuration(); - sal_uInt32 nPos = LISTBOX_ENTRY_NOTFOUND; - if( fDuration == 5.0 ) - nPos = 0; - else if( fDuration == 3.0 ) - nPos = 1; - else if( fDuration == 2.0 ) - nPos = 2; - else if( fDuration == 1.0 ) - nPos = 3; - else if( fDuration == 0.5 ) - nPos = 4; - mpCBSpeed->SelectEntryPos( nPos ); + mpCBXDuration->SetValue( (fDuration)*100.0 ); bool bHasSpeed = pDescriptor->getDuration() > 0.001; - mpCBSpeed->Enable( bHasSpeed ); - mpFTSpeed->Enable( bHasSpeed ); + mpCBXDuration->Enable( bHasSpeed ); + mpFTDuration->Enable( bHasSpeed ); if( pDescriptor.get() ) { @@ -2023,17 +1982,16 @@ void CustomAnimationPane::onChangeProperty() void CustomAnimationPane::onChangeSpeed() { - if( mpCBSpeed->GetSelectEntryCount() == 1 ) + double fDuration = getDuration(); + + if(fDuration < 0) + return; + else { addUndo(); MainSequenceRebuildGuard aGuard( mpMainSequence ); - double fDuration = getDuration(); - if(fDuration == 0) { - return; - } - // change selected effect EffectSequence::iterator aIter( maListSelection.begin() ); const EffectSequence::iterator aEnd( maListSelection.end() ); @@ -2046,22 +2004,16 @@ void CustomAnimationPane::onChangeSpeed() mpMainSequence->rebuild(); updateControls(); mrBase.GetDocShell()->SetModified(); - - onPreview( false ); } } -float CustomAnimationPane::getDuration() +double CustomAnimationPane::getDuration() { - sal_uInt16 nPos= mpCBSpeed->GetSelectEntryPos(); - float fDuration = 0; - switch( nPos ) + double fDuration = 0; + + if(!(mpCBXDuration->GetText()).isEmpty()) { - case 0: fDuration = 5.0; break; - case 1: fDuration = 3.0; break; - case 2: fDuration = 2.0; break; - case 3: fDuration = 1.0; break; - case 4: fDuration = 0.5; break; + fDuration = static_cast<double>(mpCBXDuration->GetValue())/100.0; } return fDuration; } @@ -2082,6 +2034,19 @@ IMPL_LINK_NOARG_TYPED(CustomAnimationPane, UpdateAnimationLB, ListBox&, void) fillAnimationLB(); } +IMPL_LINK_NOARG_TYPED(CustomAnimationPane, DurationModifiedHdl, Edit&, void) +{ + if(!(mpCBXDuration->GetText()).isEmpty() ) + { + double duration_value = static_cast<double>(mpCBXDuration->GetValue()); + if(duration_value <= 0.0) + { + mpCBXDuration->SetValue(1); + } + onChangeSpeed(); + } +} + sal_uInt32 CustomAnimationPane::fillAnimationLB() { PresetCategoryList rCategoryList; @@ -2158,8 +2123,6 @@ void CustomAnimationPane::implControlHdl(Control* pControl ) onRemove(); else if( pControl == mpLBStart ) onChangeStart(); - else if( pControl == mpCBSpeed ) - onChangeSpeed(); else if( pControl == mpPBPropertyMore ) showOptions(); else if( pControl == mpPBMoveUp ) diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 7729fd9058fb..992e552dc1c8 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <vcl/dialog.hxx> #include <vcl/layout.hxx> +#include <vcl/field.hxx> #include <svx/sidebar/PanelLayout.hxx> #include <sfx2/sidebar/ControlFactory.hxx> #include "CustomAnimationPreset.hxx" @@ -32,6 +33,7 @@ #include "motionpathtag.hxx" #include "misc/scopelock.hxx" #include "CustomAnimationPreset.hxx" + #include <vector> class PushButton; @@ -96,7 +98,7 @@ public: void addUndo(); - float getDuration(); + double getDuration(); void updatePathFromMotionPathTag( const rtl::Reference< MotionPathTag >& xTag ); private: @@ -123,6 +125,7 @@ private: DECL_LINK_TYPED( implPropertyHdl, LinkParamNone*, void ); DECL_LINK_TYPED( EventMultiplexerListener, tools::EventMultiplexerEvent&, void ); DECL_LINK_TYPED( lateInitCallback, Timer *, void ); + DECL_LINK_TYPED( DurationModifiedHdl, Edit&, void ); DECL_LINK_TYPED( UpdateAnimationLB, ListBox&, void ); DECL_LINK_TYPED( AnimationSelectHdl, ListBox&, void ); void implControlHdl(Control*); @@ -141,8 +144,8 @@ private: VclPtr<VclHBox> mpPlaceholderBox; VclPtr<PropertyControl> mpLBProperty; VclPtr<PushButton> mpPBPropertyMore; - VclPtr<FixedText> mpFTSpeed; - VclPtr<ListBox> mpCBSpeed; + VclPtr<FixedText> mpFTDuration; + VclPtr<MetricBox> mpCBXDuration; VclPtr<CustomAnimationList> mpCustomAnimationList; VclPtr<PushButton> mpPBMoveUp; VclPtr<PushButton> mpPBMoveDown; @@ -187,8 +190,6 @@ private: void fillRepeatComboBox( ListBox* pBox ); -void fillDurationComboBox( ListBox* pBox ); - } #endif // INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONPANE_HXX diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index 0b2a14dd1e63..8b8496937fe5 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -244,11 +244,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="effect_speed"> + <object class="GtkLabel" id="effect_duration"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Sp_eed:</property> + <property name="label" translatable="yes">D_uration:</property> <property name="use_underline">True</property> </object> <packing> @@ -310,10 +310,14 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="effect_speed_list"> + <object class="VclComboBoxNumeric" id="anim_duration:0.00sec"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Select the speed of Custom Animation.</property> + <property name="tooltip_text" translatable="yes">Select the speed of Custom Animation.</property> <property name="hexpand">True</property> + <property name="adjustment">adjustment1</property> </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 2c57f3449221..d8d1253b4325 100644 --- a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui +++ b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui @@ -52,7 +52,7 @@ <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="label" translatable="yes">D_uration:</property> <property name="use_underline">True</property> </object> <packing> @@ -104,10 +104,14 @@ </packing> </child> <child> - <object class="GtkComboBox" id="duration_list"> + <object class="VclComboBoxNumeric" id="anim_duration:0.00sec"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Select the speed of Custom Animation.</property> + <property name="tooltip_text" translatable="yes">Select the speed of Custom Animation.</property> <property name="hexpand">True</property> + <property name="adjustment">adjustment1</property> </object> <packing> <property name="left_attach">1</property> |