Kaydet (Commit) f308865d authored tarafından Ashod Nakashian's avatar Ashod Nakashian Kaydeden (comit) Jan Holesovsky

sidebar: Add .uno:MasterSlidesPanel

Change-Id: I578dc8b1f9c8df7f7cc9108c70d6fad8006871c6
üst 446ebf9c
...@@ -214,6 +214,7 @@ ...@@ -214,6 +214,7 @@
#define SID_BEFORE_OBJ (SID_SD_START+181) #define SID_BEFORE_OBJ (SID_SD_START+181)
// FREE // FREE
#define SID_CUSTOM_ANIMATION_PANEL (SID_SD_START+183) #define SID_CUSTOM_ANIMATION_PANEL (SID_SD_START+183)
#define SID_MASTER_SLIDES_PANEL (SID_SD_START+184)
// FREE // FREE
// and even more... // and even more...
#define ID_VAL_ENDINTENS (SID_SD_START+197) #define ID_VAL_ENDINTENS (SID_SD_START+197)
......
...@@ -204,6 +204,11 @@ interface SlideSorterView ...@@ -204,6 +204,11 @@ interface SlideSorterView
ExecMethod = FuTemporary ; ExecMethod = FuTemporary ;
StateMethod = GetMenuState ; StateMethod = GetMenuState ;
] ]
SID_MASTER_SLIDES_PANEL // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
SID_PRESENTATION_DLG SID_PRESENTATION_DLG
[ [
ExecMethod = FuTemporary ; ExecMethod = FuTemporary ;
......
...@@ -52,6 +52,11 @@ interface ImpressEditView : DrawView ...@@ -52,6 +52,11 @@ interface ImpressEditView : DrawView
ExecMethod = FuTemporary ; ExecMethod = FuTemporary ;
StateMethod = GetMenuState ; StateMethod = GetMenuState ;
] ]
SID_MASTER_SLIDES_PANEL // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
SID_REHEARSE_TIMINGS // ole : no, status : ? SID_REHEARSE_TIMINGS // ole : no, status : ?
[ [
ExecMethod = FuSupport ; ExecMethod = FuSupport ;
......
...@@ -3542,6 +3542,24 @@ SfxBoolItem SlideChangeWindow SID_SLIDE_TRANSITIONS_PANEL ...@@ -3542,6 +3542,24 @@ SfxBoolItem SlideChangeWindow SID_SLIDE_TRANSITIONS_PANEL
GroupId = SfxGroupId::Modify; 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 SfxVoidItem SlideMasterPage SID_SLIDE_MASTER_MODE
() ()
[ [
......
...@@ -180,6 +180,17 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) ...@@ -180,6 +180,17 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
break; 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: case SID_PRESENTATION_DLG:
FuSlideShowDlg::Create ( FuSlideShowDlg::Create (
pShell, pShell,
......
...@@ -3115,6 +3115,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ...@@ -3115,6 +3115,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break; break;
case SID_SLIDE_TRANSITIONS_PANEL: case SID_SLIDE_TRANSITIONS_PANEL:
case SID_MASTER_SLIDES_PANEL:
case SID_CUSTOM_ANIMATION_PANEL: case SID_CUSTOM_ANIMATION_PANEL:
case SID_GALLERY: case SID_GALLERY:
{ {
...@@ -3128,6 +3129,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ...@@ -3128,6 +3129,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
panelId = "GalleryPanel"; panelId = "GalleryPanel";
else if (nSId == SID_SLIDE_TRANSITIONS_PANEL) else if (nSId == SID_SLIDE_TRANSITIONS_PANEL)
panelId = "SdSlideTransitionPanel"; panelId = "SdSlideTransitionPanel";
else if (nSId == SID_MASTER_SLIDES_PANEL)
panelId = "SdAllMasterPagesPanel";
::sfx2::sidebar::Sidebar::ShowPanel( ::sfx2::sidebar::Sidebar::ShowPanel(
panelId, panelId,
......
...@@ -164,6 +164,7 @@ tools::Rectangle LayoutPanels ( ...@@ -164,6 +164,7 @@ tools::Rectangle LayoutPanels (
nTotalPreferredHeight += iItem->maLayoutSize.Preferred; nTotalPreferredHeight += iItem->maLayoutSize.Preferred;
} }
if (nTotalMinimumHeight > nAvailableHeight if (nTotalMinimumHeight > nAvailableHeight
&& ! bShowVerticalScrollBar) && ! bShowVerticalScrollBar)
{ {
......
...@@ -751,7 +751,6 @@ void SidebarController::SwitchToDeck ( ...@@ -751,7 +751,6 @@ void SidebarController::SwitchToDeck (
nDeckX = 0; nDeckX = 0;
} }
// Activate the deck and the new set of panels. // Activate the deck and the new set of panels.
mpCurrentDeck->setPosSizePixel( mpCurrentDeck->setPosSizePixel(
nDeckX, nDeckX,
......
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