fdo#73151 Make better use of the sidebar

The general idea is to encourage use of the sidebar instead of floating windows (for Navigator, Styles&Formatting and Gallery)

Changes:
* Show the sidebar by default in Writer & Impress
* Remove the Gallery floating window (Gallery now always opens in the sidebar)
* Remove all Gallery, Navigator and Styles&Formatting links from the default toolbar in Writer
(since they have an icon in the sidebar and the sidebar is shown by default now)
* When selecting "More" from the Styles dropdown, the Stylelist opens in the sidebar instead of the floating window

This has all been discussed extensively here: https://bugs.freedesktop.org/show_bug.cgi?id=73151

Change-Id: I3a0461d1472711da7121801000af294b432fccb1
Reviewed-on: https://gerrit.libreoffice.org/11077
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

16 files changed, 25 insertions, 62 deletions

diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index f8119e9356c8..999bb69b9b46 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1777,12 +1777,10 @@ interface DrawView
     SID_GALLERY // ole : yes, status : ?
     [
         ExecMethod = FuTemporary ;
-        StateMethod = GetMenuState ;
     ]
     SID_GALLERY_FORMATS // ole : no, status : ?
     [
         ExecMethod = ExecGallery ;
-        StateMethod = GetGalleryState ;
         GroupId = GID_DOCUMENT ;
         Cachable ;
     ]
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 69ec0aa530bb..42c3d7840808 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -199,7 +199,6 @@ void SdDLL::RegisterControllers()
     SvxColorChildWindow::RegisterChildWindow(false, pMod, SFX_CHILDWIN_TASK);
     SvxSearchDialogWrapper::RegisterChildWindow(false, pMod);
     SvxBmpMaskChildWindow::RegisterChildWindow(false, pMod);
-    GalleryChildWindow::RegisterChildWindow(false, pMod);
     SvxIMapDlgChildWindow::RegisterChildWindow(false, pMod);
     SvxHlinkDlgWrapper::RegisterChildWindow(false, pMod);
     ::sd::SpellDialogChildWindow::RegisterChildWindow(false, pMod);
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 37c2ec342ac9..15add1df9891 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -211,7 +211,6 @@ public:
     void            AssignFrom3DWindow();
 
     void            ExecGallery(SfxRequest& rReq);
-    void            GetGalleryState(SfxItemSet& rSet);
 
     void            ExecBmpMask( SfxRequest& rReq );
     void            GetBmpMaskState( SfxItemSet& rSet );
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 606f804f2d8d..cdca55974b51 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2484,7 +2484,6 @@ FncGetChildWindowId aShowChildren[] =
     &SvxIMapDlgChildWindow::GetChildWindowId,
     &SvxHlinkDlgWrapper::GetChildWindowId,
     &SfxTemplateDialogWrapper::GetChildWindowId,
-    &GalleryChildWindow::GetChildWindowId,
     &SfxInfoBarContainerChild::GetChildWindowId
 };
 
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 657df96f7066..54765d6500c7 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -178,6 +178,7 @@
 namespace {
     const char CustomAnimationPanelId[] = "CustomAnimationPanel";
     const char SlideTransitionPanelId[] = "SlideTransitionPanel";
+    const char GalleryPanelId[] = "GalleryPanel";
 }
 
 using namespace ::com::sun::star;
@@ -2721,16 +2722,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         }
         break;
 
-        case SID_GALLERY:
-        {
-            GetViewFrame()->ToggleChildWindow( GalleryChildWindow::GetChildWindowId() );
-            GetViewFrame()->GetBindings().Invalidate( SID_GALLERY );
-
-            Cancel();
-            rReq.Ignore ();
-        }
-        break;
-
         case SID_NAVIGATOR:
         {
             if ( rReq.GetArgs() )
@@ -2746,6 +2737,30 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         }
         break;
 
+        case SID_SLIDE_TRANSITIONS_PANEL:
+        case SID_CUSTOM_ANIMATION_PANEL:
+        case SID_GALLERY:
+        {
+            // First make sure that the sidebar is visible
+            GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
+
+            OUString panelId;
+            if (nSId == SID_CUSTOM_ANIMATION_PANEL)
+                panelId = CustomAnimationPanelId;
+            else if (nSId == SID_GALLERY)
+                panelId = GalleryPanelId;
+            else if (nSId == SID_SLIDE_TRANSITIONS_PANEL)
+                panelId = SlideTransitionPanelId;
+
+            ::sfx2::sidebar::Sidebar::ShowPanel(
+                panelId,
+                GetViewFrame()->GetFrame().GetFrameInterface());
+
+            Cancel();
+            rReq.Done();
+        }
+        break;
+
         case SID_ANIMATION_OBJECTS:
         {
             if ( rReq.GetArgs() )
@@ -2763,30 +2778,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         }
         break;
 
-        case SID_CUSTOM_ANIMATION_PANEL:
-        {
-            // Make the slide transition panel visible in the sidebar.
-            ::sfx2::sidebar::Sidebar::ShowPanel(
-                CustomAnimationPanelId,
-                GetViewFrame()->GetFrame().GetFrameInterface());
-
-            Cancel();
-            rReq.Done ();
-        }
-        break;
-
-        case SID_SLIDE_TRANSITIONS_PANEL:
-        {
-            // Make the slide transition panel visible in the sidebar.
-            ::sfx2::sidebar::Sidebar::ShowPanel(
-                SlideTransitionPanelId,
-                GetViewFrame()->GetFrame().GetFrameInterface());
-
-            Cancel();
-            rReq.Done ();
-        }
-        break;
-
         case SID_3D_WIN:
         {
             if ( rReq.GetArgs() )
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 19e141367553..093be5c9fddf 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -244,11 +244,6 @@ void DrawViewShell::SetChildWindowState( SfxItemSet& rSet )
         sal_uInt16 nId = SvxBmpMaskChildWindow::GetChildWindowId();
         rSet.Put( SfxBoolItem( SID_BMPMASK, GetViewFrame()->HasChildWindow( nId ) ) );
     }
-    if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GALLERY ) )
-    {
-        sal_uInt16 nId = GalleryChildWindow::GetChildWindowId();
-        rSet.Put( SfxBoolItem( SID_GALLERY, GetViewFrame()->HasChildWindow( nId ) ) );
-    }
     if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_IMAP ) )
     {
         sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId();
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 11912682007d..027cf54b25ca 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -181,10 +181,6 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
     GetDocSh()->SetWaitCursor( false );
 }
 
-void DrawViewShell::GetGalleryState(SfxItemSet& )
-{
-}
-
 /**
  * Edit macros for attribute configuration
  */
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 3df88208a44d..ea7c9d21ddde 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -76,7 +76,6 @@ void DrawViewShell::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(AnimationChildWindow::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(Svx3DChildWindow::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(SvxBmpMaskChildWindow::GetChildWindowId());
-    GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId());
@@ -102,7 +101,6 @@ void GraphicViewShell::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(SvxColorChildWindow::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(Svx3DChildWindow::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(SvxBmpMaskChildWindow::GetChildWindowId());
-    GetStaticInterface()->RegisterChildWindow(GalleryChildWindow::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId());
diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
index 23a905a7f0b8..5e5da76a38ff 100644
--- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
@@ -18,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
  <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
  <toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 8c4ca8ee016b..8b8af1f090a8 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -46,7 +46,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/>
  <toolbar:toolbaritem xlink:href=".uno:HyperlinkDialog" toolbar:helpid="5678"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="10366"/>
  <toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:style="auto" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:helpid="10096"/>
  <toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml
index 0c35032612fe..afdf92168b8e 100644
--- a/sd/uiconfig/sdraw/toolbar/toolbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml
@@ -47,7 +47,6 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:style="dropdown" toolbar:visible="false"/>
diff --git a/sd/uiconfig/sdraw/toolbar/viewerbar.xml b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
index a3718762921a..c57e61d8e7c8 100644
--- a/sd/uiconfig/sdraw/toolbar/viewerbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
@@ -30,7 +30,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
 </toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
index 162acead694b..25516433612d 100644
--- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
@@ -18,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:helpid="5539"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
  <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
  <toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml
index e8e548357e04..ce6a42f5a6a4 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -49,9 +49,6 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="auto"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:style="dropdown"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:HelpIndex"  />
  <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
 </toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml b/sd/uiconfig/simpress/toolbar/toolbar.xml
index 05a9c7d8166f..2e08ab4fc222 100644
--- a/sd/uiconfig/simpress/toolbar/toolbar.xml
+++ b/sd/uiconfig/simpress/toolbar/toolbar.xml
@@ -47,7 +47,6 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
- <toolbar:toolbaritem xlink:href=".uno:Gallery"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:style="dropdown" toolbar:visible="false"/>
diff --git a/sd/uiconfig/simpress/toolbar/viewerbar.xml b/sd/uiconfig/simpress/toolbar/viewerbar.xml
index 5fa4ee36c9c5..b51a741a46bd 100644
--- a/sd/uiconfig/simpress/toolbar/viewerbar.xml
+++ b/sd/uiconfig/simpress/toolbar/viewerbar.xml
@@ -30,7 +30,6 @@
  <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
  <toolbar:toolbarseparator/>