diff options
author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-08-26 22:11:43 -0400 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2019-04-30 18:06:21 +0200 |
commit | f308865d6e6921aeee9353174400d55b2679b4d1 (patch) | |
tree | 94bb0acf5898a035bccc064cf797eac032cde4ed /sd | |
parent | 446ebf9ce4080861a423899aafab48f92966005c (diff) |
sidebar: Add .uno:MasterSlidesPanel
Change-Id: I578dc8b1f9c8df7f7cc9108c70d6fad8006871c6
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/app.hrc | 1 | ||||
-rw-r--r-- | sd/sdi/SlideSorterController.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/drviewsh.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/sdraw.sdi | 18 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 11 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 3 |
6 files changed, 43 insertions, 0 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 81f83b2a8297..252b1133b02d 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -214,6 +214,7 @@ #define SID_BEFORE_OBJ (SID_SD_START+181) // FREE #define SID_CUSTOM_ANIMATION_PANEL (SID_SD_START+183) +#define SID_MASTER_SLIDES_PANEL (SID_SD_START+184) // FREE // and even more... #define ID_VAL_ENDINTENS (SID_SD_START+197) diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi index 5937ba159cec..e9d1ae77d7b2 100644 --- a/sd/sdi/SlideSorterController.sdi +++ b/sd/sdi/SlideSorterController.sdi @@ -204,6 +204,11 @@ interface SlideSorterView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] + SID_MASTER_SLIDES_PANEL // ole : no, status : ? + [ + ExecMethod = FuTemporary ; + StateMethod = GetMenuState ; + ] SID_PRESENTATION_DLG [ ExecMethod = FuTemporary ; diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi index 931a54ee983d..453ffb4a5cec 100644 --- a/sd/sdi/drviewsh.sdi +++ b/sd/sdi/drviewsh.sdi @@ -52,6 +52,11 @@ interface ImpressEditView : DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] + SID_MASTER_SLIDES_PANEL // ole : no, status : ? + [ + ExecMethod = FuTemporary ; + StateMethod = GetMenuState ; + ] SID_REHEARSE_TIMINGS // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index cdccfd94df91..e182c1cb34f6 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -3542,6 +3542,24 @@ SfxBoolItem SlideChangeWindow SID_SLIDE_TRANSITIONS_PANEL GroupId = SfxGroupId::Modify; ] +SfxBoolItem MasterSlidesPanel SID_MASTER_SLIDES_PANEL + +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = SfxGroupId::Modify; +] + SfxVoidItem SlideMasterPage SID_SLIDE_MASTER_MODE () [ diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index a21f520af711..03d4a59d861a 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -180,6 +180,17 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) break; } + case SID_MASTER_SLIDES_PANEL: + { + // First make sure that the sidebar is visible + pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR); + ::sfx2::sidebar::Sidebar::ShowPanel( + "SdAllMasterPagesPanel", + pShell->GetViewFrame()->GetFrame().GetFrameInterface()); + rRequest.Ignore (); + break; + } + case SID_PRESENTATION_DLG: FuSlideShowDlg::Create ( pShell, diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index ce5f339326e7..ed080d45ea2a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -3115,6 +3115,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) break; case SID_SLIDE_TRANSITIONS_PANEL: + case SID_MASTER_SLIDES_PANEL: case SID_CUSTOM_ANIMATION_PANEL: case SID_GALLERY: { @@ -3128,6 +3129,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) panelId = "GalleryPanel"; else if (nSId == SID_SLIDE_TRANSITIONS_PANEL) panelId = "SdSlideTransitionPanel"; + else if (nSId == SID_MASTER_SLIDES_PANEL) + panelId = "SdAllMasterPagesPanel"; ::sfx2::sidebar::Sidebar::ShowPanel( panelId, |