[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/colibre icon-themes/elementary icon-themes/karasa_jaga icon-themes/sifr icon-themes/tango officecfg/registry sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 8 08:00:44 UTC 2018
icon-themes/breeze/links.txt | 3 +
icon-themes/colibre/links.txt | 3 +
icon-themes/elementary/links.txt | 3 +
icon-themes/karasa_jaga/links.txt | 3 +
icon-themes/sifr/links.txt | 5 ++
icon-themes/tango/links.txt | 5 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 24 ++++++++++
sw/uiconfig/sglobal/popupmenu/table.xml | 6 +-
sw/uiconfig/sglobal/popupmenu/text.xml | 6 +-
sw/uiconfig/sweb/popupmenu/table.xml | 6 +-
sw/uiconfig/sweb/popupmenu/text.xml | 6 +-
sw/uiconfig/swriter/popupmenu/table.xml | 6 +-
sw/uiconfig/swriter/popupmenu/text.xml | 6 +-
sw/uiconfig/swxform/popupmenu/table.xml | 6 +-
sw/uiconfig/swxform/popupmenu/text.xml | 6 +-
15 files changed, 70 insertions(+), 24 deletions(-)
New commits:
commit 632e11d19604045e2ea9518f25dc67bf5d2695bb
Author: Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Wed Nov 7 17:34:45 2018 +0200
Commit: Maxim Monastirsky <momonasmon at gmail.com>
CommitDate: Thu Nov 8 08:58:46 2018 +0100
tdf#121018 Split labels for sub menus
Change-Id: Ia59ecb8f7912157aee23a6f2b5ea4aa178dd20fa
Reviewed-on: https://gerrit.libreoffice.org/63051
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index d1f0d7306b19..fd885877fad7 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -123,6 +123,9 @@ cmd/sc_tracechangemode.png cmd/sc_trackchanges.png
cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
cmd/sc_shapesmenu.png cmd/sc_polygon_diagonal_unfilled.png
cmd/sc_shapesmenu.png cmd/sc_basicshapes.round-quadrat.png
+cmd/sc_charactermenu.png cmd/sc_fontdialog.png
+cmd/sc_paragraphmenu.png cmd/sc_paragraphdialog.png
+cmd/sc_numberingmenu.png cmd/sc_outlinebullet.png
# Zoom
cmd/lc_previewzoom.png cmd/lc_zoomprevious.png
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 1adb56eef9ed..b6c8e2a224b2 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -119,6 +119,9 @@ cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
cmd/sc_tracechangemode.png cmd/sc_trackchanges.png
cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
cmd/sc_shapesmenu.png cmd/sc_basicshapes.round-quadrat.png
+cmd/sc_charactermenu.png cmd/sc_fontdialog.png
+cmd/sc_paragraphmenu.png cmd/sc_paragraphdialog.png
+cmd/sc_numberingmenu.png cmd/sc_outlinebullet.png
# Zoom
cmd/lc_previewzoom.png cmd/lc_zoomprevious.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index db4c5fbc2a0c..3ce756b528b0 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -205,6 +205,9 @@ cmd/sc_numericfield.png cmd/sc_numberformatstandard.png
cmd/sc_repaginate.png cmd/sc_insertpagenumberfield.png
cmd/sc_showchanges.png cmd/sc_addwatch.png
cmd/sc_tracechangemode.png cmd/sc_trackchanges.png
+cmd/sc_charactermenu.png cmd/sc_fontdialog.png
+cmd/sc_paragraphmenu.png cmd/sc_paragraphdialog.png
+cmd/sc_numberingmenu.png cmd/sc_outlinebullet.png
# Zoom
cmd/32/adjust.png cmd/32/zoomoptimal.png
diff --git a/icon-themes/karasa_jaga/links.txt b/icon-themes/karasa_jaga/links.txt
index c04432b97454..afefb875c7dd 100644
--- a/icon-themes/karasa_jaga/links.txt
+++ b/icon-themes/karasa_jaga/links.txt
@@ -886,6 +886,9 @@ cmd/sc_wrapmenu.png cmd/sc_wrapon.png
cmd/sc_zoomminus.png cmd/sc_zoomout.png
cmd/sc_zoomplus.png cmd/sc_zoomin.png
cmd/sc_zoomtoolbox.png cmd/sc_zoom.png
+cmd/sc_charactermenu.png cmd/sc_fontdialog.png
+cmd/sc_paragraphmenu.png cmd/sc_paragraphdialog.png
+cmd/sc_numberingmenu.png cmd/sc_outlinebullet.png
desktop/res/extension_16.png cmd/sc_addons.png
desktop/res/extension_32.png cmd/32/addons.png
extensions/source/scanner/minus.png res/minus.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 555f7242f40f..7551f7d63de4 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -221,3 +221,8 @@ cmd/sc_numberliststyle.png cmd/sc_defaultnumbering.png
# view menu
cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
+
+# writer text and table context menus
+cmd/sc_charactermenu.png cmd/sc_fontdialog.png
+cmd/sc_paragraphmenu.png cmd/sc_paragraphdialog.png
+cmd/sc_numberingmenu.png cmd/sc_outlinebullet.png
\ No newline at end of file
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index b483e5fa819d..c28a3accbdb8 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -627,3 +627,8 @@ cmd/sc_charmapcontrol.png cmd/sc_insertsymbol.png
# view menu
cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
+
+# writer text and table context menus
+cmd/sc_charactermenu.png cmd/sc_fontdialog.png
+cmd/sc_paragraphmenu.png cmd/sc_paragraphdialog.png
+cmd/sc_numberingmenu.png cmd/sc_outlinebullet.png
\ No newline at end of file
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index ebeba8a204ff..7b31e7dbc616 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2711,6 +2711,30 @@
</node>
</node>
<node oor:name="Popups">
+ <node oor:name=".uno:CharacterMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">C~haracter</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ParagraphMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">P~aragraph</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:NumberingMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Bullets and Numbering</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:TableSelectMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Select</value>
diff --git a/sw/uiconfig/sglobal/popupmenu/table.xml b/sw/uiconfig/sglobal/popupmenu/table.xml
index 310b3f3794c2..a65a3f6d43b4 100644
--- a/sw/uiconfig/sglobal/popupmenu/table.xml
+++ b/sw/uiconfig/sglobal/popupmenu/table.xml
@@ -71,7 +71,7 @@
<menu:menuitem menu:id=".uno:AutoFormat"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:FontDialog">
+ <menu:menu menu:id=".uno:CharacterMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuseparator/>
@@ -84,7 +84,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:ParagraphDialog">
+ <menu:menu menu:id=".uno:ParagraphMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
@@ -98,7 +98,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:OutlineBullet">
+ <menu:menu menu:id=".uno:NumberingMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/sglobal/popupmenu/text.xml b/sw/uiconfig/sglobal/popupmenu/text.xml
index f3fda1a6973d..72d35b58c37d 100644
--- a/sw/uiconfig/sglobal/popupmenu/text.xml
+++ b/sw/uiconfig/sglobal/popupmenu/text.xml
@@ -28,7 +28,7 @@
<menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menu menu:id=".uno:FontDialog">
+ <menu:menu menu:id=".uno:CharacterMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuseparator/>
@@ -41,7 +41,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:ParagraphDialog">
+ <menu:menu menu:id=".uno:ParagraphMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
@@ -55,7 +55,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:OutlineBullet">
+ <menu:menu menu:id=".uno:NumberingMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/sweb/popupmenu/table.xml b/sw/uiconfig/sweb/popupmenu/table.xml
index 310b3f3794c2..a65a3f6d43b4 100644
--- a/sw/uiconfig/sweb/popupmenu/table.xml
+++ b/sw/uiconfig/sweb/popupmenu/table.xml
@@ -71,7 +71,7 @@
<menu:menuitem menu:id=".uno:AutoFormat"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:FontDialog">
+ <menu:menu menu:id=".uno:CharacterMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuseparator/>
@@ -84,7 +84,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:ParagraphDialog">
+ <menu:menu menu:id=".uno:ParagraphMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
@@ -98,7 +98,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:OutlineBullet">
+ <menu:menu menu:id=".uno:NumberingMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/sweb/popupmenu/text.xml b/sw/uiconfig/sweb/popupmenu/text.xml
index f3fda1a6973d..72d35b58c37d 100644
--- a/sw/uiconfig/sweb/popupmenu/text.xml
+++ b/sw/uiconfig/sweb/popupmenu/text.xml
@@ -28,7 +28,7 @@
<menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menu menu:id=".uno:FontDialog">
+ <menu:menu menu:id=".uno:CharacterMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuseparator/>
@@ -41,7 +41,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:ParagraphDialog">
+ <menu:menu menu:id=".uno:ParagraphMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
@@ -55,7 +55,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:OutlineBullet">
+ <menu:menu menu:id=".uno:NumberingMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml b/sw/uiconfig/swriter/popupmenu/table.xml
index 310b3f3794c2..a65a3f6d43b4 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -71,7 +71,7 @@
<menu:menuitem menu:id=".uno:AutoFormat"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:FontDialog">
+ <menu:menu menu:id=".uno:CharacterMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuseparator/>
@@ -84,7 +84,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:ParagraphDialog">
+ <menu:menu menu:id=".uno:ParagraphMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
@@ -98,7 +98,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:OutlineBullet">
+ <menu:menu menu:id=".uno:NumberingMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml b/sw/uiconfig/swriter/popupmenu/text.xml
index f3fda1a6973d..72d35b58c37d 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -28,7 +28,7 @@
<menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menu menu:id=".uno:FontDialog">
+ <menu:menu menu:id=".uno:CharacterMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuseparator/>
@@ -41,7 +41,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:ParagraphDialog">
+ <menu:menu menu:id=".uno:ParagraphMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
@@ -55,7 +55,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:OutlineBullet">
+ <menu:menu menu:id=".uno:NumberingMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/swxform/popupmenu/table.xml b/sw/uiconfig/swxform/popupmenu/table.xml
index 310b3f3794c2..a65a3f6d43b4 100644
--- a/sw/uiconfig/swxform/popupmenu/table.xml
+++ b/sw/uiconfig/swxform/popupmenu/table.xml
@@ -71,7 +71,7 @@
<menu:menuitem menu:id=".uno:AutoFormat"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:FontDialog">
+ <menu:menu menu:id=".uno:CharacterMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuseparator/>
@@ -84,7 +84,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:ParagraphDialog">
+ <menu:menu menu:id=".uno:ParagraphMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
@@ -98,7 +98,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:OutlineBullet">
+ <menu:menu menu:id=".uno:NumberingMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/swxform/popupmenu/text.xml b/sw/uiconfig/swxform/popupmenu/text.xml
index f3fda1a6973d..72d35b58c37d 100644
--- a/sw/uiconfig/swxform/popupmenu/text.xml
+++ b/sw/uiconfig/swxform/popupmenu/text.xml
@@ -28,7 +28,7 @@
<menu:menuitem menu:id=".uno:AuthoritiesEntryDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ResetAttributes"/>
- <menu:menu menu:id=".uno:FontDialog">
+ <menu:menu menu:id=".uno:CharacterMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuseparator/>
@@ -41,7 +41,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:ParagraphDialog">
+ <menu:menu menu:id=".uno:ParagraphMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
@@ -55,7 +55,7 @@
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:OutlineBullet">
+ <menu:menu menu:id=".uno:NumberingMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
<menu:menuseparator/>
More information about the Libreoffice-commits
mailing list