Impress: Rework the way the display modes are presented.

TODO: take into account remarks from Gerrit

New combo to select display mode among:
- Slide edition (Normal)
- Outline
- Notes
- Slide sorter
- Slide master
- Notes master
- Handout (master, as we are designing the template used to generate
the handout)

The combo is based on uno command .uno:DisplayMode

Center pane tabs are hidden by default. A new uno dispatch
command (.uno:ToggleTabBarVisibility) is available to show/hide
this tab bar.

Modified uno dispatch commands:

No uno name has been modified.

.uno:DiaMode :
SID_DIAMODE renamed SID_SLIDER_SORTER_MODE

.uno:OutlineMode
SID_OUTLINEMODE renamed SID_OUTLINE_MODE

.uno:NotesMode
No change

.uno:HandoutMode
SID_HANDOUT_MODE renamed SID_HANDOUT_MASTER_MODE
All internal code also considers the edit mode as master

.uno:SlideMasterPage
SID_SLIDE_MASTERPAGE renamed SID_SLIDE_MASTER_MODE
If the input parameter SfxBoolItem Isactive is true or not provided,
activates Slide Master mode. If parameter is false, activates the
"Normal" (slide editing) mode.

.uno:NotesMasterPage
SID_NOTES_MASTERPAGE renamed SID_NOTES_MASTER_MODE
If the input parameter SfxBoolItem Isactive is true or not provided,
activates Notes Master mode. If parameter is false, activates the
"Notes" mode.

Modified behaviours: Now only one mode can be chosen. It is possible to
navigate from a mode to any other mode.
Previous behaviour: the following navigation
Normal -> Slide Master -> Notes -> Normal
was displaying slide master. It was required to activate Normal once more
to get back to normal.
Now the same commands will display the requested mode.

Still to come (at least):
- Fix reopen the last display mode.
- Center pane tabs are now presenting all buttons for all modes (TODO).

Change-Id: I11ab59d2f3caa9149260c5e55d44d598d0ce3390
Reviewed-on: https://gerrit.libreoffice.org/16723
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>

3 files changed, 83 insertions, 35 deletions

diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 98da5f536d0d..0f1bcb8f4fb2 100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -52,31 +52,51 @@ interface ViewShellBaseView
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
+    SID_TOGGLE_TABBAR_VISIBILITY
+    [
+        ExecMethod = Execute;
+        StateMethod = GetState;
+    ]
+    SID_DISPLAY_MODE
+    [
+        ExecMethod = Execute;
+        StateMethod = GetState;
+    ]
     SID_DRAWINGMODE
     [
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
-    SID_DIAMODE
+    SID_SLIDE_SORTER_MODE
     [
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
-    SID_OUTLINEMODE
+    SID_OUTLINE_MODE
     [
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
-    SID_NOTESMODE
+    SID_NOTES_MODE
     [
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
-    SID_HANDOUTMODE
+    SID_HANDOUT_MASTER_MODE
     [
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
+    SID_SLIDE_MASTER_MODE
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState ;
+    ]
+    SID_NOTES_MASTER_MODE
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState ;
+    ]
     SID_WIN_FULLSCREEN
     [
         ExecMethod = Execute;
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 682c7eca0948..2e9f7a3ee70c 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -135,21 +135,6 @@ interface ImpressEditView : DrawView
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
     ]
-    SID_SLIDE_MASTERPAGE // ole : no, status : play rec
-    [
-        ExecMethod = FuSupport ;
-        StateMethod = GetMenuState ;
-    ]
-    SID_NOTES_MASTERPAGE // ole : no, status : play rec
-    [
-        ExecMethod = FuSupport ;
-        StateMethod = GetMenuState ;
-    ]
-    SID_HANDOUT_MASTERPAGE // ole : no, status : play rec
-    [
-        ExecMethod = FuSupport ;
-        StateMethod = GetMenuState ;
-    ]
     SID_STYLE_FAMILY
     [
         ExecMethod = FuSupport ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index fd0e8bc29db8..82fa634d52a1 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -1932,8 +1932,7 @@ SfxVoidItem DeSelect SID_UNSELECT
     GroupId = GID_EDIT;
 ]
 
-SfxBoolItem DiaMode SID_DIAMODE
-
+SfxBoolItem DiaMode SID_SLIDE_SORTER_MODE
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -2944,7 +2943,7 @@ SfxVoidItem HandoutMasterPage SID_HANDOUT_MASTERPAGE
     GroupId = GID_VIEW;
 ]
 
-SfxBoolItem HandoutMode SID_HANDOUTMODE
+SfxBoolItem HandoutMode SID_HANDOUT_MASTER_MODE
 
 [
     /* flags: */
@@ -4160,6 +4159,56 @@ SfxUInt32Item AssignLayout SID_ASSIGN_LAYOUT
     GroupId = GID_MODIFY;
 ]
 
+
+SfxBoolItem ToggleTabBarVisibility SID_TOGGLE_TABBAR_VISIBILITY
+
+[
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = TRUE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_VIEW;
+]
+
+
+SfxVoidItem DisplayMode SID_DISPLAY_MODE
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_VIEW;
+]
+
 SfxVoidItem ModifyPresentationObject SID_PRESENTATIONOBJECT
 ()
 [
@@ -4463,8 +4512,8 @@ SfxBoolItem NewRouting SID_CONNECTION_NEW_ROUTING
     GroupId = GID_DRAWING;
 ]
 
-SfxVoidItem NotesMasterPage SID_NOTES_MASTERPAGE
-(SfxBoolItem Isactive ID_VAL_ISACTIVE)
+SfxVoidItem NotesMasterPage SID_NOTES_MASTER_MODE
+()
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -4479,10 +4528,7 @@ SfxVoidItem NotesMasterPage SID_NOTES_MASTERPAGE
     RecordPerSet;
     Synchron;
 
-    /* status: */
-    SlotType = SfxBoolItem
-
-    /* config: */
+     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     StatusBarConfig = FALSE,
@@ -4490,7 +4536,7 @@ SfxVoidItem NotesMasterPage SID_NOTES_MASTERPAGE
     GroupId = GID_VIEW;
 ]
 
-SfxBoolItem NotesMode SID_NOTESMODE
+SfxVoidItem NotesMode SID_NOTES_MODE
 
 [
     /* flags: */
@@ -4592,7 +4638,7 @@ SfxVoidItem OriginalSize SID_ORIGINAL_SIZE
     GroupId = GID_MODIFY;
 ]
 
-SfxBoolItem OutlineMode SID_OUTLINEMODE
+SfxVoidItem OutlineMode SID_OUTLINE_MODE
 
 [
     /* flags: */
@@ -5615,8 +5661,8 @@ SfxBoolItem SlideChangeWindow SID_SLIDE_TRANSITIONS_PANEL
     GroupId = GID_MODIFY;
 ]
 
-SfxVoidItem SlideMasterPage SID_SLIDE_MASTERPAGE
-(SfxBoolItem Isactive ID_VAL_ISACTIVE)
+SfxVoidItem SlideMasterPage SID_SLIDE_MASTER_MODE
+()
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -5631,9 +5677,6 @@ SfxVoidItem SlideMasterPage SID_SLIDE_MASTERPAGE
     RecordPerSet;
     Synchron;
 
-    /* status: */
-    SlotType = SfxBoolItem
-
     /* config: */
     AccelConfig = TRUE,
     MenuConfig = TRUE,