summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2014-11-23 14:50:11 +0400
committerCaolán McNamara <caolanm@redhat.com>2014-11-24 20:45:49 +0000
commit68c1cc33810e14c2e45e7da9f7a60429c8a942a6 (patch)
treee6b71c446ad83ec2d922c1e118c3d593323463a8
parentfe095dada4e83129d49c8cc50501aa224d61e0f9 (diff)
fdo#84909 move zoom to object and added/hid/unhid some other buttons
Change-Id: I5235c790f7e9b755ef57a9e6643b049ea802ec30 Reviewed-on: https://gerrit.libreoffice.org/13063 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sd/uiconfig/simpress/toolbar/drawingobjectbar.xml4
-rw-r--r--sd/uiconfig/simpress/toolbar/graphicobjectbar.xml2
-rw-r--r--sd/uiconfig/simpress/toolbar/standardbar.xml1
-rw-r--r--sd/uiconfig/simpress/toolbar/tableobjectbar.xml6
-rw-r--r--sd/uiconfig/simpress/toolbar/toolbar.xml2
5 files changed, 9 insertions, 6 deletions
diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
index 79a037fa1f22..33a37ee0385f 100644
--- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
@@ -46,5 +46,7 @@
<toolbar:toolbaritem xlink:href=".uno:CustomAnimation" toolbar:style="auto" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:AnimationEffects"/>
<toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:style="auto" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomObjects"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:HelplinesMove"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
index ab3943086f67..7b34facc0a04 100644
--- a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
@@ -33,7 +33,7 @@
<toolbar:toolbaritem xlink:href=".uno:Crop"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:TransformDialog"/>
<toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:style="dropdown"/>
<toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:style="dropdown"/>
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml
index 3f71ac7bc48b..b3bb79552ee8 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -44,6 +44,7 @@
<toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomMode"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomToolBox" toolbar:style="dropdown" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomObjects"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertTable"/>
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
diff --git a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
index 156447cd9ed2..280d57ae0c47 100644
--- a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
@@ -18,12 +18,12 @@
* 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:InsertTable"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
<toolbar:toolbaritem xlink:href=".uno:FillStyle"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
@@ -43,6 +43,6 @@
<toolbar:toolbaritem xlink:href=".uno:EntireColumn" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:EntireRow" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:TableDesign"/>
+ <toolbar:toolbaritem xlink:href=".uno:TableDesign" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:TableDialog"/>
</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml b/sd/uiconfig/simpress/toolbar/toolbar.xml
index 2e08ab4fc222..aaba0b07e7ec 100644
--- a/sd/uiconfig/simpress/toolbar/toolbar.xml
+++ b/sd/uiconfig/simpress/toolbar/toolbar.xml
@@ -46,7 +46,7 @@
<toolbar:toolbaritem xlink:href=".uno:ConvertInto3DLatheFast" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FontworkGalleryFloater"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" 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"/>