[Libreoffice-commits] core.git: sw/uiconfig
Szymon Kłos
szymon.klos at collabora.com
Thu Oct 12 22:13:40 UTC 2017
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 321 ++++++++-------
1 file changed, 172 insertions(+), 149 deletions(-)
New commits:
commit 923cea6817e29405a8cdf3b3f608fef84aeb4ec1
Author: Szymon Kłos <szymon.klos at collabora.com>
Date: Sat Sep 9 15:57:31 2017 +0200
tdf#107239 make PriorityHBox working in the compact notebookbar
Change-Id: Iaf087dcf71714338718088c5265d41df7e8beef4
Reviewed-on: https://gerrit.libreoffice.org/42125
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 1bcc0e3a44c3..76f657ac5978 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
<interface domain="sw">
<requires lib="gtk+" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -3900,6 +3900,138 @@
<property name="margin_right">5</property>
<property name="baseline_position">bottom</property>
<child>
+ <object class="sfxlo-DropdownBox" id="ToolsSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin_right">5</property>
+ <child>
+ <object class="GtkBox" id="Ext2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="Section2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="SearchDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="action_name">.uno:SearchDialog</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="svtlo-ManagedMenuButton" id="menub:MenuSettings">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="relief">none</property>
+ <property name="use_underline">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="GtkBox" id="box34">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox" id="thirdExt2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton" id="HelpIndex1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="action_name">.uno:HelpIndex</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="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="use_underline">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>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-DropdownBox" id="FileSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -4012,7 +4144,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator122">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -4162,7 +4309,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -4296,6 +4443,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-7"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -4503,6 +4653,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-6"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -4731,6 +4884,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-5"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -4880,6 +5036,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-4"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -4991,6 +5150,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-3"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -5102,6 +5264,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-2"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -5211,6 +5376,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="priority-1"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
@@ -9954,154 +10122,9 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="separator122">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-DropdownBox" id="ToolsSection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_right">5</property>
- <child>
- <object class="GtkBox" id="Ext2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="Section2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="SearchDialog">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="action_name">.uno:SearchDialog</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="svtlo-ManagedMenuButton" id="menub:MenuSettings">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="relief">none</property>
- <property name="use_underline">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="GtkBox" id="box34">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="thirdExt2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="HelpIndex1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="action_name">.uno:HelpIndex</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="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="relief">none</property>
- <property name="use_underline">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>
- <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">6</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list