diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-07-15 09:03:30 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-07-18 08:09:47 +0000 |
commit | e8fc80a0f03065ceb2c4f80facf08948d573b9af (patch) | |
tree | 0fe2f588a38bd7008c40c580fdd0a37f6d3dc9bd | |
parent | 54d8d7718b8ed3b3ddd47f3c2b993be689aeaab3 (diff) |
GSoC notebookbar: dropdown with hidden objects
+ added dropdown for hidden content
Change-Id: I86c9277d91b18fbe9e8505ccf170196fdb28638f
Reviewed-on: https://gerrit.libreoffice.org/27241
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 3 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar.ui | 1847 | ||||
-rw-r--r-- | sfx2/Library_sfx.mk | 1 | ||||
-rw-r--r-- | sfx2/UIConfig_sfx.mk | 1 | ||||
-rw-r--r-- | sfx2/source/notebookbar/DropdownBox.cxx | 166 | ||||
-rw-r--r-- | sfx2/source/notebookbar/DropdownBox.hxx | 54 | ||||
-rw-r--r-- | sfx2/source/notebookbar/PriorityHBox.cxx | 10 | ||||
-rw-r--r-- | sfx2/uiconfig/ui/notebookbarpopup.ui | 29 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui | 3341 |
9 files changed, 3206 insertions, 2246 deletions
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 4d8be37f194e..4be35f29602a 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 6d53571ffe83..28f1e28a3df0 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> + <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> <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="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"> + <object class="GtkBox" id="box53"> <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"> - <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,18 +2143,45 @@ </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"> + <object class="GtkBox" id="box57"> <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> + <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> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="vcllo-SmallButton" id="FormatUngroup"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:FormatUngroup</property> + <property name="image">FormatUngroupImg</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> @@ -2061,22 +2189,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="vcllo-SmallButton" id="FormatUngroup"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:FormatUngroup</property> - <property name="image">FormatUngroupImg</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> @@ -2109,49 +2221,60 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="box21"> + <object class="sfxlo-DropdownBox" id="box21"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkButton" id="ManageXMLSource"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ManageXMLSource</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="GtkButton" id="DataStreams"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:DataStreams</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> - <child> - <object class="GtkSeparator" id="separator15"> + <object class="GtkBox" id="box58"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="ManageXMLSource"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ManageXMLSource</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="GtkButton" id="DataStreams"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:DataStreams</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> + <child> + <object class="GtkSeparator" id="separator15"> + <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">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <style> @@ -2192,18 +2315,45 @@ </packing> </child> <child> - <object class="GtkBox" id="box23"> + <object class="sfxlo-DropdownBox" id="box23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="SortAscending"> + <object class="GtkBox" id="box59"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:SortAscending</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="SortAscending"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:SortAscending</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="SortDescending"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:SortDescending</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> @@ -2211,21 +2361,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="SortDescending"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:SortDescending</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> @@ -2365,17 +2500,43 @@ </packing> </child> <child> - <object class="GtkBox" id="box22"> + <object class="sfxlo-DropdownBox" id="box22"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkButton" id="TextToColumns"> + <object class="GtkBox" id="box60"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:TextToColumns</property> - <property name="relief">none</property> - <property name="image_position">top</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton" id="TextToColumns"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:TextToColumns</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="GtkButton" id="Validation"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:Validation</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> @@ -2383,21 +2544,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="Validation"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:Validation</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-3"/> </style> @@ -2409,17 +2555,43 @@ </packing> </child> <child> - <object class="GtkBox" id="box26"> + <object class="sfxlo-DropdownBox" id="box26"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkButton" id="DataConsolidate"> + <object class="GtkBox" id="box61"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:DataConsolidate</property> - <property name="relief">none</property> - <property name="image_position">top</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton" id="DataConsolidate"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:DataConsolidate</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="GtkButton" id="DataSubTotals"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:DataSubTotals</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> @@ -2427,21 +2599,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="DataSubTotals"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:DataSubTotals</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-3"/> </style> @@ -2453,17 +2610,43 @@ </packing> </child> <child> - <object class="GtkBox" id="box48"> + <object class="sfxlo-DropdownBox" id="box48"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkButton" id="DataForm"> + <object class="GtkBox" id="box62"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:DataForm</property> - <property name="relief">none</property> - <property name="image_position">top</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton" id="DataForm"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:DataForm</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="GtkButton" id="TableOperationDialog"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:TableOperationDialog</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> @@ -2471,21 +2654,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="TableOperationDialog"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:TableOperationDialog</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-3"/> </style> @@ -2550,7 +2718,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box27"> + <object class="sfxlo-DropdownBox" id="box27"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2608,18 +2776,45 @@ </packing> </child> <child> - <object class="GtkBox" id="box30"> + <object class="sfxlo-DropdownBox" id="box30"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="EditAnnotation"> + <object class="GtkBox" id="box63"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:EditAnnotation</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="EditAnnotation"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:EditAnnotation</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="DeleteNote"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:DeleteNote</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> @@ -2627,21 +2822,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="DeleteNote"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:DeleteNote</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-3"/> </style> @@ -2653,18 +2833,45 @@ </packing> </child> <child> - <object class="GtkBox" id="box31"> + <object class="sfxlo-DropdownBox" id="box31"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="HideNote"> + <object class="GtkBox" id="box64"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:HideNote</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="HideNote"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:HideNote</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="ShowNote"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ShowNote</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> @@ -2672,21 +2879,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="ShowNote"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ShowNote</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-2"/> </style> @@ -2710,18 +2902,60 @@ </packing> </child> <child> - <object class="GtkBox" id="box32"> + <object class="sfxlo-DropdownBox" id="box32"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="vcllo-SmallButton" id="Protect"> + <object class="GtkBox" id="box65"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:Protect</property> - <property name="image">ProtectImg</property> - <property name="relief">none</property> - <property name="image_position">top</property> + <property name="can_focus">False</property> + <child> + <object class="vcllo-SmallButton" id="Protect"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:Protect</property> + <property name="image">ProtectImg</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="ToolProtectionDocument"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ToolProtectionDocument</property> + <property name="image">ToolProtectionDocumentImg</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> + <child> + <object class="GtkButton" id="ShareDocument"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ShareDocument</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">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -2729,37 +2963,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="vcllo-SmallButton" id="ToolProtectionDocument"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ToolProtectionDocument</property> - <property name="image">ToolProtectionDocumentImg</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> - <child> - <object class="GtkButton" id="ShareDocument"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ShareDocument</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">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -2845,33 +3048,59 @@ </packing> </child> <child> - <object class="GtkBox" id="box35"> + <object class="sfxlo-DropdownBox" id="box35"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkButton" id="ViewRowColumnHeaders1"> + <object class="GtkBox" id="box66"> <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="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="GtkButton" id="ToggleSheetGrid2"> - <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="image">ToggleSheetGridImg</property> - <property name="relief">none</property> - <property name="image_position">top</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton" id="ToggleSheetGrid2"> + <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="image">ToggleSheetGridImg</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="GtkButton" id="ViewValueHighlighting"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ViewValueHighlighting</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> + <child> + <object class="GtkButton" id="ViewRowColumnHeaders1"> + <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="image_position">top</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -2879,21 +3108,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkButton" id="ViewValueHighlighting"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ViewValueHighlighting</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">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -2998,18 +3212,45 @@ </packing> </child> <child> - <object class="GtkBox" id="box38"> + <object class="sfxlo-DropdownBox" id="box38"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="vcllo-SmallButton" id="SplitWindow"> + <object class="GtkBox" id="box67"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:SplitWindow</property> - <property name="image">SplitWindowImg</property> - <property name="relief">none</property> - <property name="image_position">top</property> + <property name="can_focus">False</property> + <child> + <object class="vcllo-SmallButton" id="SplitWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:SplitWindow</property> + <property name="image">SplitWindowImg</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="FreezePanes"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:FreezePanes</property> + <property name="image">FreezePanesImg</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> @@ -3017,22 +3258,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="vcllo-SmallButton" id="FreezePanes"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:FreezePanes</property> - <property name="image">FreezePanesImg</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> diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index fddb89b8af75..1a28afd63dee 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -234,6 +234,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/saveastemplatedlg \ sfx2/source/explorer/nochaos \ sfx2/source/inet/inettbc \ + sfx2/source/notebookbar/DropdownBox \ sfx2/source/notebookbar/PriorityHBox \ sfx2/source/notebookbar/SfxNotebookBar \ sfx2/source/notify/eventsupplier \ diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk index a7f532dce520..8482eca333e4 100644 --- a/sfx2/UIConfig_sfx.mk +++ b/sfx2/UIConfig_sfx.mk @@ -37,6 +37,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\ sfx2/uiconfig/ui/notebookbar \ sfx2/uiconfig/ui/optprintpage \ sfx2/uiconfig/ui/password \ + sfx2/uiconfig/ui/notebookbarpopup \ sfx2/uiconfig/ui/printeroptionsdialog \ sfx2/uiconfig/ui/querysavedialog \ sfx2/uiconfig/ui/searchdialog \ diff --git a/sfx2/source/notebookbar/DropdownBox.cxx b/sfx2/source/notebookbar/DropdownBox.cxx new file mode 100644 index 000000000000..0058c89cfade --- /dev/null +++ b/sfx2/source/notebookbar/DropdownBox.cxx @@ -0,0 +1,166 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <vcl/builderfactory.hxx> +#include <vcl/layout.hxx> +#include <sfx2/dllapi.h> +#include <sfx2/viewfrm.hxx> +#include "DropdownBox.hxx" + +#define NOTEBOOK_HEADER_HEIGHT 30 + +/* + * Popup - shows hidden content, controls are moved to this popup + * and after close moved to the original parent + */ + +class Popup : public FloatingWindow +{ +private: + VclPtr<VclHBox> m_pBox; + ScopedVclPtr<DropdownBox> m_pParent; + +public: + Popup(VclPtr<DropdownBox> pParent) + : FloatingWindow(pParent, "Popup", "sfx/ui/notebookbarpopup.ui") + , m_pParent(pParent) + { + get(m_pBox, "box"); + m_pBox->SetSizePixel(Size(100, 75)); + } + + virtual ~Popup() + { + disposeOnce(); + } + + VclHBox* getBox() + { + return m_pBox.get(); + } + + virtual void PopupModeEnd() override + { + for (int i = 0; i < m_pBox->GetChildCount(); i++) + { + m_pBox->GetChild(i)->Hide(); + m_pBox->GetChild(i)->SetParent(m_pParent); + } + FloatingWindow::PopupModeEnd(); + } + + void dispose() override + { + m_pBox.disposeAndClear(); + m_pParent.clear(); + + FloatingWindow::dispose(); + } +}; + +/* + * DropdownBox - shows content or moves it to the popup + * which can be opened by clicking on a button + */ + +DropdownBox::DropdownBox(vcl::Window *pParent) + : VclHBox(pParent) + , m_bInFullView(true) +{ + m_pButton = VclPtr<PushButton>::Create(this, WB_FLATBUTTON); + m_pButton->SetClickHdl(LINK(this, DropdownBox, PBClickHdl)); + m_pButton->SetSymbol(SymbolType::MENU); + m_pButton->set_width_request(15); + m_pButton->SetQuickHelpText(GetQuickHelpText()); + m_pButton->Resize(); +} + +DropdownBox::~DropdownBox() +{ + disposeOnce(); +} + +void DropdownBox::dispose() +{ + m_pButton.disposeAndClear(); + if (m_pPopup) + m_pPopup.disposeAndClear(); + + VclHBox::dispose(); +} + +void DropdownBox::HideContent() +{ + if (m_bInFullView) + { + m_bInFullView = false; + + for (int i = 0; i < GetChildCount(); i++) + GetChild(i)->Hide(); + + m_pButton->Show(); + SetOutputSizePixel(Size(m_pButton->GetSizePixel().Width(), GetSizePixel().Height())); + } +} + +void DropdownBox::ShowContent() +{ + if (!m_bInFullView) + { + m_bInFullView = true; + + for (int i = 0; i < GetChildCount(); i++) + GetChild(i)->Show(); + + m_pButton->Hide(); + } +} + +IMPL_LINK_TYPED(DropdownBox, PBClickHdl, Button*, /*pButton*/, void) +{ + if (m_pPopup) + m_pPopup.disposeAndClear(); + + m_pPopup = VclPtr<Popup>::Create(this); + + for (int i = 0; i < GetChildCount(); i++) + { + if (GetChild(i) != m_pButton) + { + Window* pChild = GetChild(i); + pChild->Show(); + + pChild->SetParent(m_pPopup->getBox()); + } + } + + m_pPopup->getBox()->set_height_request(GetSizePixel().Height()); + + long x = GetPosPixel().getX(); + long y = GetPosPixel().getY() + NOTEBOOK_HEADER_HEIGHT + GetSizePixel().Height(); + Rectangle aRect(x, y, x, y); + + m_pPopup->StartPopupMode(aRect, FloatWinPopupFlags::Down + |FloatWinPopupFlags::GrabFocus + |FloatWinPopupFlags::AllMouseButtonClose); +} + +VCL_BUILDER_FACTORY(DropdownBox) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/notebookbar/DropdownBox.hxx b/sfx2/source/notebookbar/DropdownBox.hxx new file mode 100644 index 000000000000..a44d9708017d --- /dev/null +++ b/sfx2/source/notebookbar/DropdownBox.hxx @@ -0,0 +1,54 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SFX2_NOTEBOOKBAR_DROPDOWNBOX_HXX +#define INCLUDED_SFX2_NOTEBOOKBAR_DROPDOWNBOX_HXX + +#include <vcl/builderfactory.hxx> +#include <vcl/layout.hxx> +#include <sfx2/dllapi.h> +#include <sfx2/viewfrm.hxx> +#include <vcl/floatwin.hxx> +#include <vcl/toolbox.hxx> +#include <sfx2/tbxctrl.hxx> + +class Popup; + +class SFX2_DLLPUBLIC DropdownBox : public VclHBox +{ +private: + bool m_bInFullView; + VclPtr<PushButton> m_pButton; + VclPtr<Popup> m_pPopup; + +public: + DropdownBox(vcl::Window *pParent); + virtual ~DropdownBox() override; + virtual void dispose() override; + + virtual void HideContent(); + virtual void ShowContent(); + +private: + DECL_LINK_TYPED(PBClickHdl, Button*, void); +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx b/sfx2/source/notebookbar/PriorityHBox.cxx index 88f91bc90518..52ce58aa9f16 100644 --- a/sfx2/source/notebookbar/PriorityHBox.cxx +++ b/sfx2/source/notebookbar/PriorityHBox.cxx @@ -21,6 +21,7 @@ #include <vcl/layout.hxx> #include <sfx2/dllapi.h> #include <sfx2/viewfrm.hxx> +#include "DropdownBox.hxx" #include <vector> @@ -75,16 +76,17 @@ public: auto pChild = m_aSortedChilds.begin(); while (nCurrentWidth > nWidth && pChild != m_aSortedChilds.end()) { - VclContainer* pContainer = static_cast<VclContainer*>(*pChild); + DropdownBox* pContainer = static_cast<DropdownBox*>(*pChild); nCurrentWidth -= pContainer->GetSizePixel().Width() + get_spacing(); - pContainer->Hide(); + pContainer->HideContent(); + nCurrentWidth += pContainer->GetSizePixel().Width() + get_spacing(); pChild++; } // Show higher priority controls if we already have enough space while (pChild != m_aSortedChilds.end()) { - static_cast<VclContainer*>(*pChild)->Show(); + static_cast<DropdownBox*>(*pChild)->ShowContent(); pChild++; } @@ -93,7 +95,7 @@ public: virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override { - if (!m_bInitialized) + if (!m_bInitialized && SfxViewFrame::Current()) { m_bInitialized = true; diff --git a/sfx2/uiconfig/ui/notebookbarpopup.ui b/sfx2/uiconfig/ui/notebookbarpopup.ui new file mode 100644 index 000000000000..8400e481e66c --- /dev/null +++ b/sfx2/uiconfig/ui/notebookbarpopup.ui @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> +<interface> + <requires lib="gtk+" version="3.10"/> + <object class="GtkWindow" id="Popup"> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="border_width">4</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">True</property> + <property name="type_hint">popup-menu</property> + <property name="skip_pager_hint">True</property> + <property name="deletable">False</property> + <child> + <object class="GtkBox" id="box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_right">6</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="spacing">6</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> +</interface> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 107289aa3b51..b9122739d6cd 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -288,7 +288,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box63"> + <object class="sfxlo-DropdownBox" id="box63"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -318,7 +318,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box68"> + <object class="sfxlo-DropdownBox" id="box68"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -364,7 +364,7 @@ </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> <child> @@ -411,7 +411,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="box5"> + <object class="sfxlo-DropdownBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -483,9 +483,10 @@ </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> + <property name="tooltip_text" translatable="yes">Clone Formatting</property> <child> <object class="vcllo-SmallButton" id="FormatPaintbrush"> <property name="visible">True</property> @@ -526,7 +527,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box9"> + <object class="sfxlo-DropdownBox" id="box9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -534,138 +535,56 @@ <object class="GtkBox" id="box11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="sfxlo-SidebarToolBox" id="font"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkToolButton" id="fontname"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:CharFontName</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="fontheight"> + <object class="GtkBox" id="box76"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkToolButton" id="fontsize"> + <object class="sfxlo-SidebarToolBox" id="font"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:FontHeight</property> + <child> + <object class="GtkToolButton" id="fontname"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:CharFontName</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">True</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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="sfxlo-SidebarToolBox" id="fonteffects"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="bold"> - <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:Bold</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="italic"> - <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:Italic</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="underline"> - <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:Underline</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="strikeout"> - <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:Strikeout</property> - <property name="use_underline">True</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="shadowed"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="fontheight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:Shadowed</property> - <property name="use_underline">True</property> + <child> + <object class="GtkToolButton" id="fontsize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:FontHeight</property> + </object> + <packing> + <property name="expand">True</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> @@ -676,188 +595,149 @@ </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbar_writer"> + <object class="GtkBox" id="box10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="fontcolor"> - <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:FontColor</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="spacing">12</property> <child> - <object class="GtkMenuToolButton" id="highlight"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="fonteffects"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:BackColor</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="bold"> + <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:Bold</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="italic"> + <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:Italic</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="underline"> + <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:Underline</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="strikeout"> + <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:Strikeout</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="shadowed"> + <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:Shadowed</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="GtkMenuToolButton" id="parabkcolor"> + <object class="sfxlo-SidebarToolBox" id="colorbar_writer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="fontcolor"> + <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:FontColor</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="highlight"> + <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:BackColor</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="parabkcolor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BackgroundColor</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">3</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</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">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box27"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-SidebarToolBox" id="fontadjust"> - <property name="visible">True</property> - <property name="can_focus">False</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="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="position1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="subscript2"> - <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="superscript2"> - <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-4"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box67"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="sfxlo-SidebarToolBox" id="reset1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="ResetAttributes2"> - <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:ResetAttributes</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -867,76 +747,36 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-SidebarToolBox" id="spacingbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuToolButton" id="spacing1"> - <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:Spacing</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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <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">6</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="sfxlo-DropdownBox" id="box27"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Character properties</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box19"> + <object class="GtkBox" id="box77"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="numberbullet"> + <object class="sfxlo-SidebarToolBox" id="fontadjust"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Bullets and Numbering</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="bullet"> + <object class="GtkToolButton" id="grow"> + <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:DefaultBullet</property> + <property name="action_name">.uno:Grow</property> <property name="use_underline">True</property> </object> <packing> @@ -945,11 +785,12 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="number"> + <object class="GtkToolButton" id="shrink"> + <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:DefaultNumbering</property> + <property name="action_name">.uno:Shrink</property> <property name="use_underline">True</property> </object> <packing> @@ -957,26 +798,13 @@ <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="controlcodes"> - <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="ControlCodes"> + <object class="GtkToolButton" id="ResetAttributes"> <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:ControlCodes</property> + <property name="action_name">.uno:ResetAttributes</property> <property name="use_underline">True</property> </object> <packing> @@ -988,47 +816,21 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">0</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="GtkBox" id="box8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> <child> - <object class="sfxlo-SidebarToolBox" id="horizontalalignment"> + <object class="sfxlo-SidebarToolBox" id="position"> <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="leftpara"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LeftPara</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="centerpara"> + <object class="GtkToolButton" id="subscript"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CenterPara</property> + <property name="is_important">True</property> + <property name="action_name">.uno:SubScript</property> <property name="use_underline">True</property> </object> <packing> @@ -1037,10 +839,12 @@ </packing> </child> <child> - <object class="GtkToolButton" id="rightpara"> + <object class="GtkToolButton" id="superscript"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:RightPara</property> + <property name="is_important">True</property> + <property name="action_name">.uno:SuperScript</property> <property name="use_underline">True</property> </object> <packing> @@ -1049,10 +853,12 @@ </packing> </child> <child> - <object class="GtkToolButton" id="substjustify"> + <object class="GtkMenuToolButton" id="spacing"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:JustifyPara</property> + <property name="is_important">True</property> + <property name="action_name">.uno:Spacing</property> <property name="use_underline">True</property> </object> <packing> @@ -1064,125 +870,251 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">4</property> </packing> </child> <child> - <object class="GtkBox" id="box28"> + <object class="sfxlo-DropdownBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Aligment, numbering and bullets</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box31"> + <object class="GtkBox" id="box8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="box66"> + <object class="GtkSeparator" id="separator5"> <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="box19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="indent"> + <object class="GtkBox" id="box79"> <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> + <property name="spacing">12</property> <child> - <object class="GtkToolButton" id="increaseindent1"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="numberbullet"> <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> + <property name="tooltip_text" translatable="yes">Bullets and Numbering</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="bullet"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:DefaultBullet</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="number"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:DefaultNumbering</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="decreaseindent1"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="controlcodes"> <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> + <property name="tooltip_text" translatable="yes">Indent</property> + <child> + <object class="GtkToolButton" id="ControlCodes"> + <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:ControlCodes</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> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="writedirection"> + <object class="GtkBox" id="box67"> <property name="visible">True</property> <property name="can_focus">False</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> + <property name="spacing">6</property> <child> - <object class="GtkToolButton" id="righttoleft1"> + <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: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="leftpara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LeftPara</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="centerpara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CenterPara</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="rightpara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RightPara</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="substjustify"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:JustifyPara</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">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">7</property> + </packing> + </child> + <child> + <object class="sfxlo-DropdownBox" id="box28"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Paragraph properties</property> + <child> + <object class="GtkBox" id="box31"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator18"> + <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> @@ -1190,94 +1122,202 @@ <object class="GtkBox" id="box32"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="orientation">vertical</property> <child> - <object class="GtkSeparator" id="separator20"> + <object class="GtkBox" id="box66"> <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">1</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="line"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> + <property name="spacing">12</property> <child> - <object class="GtkMenuToolButton" id="LineSpacing1"> + <object class="sfxlo-SidebarToolBox" id="indent"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="action_name">.uno:LineSpacing</property> - <property name="use_underline">True</property> + <property name="has_tooltip">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="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-SidebarToolBox" id="writedirection"> + <property name="visible">True</property> + <property name="can_focus">False</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">False</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">False</property> - <property name="position">2</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="verticalalignment"> + <object class="GtkBox" id="box106"> <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">6</property> <child> - <object class="GtkToolButton" id="cellverttop1"> + <object class="GtkSeparator" id="separator20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertTop</property> - <property name="use_underline">True</property> + <property name="orientation">vertical</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> <child> - <object class="GtkToolButton" id="cellvertcenter1"> + <object class="sfxlo-SidebarToolBox" id="line"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertCenter</property> - <property name="use_underline">True</property> + <property name="halign">end</property> + <child> + <object class="GtkMenuToolButton" id="LineSpacing1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="action_name">.uno:LineSpacing</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkToolButton" id="cellvertbottom1"> + <object class="sfxlo-SidebarToolBox" id="verticalalignment"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertBottom</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="cellverttop1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CellVertTop</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="cellvertcenter1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CellVertCenter</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="cellvertbottom1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CellVertBottom</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">4</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> </object> @@ -1294,18 +1334,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator18"> - <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">1</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -1317,46 +1345,32 @@ </packing> </child> <child> - <object class="GtkBox" id="box37"> + <object class="sfxlo-DropdownBox" id="box37"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Paragraph styles</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="style"> + <object class="GtkBox" id="box80"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkToolButton" id="StyleApply"> + <object class="sfxlo-SidebarToolBox" id="style"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:StyleApply</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box64"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton" id="StyleUpdateByExample"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:StyleUpdateByExample</property> - <property name="relief">none</property> - <property name="xalign">0</property> + <child> + <object class="GtkToolButton" id="StyleApply"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:StyleApply</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -1365,13 +1379,40 @@ </packing> </child> <child> - <object class="GtkButton" id="StyleNewByExample"> + <object class="GtkBox" id="box64"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:StyleNewByExample</property> - <property name="relief">none</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton" id="StyleUpdateByExample"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:StyleUpdateByExample</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="StyleNewByExample"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:StyleNewByExample</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> @@ -1381,9 +1422,9 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <style> @@ -1397,31 +1438,43 @@ </packing> </child> <child> - <object class="GtkBox" id="box30"> + <object class="sfxlo-DropdownBox" id="box30"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Find & Replace</property> <child> - <object class="GtkSeparator" id="separator19"> + <object class="GtkBox" id="box95"> <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="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="image">SearchDialogImg</property> - <property name="relief">none</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> + <child> + <object class="GtkSeparator" id="separator19"> + <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="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="image">SearchDialogImg</property> + <property name="relief">none</property> + <property name="image_position">top</property> + <property name="always_show_image">True</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> @@ -1465,18 +1518,45 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox" id="box16"> + <object class="sfxlo-DropdownBox" id="box16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="TitlePageDialog"> + <object class="GtkBox" id="box78"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:TitlePageDialog</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="TitlePageDialog"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:TitlePageDialog</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="InsertPagebreak"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertPagebreak</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> @@ -1484,21 +1564,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkButton" id="InsertPagebreak"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertPagebreak</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">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -1568,7 +1633,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box69"> + <object class="sfxlo-DropdownBox" id="box69"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1599,7 +1664,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box70"> + <object class="sfxlo-DropdownBox" id="box70"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1659,18 +1724,45 @@ </packing> </child> <child> - <object class="GtkBox" id="box29"> + <object class="sfxlo-DropdownBox" id="box29"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="hyperlinkdialog"> + <object class="GtkBox" id="box107"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:HyperlinkDialog</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="hyperlinkdialog"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:HyperlinkDialog</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="bookmark"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertBookmark</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> @@ -1678,21 +1770,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="bookmark"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertBookmark</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-3"/> </style> @@ -1737,7 +1814,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box14"> + <object class="sfxlo-DropdownBox" id="box14"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1785,14 +1862,42 @@ </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="separator9"> + <object class="GtkBox" id="box109"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <child> + <object class="GtkSeparator" id="separator9"> + <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> + <property name="always_show_image">True</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> @@ -1800,23 +1905,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> - <property name="always_show_image">True</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> @@ -1828,79 +1916,90 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator7"> - <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">15</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator8"> - <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">16</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box50"> + <object class="sfxlo-DropdownBox" id="box50"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="sfxlo-SidebarToolBox" id="basicshapes"> + <object class="GtkBox" id="box81"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkToolButton" id="BasicShapes"> + <object class="GtkSeparator" id="separator7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:BasicShapes</property> + <property name="orientation">vertical</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</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="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="insertdraw"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="InsertDraw"> + <object class="GtkBox" id="box84"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:InsertDraw</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-SidebarToolBox" id="basicshapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkToolButton" id="BasicShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:BasicShapes</property> + </object> + <packing> + <property name="expand">True</property> + <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="insertdraw"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkToolButton" id="InsertDraw"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:InsertDraw</property> + </object> + <packing> + <property name="expand">True</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> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <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">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -1911,31 +2010,70 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator10"> - <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">19</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box36"> + <object class="sfxlo-DropdownBox" id="box36"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="InsertPageNumberField"> + <object class="GtkBox" id="box82"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertPageNumberField</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator10"> + <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="box108"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="InsertPageNumberField"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertPageNumberField</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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="InsertDateField"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertDateField</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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> </object> <packing> <property name="expand">False</property> @@ -1943,22 +2081,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="InsertDateField"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertDateField</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</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> @@ -1970,18 +2092,45 @@ </packing> </child> <child> - <object class="GtkBox" id="box17"> + <object class="sfxlo-DropdownBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="InsertObjectStarMath"> + <object class="GtkBox" id="box83"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertObjectStarMath</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="InsertObjectStarMath"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertObjectStarMath</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="InsertSymbol"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertSymbol</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> @@ -1989,21 +2138,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="InsertSymbol"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertSymbol</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-4"/> </style> @@ -2015,7 +2149,7 @@ </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> @@ -2101,7 +2235,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box71"> + <object class="sfxlo-DropdownBox" id="box71"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2131,7 +2265,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box15"> + <object class="sfxlo-DropdownBox" id="box15"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2161,7 +2295,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box26"> + <object class="sfxlo-DropdownBox" id="box26"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2235,7 +2369,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box72"> + <object class="sfxlo-DropdownBox" id="box72"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2302,7 +2436,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="box53"> + <object class="sfxlo-DropdownBox" id="box53"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -2407,7 +2541,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> <property name="spacing">6</property> @@ -2436,19 +2570,47 @@ </packing> </child> <child> - <object class="GtkBox" id="box48"> + <object class="sfxlo-DropdownBox" id="box48"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="InsertEndnote1"> + <object class="GtkBox" id="box112"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertEndnote</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="InsertEndnote1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertEndnote</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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="InsertFootnoteDialog"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertFootnoteDialog</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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> @@ -2456,22 +2618,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="InsertFootnoteDialog"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertFootnoteDialog</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> <style> <class name="priority-4"/> </style> @@ -2495,36 +2641,47 @@ </packing> </child> <child> - <object class="GtkBox" id="box49"> + <object class="sfxlo-DropdownBox" id="box49"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkButton" id="BibliographyComponent"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:BibliographyComponent</property> - <property name="relief">none</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator3"> + <object class="GtkBox" id="box110"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="BibliographyComponent"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:BibliographyComponent</property> + <property name="relief">none</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <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">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <style> @@ -2538,7 +2695,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box51"> + <object class="sfxlo-DropdownBox" id="box51"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -2569,19 +2726,47 @@ </packing> </child> <child> - <object class="GtkBox" id="box52"> + <object class="sfxlo-DropdownBox" id="box52"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="InsertAuthoritiesEntry"> + <object class="GtkBox" id="box111"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertAuthoritiesEntry</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="InsertAuthoritiesEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertAuthoritiesEntry</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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="InsertReferenceField"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertReferenceField</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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> @@ -2589,22 +2774,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkButton" id="InsertReferenceField"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertReferenceField</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> <style> <class name="priority-2"/> </style> @@ -2654,7 +2823,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box56"> + <object class="sfxlo-DropdownBox" id="box56"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2685,19 +2854,46 @@ </packing> </child> <child> - <object class="GtkBox" id="box75"> + <object class="sfxlo-DropdownBox" id="box75"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="vcllo-SmallButton" id="ThesaurusDialog"> + <object class="GtkBox" id="box113"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ThesaurusDialog</property> - <property name="image">ThesaurusDialogImg</property> - <property name="relief">none</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <child> + <object class="vcllo-SmallButton" id="ThesaurusDialog"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ThesaurusDialog</property> + <property name="image">ThesaurusDialogImg</property> + <property name="relief">none</property> + <property name="image_position">top</property> + <property name="always_show_image">True</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="WordCountDialog"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:WordCountDialog</property> + <property name="relief">none</property> + <property name="image_position">top</property> + <property name="always_show_image">True</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> @@ -2705,22 +2901,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="WordCountDialog"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:WordCountDialog</property> - <property name="relief">none</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> <style> <class name="priority-4"/> </style> @@ -2732,30 +2912,57 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator25"> - <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">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box57"> + <object class="sfxlo-DropdownBox" id="box57"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="vcllo-SmallButton" id="InsertAnnotation"> + <object class="GtkBox" id="box114"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertAnnotation</property> - <property name="relief">none</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator25"> + <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="InsertAnnotation"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertAnnotation</property> + <property name="relief">none</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ShowAnnotations"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ShowAnnotations</property> + <property name="relief">none</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -2763,22 +2970,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="ShowAnnotations"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ShowAnnotations</property> - <property name="relief">none</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> <style> <class name="priority-5"/> </style> @@ -2802,7 +2993,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box58"> + <object class="sfxlo-DropdownBox" id="box58"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -2847,19 +3038,47 @@ </packing> </child> <child> - <object class="GtkBox" id="box59"> + <object class="sfxlo-DropdownBox" id="box59"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="ShowTrackedChanges"> + <object class="GtkBox" id="box87"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ShowTrackedChanges</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="ShowTrackedChanges"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ShowTrackedChanges</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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="CommentChangeTracking"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:CommentChangeTracking</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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> @@ -2867,22 +3086,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="CommentChangeTracking"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:CommentChangeTracking</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> <style> <class name="priority-4"/> </style> @@ -2894,20 +3097,48 @@ </packing> </child> <child> - <object class="GtkBox" id="box62"> + <object class="sfxlo-DropdownBox" id="box62"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="homogeneous">True</property> <child> - <object class="GtkButton" id="AcceptTrackedChange"> + <object class="GtkBox" id="box88"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:AcceptTrackedChange</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="AcceptTrackedChange"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:AcceptTrackedChange</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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="RejectTrackedChange"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:RejectTrackedChange</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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> @@ -2915,22 +3146,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="RejectTrackedChange"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:RejectTrackedChange</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> - </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> @@ -2942,20 +3157,48 @@ </packing> </child> <child> - <object class="GtkBox" id="box60"> + <object class="sfxlo-DropdownBox" id="box60"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="homogeneous">True</property> <child> - <object class="GtkButton" id="NextTrackedChange"> + <object class="GtkBox" id="box89"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:NextTrackedChange</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="NextTrackedChange"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:NextTrackedChange</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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="PreviousTrackedChange"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:PreviousTrackedChange</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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> @@ -2963,22 +3206,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="PreviousTrackedChange"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:PreviousTrackedChange</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</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> @@ -2990,31 +3217,58 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator27"> - <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">10</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box61"> + <object class="sfxlo-DropdownBox" id="box61"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="vcllo-SmallButton" id="CompareDocuments"> + <object class="GtkBox" id="box115"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:CompareDocuments</property> - <property name="image">CompareDocumentsImg</property> - <property name="relief">none</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator8"> + <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="CompareDocuments"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:CompareDocuments</property> + <property name="image">CompareDocumentsImg</property> + <property name="relief">none</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="MergeDocuments"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:MergeDocuments</property> + <property name="relief">none</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -3022,22 +3276,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="MergeDocuments"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:MergeDocuments</property> - <property name="relief">none</property> - <property name="image_position">top</property> - <property name="always_show_image">True</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> @@ -3069,12 +3307,10 @@ <object class="sfxlo-PriorityHBox" id="ViewBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> <child> - <object class="GtkBox" id="box22"> + <object class="sfxlo-DropdownBox" id="box22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> <child> <object class="vcllo-SmallButton" id="PrintPreview"> <property name="visible">True</property> @@ -3144,19 +3380,47 @@ </packing> </child> <child> - <object class="GtkBox" id="box65"> + <object class="sfxlo-DropdownBox" id="box65"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="Ruler"> + <object class="GtkBox" id="box86"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:Ruler</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="Ruler"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:Ruler</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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="VRuler"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:VRuler</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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> @@ -3164,22 +3428,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="VRuler"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:VRuler</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</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> @@ -3191,36 +3439,47 @@ </packing> </child> <child> - <object class="GtkBox" id="box23"> + <object class="sfxlo-DropdownBox" id="box23"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="vcllo-SmallButton" id="GridVisible"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:GridVisible</property> - <property name="image">GridVisibleImg</property> - <property name="relief">none</property> - <property name="image_position">top</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator12"> + <object class="GtkBox" id="box116"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <child> + <object class="vcllo-SmallButton" id="GridVisible"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:GridVisible</property> + <property name="image">GridVisibleImg</property> + <property name="relief">none</property> + <property name="image_position">top</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator12"> + <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">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <style> @@ -3234,7 +3493,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box24"> + <object class="sfxlo-DropdownBox" id="box24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -3280,7 +3539,7 @@ </packing> </child> <child> - <object class="GtkBox" id="box74"> + <object class="sfxlo-DropdownBox" id="box74"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -3311,19 +3570,70 @@ </packing> </child> <child> - <object class="GtkBox" id="box25"> + <object class="sfxlo-DropdownBox" id="box25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="ZoomPage"> + <object class="GtkBox" id="box85"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ZoomPage</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box117"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="ZoomPage"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ZoomPage</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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="ZoomPageWidth"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:ZoomPageWidth</property> + <property name="relief">none</property> + <property name="xalign">0</property> + <property name="always_show_image">True</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">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator13"> + <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">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -3331,22 +3641,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="ZoomPageWidth"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:ZoomPageWidth</property> - <property name="relief">none</property> - <property name="xalign">0</property> - <property name="always_show_image">True</property> - </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> @@ -3358,19 +3652,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator13"> - <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">8</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box73"> + <object class="sfxlo-DropdownBox" id="box73"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -3422,18 +3704,45 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="box34"> + <object class="sfxlo-DropdownBox" id="box34"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="TableDialog"> + <object class="GtkBox" id="box90"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:TableDialog</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="TableDialog"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:TableDialog</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="AutoFormat"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:AutoFormat</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> @@ -3441,37 +3750,37 @@ <property name="position">0</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-DropdownBox" id="box40"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="AutoFormat"> + <object class="vcllo-SmallButton" id="InsertCaptionDialog"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="action_name">.uno:AutoFormat</property> + <property name="action_name">.uno:InsertCaptionDialog</property> + <property name="image">InsertCaptionDialogImg</property> <property name="relief">none</property> - <property name="xalign">0</property> + <property name="image_position">top</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</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="vcllo-SmallButton" id="InsertCaptionDialog"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertCaptionDialog</property> - <property name="image">InsertCaptionDialogImg</property> - <property name="relief">none</property> - <property name="image_position">top</property> + <style> + <class name="priority-2"/> + </style> </object> <packing> <property name="expand">False</property> @@ -3488,21 +3797,21 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkBox" id="box35"> + <object class="sfxlo-DropdownBox" id="box96"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="box40"> + <object class="GtkBox" id="box97"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="SplitTable"> + <object class="GtkButton" id="SplitTable1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -3517,7 +3826,7 @@ </packing> </child> <child> - <object class="GtkButton" id="DeleteTable"> + <object class="GtkButton" id="DeleteTable1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -3538,6 +3847,21 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="sfxlo-DropdownBox" id="box35"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> <object class="GtkBox" id="box20"> <property name="visible">True</property> @@ -3669,7 +3993,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> <child> @@ -3681,22 +4005,49 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <child> - <object class="GtkBox" id="box43"> + <object class="sfxlo-DropdownBox" id="box43"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="MergeCells"> + <object class="GtkBox" id="box91"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:MergeCells</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="MergeCells"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:MergeCells</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="SplitCell"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:SplitCell</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> @@ -3704,41 +4055,53 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="SplitCell"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:SplitCell</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">5</property> + <property name="position">7</property> </packing> </child> <child> - <object class="GtkBox" id="box44"> + <object class="sfxlo-DropdownBox" id="box44"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="Protect"> + <object class="GtkBox" id="box92"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:Protect</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="Protect"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:Protect</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="UnsetCellsReadOnly"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:UnsetCellsReadOnly</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> @@ -3746,26 +4109,14 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="UnsetCellsReadOnly"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:UnsetCellsReadOnly</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> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">8</property> </packing> </child> <child> @@ -3781,35 +4132,73 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator16"> - <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">8</property> + <property name="position">9</property> </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> <property name="orientation">vertical</property> <property name="homogeneous">True</property> <child> - <object class="GtkButton" id="AutoSum"> + <object class="GtkBox" id="box93"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:AutoSum</property> - <property name="relief">none</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator16"> + <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="box98"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton" id="AutoSum"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:AutoSum</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="InsertFormula"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="action_name">.uno:InsertFormula</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> </object> <packing> <property name="expand">False</property> @@ -3817,26 +4206,14 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="InsertFormula"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">.uno:InsertFormula</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-3"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">11</property> </packing> </child> <child> @@ -3848,90 +4225,102 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">12</property> </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> <property name="orientation">vertical</property> <property name="spacing">6</property> <property name="homogeneous">True</property> <child> - <object class="sfxlo-SidebarToolBox" id="formattable1"> - <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="GtkMenuToolButton" id="SetBorderStyle"> - <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:SetBorderStyle</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="LineStyle"> - <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:LineStyle</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="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="formattable"> + <object class="GtkBox" id="box94"> <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> + <property name="orientation">vertical</property> <child> - <object class="GtkMenuToolButton" id="FrameLineColor"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="formattable"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:FrameLineColor</property> - <property name="use_underline">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Indent</property> + <child> + <object class="GtkMenuToolButton" id="FrameLineColor"> + <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:FrameLineColor</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="BackgroundColor"> + <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:BackgroundColor</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="GtkMenuToolButton" id="BackgroundColor"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="formattable1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:BackgroundColor</property> - <property name="use_underline">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Indent</property> + <child> + <object class="GtkMenuToolButton" id="SetBorderStyle"> + <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:SetBorderStyle</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="LineStyle"> + <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:LineStyle</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> @@ -3942,11 +4331,14 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-4"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">13</property> </packing> </child> </object> @@ -3975,62 +4367,74 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="sfxlo-DropdownBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="brightnes"> + <object class="GtkBox" id="box99"> <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="GrafLuminance"> - <property name="use_action_appearance">False</property> - <property name="width_request">135</property> + <object class="sfxlo-SidebarToolBox" id="brightnes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:GrafLuminance</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="GrafLuminance"> + <property name="use_action_appearance">False</property> + <property name="width_request">135</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:GrafLuminance</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="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="contrast"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="GrafContrast"> - <property name="use_action_appearance">False</property> - <property name="width_request">135</property> + <object class="sfxlo-SidebarToolBox" id="contrast"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:GrafContrast</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="GrafContrast"> + <property name="use_action_appearance">False</property> + <property name="width_request">135</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:GrafContrast</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> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> @@ -4041,64 +4445,79 @@ </packing> </child> <child> - <object class="GtkBox" id="box7"> + <object class="sfxlo-DropdownBox" id="box7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="gamma"> + <object class="GtkBox" id="box100"> <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="GrafGamma"> - <property name="use_action_appearance">False</property> - <property name="width_request">135</property> + <object class="sfxlo-SidebarToolBox" id="gamma"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:GrafGamma</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="GrafGamma"> + <property name="use_action_appearance">False</property> + <property name="width_request">135</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:GrafGamma</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="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="transparence"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="GrafTransparence"> - <property name="use_action_appearance">False</property> - <property name="width_request">135</property> + <object class="sfxlo-SidebarToolBox" id="transparence"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:GrafTransparence</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="GrafTransparence"> + <property name="use_action_appearance">False</property> + <property name="width_request">135</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:GrafTransparence</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> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> + <style> + <class name="priority-1"/> + </style> </object> <packing> <property name="expand">False</property> @@ -4119,62 +4538,74 @@ </packing> </child> <child> - <object class="GtkBox" id="box21"> + <object class="sfxlo-DropdownBox" id="box21"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="mode"> + <object class="GtkBox" id="box101"> <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="GrafMode"> - <property name="use_action_appearance">False</property> - <property name="width_request">135</property> + <object class="sfxlo-SidebarToolBox" id="mode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:GrafMode</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="GrafMode"> + <property name="use_action_appearance">False</property> + <property name="width_request">135</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:GrafMode</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="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="red"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="GrafRed"> - <property name="use_action_appearance">False</property> - <property name="width_request">135</property> + <object class="sfxlo-SidebarToolBox" id="red"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:GrafRed</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="GrafRed"> + <property name="use_action_appearance">False</property> + <property name="width_request">135</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:GrafRed</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> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> @@ -4185,62 +4616,74 @@ </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> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="green"> + <object class="GtkBox" id="box102"> <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="GrafGreen"> - <property name="use_action_appearance">False</property> - <property name="width_request">135</property> + <object class="sfxlo-SidebarToolBox" id="green"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:GrafGreen</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="GrafGreen"> + <property name="use_action_appearance">False</property> + <property name="width_request">135</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:GrafGreen</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="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="blue"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="GrafBlue"> - <property name="use_action_appearance">False</property> - <property name="width_request">135</property> + <object class="sfxlo-SidebarToolBox" id="blue"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:GrafBlue</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="GrafBlue"> + <property name="use_action_appearance">False</property> + <property name="width_request">135</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:GrafBlue</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> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> @@ -4263,60 +4706,72 @@ </packing> </child> <child> - <object class="GtkBox" id="box38"> + <object class="sfxlo-DropdownBox" id="box38"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="flip"> + <object class="GtkBox" id="box103"> <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="FlipVertical"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="flip"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:FlipVertical</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="FlipVertical"> + <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:FlipVertical</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="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="flip1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="FlipHorizontal"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="flip1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:FlipHorizontal</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="FlipHorizontal"> + <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:FlipHorizontal</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> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> @@ -4327,60 +4782,72 @@ </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> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="rotate"> + <object class="GtkBox" id="box104"> <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="RotateLeft"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="rotate"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:RotateLeft</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="RotateLeft"> + <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:RotateLeft</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="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="rotate1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="RotateRight"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="rotate1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:RotateRight</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="RotateRight"> + <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:RotateRight</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> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> @@ -4391,60 +4858,72 @@ </packing> </child> <child> - <object class="GtkBox" id="box55"> + <object class="sfxlo-DropdownBox" id="box55"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="crop"> + <object class="GtkBox" id="box105"> <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="Crop"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="crop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:Crop</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Crop"> + <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:Crop</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="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="filter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="GraphicFilterToolbox"> - <property name="use_action_appearance">False</property> + <object class="sfxlo-SidebarToolBox" id="filter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="is_important">True</property> - <property name="action_name">.uno:GraphicFilterToolbox</property> - <property name="use_underline">True</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="GraphicFilterToolbox"> + <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:GraphicFilterToolbox</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> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> |