Kaydet (Commit) eafd376f authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt Kaydeden (comit) Caolán McNamara

fdo#62082 Better Layout for Custom Animation Sidebar

* Use a toolbar with Icons instead of buttons with text
* Remove the "Start Presentation" button - it's already in the global toolbar
* Move the List of Animations to the top, the toolbar below it

This has already been discussed in the Design team (see bug report)

Change-Id: Iacbb4019ce496f1fc0dd7a252fb84f1ab52cc945
Reviewed-on: https://gerrit.libreoffice.org/6055Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst a5730bde
......@@ -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);
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment