extras/source/glade/libreoffice-catalog.xml.in | 3
sc/uiconfig/scalc/ui/notebookbar.ui | 1861 +++++++------
sfx2/Library_sfx.mk | 1
sfx2/UIConfig_sfx.mk | 1
sfx2/source/notebookbar/DropdownBox.cxx | 166 +
sfx2/source/notebookbar/DropdownBox.hxx | 54
sfx2/source/notebookbar/PriorityHBox.cxx | 10
sfx2/uiconfig/ui/notebookbarpopup.ui | 29
sw/uiconfig/swriter/ui/notebookbar.ui | 3427 ++++++++++++++-----------
9 files changed, 3256 insertions(+), 2296 deletions(-)
New commits:
commit e8fc80a0f03065ceb2c4f80facf08948d573b9af
Author: Szymon KÅos <eszka...@gmail.com>
Date: Fri Jul 15 09:03:30 2016 +0200
GSoC notebookbar: dropdown with hidden objects
+ added dropdown for hidden content
Change-Id: I86c9277d91b18fbe9e8505ccf170196fdb28638f
Reviewed-on: https://gerrit.libreoffice.org/27241
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 4d8be37..4be35f2 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -836,5 +836,8 @@
<glade-widget-class title="Custom Animation" name="sdlo-CustomAnimationBox"
generic-name="CustomAnimationBox" parent="GtkImage"
icon-name="widget-gtk-image"/>
+ <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-classes>
</glade-catalog>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 6d53571..28f1e28 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -267,7 +267,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box28">
+ <object class="sfxlo-DropdownBox" id="box28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -297,7 +297,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box33">
+ <object class="sfxlo-DropdownBox" id="box33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -343,7 +343,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="sfxlo-DropdownBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -448,7 +448,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="sfxlo-DropdownBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -748,41 +748,93 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="sfxlo-DropdownBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-SidebarToolBox" id="fontadjust">
+ <object class="GtkBox" id="box29">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="show_arrow">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkToolButton" id="grow1">
- <property
name="use_action_appearance">False</property>
+ <object class="sfxlo-SidebarToolBox" id="fontadjust">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property name="action_name">.uno:Grow</property>
- <property name="use_underline">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="grow1">
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property
name="action_name">.uno:Grow</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="shrink1">
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property
name="action_name">.uno:Shrink</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="shrink1">
- <property
name="use_action_appearance">False</property>
+ <object class="sfxlo-SidebarToolBox" id="position">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property name="action_name">.uno:Shrink</property>
- <property name="use_underline">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="subscript1">
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property
name="action_name">.uno:SubScript</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="superscript1">
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property
name="action_name">.uno:SuperScript</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -792,46 +844,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="sfxlo-SidebarToolBox" id="position">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="subscript1">
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property
name="action_name">.uno:SubScript</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="superscript1">
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property
name="action_name">.uno:SuperScript</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
<style>
<class name="priority-3"/>
</style>
@@ -843,74 +855,167 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="sfxlo-DropdownBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator2">
+ <object class="GtkBox" id="box49">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box19">
+ <object class="GtkSeparator" id="separator2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="sfxlo-SidebarToolBox"
id="verticalalignment">
+ <object class="GtkBox" id="box19">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">Vertical Alignment</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="show_arrow">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkToolButton" id="AlignTop">
+ <object class="sfxlo-SidebarToolBox"
id="verticalalignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:AlignTop</property>
- <property
name="use_underline">True</property>
+ <property
name="has_tooltip">True</property>
+ <property name="tooltip_text"
translatable="yes">Vertical Alignment</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="AlignTop">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:AlignTop</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="AlignVCenter">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:AlignVCenter</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="AlignBottom">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:AlignBottom</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="AlignVCenter">
+ <object class="sfxlo-SidebarToolBox"
id="writedirection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:AlignVCenter</property>
- <property
name="use_underline">True</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="lefttoright1">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:ParaLeftToRight</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="righttoleft1">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:ParaRightToLeft</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="AlignBottom">
+ <object class="sfxlo-SidebarToolBox"
id="textdir">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:AlignBottom</property>
- <property
name="use_underline">True</property>
+ <property
name="has_tooltip">True</property>
+ <child>
+ <object class="GtkToolButton"
id="TextdirectionLeftToRight1">
+ <property
name="use_action_appearance">False</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="has_tooltip">True</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:TextdirectionLeftToRight</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="TextdirectionTopToBottom1">
+ <property
name="use_action_appearance">False</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="has_tooltip">True</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:TextdirectionTopToBottom</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -921,124 +1026,214 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox"
id="writedirection">
+ <object class="GtkBox" id="box43">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="show_arrow">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkToolButton"
id="lefttoright1">
+ <object class="sfxlo-SidebarToolBox"
id="horizontalalignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="is_important">True</property>
- <property
name="action_name">.uno:ParaLeftToRight</property>
- <property
name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="righttoleft1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="is_important">True</property>
- <property
name="action_name">.uno:ParaRightToLeft</property>
- <property
name="use_underline">True</property>
+ <property
name="has_tooltip">True</property>
+ <property name="tooltip_text"
translatable="yes">Horizontal Alignment</property>
+ <property name="halign">start</property>
+ <property
name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="AlignLeft">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:AlignLeft</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="AlignHorizontalCenter">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:AlignHorizontalCenter</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="AlignRight">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:AlignRight</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="AlignBlock">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:AlignBlock</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-SidebarToolBox"
id="textdir">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
<child>
- <object class="GtkToolButton"
id="TextdirectionLeftToRight1">
- <property
name="use_action_appearance">False</property>
+ <object class="sfxlo-SidebarToolBox"
id="indent">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="has_tooltip">True</property>
- <property
name="is_important">True</property>
- <property
name="action_name">.uno:TextdirectionLeftToRight</property>
- <property
name="use_underline">True</property>
+ <property name="tooltip_text"
translatable="yes">Indent</property>
+ <child>
+ <object class="GtkToolButton"
id="increaseindent1">
+ <property
name="use_action_appearance">False</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="has_tooltip">True</property>
+ <property name="tooltip_text"
translatable="yes">Increase Indent</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:IncrementIndent</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="decreaseindent1">
+ <property
name="use_action_appearance">False</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="has_tooltip">True</property>
+ <property name="tooltip_text"
translatable="yes">Decrease Indent</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:DecrementIndent</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="TextdirectionTopToBottom1">
- <property
name="use_action_appearance">False</property>
+ <object class="sfxlo-SidebarToolBox"
id="wrap">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="has_tooltip">True</property>
- <property
name="is_important">True</property>
- <property
name="action_name">.uno:TextdirectionTopToBottom</property>
- <property
name="use_underline">True</property>
+ <child>
+ <object class="GtkToolButton"
id="WrapText1">
+ <property
name="use_action_appearance">False</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="has_tooltip">True</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:WrapText</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-5"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-DropdownBox" id="box7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="box50">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkSeparator" id="separator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box43">
+ <object class="GtkBox" id="box44">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="sfxlo-SidebarToolBox"
id="horizontalalignment">
+ <object class="sfxlo-SidebarToolBox"
id="numberformat">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">Horizontal Alignment</property>
- <property name="halign">start</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="AlignLeft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:AlignLeft</property>
- <property
name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="AlignHorizontalCenter">
+ <object class="GtkToolButton"
id="NumberFormatType">
+ <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:AlignHorizontalCenter</property>
+ <property
name="action_name">.uno:NumberFormatType</property>
<property
name="use_underline">True</property>
</object>
<packing>
@@ -1046,11 +1241,24 @@
<property
name="homogeneous">True</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-SidebarToolBox"
id="numberformat1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="AlignRight">
+ <object class="GtkToolButton" id="currency">
+ <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:AlignRight</property>
+ <property
name="action_name">.uno:NumberFormatCurrency</property>
<property
name="use_underline">True</property>
</object>
<packing>
@@ -1059,10 +1267,11 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="AlignBlock">
+ <object class="GtkToolButton" id="percent">
+ <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:AlignBlock</property>
+ <property
name="action_name">.uno:NumberFormatPercent</property>
<property
name="use_underline">True</property>
</object>
<packing>
@@ -1070,28 +1279,12 @@
<property
name="homogeneous">True</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-SidebarToolBox" id="indent">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">Indent</property>
<child>
- <object class="GtkToolButton"
id="increaseindent1">
+ <object class="GtkToolButton"
id="numericfield">
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">Increase Indent</property>
- <property
name="is_important">True</property>
- <property
name="action_name">.uno:IncrementIndent</property>
+ <property
name="action_name">.uno:NumberFormatDecimal</property>
<property
name="use_underline">True</property>
</object>
<packing>
@@ -1100,14 +1293,11 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="decreaseindent1">
+ <object class="GtkToolButton"
id="NumberFormatIncDecimals">
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">Decrease Indent</property>
- <property
name="is_important">True</property>
- <property
name="action_name">.uno:DecrementIndent</property>
+ <property
name="action_name">.uno:NumberFormatIncDecimals</property>
<property
name="use_underline">True</property>
</object>
<packing>
@@ -1115,27 +1305,12 @@
<property
name="homogeneous">True</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-SidebarToolBox" id="wrap">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
<child>
- <object class="GtkToolButton" id="WrapText1">
+ <object class="GtkToolButton"
id="NumberFormatDecDecimals">
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="has_tooltip">True</property>
- <property
name="is_important">True</property>
- <property
name="action_name">.uno:WrapText</property>
+ <property
name="action_name">.uno:NumberFormatDecDecimals</property>
<property
name="use_underline">True</property>
</object>
<packing>
@@ -1147,8 +1322,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1162,7 +1336,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<style>
@@ -1172,48 +1346,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box7">
+ <object class="sfxlo-DropdownBox" id="box14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box44">
+ <object class="GtkBox" id="box51">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="sfxlo-SidebarToolBox"
id="numberformat">
+ <object class="GtkSeparator" id="separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton"
id="NumberFormatType">
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:NumberFormatType</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1222,73 +1370,38 @@
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox"
id="numberformat1">
+ <object class="GtkBox" id="box40">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="currency">
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:NumberFormatCurrency</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="percent">
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:NumberFormatPercent</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="numericfield">
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:NumberFormatDecimal</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkToolButton"
id="NumberFormatIncDecimals">
- <property
name="use_action_appearance">False</property>
+ <object class="GtkButton"
id="ConditionalFormatMenu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:NumberFormatIncDecimals</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="action_name">.uno:ConditionalFormatMenu</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="NumberFormatDecDecimals">
- <property
name="use_action_appearance">False</property>
+ <object class="GtkButton" id="ToggleMergeCells">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:NumberFormatDecDecimals</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="action_name">.uno:ToggleMergeCells</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1302,77 +1415,9 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <style>
- <class name="priority-5"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">11</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkSeparator" id="separator4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkBox" id="box40">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkButton" id="ConditionalFormatMenu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:ConditionalFormatMenu</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="ToggleMergeCells">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:ToggleMergeCells</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
<style>
<class name="priority-2"/>
</style>
@@ -1384,109 +1429,120 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box12">
+ <object class="sfxlo-DropdownBox" id="box12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="box41">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="sfxlo-SidebarToolBox" id="rows">
+ <object class="GtkSeparator" id="separator5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <child>
- <object class="GtkToolButton"
id="InsertRowsBefore">
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="is_important">True</property>
- <property
name="action_name">.uno:InsertRowsBefore</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="DeleteRows">
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="is_important">True</property>
- <property
name="action_name">.uno:DeleteRows</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="cols">
+ <object class="GtkBox" id="box52">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkToolButton"
id="InsertColumnsBefore">
- <property
name="use_action_appearance">False</property>
+ <object class="sfxlo-SidebarToolBox" id="rows">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="is_important">True</property>
- <property
name="action_name">.uno:InsertColumnsBefore</property>
- <property name="use_underline">True</property>
+ <child>
+ <object class="GtkToolButton"
id="InsertRowsBefore">
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="has_tooltip">True</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:InsertRowsBefore</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="DeleteRows">
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="has_tooltip">True</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:DeleteRows</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="DeleteColumns">
- <property
name="use_action_appearance">False</property>
+ <object class="sfxlo-SidebarToolBox" id="cols">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="is_important">True</property>
- <property
name="action_name">.uno:DeleteColumns</property>
- <property name="use_underline">True</property>
+ <child>
+ <object class="GtkToolButton"
id="InsertColumnsBefore">
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="has_tooltip">True</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:InsertColumnsBefore</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="DeleteColumns">
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="has_tooltip">True</property>
+ <property
name="is_important">True</property>
+ <property
name="action_name">.uno:DeleteColumns</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -1504,38 +1560,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box13">
+ <object class="sfxlo-DropdownBox" id="box13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box42">
+ <object class="GtkBox" id="box53">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkButton" id="SearchDialog">
+ <object class="GtkSeparator" id="separator6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:SearchDialog</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1544,13 +1584,40 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="DataSort">
+ <object class="GtkBox" id="box42">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:DataSort</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkButton" id="SearchDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="action_name">.uno:SearchDialog</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="DataSort">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="action_name">.uno:DataSort</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1562,7 +1629,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<style>
@@ -1636,18 +1703,45 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box16">
+ <object class="sfxlo-DropdownBox" id="box16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="vcllo-SmallButton" id="InsertGraphic">
+ <object class="GtkBox" id="box54">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:InsertGraphic</property>
- <property name="image">InsertGraphicImg</property>
- <property name="relief">none</property>
- <property name="image_position">top</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="vcllo-SmallButton" id="InsertGraphic">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="action_name">.uno:InsertGraphic</property>
+ <property name="image">InsertGraphicImg</property>
+ <property name="relief">none</property>
+ <property name="image_position">top</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="vcllo-SmallButton" id="InsertAVMedia">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="action_name">.uno:InsertAVMedia</property>
+ <property name="image">InsertAVMediaImg</property>
+ <property name="relief">none</property>
+ <property name="image_position">top</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1655,22 +1749,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="vcllo-SmallButton" id="InsertAVMedia">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:InsertAVMedia</property>
- <property name="image">InsertAVMediaImg</property>
- <property name="relief">none</property>
- <property name="image_position">top</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
<style>
<class name="priority-2"/>
</style>
@@ -1725,7 +1803,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box46">
+ <object class="sfxlo-DropdownBox" id="box46">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1771,7 +1849,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box47">
+ <object class="sfxlo-DropdownBox" id="box47">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1801,7 +1879,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box39">
+ <object class="sfxlo-DropdownBox" id="box39">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1847,14 +1925,41 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box45">
+ <object class="sfxlo-DropdownBox" id="box45">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator11">
+ <object class="GtkBox" id="box55">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkSeparator" id="separator11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="vcllo-SmallButton" id="DrawText">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="action_name">.uno:DrawText</property>
+ <property name="image">DrawTextImg</property>
+ <property name="relief">none</property>
+ <property name="image_position">top</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1862,22 +1967,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="vcllo-SmallButton" id="DrawText">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:DrawText</property>
- <property name="image">DrawTextImg</property>
- <property name="relief">none</property>
- <property name="image_position">top</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
<style>
<class name="priority-1"/>
</style>
@@ -1953,18 +2042,45 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box20">
+ <object class="sfxlo-DropdownBox" id="box20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkButton" id="ToggleSheetGrid">
+ <object class="GtkBox" id="box56">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:ToggleSheetGrid</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkButton" id="ToggleSheetGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="action_name">.uno:ToggleSheetGrid</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ViewRowColumnHeaders">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="action_name">.uno:ViewRowColumnHeaders</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1972,21 +2088,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="ViewRowColumnHeaders">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:ViewRowColumnHeaders</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
<style>
<class name="priority-1"/>
</style>
@@ -2042,39 +2143,50 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box18">
+ <object class="sfxlo-DropdownBox" id="box18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="vcllo-SmallButton" id="FormatGroup">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:FormatGroup</property>
- <property name="image">FormatGroupImg</property>
- <property name="relief">none</property>
- <property name="image_position">top</property>
- </object>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
