[Libreoffice-commits] core.git: officecfg/registry sd/inc sd/source sd/uiconfig

2023-05-24 Thread Baole Fang (via logerrit) 
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2 -
 sd/inc/strings.hrc   |
8 -
 sd/source/ui/dlg/sdpreslt.cxx|   
16 +-
 sd/source/ui/inc/sdpreslt.hxx|
1 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx   |   
16 +++---
 sd/uiconfig/sdraw/popupmenu/page.xml |
2 -
 sd/uiconfig/sdraw/popupmenu/pagepanemaster.xml   |
2 -
 sd/uiconfig/sdraw/ui/notebookbar.ui  |
4 +-
 sd/uiconfig/sdraw/ui/notebookbar_compact.ui  |
4 +-
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui   |
2 -
 10 files changed, 43 insertions(+), 14 deletions(-)

New commits:
commit 0a90b90048313fb43f8c5d7461f58dafec276600
Author: Baole Fang 
AuthorDate: Sun May 7 22:35:34 2023 -0400
Commit: Heiko Tietze 
CommitDate: Wed May 24 09:22:48 2023 +0200

tdf#148088: Fix master related UI in Draw

Page/Master Page... -> Page/Change Master Page... (corresponds to Impress)
In the above dialog:
Available Master Slides -> Available Master Pages
Select a Slide Design -> Select a Page Design
After clickling load:
Load Master Slide -> Load Master Page
In Master mode, right click/Rename Master:
Rename Master Slide -> Rename Master Page

Change-Id: I6a8e987d6f3eaf91289ec061ec87cd76b3f90ca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151489
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 716d496161e6..cca1b2ec38ae 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1103,7 +1103,7 @@
   
   
 
-  Master Page...
+  Change Master Page...
 
 
   .uno:PresentationLayout
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index bf5372b2ad33..3e1ddd1542e7 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -159,7 +159,12 @@
 
 // Strings for animation effects
 #define STR_INSERT_TEXT NC_("STR_INSERT_TEXT", 
"Insert Text")
+#define STR_AVAILABLE_MASTERSLIDE   
NC_("STR_AVAILABLE_MASTERSLIDE", "Available Master Slides")
+#define STR_AVAILABLE_MASTERPAGE
NC_("STR_AVAILABLE_MASTERPAGE", "Available Master Pages")
+#define STR_SELECT_SLIDE
NC_("STR_SELECT_SLIDE", "Select a Slide Design")
+#define STR_SELECT_PAGE NC_("STR_SELECT_PAGE", 
"Select a Page Design")
 #define STR_LOAD_PRESENTATION_LAYOUT
NC_("STR_LOAD_PRESENTATION_LAYOUT", "Load Master Slide")
+#define STR_LOAD_DRAWING_LAYOUT 
NC_("STR_LOAD_DRAWING_LAYOUT", "Load Master Page")
 #define STR_GLUE_ESCDIR_SMART   
NC_("STR_GLUE_ESCDIR_SMART", "Smart")
 #define STR_GLUE_ESCDIR_LEFT
NC_("STR_GLUE_ESCDIR_LEFT", "Left")
 #define STR_GLUE_ESCDIR_RIGHT   
NC_("STR_GLUE_ESCDIR_RIGHT", "Right")
@@ -238,7 +243,8 @@
 #define STR_TITLE_RENAMEPAGE
NC_("STR_TITLE_RENAMEPAGE", "Rename Page")
 #define STR_TOOLTIP_RENAME  
NC_("STR_TOOLTIP_RENAME", "Duplicate or empty names are not possible")
 #define STR_DESC_RENAMESLIDE
NC_("STR_DESC_RENAMESLIDE", "Name")
-#define STR_TITLE_RENAMEMASTER  
NC_("STR_TITLE_RENAMEMASTER", "Rename Master Slide")
+#define STR_TITLE_RENAMEMASTERSLIDE 
NC_("STR_TITLE_RENAMEMASTERSLIDE", "Rename Master Slide")
+#define STR_TITLE_RENAMEMASTERPAGE  
NC_("STR_TITLE_RENAMEMASTERPAGE", "Rename Master Page")
 #define STR_PLACEHOLDER_DESCRIPTION_TITLE   
NC_("STR_PLACEHOLDER_DESCRIPTION_TITLE", "Title Area for AutoLayouts" )
 #define STR_PLACEHOLDER_DESCRIPTION_OUTLINE 
NC_("STR_PLACEHOLDER_DESCRIPTION_OUTLINE", "Object Area for AutoLayouts" )
 #define STR_PLACEHOLDER_DESCRIPTION_FOOTER  
NC_("STR_PLACEHOLDER_DESCRIPTION_FOOTER", "Footer Area" )
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index dd54611e28d9..d0d0839bbb41 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -47,7 +47,18 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* 
pDocShell,
 , m_xBtnLoad(m_xBuilder->weld_button("load"))
 , m_xVS(new ValueSet(m_xBuilder->weld_scrolled_window("selectwin", true)))
 ,

[Libreoffice-commits] core.git: officecfg/registry sd/inc sd/source sd/uiconfig

2016-08-13 Thread Susobhan Ghosh 
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |1 
 sd/inc/glob.hrc  |2 
 sd/source/core/glob.src  |8 +
 sd/source/ui/sidebar/SlideBackground.cxx |   85 +--
 sd/source/ui/sidebar/SlideBackground.hxx |8 +
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui|   53 +-
 6 files changed, 132 insertions(+), 25 deletions(-)

New commits:
commit 64ff7453408e578b95073db1740bfef4f500a2e4
Author: Susobhan Ghosh 
Date:   Wed Aug 3 23:22:53 2016 +0530

tdf#89466 Add Master Slide and Close Master View button

Impress only. Change panel title on master slide context.
Disable controls in master view.

Change-Id: Ic355a6c74d3f61ea23bcf80e2a2d7e7d7a7980b8
Reviewed-on: https://gerrit.libreoffice.org/27840
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index e1e8cce..ac13581 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -747,6 +747,7 @@
 DrawImpress, HandoutPage, visible, .uno:PageSetup  ;
 DrawImpress, NotesPage,   visible, .uno:PageSetup  ;
 DrawImpress, SlidesorterPage, visible, .uno:PageSetup  ;
+DrawImpress, MasterPage,  visible, .uno:PageSetup  ;
   
 
 
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index bec03c2..b950a51 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -136,6 +136,8 @@
 
 #define RID_SLIDESORTER_ICONS   RID_GLOB_START+227
 #define STR_DEAUTHORISE_CLIENT  RID_GLOB_START+229
+#define STR_MASTERSLIDE_NAMERID_GLOB_START+230
+#define STR_MASTERPAGE_NAME RID_GLOB_START+231
 
 #endif
 
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index d3b3a71..8e7fe18 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -55,6 +55,14 @@ String STR_SLIDE_NAME
 {
 Text [ en-US ] = "Slide" ;
 };
+String STR_MASTERSLIDE_NAME
+{
+Text [ en-US ] = "Master Slide";
+};
+String STR_MASTERPAGE_NAME
+{
+Text [ en-US ] = "Master Page";
+};
 String STR_MASTERPAGE
 {
 Text [ en-US ] = "Background" ;
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index a3c6ec9..7c9af4c 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -101,6 +101,7 @@ SlideBackground::SlideBackground(
 maDspBckController(SID_DISPLAY_MASTER_BACKGROUND, *pBindings, *this),
 maDspObjController(SID_DISPLAY_MASTER_OBJECTS, *pBindings, *this),
 maMetricController(SID_ATTR_METRIC, *pBindings, *this),
+maCloseMasterController(SID_CLOSE_MASTER_VIEW, *pBindings, *this),
 mpColorItem(),
 mpGradientItem(),
 mpHatchItem(),
@@ -120,6 +121,9 @@ SlideBackground::SlideBackground(
 get(mpFillLB, "fillattr");
 get(mpDspMasterBackground, "displaymasterbackground");
 get(mpDspMasterObjects, "displaymasterobjects");
+get(mpCloseMaster, "closemasterslide");
+get(mpEditMaster, "masterslidebutton");
+get(mpMasterLabel, "masterlabel");
 addListener();
 Initialize();
 }
@@ -129,13 +133,23 @@ SlideBackground::~SlideBackground()
 disposeOnce();
 }
 
+bool SlideBackground::IsDraw()
+{
+return ( maApplication == vcl::EnumContext::Application_Draw );
+}
+
+bool SlideBackground::IsImpress()
+{
+return ( maApplication == vcl::EnumContext::Application_Impress );
+}
+
 void SlideBackground::Initialize()
 {
 mpPaperSizeBox->FillPaperSizeEntries( PaperSizeDraw );
 
mpPaperSizeBox->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
 
mpPaperOrientation->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
-
-
+mpCloseMaster->Hide();
+mpCloseMaster->SetClickHdl(LINK(this, SlideBackground, CloseMasterHdl));
 meUnit = maPaperSizeController.GetCoreMetric();
 
 mpMasterSlide->SetSelectHdl(LINK(this, SlideBackground, AssignMasterPage));
@@ -364,11 +378,34 @@ IMPL_LINK_TYPED(SlideBackground, EventMultiplexerListener,
 EditMode eMode = pDrawViewShell->GetEditMode();
 
 if ( eMode == EM_MASTERPAGE)
+{
+if( IsImpress() )
+{
+SetPanelTitle(SD_RESSTR(STR_MASTERSLIDE_NAME));
+mpEditMaster->Hide();
+mpCloseMaster->Show();
+}
+else
+