[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 14 + sc/UIConfig_scalc.mk|1 sc/uiconfig/scalc/menubar/menubar.xml | 18 -- sc/uiconfig/scalc/popupmenu/statisticsmenu.xml | 24 ++ sc/uiconfig/scalc/ui/notebookbar.ui | 13 + sc/uiconfig/scalc/ui/notebookbar_compact.ui | 13 + sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 88 -- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 88 -- 8 files changed, 70 insertions(+), 189 deletions(-) New commits: commit ce81efb31c311dc835d2e1572751964dbe8e6aa6 Author: Justin Luth AuthorDate: Mon Oct 16 19:32:35 2023 -0400 Commit: Justin Luth CommitDate: Tue Oct 17 13:22:28 2023 +0200 related tdf#141457 sc notebookbar: make statistics a submenu With so many different statistics commands, the super-popular insert menu was dreadfully long. And since it is a now single entry, might as well add it to all MenuDatas to keep them all pretty much identical. Change-Id: I89247a1806f884e92a52b66015c766180d89149e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158065 Tested-by: Justin Luth Reviewed-by: Justin Luth diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 2720e33ccec6..2158cbcab053 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -551,6 +551,20 @@ sparklinemenu + + + .uno:StatisticsMenu + + + + + + com.sun.star.comp.framework.ResourceMenuController + + + statisticsmenu + + .uno:WindowList diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index d6ea2fe8947b..0b9f514d0fd5 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -40,6 +40,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\ sc/uiconfig/scalc/popupmenu/sheettab \ sc/uiconfig/scalc/popupmenu/sparkline \ sc/uiconfig/scalc/popupmenu/sparklinemenu \ + sc/uiconfig/scalc/popupmenu/statisticsmenu \ )) $(eval $(call gb_UIConfig_add_statusbarfiles,modules/scalc,\ diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index bfcac17c9602..ab2c7f81f672 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -647,23 +647,7 @@ - - - - - - - - - - - - - - - - - + diff --git a/sc/uiconfig/scalc/popupmenu/statisticsmenu.xml b/sc/uiconfig/scalc/popupmenu/statisticsmenu.xml new file mode 100644 index ..9bc4f2135f78 --- /dev/null +++ b/sc/uiconfig/scalc/popupmenu/statisticsmenu.xml @@ -0,0 +1,24 @@ + + +http://openoffice.org/2001/menu;> + + + + + + + + + + + + + + diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 5094f94198b4..f6d60d0b1e92 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -281,6 +281,19 @@ .uno:ShowDetail + + +True +False + + + + +True +False +.uno:StatisticsMenu + + True diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index 1328f59d7463..4f6c192a87d6 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -281,6 +281,19 @@ .uno:ShowDetail + + +True +False + + + + +True +False +.uno:StatisticsMenu + + True diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 0587bab1025c..2533c66719f0 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -2971,94 +2971,10 @@ - + True False -.uno:SamplingDialog - - - - -True -False -.uno:DescriptiveStatisticsDialog - - - - -True -False -.uno:AnalysisOfVarianceDialog - - - - -True -False -.uno:CorrelationDialog - - - - -True -False -
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 14 +++ sc/UIConfig_scalc.mk|1 sc/uiconfig/scalc/menubar/menubar.xml | 10 -- sc/uiconfig/scalc/popupmenu/cell.xml| 12 --- sc/uiconfig/scalc/popupmenu/sparkline.xml | 12 --- sc/uiconfig/scalc/popupmenu/sparklinemenu.xml | 18 sc/uiconfig/scalc/ui/notebookbar.ui | 13 +++ sc/uiconfig/scalc/ui/notebookbar_compact.ui | 38 ++ sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 13 +++ sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 13 +++ 10 files changed, 113 insertions(+), 31 deletions(-) New commits: commit f5a2192effbf52b2e64e4a40f325b1b42285833c Author: Justin Luth AuthorDate: Sat Oct 14 10:07:22 2023 -0400 Commit: Justin Luth CommitDate: Mon Oct 16 15:19:26 2023 +0200 tdf#148539 sc notebookbar: add Sparklines to MenuData Sparklines do not have an icon yet, so I didn't attempt to add any (visible) entries to the notebookbar itself. Change-Id: I144ff76306aef0ec184794878a449e0cefd09280 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157978 Tested-by: Justin Luth Reviewed-by: Justin Luth diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index b0e17643905d..2720e33ccec6 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -537,6 +537,20 @@ printranges + + + .uno:FormatSparklineMenu + + + + + + com.sun.star.comp.framework.ResourceMenuController + + + sparklinemenu + + .uno:WindowList diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 637a1ac2eca6..d6ea2fe8947b 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\ sc/uiconfig/scalc/popupmenu/row_operations \ sc/uiconfig/scalc/popupmenu/sheettab \ sc/uiconfig/scalc/popupmenu/sparkline \ + sc/uiconfig/scalc/popupmenu/sparklinemenu \ )) $(eval $(call gb_UIConfig_add_statusbarfiles,modules/scalc,\ diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index cbb352c7ac6a..bfcac17c9602 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -433,15 +433,7 @@ - - - - - - - - - + diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml b/sc/uiconfig/scalc/popupmenu/cell.xml index fb7f4ff9ecd8..163c54b09bc6 100644 --- a/sc/uiconfig/scalc/popupmenu/cell.xml +++ b/sc/uiconfig/scalc/popupmenu/cell.xml @@ -63,17 +63,7 @@ - - - - - - - - - - - + diff --git a/sc/uiconfig/scalc/popupmenu/sparkline.xml b/sc/uiconfig/scalc/popupmenu/sparkline.xml index fb7f4ff9ecd8..163c54b09bc6 100644 --- a/sc/uiconfig/scalc/popupmenu/sparkline.xml +++ b/sc/uiconfig/scalc/popupmenu/sparkline.xml @@ -63,17 +63,7 @@ - - - - - - - - - - - + diff --git a/sc/uiconfig/scalc/popupmenu/sparklinemenu.xml b/sc/uiconfig/scalc/popupmenu/sparklinemenu.xml new file mode 100644 index ..1abc1da66e94 --- /dev/null +++ b/sc/uiconfig/scalc/popupmenu/sparklinemenu.xml @@ -0,0 +1,18 @@ + + +http://openoffice.org/2001/menu;> + + + + + + + + diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 9fa7632cd732..5094f94198b4 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -152,6 +152,19 @@ False + + +True +False +.uno:FormatSparklineMenu + + + + +True +False + + True diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index 0bc0f5c5d364..1328f59d7463 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -152,6 +152,19 @@ False + + +True +False +.uno:FormatSparklineMenu + + + + +True +False + + True @@ -4714,6 +4727,31 @@ 1 +
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 14 + sc/UIConfig_scalc.mk|1 sc/uiconfig/scalc/menubar/menubar.xml |9 --- sc/uiconfig/scalc/popupmenu/printranges.xml | 15 ++ sc/uiconfig/scalc/ui/notebookbar.ui | 25 -- sc/uiconfig/scalc/ui/notebookbar_compact.ui | 25 -- sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 25 -- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 25 -- 8 files changed, 39 insertions(+), 100 deletions(-) New commits: commit 1310ce65f18c0b03051c6f23e40b8b39b8053fec Author: Justin Luth AuthorDate: Wed Jun 21 11:40:03 2023 -0400 Commit: Caolán McNamara CommitDate: Thu Jun 22 18:34:24 2023 +0200 tdf#147056 sc: convert xml menu to popupmenu .uno:PrintRangesMenu The labelling in the notebookbar left much to be desired when adding the print ranges separately in the "context menus". Making this into a proper submenu fixes the problem. Thanks to Maxim for reviewing and for the commit template: commit 0e7cd653ea90da388820220bf6a3eb140b57bbd6 Author: Maxim Monastirsky on Mon Jan 25 01:09:03 2016 +0200 tdf#86567 Dropdown for conditional formatting Change-Id: If92836ee29d322f5a2fca1e27d2e034e5cc995e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153402 Tested-by: Justin Luth Reviewed-by: Justin Luth Reviewed-by: Caolán McNamara diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index de6221954ab0..b0e17643905d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -523,6 +523,20 @@ showtrackedchanges + + + .uno:PrintRangesMenu + + + + + + com.sun.star.comp.framework.ResourceMenuController + + + printranges + + .uno:WindowList diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 214a300a04d9..637a1ac2eca6 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\ sc/uiconfig/scalc/popupmenu/pagebreak \ sc/uiconfig/scalc/popupmenu/pivot \ sc/uiconfig/scalc/popupmenu/preview \ + sc/uiconfig/scalc/popupmenu/printranges \ sc/uiconfig/scalc/popupmenu/rowheader \ sc/uiconfig/scalc/popupmenu/row_operations \ sc/uiconfig/scalc/popupmenu/sheettab \ diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 413e2e5ce11c..cbb352c7ac6a 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -409,14 +409,7 @@ - - - - - - - - + diff --git a/sc/uiconfig/scalc/popupmenu/printranges.xml b/sc/uiconfig/scalc/popupmenu/printranges.xml new file mode 100644 index ..7bd89fdef765 --- /dev/null +++ b/sc/uiconfig/scalc/popupmenu/printranges.xml @@ -0,0 +1,15 @@ + + +http://openoffice.org/2001/menu;> + + + + + diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 0adc829feab4..5f9ea5dff8cc 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -1380,31 +1380,10 @@ - + True False -.uno:DefinePrintArea - - - - -True -False -.uno:AddPrintArea - - - - -True -False -.uno:EditPrintArea - - - - -True -False -.uno:DeletePrintArea +.uno:PrintRangesMenu diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index 8991949ac917..5da5b2f23216 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -1542,31 +1542,10 @@ - + True False -.uno:DefinePrintArea - - - - -True -False -.uno:AddPrintArea - - - - -True -False -.uno:EditPrintArea - - - - -True -False -.uno:DeletePrintArea +.uno:PrintRangesMenu diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index dc0bb54cdc2f..94f115231801 100644
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu | 22 sc/UIConfig_scalc.mk |2 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 9879 +++ sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui |12664 ++ 4 files changed, 22567 insertions(+) New commits: commit 342622d51f457c5a7d5026814a323d1deece4681 Author: andreas kainzDate: Thu Aug 31 00:19:40 2017 +0200 tdf#107158 Groupedbar variant of the Notebookbar for Calc Change-Id: I8f6a086a0895d54cce6243f65c3f47f7cc4cf50e Reviewed-on: https://gerrit.libreoffice.org/41742 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu index ee8aff0b52a5..f10de902dc00 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu @@ -83,6 +83,28 @@ false + + +Groupedbar Compact + + +notebookbar_groupedbar_compact.ui + + +false + + + + +Groupedbar Full + + +notebookbar_groupedbar_full.ui + + +false + + Contextual groups diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index bd926ac93dd6..4e03e316669c 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -146,6 +146,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/namerangesdialog \ sc/uiconfig/scalc/ui/notebookbar \ sc/uiconfig/scalc/ui/notebookbar_groups \ + sc/uiconfig/scalc/ui/notebookbar_groupedbar_full \ + sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact \ sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/mergecellsdialog \ sc/uiconfig/scalc/ui/movecopysheet \ diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui new file mode 100644 index ..f4933e3a4e6a --- /dev/null +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -0,0 +1,9879 @@ + + + + + + +True +False + + +True +False +.uno:LeftPara + + + + +True +False +.uno:CenterPara + + + + +True +False +.uno:RightPara + + + + +True +False +.uno:JustifyPara + + + + +True +False + + +True +False +.uno:ExtrusionToggle + + + + +True +False + + + + +True +False +.uno:ExtrusionTiltDown + + + + +True +False +.uno:ExtrusionTiltUp + + + + +True +False +.uno:ExtrusionTiltLeft + + + + +True +False +.uno:ExtrusionTiltRight + + + + +True +False + + +True +False +.uno:ObjectAlignLeft + + + + +True +False +.uno:AlignCenter + + + + +True +False +.uno:ObjectAlignRight + + + + +True +False + + + + +True +False +.uno:AlignUp + + + + +True +False +.uno:AlignMiddle + + + + +True +False +.uno:AlignDown + + + + +True +False + + +True +False +.uno:ToggleAnchorType + + + + +True +False + + + + +True +False +.uno:WrapOff + + + + +True +False +.uno:WrapOn + + + + +True +False +.uno:WrapIdeal + + + + +True +False +.uno:WrapLeft + + + + +True +False +.uno:WrapRight + + + + +True +False +.uno:WrapThrough + + + + +True +False +.uno:WrapThroughTransparent + + + + +True +False +.uno:WrapContour + + + + +True +False +.uno:WrapAnchorOnly + + + + +True +False +.uno:TextWrap + + + + +
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu | 11 sc/UIConfig_scalc.mk |1 sc/uiconfig/scalc/ui/notebookbar_groups.ui | 2255 ++ 3 files changed, 2267 insertions(+) New commits: commit ec6a1391d97c016b1b911f579c0460205564af6b Author: Yousuf PhilipsDate: Wed Oct 19 16:50:04 2016 +0400 tdf#103170 Heikobar: Add it to Calc Change-Id: I9b7c004558a15f520b54935c2a712fcdb551757e Reviewed-on: https://gerrit.libreoffice.org/30042 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu index e339abb..36ff663 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu @@ -61,6 +61,17 @@ false + + +Contextual groups + + +notebookbar_groups.ui + + +true + + diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 9ec5dac..5008729 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -144,6 +144,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/leftheaderdialog \ sc/uiconfig/scalc/ui/namerangesdialog \ sc/uiconfig/scalc/ui/notebookbar \ + sc/uiconfig/scalc/ui/notebookbar_groups \ sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/mergecellsdialog \ sc/uiconfig/scalc/ui/movecopysheet \ diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui b/sc/uiconfig/scalc/ui/notebookbar_groups.ui new file mode 100644 index 000..5011d96 --- /dev/null +++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui @@ -0,0 +1,2255 @@ + + + + + + + +True +False +cmd/sc_bold.png + + +True +False +cmd/sc_insertobjectchart.png + + +True +False +cmd/sc_numberformatincdecimals.png + + +True +False +cmd/sc_italic.png + + +True +False +cmd/sc_inserthyperlink.png + + +True +False + + +True +False +.uno:HyperlinkDialog +Hyperlink + + + + +True +False + + + + +True +False +.uno:InsertFootnote +Footnote +True + + + + +True +False +.uno:InsertEndnote +Endnote +True + + + + +True +False + + + + +True +False +.uno:InsertBookmark +Bookmark +True + + + + +True +False +.uno:InsertReferenceField +Cross-Reference + + + + +True +False +cmd/lc_adddirect.png +24 + + +True +False +cmd/lc_open.png +24 + + +True +False +cmd/lc_designerdialog.png + + +True +False +cmd/32/paste.png +24 + + +True +False +cmd/lc_exportdirecttopdf.png +24 + + +True +False +cmd/lc_print.png +24 + + +True +False +cmd/lc_redo.png +24 + + +True +False +cmd/32/save.png +32 +3 + + +True +False +cmd/sc_numberformatdecdecimals.png + + +True +False + + +True +False +Default +True + + + + +True +False + + + + +True +False +Accent 1 +True + + + + +True +False +Accent 2 +True + + + + +True +False +Accent 3 +True + + + + +True +False + + + + +True +False +Heading 1 +True + + + + +True +False +Heading 2 +True + + + + +True +False + + + + +True +False +Good +True + + + + +True +False +Neutral +True + + + + +True +False +Bad +True + + + + +True +False +Warning +True + + + + +True +False +Error +True + + + + +True +False + + + + +True +False +Note +True + + + + +True +False +Footnote +
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk sd/uiconfig sd/UIConfig_simpress.mk sw/uiconfig sw/UIConfig_swriter.mk
officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu | 11 sc/UIConfig_scalc.mk |1 sc/uiconfig/scalc/ui/notebookbar_single.ui | 133 + sd/UIConfig_simpress.mk |1 sd/uiconfig/simpress/ui/notebookbar_single.ui| 133 + sw/UIConfig_swriter.mk |1 sw/uiconfig/swriter/ui/notebookbar_single.ui | 993 ++ 7 files changed, 1273 insertions(+) New commits: commit 139d3b3e8b157c1f365f888126269f0902acbaa2 Author: Yousuf PhilipsDate: Tue Aug 23 17:40:44 2016 +0400 Notebookbar: Single contextual toolbar implementation Change-Id: I72a0bffc3f1093d9f07ea9d4ba9101df2cf4d032 Reviewed-on: https://gerrit.libreoffice.org/28331 Reviewed-by: Szymon KÅos Tested-by: Szymon KÅos diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu index 2b67a6d..4b3c45a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu @@ -27,5 +27,16 @@ true + + +Contextual single + + +notebookbar_single.ui + + +true + + diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 76dc169..8ddcccf 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -142,6 +142,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/namerangesdialog \ sc/uiconfig/scalc/ui/notebookbar \ sc/uiconfig/scalc/ui/notebookbar_groups \ + sc/uiconfig/scalc/ui/notebookbar_single \ sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/mergecellsdialog \ sc/uiconfig/scalc/ui/movecopysheet \ diff --git a/sc/uiconfig/scalc/ui/notebookbar_single.ui b/sc/uiconfig/scalc/ui/notebookbar_single.ui new file mode 100644 index 000..9b5e4b4 --- /dev/null +++ b/sc/uiconfig/scalc/ui/notebookbar_single.ui @@ -0,0 +1,133 @@ + + + + + + + +True +False + + +True +False +vertical + + +True +True +True +True + + +True +False +6 + + + + + + + + + + + + + + + + + + + + + + + +True +False + + + + + + + + +False +True +7 + + + + + + +True +False +File +True + + +False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +False +True +0 + + + + +0 +0 + + + + diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index b71f709..da5ae10 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -121,6 +121,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/masterlayoutdlg \ sd/uiconfig/simpress/ui/notebookbar \ sd/uiconfig/simpress/ui/notebookbar_groups \ + sd/uiconfig/simpress/ui/notebookbar_single \ sd/uiconfig/simpress/ui/optimpressgeneralpage \ sd/uiconfig/simpress/ui/photoalbum \ sd/uiconfig/simpress/ui/presentationdialog \ diff --git
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu | 23 ++ sc/UIConfig_scalc.mk |1 sc/uiconfig/scalc/toolbar/singlemode.xml | 88 ++ 3 files changed, 112 insertions(+) New commits: commit da27c5d58948a782f25338320f9c57cfe542986e Author: Yousuf PhilipsDate: Thu Apr 14 18:12:11 2016 +0400 tdf#92218 Implement Calc single toolbar mode toolbar Change-Id: Ie261b71000c37f18efe0658bbf239c9639a5fcf3 Reviewed-on: https://gerrit.libreoffice.org/24088 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu index 0485e53..d41335a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu @@ -694,6 +694,29 @@ true + + + 0,0 + + + true + + + 0 + + + Standard (Single Mode) + + + false + + + false + + + false + + diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 21bb7e1..7ab8cd4 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -76,6 +76,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\ sc/uiconfig/scalc/toolbar/mediaobjectbar \ sc/uiconfig/scalc/toolbar/moreformcontrols \ sc/uiconfig/scalc/toolbar/previewbar \ + sc/uiconfig/scalc/toolbar/singlemode \ sc/uiconfig/scalc/toolbar/standardbar \ sc/uiconfig/scalc/toolbar/starshapes \ sc/uiconfig/scalc/toolbar/symbolshapes \ diff --git a/sc/uiconfig/scalc/toolbar/singlemode.xml b/sc/uiconfig/scalc/toolbar/singlemode.xml new file mode 100644 index 000..fff6ef8 --- /dev/null +++ b/sc/uiconfig/scalc/toolbar/singlemode.xml @@ -0,0 +1,88 @@ + + + +http://openoffice.org/2001/toolbar; xmlns:xlink="http://www.w3.org/1999/xlink;> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits