summaryrefslogtreecommitdiff
path: root/sd/source/ui/animations/SlideTransitionPane.cxx
diff options
context:
space:
mode:
authorSzymon Kłos <eszkadev@gmail.com>2016-06-02 15:43:45 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-06-28 07:53:22 +0000
commitc4e0d6596da5ef2aa040b9974aac987c6a93bb6d (patch)
treec920a093acd572470cc87dd9c94798111242be0e /sd/source/ui/animations/SlideTransitionPane.cxx
parentbe40d4e7102d79d1e3aac5771869585cd1545379 (diff)
notebookbar: added slide transition tab
- created VclVBox control which creates SlideTransitionPane - SlideTransitionPane extended with second constructor which loads ui in horizontal mode - introduced CloseMethod for NotebookBar to kill widgets in right order Change-Id: Ic3ba35cb7734aa744a4804c5b670fed7c1bec204 Reviewed-on: https://gerrit.libreoffice.org/25844 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sd/source/ui/animations/SlideTransitionPane.cxx')
-rwxr-xr-xsd/source/ui/animations/SlideTransitionPane.cxx43
1 files changed, 40 insertions, 3 deletions
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 1778f13a72ed..174d83f96ef3 100755
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -404,8 +404,33 @@ SlideTransitionPane::SlideTransitionPane(
mbHasSelection( false ),
mbUpdatingControls( false ),
mbIsMainViewChangePending( false ),
+ mbHorizontalLayout( false ),
maLateInitTimer()
{
+ Initialize(pDoc);
+}
+
+SlideTransitionPane::SlideTransitionPane(
+ Window * pParent,
+ ViewShellBase & rBase,
+ SdDrawDocument* pDoc,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ bool /*bHorizontalLayout*/ ) :
+ PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanelhorizontal.ui", rxFrame ),
+
+ mrBase( rBase ),
+ mpDrawDoc( pDoc ),
+ mbHasSelection( false ),
+ mbUpdatingControls( false ),
+ mbIsMainViewChangePending( false ),
+ mbHorizontalLayout( true ),
+ maLateInitTimer()
+{
+ Initialize(pDoc);
+}
+
+void SlideTransitionPane::Initialize(SdDrawDocument* pDoc)
+{
get(mpFT_VARIANT, "variant_label");
get(mpLB_VARIANT, "variant_list");
get(mpFT_duration, "duration_label");
@@ -511,9 +536,16 @@ void SlideTransitionPane::DataChanged (const DataChangedEvent& rEvent)
void SlideTransitionPane::UpdateLook()
{
- SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
- mpFT_duration->SetBackground(Wallpaper());
- mpFT_SOUND->SetBackground(Wallpaper());
+ if( mbHorizontalLayout )
+ {
+ SetBackground(Wallpaper());
+ }
+ else
+ {
+ SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
+ mpFT_duration->SetBackground(Wallpaper());
+ mpFT_SOUND->SetBackground(Wallpaper());
+ }
}
void SlideTransitionPane::onSelectionChanged()
@@ -981,6 +1013,11 @@ IMPL_LINK_TYPED(SlideTransitionPane,EventMultiplexerListener,
break;
default:
+ if (rEvent.meEventId != tools::EventMultiplexerEvent::EID_DISPOSING)
+ {
+ onSelectionChanged();
+ onChangeCurrentPage();
+ }
break;
}
}