diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-15 01:39:02 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-15 00:19:45 +0000 |
| commit | cdf4b2bba8d694299c784f46fe3ecef2ce41171e (patch) | |
| tree | e5f03def77b83750255865aeb44d4262f4946665 /extras | |
| parent | 3fac6aa16eb4b3e19100725f9fc2350cfe9ecee8 (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 'extras')
| -rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 2019ab256c5c..6fea54ad7ebc 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -726,7 +726,12 @@ <glade-widget-class title="Sidebar ToolBox" name="sfxlo-SidebarToolBox" generic-name="Sidebar ToolBox" parent="GtkToolbar" - icon-name="widget-gtk-toolbar"/> + icon-name="widget-gtk-toolbar"> + <properties> + <!-- Must override the default value of "icon-size", so "Large Toolbar" will be saved into .ui --> + <property id="icon-size" optional-default="False" optional="True" default="GTK_ICON_SIZE_BUTTON"/> + </properties> + </glade-widget-class> <glade-widget-class title="Writer Navigator ToolBox" name="swlo-SwNavHelpToolBox" generic-name="Writer Navigator ToolBox" parent="GtkToolbar" @@ -841,11 +846,8 @@ <glade-widget-class title="Box which can move own content to the popup" name="sfxlo-DropdownBox" generic-name="DropdownBox" parent="GtkBox" icon-name="widget-gtk-box"/> - <glade-widget-class title="Big ToolBox" name="sfxlo-BigToolBox" - generic-name="Big ToolBox" parent="GtkToolbar" - icon-name="widget-gtk-toolbar"/> <glade-widget-class title="Notebookbar ToolBox" name="sfxlo-NotebookbarToolBox" - generic-name="Notebookbar ToolBox" parent="GtkToolbar" + generic-name="Notebookbar ToolBox" parent="sfxlo-SidebarToolBox" icon-name="widget-gtk-toolbar"/> <glade-widget-class title="Vertical box hiding childs depending on context" name="sfxlo-ContextVBox" generic-name="ContextVBox" parent="GtkBox" |