Impress: Rework the way the display modes are presented

Desktop / LibreOffice - Philippe Jung [free.fr] - 18 November 2015 08:09 UTC

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

229fc16 Impress: Rework the way the display modes are presented.
.../breeze/cmd/lc_toggletabbarvisibility.png | Bin 0 -> 702 bytes
.../galaxy/cmd/lc_toggletabbarvisibility.png | Bin 0 -> 702 bytes
icon-themes/tango/cmd/lc_displaymode.png | Bin 466 -> 0 bytes
.../tango/cmd/lc_toggletabbarvisibility.png | Bin 0 -> 702 bytes
.../data/org/openoffice/Office/UI/Controller.xcu | 11 +
.../openoffice/Office/UI/DrawImpressCommands.xcu | 16 +
sd/Library_sd.mk | 1 +
sd/inc/app.hrc | 23 +-
sd/inc/sdcommands.h | 4 +-
sd/sdi/ViewShellBase.sdi | 28 +-
sd/sdi/drviewsh.sdi | 15 -
sd/sdi/sdraw.sdi | 75 ++++-
sd/source/filter/ppt/pptin.cxx | 2 +-
sd/source/ui/app/strings.src | 23 +-
sd/source/ui/controller/displaymodecontroller.cxx | 316 ++++++++++++++++++++
sd/source/ui/controller/displaymodecontroller.hxx | 53 ++++
.../ui/framework/module/SlideSorterModule.cxx | 2 +-
sd/source/ui/framework/module/ViewTabBarModule.cxx | 4 +-
sd/source/ui/framework/tools/FrameworkHelper.cxx | 113 +++----
sd/source/ui/func/fusearch.cxx | 10 +-
sd/source/ui/inc/FrameView.hxx | 11 +-
sd/source/ui/inc/strings.hrc | 31 +-
sd/source/ui/inc/unokywds.hxx | 7 +-
.../ui/slidesorter/controller/SlsSlotManager.cxx | 16 +-
sd/source/ui/view/GraphicViewShellBase.cxx | 10 +-
sd/source/ui/view/ViewShellBase.cxx | 104 +++++--
sd/source/ui/view/drviews1.cxx | 6 +-
sd/source/ui/view/drviews5.cxx | 17 +-
sd/source/ui/view/drviews7.cxx | 86 +++---
sd/source/ui/view/drviewsa.cxx | 14 +-
sd/source/ui/view/drviewse.cxx | 89 ++----
sd/source/ui/view/frmview.cxx | 83 ++---
sd/source/ui/view/outlnvsh.cxx | 20 +-
sd/uiconfig/simpress/toolbar/standardbar.xml | 3 +
sd/util/sd.component | 4 +
35 files changed, 836 insertions(+), 361 deletions(-)

Upstream: cgit.freedesktop.org

  • Share