[Libreoffice-commits] core.git: officecfg/registry sd/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 31 17:54:04 UTC 2018
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 49 ++--------
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5 +
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 5 -
sd/uiconfig/sdraw/menubar/menubar.xml | 23 ++++
sd/uiconfig/simpress/menubar/menubar.xml | 23 ++++
5 files changed, 62 insertions(+), 43 deletions(-)
New commits:
commit 72ec2c80d78af0c7601718ed89bd6b1e380a6940
Author: Justin Luth <justin_luth at sil.org>
AuthorDate: Fri Oct 12 15:39:08 2018 +0300
Commit: Justin Luth <justin_luth at sil.org>
CommitDate: Wed Oct 31 18:53:39 2018 +0100
tdf#120540 draw/impress UI: add Format / Table submenu
Although these commands were available in context menus,
there was no main menu access to these commands.
Also:
-cleanup unused context/popup labels related to table items.
Change-Id: Ia574c3783bb279e869c2b8c716f6fb394aa21873
Reviewed-on: https://gerrit.libreoffice.org/61715
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth at sil.org>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index a82e0c531123..195b04201b43 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1917,12 +1917,6 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Rows</value>
</prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Rows...</value>
- </prop>
- <prop oor:name="PopupLabel" oor:type="xs:string">
- <value xml:lang="en-US">Insert Rows...</value>
- </prop>
</node>
<node oor:name=".uno:InsertColumnsAfter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
@@ -1944,23 +1938,11 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Columns</value>
</prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Columns...</value>
- </prop>
- <prop oor:name="PopupLabel" oor:type="xs:string">
- <value xml:lang="en-US">Insert Columns...</value>
- </prop>
</node>
<node oor:name=".uno:DeleteRows" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Delete Row</value>
</prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Rows</value>
- </prop>
- <prop oor:name="PopupLabel" oor:type="xs:string">
- <value xml:lang="en-US">Delete Row</value>
- </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
@@ -1969,12 +1951,6 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Delete Column</value>
</prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Columns</value>
- </prop>
- <prop oor:name="PopupLabel" oor:type="xs:string">
- <value xml:lang="en-US">Delete Column</value>
- </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
@@ -1984,7 +1960,10 @@
<value xml:lang="en-US">Select Table</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Table</value>
+ <value xml:lang="en-US">~Select...</value>
+ </prop>
+ <prop oor:name="PopupLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Select Table</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1994,25 +1973,13 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Select Column</value>
</prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Columns</value>
- </prop>
- <prop oor:name="PopupLabel" oor:type="xs:string">
- <value xml:lang="en-US">Select Column</value>
- </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:EntireRow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Select Rows</value>
- </prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Rows</value>
- </prop>
- <prop oor:name="PopupLabel" oor:type="xs:string">
- <value xml:lang="en-US">Select Rows</value>
+ <value xml:lang="en-US">Select Row</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -2022,6 +1989,12 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Ta~ble Properties...</value>
</prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
+ <value xml:lang="en-US">~Properties...</value>
+ </prop>
+ <prop oor:name="PopupLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Ta~ble Properties...</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index b9678d0cb204..37bee5994fd7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6365,6 +6365,11 @@
<value xml:lang="en-US">Sen~d</value>
</prop>
</node>
+ <node oor:name=".uno:TableMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">T~able</value>
+ </prop>
+ </node>
<node oor:name=".uno:SignaturesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Digital Signatures</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 486467c74f67..70a2fd09e3f0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2705,11 +2705,6 @@
</node>
</node>
<node oor:name="Popups">
- <node oor:name=".uno:TableMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">T~able</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/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 5c06ce5d4b04..b61dbf62b83d 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -347,6 +347,29 @@
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
+ <menu:menu menu:id=".uno:TableMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SetMinimalRowHeight"/>
+ <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
+ <menu:menuitem menu:id=".uno:DistributeRows"/>
+ <menu:menuitem menu:id=".uno:EntireRow"/>
+ <menu:menuitem menu:id=".uno:InsertRowDialog"/>
+ <menu:menuitem menu:id=".uno:DeleteRows"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SetMinimalColumnWidth"/>
+ <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
+ <menu:menuitem menu:id=".uno:DistributeColumns"/>
+ <menu:menuitem menu:id=".uno:EntireColumn"/>
+ <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
+ <menu:menuitem menu:id=".uno:DeleteColumns"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:MergeCells"/>
+ <menu:menuitem menu:id=".uno:SplitCell"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SelectTable"/>
+ <menu:menuitem menu:id=".uno:TableDialog"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menuitem menu:id=".uno:ModifyLayer"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index c22d6ef79ff8..111548e79978 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -375,6 +375,29 @@
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuitem menu:id=".uno:OutlineBullet"/>
+ <menu:menu menu:id=".uno:TableMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SetMinimalRowHeight"/>
+ <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
+ <menu:menuitem menu:id=".uno:DistributeRows"/>
+ <menu:menuitem menu:id=".uno:EntireRow"/>
+ <menu:menuitem menu:id=".uno:InsertRowDialog"/>
+ <menu:menuitem menu:id=".uno:DeleteRows"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SetMinimalColumnWidth"/>
+ <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
+ <menu:menuitem menu:id=".uno:DistributeColumns"/>
+ <menu:menuitem menu:id=".uno:EntireColumn"/>
+ <menu:menuitem menu:id=".uno:InsertColumnDialog"/>
+ <menu:menuitem menu:id=".uno:DeleteColumns"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:MergeCells"/>
+ <menu:menuitem menu:id=".uno:SplitCell"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SelectTable"/>
+ <menu:menuitem menu:id=".uno:TableDialog"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menuseparator/>
<menu:menu menu:id=".uno:FormatImageMenu">
<menu:menupopup>
More information about the Libreoffice-commits
mailing list