[Libreoffice-commits] core.git: officecfg/registry sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 14 +++ sd/UIConfig_sdraw.mk|1 sd/UIConfig_simpress.mk |1 sd/uiconfig/sdraw/menubar/menubar.xml | 12 -- sd/uiconfig/sdraw/popupmenu/3dobject.xml| 12 -- sd/uiconfig/sdraw/popupmenu/3dscene.xml | 12 -- sd/uiconfig/sdraw/popupmenu/3dscene2.xml| 12 -- sd/uiconfig/sdraw/popupmenu/connector.xml | 12 -- sd/uiconfig/sdraw/popupmenu/curve.xml | 12 -- sd/uiconfig/sdraw/popupmenu/draw.xml| 12 -- sd/uiconfig/sdraw/popupmenu/form.xml| 12 -- sd/uiconfig/sdraw/popupmenu/graphic.xml | 12 -- sd/uiconfig/sdraw/popupmenu/group.xml | 12 -- sd/uiconfig/sdraw/popupmenu/line.xml| 12 -- sd/uiconfig/sdraw/popupmenu/measure.xml | 12 -- sd/uiconfig/sdraw/popupmenu/media.xml | 12 -- sd/uiconfig/sdraw/popupmenu/multiselect.xml | 12 -- sd/uiconfig/sdraw/popupmenu/objectalign.xml | 18 ++ sd/uiconfig/sdraw/popupmenu/oleobject.xml | 12 -- sd/uiconfig/sdraw/popupmenu/table.xml | 12 -- sd/uiconfig/sdraw/popupmenu/textbox.xml | 12 -- sd/uiconfig/sdraw/ui/notebookbar.ui |7 +++ sd/uiconfig/sdraw/ui/notebookbar_compact.ui |7 +++ sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 13 +++ sd/uiconfig/simpress/menubar/menubar.xml| 12 -- sd/uiconfig/simpress/popupmenu/3dobject.xml | 12 -- sd/uiconfig/simpress/popupmenu/3dscene.xml | 12 -- sd/uiconfig/simpress/popupmenu/3dscene2.xml | 12 -- sd/uiconfig/simpress/popupmenu/connector.xml| 12 -- sd/uiconfig/simpress/popupmenu/curve.xml| 12 -- sd/uiconfig/simpress/popupmenu/draw.xml | 12 -- sd/uiconfig/simpress/popupmenu/form.xml | 12 -- sd/uiconfig/simpress/popupmenu/graphic.xml | 12 -- sd/uiconfig/simpress/popupmenu/group.xml| 12 -- sd/uiconfig/simpress/popupmenu/line.xml | 12 -- sd/uiconfig/simpress/popupmenu/measure.xml | 12 -- sd/uiconfig/simpress/popupmenu/media.xml| 12 -- sd/uiconfig/simpress/popupmenu/multiselect.xml | 12 -- sd/uiconfig/simpress/popupmenu/objectalign.xml | 18 ++ sd/uiconfig/simpress/popupmenu/oleobject.xml| 12 -- sd/uiconfig/simpress/popupmenu/table.xml| 12 -- sd/uiconfig/simpress/popupmenu/textbox.xml | 12 -- sd/uiconfig/simpress/ui/notebookbar.ui |7 +++ sd/uiconfig/simpress/ui/notebookbar_compact.ui |7 +++ sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 13 +++ sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 13 +++ 46 files changed, 153 insertions(+), 374 deletions(-) New commits: commit 4e871d99ccace244de42c0d5c4bd11611af6ccb2 Author: Justin Luth AuthorDate: Tue Oct 17 08:18:17 2023 -0400 Commit: Justin Luth CommitDate: Fri Oct 20 20:25:58 2023 +0200 tdf#157026 sd notebookbar: add ObjectAlign to MenuTable as popupmenu The vast majority of this is just eliminating copy/paste, since I have now created a popupmenu.xml list for the popup menu. The "fix" is adding this to the Table menus. .uno:ObjectAlign is basically just a "label". Now it is a label for two different "views": * a toolbar widget dropdown * a menu subcategory Perhaps it is confusing to have one UNO entry serve these two similar purposes? I suppose someone might also complain that a simple isn't clear that this is a submenu. I considered making mine a new ObjectAlignMenu, but the annoyance of having to create a duplicate string translation in officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu made me just reuse the existing label. Change-Id: I17e037e0c9c5d1f57ac9f174a76cd041983bcea4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157894 Tested-by: Jenkins Reviewed-by: Justin Luth diff --git
[Libreoffice-commits] core.git: officecfg/registry sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk
officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu | 36 sd/UIConfig_sdraw.mk |4 sd/UIConfig_simpress.mk |1 sd/uiconfig/simpress/ui/notebookbar.ui | 15 sd/uiconfig/simpress/ui/notebookbar_compact.ui |19603 ++ 5 files changed, 19651 insertions(+), 8 deletions(-) New commits: commit 4808ae1c73597726c89936f5b9cb3f11c9a4a7bf Author: andreas kainz AuthorDate: Mon Jun 24 23:26:47 2019 +0200 Commit: andreas_kainz CommitDate: Tue Jun 25 00:37:59 2019 +0200 NB impress add tabbed compact layout Change-Id: Ia1aab531967644ac6f7cd21210a87a30082de42a Reviewed-on: https://gerrit.libreoffice.org/74660 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu index 332c9b5d9085..327dd474457c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu @@ -483,7 +483,7 @@ true -6 +7 notebookbar_groupedbar_full.ui @@ -613,7 +613,7 @@ false -4 +3 notebookbar.ui @@ -630,6 +630,34 @@ Arrow + + +Tabbed Compact + + +true + + +false + + +4 + + +notebookbar_compact.ui + + + + + + + + + + +Arrow + + Groupedbar Compact @@ -674,7 +702,7 @@ true -6 +7 notebookbar_groupedbar_full.ui @@ -776,7 +804,7 @@ false -4 +3 notebookbar.ui diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk index bbdb3efc4d87..247767eb6f26 100644 --- a/sd/UIConfig_sdraw.mk +++ b/sd/UIConfig_sdraw.mk @@ -113,8 +113,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\ sd/uiconfig/sdraw/ui/insertslidesdialog \ sd/uiconfig/sdraw/ui/namedesign \ sd/uiconfig/sdraw/ui/notebookbar \ - sw/uiconfig/swriter/ui/notebookbar_compact \ - sw/uiconfig/swriter/ui/notebookbar_single \ + sd/uiconfig/sdraw/ui/notebookbar_compact \ + sd/uiconfig/sdraw/ui/notebookbar_single \ sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact \ sd/uiconfig/sdraw/ui/notebookbar_groupedbar_full \ sd/uiconfig/sdraw/ui/paranumberingtab \ diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index fce9c5704fda..4f4ca1f024b2 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -130,6 +130,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/mastermenu \ sd/uiconfig/simpress/ui/navigatorpanel \ sd/uiconfig/simpress/ui/notebookbar \ + sd/uiconfig/simpress/ui/notebookbar_compact \ sd/uiconfig/simpress/ui/notebookbar_groups \ sd/uiconfig/simpress/ui/notebookbar_groupedbar_full \ sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact \ diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index e190bd811ff6..3a4e82f2329f 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -4165,7 +4165,7 @@ icons False - + True False .uno:DefaultBullet @@ -4176,9 +4176,19 @@ - + True False +.uno:DefaultNumbering + + +False +True + + + + +
