summaryrefslogtreecommitdiff
path: root/sw/uiconfig/swriter
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-02-15 01:39:02 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2017-02-15 00:19:45 +0000
commitcdf4b2bba8d694299c784f46fe3ecef2ce41171e (patch)
treee5f03def77b83750255865aeb44d4262f4946665 /sw/uiconfig/swriter
parent3fac6aa16eb4b3e19100725f9fc2350cfe9ecee8 (diff)
Related: tdf#105672 Load toolbar properties from .ui
- Supports toolbar-style, icon-size, orientation. - Defaults are: toolbar-style = icons only icon-size = what's set in Tools > Options... for Sidebar/Notebookbar orientation = horizontal - Remove no longer needed BigToolBox (use toolbar-style=both + icon-size=3 instead). Change-Id: I185388255a351dfd6719a363b7e399bf36b0b25d Reviewed-on: https://gerrit.libreoffice.org/34281 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sw/uiconfig/swriter')
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar.ui24
1 files changed, 18 insertions, 6 deletions
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index fa77d74cac91..cc0c70c60b29 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -406,9 +406,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-BigToolBox" id="pastebox">
+ <object class="sfxlo-NotebookbarToolBox" id="pastebox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">both</property>
+ <property name="icon_size">3</property>
<property name="valign">center</property>
<property name="show_arrow">False</property>
<child>
@@ -1875,9 +1877,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-BigToolBox" id="tablebox">
+ <object class="sfxlo-NotebookbarToolBox" id="tablebox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">both</property>
+ <property name="icon_size">3</property>
<property name="valign">center</property>
<property name="show_arrow">False</property>
<child>
@@ -2801,9 +2805,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-BigToolBox" id="sizebox">
+ <object class="sfxlo-NotebookbarToolBox" id="sizebox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">both</property>
+ <property name="icon_size">3</property>
<property name="valign">center</property>
<property name="show_arrow">False</property>
<child>
@@ -2828,9 +2834,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-BigToolBox" id="columnbox">
+ <object class="sfxlo-NotebookbarToolBox" id="columnbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">both</property>
+ <property name="icon_size">3</property>
<property name="valign">center</property>
<property name="show_arrow">False</property>
<child>
@@ -2855,9 +2863,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-BigToolBox" id="orientationbox">
+ <object class="sfxlo-NotebookbarToolBox" id="orientationbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">both</property>
+ <property name="icon_size">3</property>
<property name="valign">center</property>
<property name="show_arrow">False</property>
<child>
@@ -2882,9 +2892,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-BigToolBox" id="marginbox">
+ <object class="sfxlo-NotebookbarToolBox" id="marginbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">both</property>
+ <property name="icon_size">3</property>
<property name="valign">center</property>
<property name="show_arrow">False</property>
<child>