[Libreoffice-commits] core.git: officecfg/registry sd/uiconfig
Yousuf Philips
philipz85 at hotmail.com
Wed Apr 22 15:01:18 PDT 2015
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 25 +++--
sd/uiconfig/sdraw/toolbar/arrowsbar.xml | 16 +--
sd/uiconfig/sdraw/toolbar/basicshapes.xml | 20 ++--
sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml | 12 +-
sd/uiconfig/sdraw/toolbar/calloutshapes.xml | 3
sd/uiconfig/sdraw/toolbar/connectorsbar.xml | 18 ++--
sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml | 22 ++---
sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml | 18 ++--
sd/uiconfig/sdraw/toolbar/linesbar.xml | 12 +-
sd/uiconfig/sdraw/toolbar/standardbar.xml | 7 +
sd/uiconfig/sdraw/toolbar/starshapes.xml | 8 -
sd/uiconfig/sdraw/toolbar/toolbar.xml | 44 +++++-----
12 files changed, 110 insertions(+), 95 deletions(-)
New commits:
commit ba4191c6986fa9fc5d22fa8203d8a986edfdcdaf
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Sun Apr 19 01:38:17 2015 +0400
tdf#90090 - customizing and positioning additional toolbars
Restoring the line & filling and image toolbars to how they were and
reorganized the standard and drawing toolbar buttons and used OOo
stats to reogranize the buttons in the split buttons
Change-Id: I63117f5a7b1243bd6f359bcd965d240d4237c8ef
Reviewed-on: https://gerrit.libreoffice.org/15483
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 3b43ac2..349df4e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -22,10 +22,10 @@
<node oor:name="States">
<node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
- <value>0,0</value>
+ <value>1,0</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>1</value>
+ <value>0</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
<value>true</value>
@@ -57,7 +57,7 @@
<value xml:lang="en-US">Image</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="ContextSensitive" oor:type="xs:boolean">
<value>true</value>
@@ -131,7 +131,7 @@
<value>0</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Line and Filling</value>
@@ -150,9 +150,6 @@
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
</prop>
- <prop oor:name="Locked" oor:type="xs:boolean">
- <value>true</value>
- </prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Drawing</value>
</prop>
@@ -198,10 +195,10 @@
</node>
<node oor:name="private:resource/toolbar/bezierobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
- <value>0,0</value>
+ <value>1,0</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>1</value>
+ <value>0</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
<value>true</value>
@@ -405,10 +402,16 @@
</node>
<node oor:name="private:resource/toolbar/gluepointsobjectbar" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Gluepoints</value>
+ <value xml:lang="en-US">Glue Points</value>
+ </prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>1,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>0</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
diff --git a/sd/uiconfig/sdraw/toolbar/arrowsbar.xml b/sd/uiconfig/sdraw/toolbar/arrowsbar.xml
index 52ac495..1e205a3 100644
--- a/sd/uiconfig/sdraw/toolbar/arrowsbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/arrowsbar.xml
@@ -18,16 +18,16 @@
* 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:Line" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:LineArrowCircle" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:LineArrowSquare" toolbar:style="radio"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Line_Diagonal" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:LineArrowStart" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:LineCircleArrow" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:LineSquareArrow" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrows" toolbar:style="radio"/>
<toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrowStart" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrowCircle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrowSquare" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:MeasureLine" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:LineArrows" toolbar:style="radio"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:Line_Diagonal" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:style="radio"/>
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/basicshapes.xml b/sd/uiconfig/sdraw/toolbar/basicshapes.xml
index e0ff214..17a56ad 100644
--- a/sd/uiconfig/sdraw/toolbar/basicshapes.xml
+++ b/sd/uiconfig/sdraw/toolbar/basicshapes.xml
@@ -22,25 +22,27 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
<toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie"/>
+ <toolbar:toolbaritem xlink:href=".uno:CircleCut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Arc"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
+ <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
<toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml b/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml
index 84895cf..eb407c6 100644
--- a/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml
@@ -18,20 +18,18 @@
* 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:ToggleObjectBezierMode" toolbar:style="radio auto"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierMove"/>
<toolbar:toolbaritem xlink:href=".uno:BezierInsert"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierDelete"/>
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierConvert"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierClose"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierCutLine"/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierEdge"/>
<toolbar:toolbaritem xlink:href=".uno:BezierSmooth"/>
<toolbar:toolbaritem xlink:href=".uno:BezierSymmetric"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose"/>
- <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/calloutshapes.xml b/sd/uiconfig/sdraw/toolbar/calloutshapes.xml
index 7bf4756..e894bc1 100644
--- a/sd/uiconfig/sdraw/toolbar/calloutshapes.xml
+++ b/sd/uiconfig/sdraw/toolbar/calloutshapes.xml
@@ -22,7 +22,8 @@
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout"/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout"/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout"/>
+ <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1"/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2"/>
<toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/connectorsbar.xml b/sd/uiconfig/sdraw/toolbar/connectorsbar.xml
index 7833f73..7fa0524 100644
--- a/sd/uiconfig/sdraw/toolbar/connectorsbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/connectorsbar.xml
@@ -26,14 +26,6 @@
<toolbar:toolbaritem xlink:href=".uno:ConnectorCircleEnd" toolbar:visible="false" toolbar:helpid="27123"/>
<toolbar:toolbaritem xlink:href=".uno:ConnectorCircles" toolbar:visible="false" toolbar:helpid="27124"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLines" toolbar:helpid="27139"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowStart" toolbar:visible="false" toolbar:helpid="27140"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowEnd" toolbar:helpid="27141"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrows" toolbar:helpid="27142"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleStart" toolbar:visible="false" toolbar:helpid="27143"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleEnd" toolbar:visible="false" toolbar:helpid="27144"/>
- <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircles" toolbar:visible="false" toolbar:helpid="27145"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:ConnectorLine" toolbar:helpid="27125"/>
<toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowStart" toolbar:visible="false" toolbar:helpid="27126"/>
<toolbar:toolbaritem xlink:href=".uno:ConnectorLineArrowEnd" toolbar:helpid="27127"/>
@@ -49,4 +41,12 @@
<toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleStart" toolbar:visible="false" toolbar:helpid="27136"/>
<toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircleEnd" toolbar:visible="false" toolbar:helpid="27137"/>
<toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircles" toolbar:visible="false" toolbar:helpid="27138"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLines" toolbar:helpid="27139"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowStart" toolbar:visible="false" toolbar:helpid="27140"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrowEnd" toolbar:helpid="27141"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesArrows" toolbar:helpid="27142"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleStart" toolbar:visible="false" toolbar:helpid="27143"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircleEnd" toolbar:visible="false" toolbar:helpid="27144"/>
+ <toolbar:toolbaritem xlink:href=".uno:ConnectorLinesCircles" toolbar:visible="false" toolbar:helpid="27145"/>
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
index 996bece..227f577 100644
--- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
@@ -20,25 +20,25 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DesignerDialog" toolbar:visible="false" toolbar:helpid="5539"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:visible="false" toolbar:helpid="10143"/>
- <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:visible="false" toolbar:helpid="10301"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:helpid="10143"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineEndStyle" toolbar:helpid="10301"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:visible="false" toolbar:helpid="10169"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineStyle" toolbar:helpid="10169"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false" toolbar:helpid="10142"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:helpid="10164"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:visible="false" toolbar:helpid="10299"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:visible="false" toolbar:helpid="10371"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="10299"/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:helpid="10371"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:style="radio dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:style="dropdown" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:style="dropdown" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:DistributeSelection" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:DistributeSelection"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
index 3af5bc9..90abc87 100644
--- a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
@@ -20,21 +20,21 @@
<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:GraphicFilterToolbox" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:GrafMode"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ColorSettings" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ColorSettings"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GrafTransparence" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:GrafTransparence"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FormatLine" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatLine"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillShadow"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Crop"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:style="radio dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:style="dropdown" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:style="dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:style="dropdown"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/linesbar.xml b/sd/uiconfig/sdraw/toolbar/linesbar.xml
index 9c3ffaf..3c8dd0f 100644
--- a/sd/uiconfig/sdraw/toolbar/linesbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/linesbar.xml
@@ -18,14 +18,14 @@
* 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:BezierFill" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:style="radio"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:style="radio"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal_Unfilled" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierFill" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Polygon_Diagonal" toolbar:style="radio"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index 2efee39..5a6de30 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -28,6 +28,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportTo"/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
<toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Print"/>
@@ -40,7 +41,7 @@
<toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="5701"/>
<toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="5700"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:helpid="20622"/>
+ <toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:visible="false" toolbar:helpid="20622"/>
<toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:visible="false" toolbar:helpid="12021"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomMode" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomObjects" toolbar:visible="false"/>
@@ -62,9 +63,13 @@
<toolbar:toolbaritem xlink:href=".uno:DistributeSelection" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="10299"/>
+ <toolbar:toolbaritem xlink:href=".uno:Crop"/>
<toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:helpid="10371"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:style="auto" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
+ <toolbar:toolbaritem xlink:href=".uno:GlueEditMode" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
diff --git a/sd/uiconfig/sdraw/toolbar/starshapes.xml b/sd/uiconfig/sdraw/toolbar/starshapes.xml
index 7168e3c..cc9cfd6 100644
--- a/sd/uiconfig/sdraw/toolbar/starshapes.xml
+++ b/sd/uiconfig/sdraw/toolbar/starshapes.xml
@@ -18,17 +18,17 @@
* 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:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star4"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star5"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star6"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star8"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star12"/>
- <toolbar:toolbarbreak/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.star24"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:StarShapes.bang"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.vertical-scroll"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.horizontal-scroll"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.signet"/>
<toolbar:toolbaritem xlink:href=".uno:StarShapes.doorplate"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:StarShapes.concave-star6"/>
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml
index 5466bb6..ee1ef3d 100644
--- a/sd/uiconfig/sdraw/toolbar/toolbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml
@@ -18,42 +18,48 @@
* 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:SelectObject" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:style="radio" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomMode"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomObjects" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:visible="false"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:FillStyle" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:Freeline" toolbar:style="radio" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowsToolbox" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:style="radio" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:style="radio" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:LineToolbox" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowsToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ConnectorToolbox" toolbar:style="radio dropdown"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:style="radio dropdown" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes" toolbar:style="radio dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes" toolbar:style="radio dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:style="radio dropdown" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:style="radio dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:StarShapes" toolbar:style="radio dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Objects3DToolbox" toolbar:style="radio dropdown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
- <toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126"/>
- <toolbar:toolbaritem xlink:href=".uno:GlueEditMode" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="10126" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:GlueEditMode" toolbar:style="auto" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ChangeBezier" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ChangePolygon" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ConvertInto3D" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLatheFast" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Objects3DToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:style="radio dropdown" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:Config" toolbar:style="dropdown" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960" toolbar:visible="false"/>
</toolbar:toolbar>
More information about the Libreoffice-commits
mailing list