[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/breeze icon-themes/sifr icon-themes/tango officecfg/registry sw/uiconfig
Yousuf Philips
philipz85 at hotmail.com
Mon Dec 18 23:44:32 UTC 2017
icon-themes/breeze/links.txt | 2
icon-themes/sifr/links.txt | 4
icon-themes/tango/links.txt | 3
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 20 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 67 +++++++++-
sw/uiconfig/swriter/menubar/menubar.xml | 25 ++-
6 files changed, 107 insertions(+), 14 deletions(-)
New commits:
commit 35589bc4e390282f1e26b9900addc3742e61b3ff
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Fri Dec 15 01:54:52 2017 +0400
tdf#91781 Round of improvements to Writer's menus for 6.0
Change-Id: I17c1edc2e14146144868df51a1f5a71e323eead6
Reviewed-on: https://gerrit.libreoffice.org/46451
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
Tested-by: Yousuf Philips <philipz85 at hotmail.com>
(cherry picked from commit 67d245adca298134fc8ab4364acbe880b4e0911a)
Reviewed-on: https://gerrit.libreoffice.org/46616
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 314c6f4fd05b..a12de86cda03 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -708,6 +708,8 @@ cmd/sc_presentation.png cmd/sc_dia.png
# Style
cmd/lc_editstyled.png cmd/lc_editstyle.png
cmd/sc_editstyled.png cmd/sc_editstyle.png
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
# Outline
cmd/lc_outlineright.png cmd/lc_decrementlevel.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 08af510ca16f..e2dae945a9ca 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -218,3 +218,7 @@ cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
cmd/sc_bulletliststyle.png cmd/sc_defaultbullet.png
cmd/lc_numberliststyle.png cmd/lc_defaultnumbering.png
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
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index e73922a59a92..b483e5fa819d 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -624,3 +624,6 @@ cmd/sc_formatframemenu.png cmd/sc_inserttextframe.png
cmd/lc_charmapcontrol.png cmd/lc_insertsymbol.png
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
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 9ae90f080953..18954711014e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2643,7 +2643,7 @@
</node>
<node oor:name=".uno:InsertDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Doc~ument...</value>
+ <value xml:lang="en-US">Text from File...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -2779,6 +2779,17 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:ViewSidebarStyles" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Styles</value>
+ </prop>
+ <prop oor:name="TargetURL" oor:type="xs:string">
+ <value>.uno:DesignerDialog</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:OutlineRight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Demote</value>
@@ -4806,6 +4817,11 @@
<value xml:lang="en-US">Send via ~Bluetooth...</value>
</prop>
</node>
+ <node oor:name=".uno:ExportAsMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Export As</value>
+ </prop>
+ </node>
<node oor:name=".uno:ExportToPDF" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">PDF</value>
@@ -4839,7 +4855,7 @@
<value xml:lang="en-US">EPUB</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Export as EPUB...</value>
+ <value xml:lang="en-US">Export as E~PUB...</value>
</prop>
<prop oor:name="TooltipLabel" oor:type="xs:string">
<value xml:lang="en-US">Export as EPUB</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 67877a3b5539..c0071633ec82 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -55,7 +55,7 @@
</node>
<node oor:name=".uno:ShowHiddenParagraphs" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Hidden Paragraphs</value>
+ <value xml:lang="en-US">Field ~Hidden Paragraphs</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>8</value>
@@ -1330,7 +1330,7 @@
</node>
<node oor:name=".uno:LinkDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Lin~ks...</value>
+ <value xml:lang="en-US">Lin~ks to External Files...</value>
</prop>
</node>
<node oor:name=".uno:ConvertTableText" oor:op="replace">
@@ -3140,17 +3140,55 @@
<value>11</value>
</prop>
</node>
+ <node oor:name=".uno:StyleApply?Style:string=Numbering ABC&FamilyName:string=NumberingStyles" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Alphabet Uppercase List</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:AlphaListStyle" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Alphabet Uppercase List</value>
+ </prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Alphabet Uppercase List Style</value>
+ </prop>
+ <prop oor:name="TargetURL" oor:type="xs:string">
+ <value>.uno:StyleApply?Style:string=Numbering ABC&FamilyName:string=NumberingStyles</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>11</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:StyleApply?Style:string=Numbering abc&FamilyName:string=NumberingStyles" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Alphabet Lowercase List</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:AlphaLowListStyle" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Alphabet Lowercase List</value>
+ </prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Alphabet Lowercase List Style</value>
+ </prop>
+ <prop oor:name="TargetURL" oor:type="xs:string">
+ <value>.uno:StyleApply?Style:string=Numbering abc&FamilyName:string=NumberingStyles</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>11</value>
+ </prop>
+ </node>
<node oor:name=".uno:StyleApply?Style:string=Numbering IVX&FamilyName:string=NumberingStyles" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Roman List</value>
+ <value xml:lang="en-US">Roman Uppercase List</value>
</prop>
</node>
<node oor:name=".uno:RomanListStyle" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Roman List</value>
+ <value xml:lang="en-US">Roman Uppercase List</value>
</prop>
<prop oor:name="TooltipLabel" oor:type="xs:string">
- <value xml:lang="en-US">Roman List Style</value>
+ <value xml:lang="en-US">Roman Uppercase List Style</value>
</prop>
<prop oor:name="TargetURL" oor:type="xs:string">
<value>.uno:StyleApply?Style:string=Numbering IVX&FamilyName:string=NumberingStyles</value>
@@ -3159,6 +3197,25 @@
<value>11</value>
</prop>
</node>
+ <node oor:name=".uno:StyleApply?Style:string=Numbering ivx&FamilyName:string=NumberingStyles" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Roman Lowercase List</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:RomanLowListStyle" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Roman Lowercase List</value>
+ </prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Roman Lowercase List Style</value>
+ </prop>
+ <prop oor:name="TargetURL" oor:type="xs:string">
+ <value>.uno:StyleApply?Style:string=Numbering ivx&FamilyName:string=NumberingStyles</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>11</value>
+ </prop>
+ </node>
<node oor:name=".uno:StyleApply" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Paragraph Style</value>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index a9dabcc18a6a..bcb83ff39972 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -48,7 +48,14 @@
<menu:menuitem menu:id=".uno:CheckIn"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ExportTo"/>
- <menu:menuitem menu:id=".uno:ExportToPDF"/>
+ <menu:menu menu:id=".uno:ExportAsMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:ExportToPDF"/>
+ <menu:menuitem menu:id=".uno:ExportDirectToPDF"/>
+ <menu:menuitem menu:id=".uno:ExportToEPUB"/>
+ <menu:menuitem menu:id=".uno:ExportDirectToEPUB"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menu menu:id=".uno:SendToMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:SendMail"/>
@@ -198,7 +205,7 @@
<menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Sidebar"/>
- <menu:menuitem menu:id=".uno:DesignerDialog"/>
+ <menu:menuitem menu:id=".uno:ViewSidebarStyles"/>
<menu:menuitem menu:id=".uno:Gallery"/>
<menu:menuitem menu:id=".uno:Navigator"/>
<menu:menuseparator/>
@@ -324,8 +331,9 @@
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:InsertSection"/>
- <menu:menuitem menu:id=".uno:InsertDoc"/>
<menu:menuitem menu:id=".uno:InsertEnvelope"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertDoc"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:FormatMenu">
@@ -422,10 +430,10 @@
<menu:menuitem menu:id=".uno:PageDialog"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:TitlePageDialog"/>
- <menu:menuitem menu:id=".uno:RubyDialog"/>
- <menu:menuitem menu:id=".uno:Watermark"/>
<menu:menuitem menu:id=".uno:EditRegion"/>
<menu:menuitem menu:id=".uno:FormatAllNotes"/>
+ <menu:menuitem menu:id=".uno:RubyDialog"/>
+ <menu:menuitem menu:id=".uno:Watermark"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:FormatImageMenu">
<menu:menupopup>
@@ -483,6 +491,8 @@
<menu:menuitem menu:id=".uno:WrapOff"/>
<menu:menuitem menu:id=".uno:WrapOn"/>
<menu:menuitem menu:id=".uno:WrapIdeal"/>
+ <menu:menuitem menu:id=".uno:WrapLeft"/>
+ <menu:menuitem menu:id=".uno:WrapRight"/>
<menu:menuitem menu:id=".uno:WrapThrough"/>
<menu:menuitem menu:id=".uno:WrapThroughTransparencyToggle"/>
<menu:menuseparator/>
@@ -536,8 +546,6 @@
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=ParagraphStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=ParagraphStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 3&FamilyName:string=ParagraphStyles" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 4&FamilyName:string=ParagraphStyles" menu:style="radio"/>
- <menu:menuitem menu:id=".uno:StyleApply?Style:string=Text body&FamilyName:string=ParagraphStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Quotations&FamilyName:string=ParagraphStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Preformatted Text&FamilyName:string=ParagraphStyles" menu:style="radio"/>
<menu:menuseparator/>
@@ -549,7 +557,10 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=List 1&FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering 123&FamilyName:string=NumberingStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering ABC&FamilyName:string=NumberingStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering abc&FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering IVX&FamilyName:string=NumberingStyles" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:StyleApply?Style:string=Numbering ivx&FamilyName:string=NumberingStyles" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
<menu:menuitem menu:id=".uno:StyleUpdateByExample"/>
More information about the Libreoffice-commits
mailing list