diff options
| author | Yousuf Philips <philipz85@hotmail.com> | 2017-12-07 02:34:43 +0400 |
|---|---|---|
| committer | Yousuf Philips <philipz85@hotmail.com> | 2017-12-19 00:50:41 +0100 |
| commit | e027dc4629db2959e2c62b97b463c1846849dbd7 (patch) | |
| tree | 300bf01ad8ad109f986022a2ca13633ccef6f243 /sd | |
| parent | 35589bc4e390282f1e26b9900addc3742e61b3ff (diff) | |
tdf#81475 Organize the form toolbars
Change-Id: Ic79b326c4c15f656ce533eb37bbd27853b8f4af7
Reviewed-on: https://gerrit.libreoffice.org/43861
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit f894386a8fe58639c295048fe7894f68613a0df1)
Reviewed-on: https://gerrit.libreoffice.org/46465
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/uiconfig/sdraw/toolbar/formcontrols.xml | 24 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/toolbar/moreformcontrols.xml | 22 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/toolbar/formcontrols.xml | 24 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/toolbar/moreformcontrols.xml | 22 |
4 files changed, 44 insertions, 48 deletions
diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml index 3905ded90a70..f40d374ec59a 100644 --- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml +++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml @@ -21,23 +21,29 @@ <toolbar:toolbaritem xlink:href=".uno:SelectObject"/> <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/> - <toolbar:toolbaritem xlink:href=".uno:FormProperties"/> + <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:CheckBox"/> + <toolbar:toolbaritem xlink:href=".uno:Label"/> <toolbar:toolbaritem xlink:href=".uno:Edit"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FormattedField"/> - <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/> - <toolbar:toolbarbreak/> + <toolbar:toolbaritem xlink:href=".uno:CheckBox"/> <toolbar:toolbaritem xlink:href=".uno:RadioButton"/> - <toolbar:toolbaritem xlink:href=".uno:ListBox"/> <toolbar:toolbarbreak/> + <toolbar:toolbaritem xlink:href=".uno:ListBox"/> <toolbar:toolbaritem xlink:href=".uno:ComboBox"/> - <toolbar:toolbaritem xlink:href=".uno:Label"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/> + <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/> + <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/> + <toolbar:toolbarbreak/> + <toolbar:toolbaritem xlink:href=".uno:FormattedField"/> + <toolbar:toolbaritem xlink:href=".uno:DateField"/> + <toolbar:toolbarbreak/> + <toolbar:toolbaritem xlink:href=".uno:NumericField"/> + <toolbar:toolbaritem xlink:href=".uno:GroupBox"/> + <toolbar:toolbarbreak/> <toolbar:toolbaritem xlink:href=".uno:MoreControls"/> + <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/> <toolbar:toolbarbreak/> <toolbar:toolbaritem xlink:href=".uno:UseWizards"/> </toolbar:toolbar> diff --git a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml index 1b1bbcef1b61..14f2d133dc05 100644 --- a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml +++ b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml @@ -18,23 +18,15 @@ * 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:SpinButton"/> - <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/> - <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/> - <toolbar:toolbaritem xlink:href=".uno:ImageControl"/> - <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FileControl"/> - <toolbar:toolbaritem xlink:href=".uno:DateField"/> - <toolbar:toolbarbreak/> <toolbar:toolbaritem xlink:href=".uno:TimeField"/> - <toolbar:toolbaritem xlink:href=".uno:NumericField"/> + <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/> <toolbar:toolbaritem xlink:href=".uno:PatternField"/> + <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:GroupBox"/> - <toolbar:toolbaritem xlink:href=".uno:Grid"/> + <toolbar:toolbaritem xlink:href=".uno:ImageControl"/> + <toolbar:toolbaritem xlink:href=".uno:FileControl"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/> -</toolbar:toolbar>
\ No newline at end of file + <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/> +</toolbar:toolbar> diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml index 3905ded90a70..f40d374ec59a 100644 --- a/sd/uiconfig/simpress/toolbar/formcontrols.xml +++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml @@ -21,23 +21,29 @@ <toolbar:toolbaritem xlink:href=".uno:SelectObject"/> <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/> - <toolbar:toolbaritem xlink:href=".uno:FormProperties"/> + <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:CheckBox"/> + <toolbar:toolbaritem xlink:href=".uno:Label"/> <toolbar:toolbaritem xlink:href=".uno:Edit"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FormattedField"/> - <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/> - <toolbar:toolbarbreak/> + <toolbar:toolbaritem xlink:href=".uno:CheckBox"/> <toolbar:toolbaritem xlink:href=".uno:RadioButton"/> - <toolbar:toolbaritem xlink:href=".uno:ListBox"/> <toolbar:toolbarbreak/> + <toolbar:toolbaritem xlink:href=".uno:ListBox"/> <toolbar:toolbaritem xlink:href=".uno:ComboBox"/> - <toolbar:toolbaritem xlink:href=".uno:Label"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/> + <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/> + <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/> + <toolbar:toolbarbreak/> + <toolbar:toolbaritem xlink:href=".uno:FormattedField"/> + <toolbar:toolbaritem xlink:href=".uno:DateField"/> + <toolbar:toolbarbreak/> + <toolbar:toolbaritem xlink:href=".uno:NumericField"/> + <toolbar:toolbaritem xlink:href=".uno:GroupBox"/> + <toolbar:toolbarbreak/> <toolbar:toolbaritem xlink:href=".uno:MoreControls"/> + <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/> <toolbar:toolbarbreak/> <toolbar:toolbaritem xlink:href=".uno:UseWizards"/> </toolbar:toolbar> diff --git a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml index 1b1bbcef1b61..14f2d133dc05 100644 --- a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml +++ b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml @@ -18,23 +18,15 @@ * 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:SpinButton"/> - <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/> - <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/> - <toolbar:toolbaritem xlink:href=".uno:ImageControl"/> - <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FileControl"/> - <toolbar:toolbaritem xlink:href=".uno:DateField"/> - <toolbar:toolbarbreak/> <toolbar:toolbaritem xlink:href=".uno:TimeField"/> - <toolbar:toolbaritem xlink:href=".uno:NumericField"/> + <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/> <toolbar:toolbaritem xlink:href=".uno:PatternField"/> + <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:GroupBox"/> - <toolbar:toolbaritem xlink:href=".uno:Grid"/> + <toolbar:toolbaritem xlink:href=".uno:ImageControl"/> + <toolbar:toolbaritem xlink:href=".uno:FileControl"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/> -</toolbar:toolbar>
\ No newline at end of file + <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/> +</toolbar:toolbar> |