tdf#90492 Rearrange toolbars and buttons in Chart

Change-Id: I8594ad75b82ea4d8b5178de7e1f44e7402b22fda
Reviewed-on: https://gerrit.libreoffice.org/15225Tested-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>

chart2/uiconfig/toolbar/standardbar.xml

@@ -18,23 +18,20 @@
  *   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:AddDirect" toolbar:text="" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:text="" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:text="" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:text="" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:text="" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:text="" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text=""/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
 </toolbar:toolbar>

chart2/uiconfig/toolbar/toolbar.xml

@@ -21,13 +21,27 @@
  <toolbar:toolbaritem xlink:href=".uno:ChartElementSelector"/>
  <toolbar:toolbaritem xlink:href=".uno:FormatSelection"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DiagramType" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:DiagramData" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DiagramType"/>
+ <toolbar:toolbaritem xlink:href=".uno:DiagramArea"/>
+ <toolbar:toolbaritem xlink:href=".uno:DiagramWall"/>
+ <toolbar:toolbaritem xlink:href=".uno:View3D"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleGridHorizontal" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleGridVertical" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleLegend" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:ScaleText" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:DataRanges"/>
+ <toolbar:toolbaritem xlink:href=".uno:DiagramData"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:NewArrangement" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertMenuTitles"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleLegend"/>
+ <toolbar:toolbaritem xlink:href=".uno:Legend"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleGridHorizontal"/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleGridVertical"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:DiagramAxisX"/>
+ <toolbar:toolbaritem xlink:href=".uno:DiagramAxisY"/>
+ <toolbar:toolbaritem xlink:href=".uno:DiagramAxisZ"/>
+ <toolbar:toolbaritem xlink:href=".uno:DiagramAxisAll"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ScaleText" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:NewArrangement" toolbar:visible="false"/>
 </toolbar:toolbar>

icon-themes/galaxy/links.txt

@@ -51,3 +51,9 @@ cmd/sc_removetableof.png cmd/sc_cancel.png
 cmd/lc_insertrowbreak.png cmd/lc_insertpagebreak.png
 cmd/sc_insertrowbreak.png cmd/sc_insertpagebreak.png
 
+# chart app
+cmd/lc_formatselection.png sfx2/res/symphony/sidebar-property-large.png
+cmd/sc_formatselection.png sfx2/res/symphony/sidebar-property-small.png
+cmd/lc_view3d.png sfx2/res/symphony/sidebar-3d-large.png
+cmd/sc_view3d.png sfx2/res/symphony/sidebar-3d-small.png
+

officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu

@@ -11,6 +11,9 @@
       </node>
       <node oor:name=".uno:InsertMenuLegend" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Position</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Legend...</value>
         </prop>
       </node>
@@ -54,9 +57,15 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Format Selection...</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:Legend" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Format Legend</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Legend...</value>
         </prop>
       </node>
@@ -90,7 +99,7 @@
       </node>
       <node oor:name=".uno:DiagramData" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Chart ~Data Table...</value>
+          <value xml:lang="en-US">~Data Table...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -493,7 +502,7 @@
       </node>
       <node oor:name=".uno:ToggleGridHorizontal" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Horizontal Grid Major/Major&amp;Minor/Off</value>
+          <value xml:lang="en-US">Horizontal Grids</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -547,7 +556,7 @@
       </node>
       <node oor:name=".uno:ToggleGridVertical" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Vertical Grid Major/Major&amp;Minor/Off</value>
+          <value xml:lang="en-US">Vertical Grids</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>

officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu

@@ -27,6 +27,9 @@
         <prop oor:name="DockingArea" oor:type="xs:int">
           <value>0</value>
         </prop>
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,0</value>
+        </prop>
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Standard</value>
         </prop>
@@ -41,12 +44,18 @@
         <prop oor:name="DockingArea" oor:type="xs:int">
           <value>0</value>
         </prop>
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,1</value>
+        </prop>
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Formatting</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>true</value>
         </prop>
+        <prop oor:name="Style" oor:type="xs:int">
+          <value>0</value>
+        </prop>
       </node>
       <node oor:name="private:resource/toolbar/drawbar" oor:op="replace">
         <prop oor:name="Docked" oor:type="xs:boolean">
@@ -59,7 +68,7 @@
           <value xml:lang="en-US">Drawing</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>true</value>
+          <value>false</value>
         </prop>
       </node>
       <node oor:name="private:resource/toolbar/basicshapes" oor:op="replace">