diff options
-rw-r--r-- | icon-themes/galaxy/cmd/lc_list-add.png | bin | 0 -> 739 bytes | |||
-rw-r--r-- | icon-themes/galaxy/cmd/lc_playback-start.png | bin | 0 -> 956 bytes | |||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.hxx | 2 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/customanimationspanel.ui | 541 |
5 files changed, 231 insertions, 326 deletions
diff --git a/icon-themes/galaxy/cmd/lc_list-add.png b/icon-themes/galaxy/cmd/lc_list-add.png Binary files differnew file mode 100644 index 000000000000..117ec830c6ff --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_list-add.png diff --git a/icon-themes/galaxy/cmd/lc_playback-start.png b/icon-themes/galaxy/cmd/lc_playback-start.png Binary files differnew file mode 100644 index 000000000000..734b8894979b --- /dev/null +++ b/icon-themes/galaxy/cmd/lc_playback-start.png diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index e1e24ce48ccf..8ab77260c29b 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -187,9 +187,7 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas get(mpPBMoveUp, "move_up"); get(mpPBMoveDown, "move_down"); - get(mpFTChangeOrder, "change_order"); get(mpPBPlay, "play"); - get(mpPBSlideShow, "slideshow"); get(mpCBAutoPreview,"auto_preview"); maStrProperty = mpFTProperty->GetText(); @@ -207,7 +205,6 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas mpPBMoveUp->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); mpPBMoveDown->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); mpPBPlay->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); - mpPBSlideShow->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); mpCBAutoPreview->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); maStrModify = mpFTEffect->GetText(); @@ -466,11 +463,9 @@ void CustomAnimationPane::updateControls() mpFTSpeed->Enable( mxView.is() ); mpCBSpeed->Enable( mxView.is() ); mpCustomAnimationList->Enable( mxView.is() ); - mpFTChangeOrder->Enable( mxView.is() ); mpPBMoveUp->Enable( mxView.is() ); mpPBMoveDown->Enable( mxView.is() ); mpPBPlay->Enable( mxView.is() ); - mpPBSlideShow->Enable( mxView.is() ); mpCBAutoPreview->Enable( mxView.is() ); if( !mxView.is() ) @@ -600,8 +595,6 @@ void CustomAnimationPane::updateControls() } mpPBPropertyMore->Enable( sal_True ); - - mpFTChangeOrder->Enable( sal_True ); } else { @@ -611,7 +604,6 @@ void CustomAnimationPane::updateControls() mpPBPropertyMore->Enable( sal_False ); mpFTSpeed->Enable(sal_False); mpCBSpeed->Enable(sal_False); - mpFTChangeOrder->Enable( sal_False ); mpLBStart->SetNoSelection(); mpCBSpeed->SetNoSelection(); mpFTEffect->SetText( maStrModify ); @@ -838,8 +830,6 @@ void CustomAnimationPane::UpdateLook (void) mpFTProperty->SetBackground(aBackground); if (mpFTSpeed != NULL) mpFTSpeed->SetBackground(aBackground); - if (mpFTChangeOrder != NULL) - mpFTChangeOrder->SetBackground(aBackground); } @@ -2047,10 +2037,6 @@ IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl ) moveSelection( false ); else if( pControl == mpPBPlay ) onPreview( true ); - else if( pControl == mpPBSlideShow ) - { - mrBase.StartPresentation(); - } else if( pControl == mpCBAutoPreview ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 489f13cc6c5d..2a12ed61c595 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -140,11 +140,9 @@ private: FixedText* mpFTSpeed; ListBox* mpCBSpeed; CustomAnimationList* mpCustomAnimationList; - FixedText* mpFTChangeOrder; PushButton* mpPBMoveUp; PushButton* mpPBMoveDown; PushButton* mpPBPlay; - PushButton* mpPBSlideShow; CheckBox* mpCBAutoPreview; OUString maStrModify; diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index a0c829b3c363..b341cd61e37e 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -5,7 +5,9 @@ <object class="GtkBox" id="CustomAnimationsPanel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> @@ -14,261 +16,212 @@ <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkFrame" id="frame1"> + <object class="sdlo-CustomAnimationList" id="custom_animation_list"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Custom Animation ListBox-selection"/> + </child> + </object> + <packing> + <property name="expand">True</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="label_xalign">0</property> - <property name="shadow_type">none</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkButton" id="add_effect"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton" id="add_effect"> - <property name="label" translatable="yes">_Add...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</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="GtkButton" id="change_effect"> - <property name="label" translatable="yes">_Change...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">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="remove_effect"> - <property name="label" translatable="yes">_Remove</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Add Effect</property> + <property name="image">image_add</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label5"> + <child> + <object class="GtkButton" id="remove_effect"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Modify effect</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Remove Effect</property> + <property name="image">image_remove</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="change_effect"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Modify Effect</property> + <property name="image">image_change</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="move_up"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Move Up</property> + <property name="image">image_up</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="move_down"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Move Down</property> + <property name="image">image_down</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="play"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Preview Effect</property> + <property name="image">image_play</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="vexpand">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="start_effect"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="start_effect"> - <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="effect_property"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Direction:</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="effect_speed"> - <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="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="GtkComboBoxText" id="start_effect_list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</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="GtkBox" id="placeholder"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="sdlo-PropertyControl" id="effect_property_list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </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="GtkButton" id="more_properties"> - <property name="label" translatable="yes">_...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="effect_speed_list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</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> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="halign">end</property> + <property name="label" translatable="yes">_Start</property> + <property name="use_underline">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <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="sdlo-CustomAnimationList" id="custom_animation_list"> + <object class="GtkLabel" id="effect_property"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Custom Animation ListBox-selection"/> - </child> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Direction</property> + <property name="use_underline">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <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="GtkBox" id="box4"> + <object class="GtkLabel" id="effect_speed"> <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="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="GtkComboBoxText" id="start_effect_list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</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="GtkBox" id="placeholder"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="change_order"> + <object class="sdlo-PropertyControl" id="effect_property_list"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Change order:</property> + <property name="hexpand">True</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> </object> <packing> <property name="expand">False</property> @@ -276,160 +229,128 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="move_up"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image1</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="move_down"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image2</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">2</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="effect_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Effect</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> - <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="GtkBox" id="box5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> <child> - <object class="GtkButton" id="play"> - <property name="label" translatable="yes">_Play</property> + <object class="GtkButton" id="more_properties"> + <property name="label" translatable="yes">_...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_underline">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkButton" id="slideshow"> - <property name="label" translatable="yes">S_lide Show</property> + <object class="GtkComboBoxText" id="effect_speed_list"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <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> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label7"> + <object class="GtkLabel" id="effect_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Effect</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> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkFrame" id="frame4"> + <object class="GtkCheckButton" id="auto_preview"> + <property name="label" translatable="yes">Automatic pre_view</property> <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="GtkCheckButton" id="auto_preview"> - <property name="label" translatable="yes">Automatic pre_view</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> - </child> - <child type="label"> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> + <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="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> </object> - <object class="GtkImage" id="image1"> + <object class="GtkImage" id="image_add"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">cmd/lc_list-add.png</property> + <property name="icon-size">2</property> + </object> + <object class="GtkImage" id="image_change"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">cmd/lc_editdoc.png</property> + <property name="icon-size">2</property> + </object> + <object class="GtkImage" id="image_down"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">cmd/lc_movedown.png</property> + <property name="icon-size">2</property> + </object> + <object class="GtkImage" id="image_play"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">cmd/lc_playback-start.png</property> + </object> + <object class="GtkImage" id="image_remove"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-go-up</property> - <property name="icon-size">1</property> + <property name="pixbuf">cmd/lc_delete.png</property> + <property name="icon-size">2</property> </object> - <object class="GtkImage" id="image2"> + <object class="GtkImage" id="image_up"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-go-down</property> - <property name="icon-size">1</property> + <property name="pixbuf">cmd/lc_moveup.png</property> + <property name="icon-size">2</property> </object> </interface> |