summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2017-04-20 17:01:10 +0400
committerYousuf Philips <philipz85@hotmail.com>2017-04-20 15:04:20 +0200
commite3cfb753524ecfabc07bccef5f5b2b54d06cd444 (patch)
tree3132abc85261402bc06d98a9de27ac460480f7ce
parentf0fef88b747cc4f4de7a5ccb93da9c062545dcfb (diff)
tdf#106781 Style-focused formatting toolbar for writer
Change-Id: I941c49aa502fa2757bb7f6a1d0cba4d02f00e686 Reviewed-on: https://gerrit.libreoffice.org/36717 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com>
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu23
-rw-r--r--sw/UIConfig_swriter.mk1
-rw-r--r--sw/uiconfig/swriter/toolbar/textstylebar.xml93
3 files changed, 117 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index ac0b4c2a750c..755929281ca3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -912,6 +912,29 @@
<value>false</value>
</prop>
</node>
+ <node oor:name="private:resource/toolbar/textstylebar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,2</value>
+ </prop>
+ <prop oor:name="Docked" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
+ </prop>
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Formatting (Styles)</value>
+ </prop>
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
</node>
</node>
</oor:component-data>
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 86fe9b7e503d..3be87d04f098 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swriter,\
sw/uiconfig/swriter/toolbar/symbolshapes \
sw/uiconfig/swriter/toolbar/tableobjectbar \
sw/uiconfig/swriter/toolbar/textobjectbar \
+ sw/uiconfig/swriter/toolbar/textstylebar \
sw/uiconfig/swriter/toolbar/toolbar \
sw/uiconfig/swriter/toolbar/viewerbar \
))
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml b/sw/uiconfig/swriter/toolbar/textstylebar.xml
new file mode 100644
index 000000000000..802a9d997721
--- /dev/null
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:DesignerDialog"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleUpdateByExample"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleNewByExample"/>
+ <toolbar:toolbaritem xlink:href=".uno:EditStyle"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:CharFontName" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FontHeight" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles" toolbar:text="Default" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Subtitle&amp;FamilyName:string=ParagraphStyles" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%201&amp;FamilyName:string=ParagraphStyles" toolbar:text="H1"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%202&amp;FamilyName:string=ParagraphStyles" toolbar:text="H2"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%203&amp;FamilyName:string=ParagraphStyles" toolbar:text="H3"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%204&amp;FamilyName:string=ParagraphStyles" toolbar:text="H4" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%203&amp;FamilyName:string=ParagraphStyles" toolbar:text="H5" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Heading%204&amp;FamilyName:string=ParagraphStyles" toolbar:text="H6" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Text%20body&amp;FamilyName:string=ParagraphStyles" toolbar:text="Text"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Quotations&amp;FamilyName:string=ParagraphStyles" toolbar:text="Quote"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Preformatted%20Text&amp;FamilyName:string=ParagraphStyles" toolbar:text="Pre"/>
+ <toolbar:toolbarseparator/>
+ <!-- These commands can be enabled when tdf#88512 and tdf#106782 are fixed -->
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:text="Character Styles" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleUpdateByExample" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleNewByExample" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EditStyle" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Default%20Style&amp;FamilyName:string=CharacterStyles" toolbar:text="Default"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Strong%20Emphasis&amp;FamilyName:string=CharacterStyles" toolbar:text="Strong"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Quotation&amp;FamilyName:string=CharacterStyles" toolbar:text="Quote" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Source%20Text&amp;FamilyName:string=CharacterStyles" toolbar:text="Code"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=User%20Entry&amp;FamilyName:string=CharacterStyles" toolbar:text="User" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Bold" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Italic" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnderlineSimple" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Strikeout" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SuperScript" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SubScript" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ResetAttributes"/>
+ <toolbar:toolbarseparator/>
+ <!-- These command can be enabled when tdf#107000 is fixed -->
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply" toolbar:text="List Styles" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=List%201&amp;FamilyName:string=NumberingStyles" toolbar:text="Bullet"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Numbering%201&amp;FamilyName:string=NumberingStyles" toolbar:text="Number"/>
+ <toolbar:toolbaritem xlink:href=".uno:StyleApply?Style:string=Numbering%204&amp;FamilyName:string=NumberingStyles" toolbar:text="Roman"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SetOutline" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:LeftPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:CenterPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:RightPara"/>
+ <toolbar:toolbaritem xlink:href=".uno:JustifyPara"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:LineSpacing"/>
+ <toolbar:toolbaritem xlink:href=".uno:Spacing" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceIncrease"/>
+ <toolbar:toolbaritem xlink:href=".uno:ParaspaceDecrease"/>
+</toolbar:toolbar>