tdf#122154 add DataSort action to data group
and update some alignments
Change-Id: I8d21e2764805e6b86fce776b7587d7bc0f76ae33
Reviewed-on: https://gerrit.libreoffice.org/65263
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 66dc9ca..8d3438a 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -3456,8 +3456,21 @@
<property name="homogeneous">False</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-NotebookbarToolBox" id="SectionBottom26">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkMenuToolButton" id="Default-Color">
<object class="GtkMenuToolButton" id="Default-Color1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Color</property>
@@ -3471,7 +3484,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>
@@ -3546,8 +3559,6 @@
<object class="GtkMenuToolButton" id="Default-SetBoarderStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes" context="notebookbar_groupedbar_compact|bordertype">Specify the borders of the selected cells.</property>
<property name="action_name">.uno:SetBorderStyle</property>
</object>
<packing>
@@ -3555,8 +3566,23 @@
<property name="homogeneous">False</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-NotebookbarToolBox" id="ExtTop1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkMenuToolButton" id="Default-BackgroundColor">
<object class="GtkMenuToolButton" id="Default-BackgroundColor1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:BackgroundColor</property>
@@ -3570,7 +3596,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>
@@ -4166,10 +4192,10 @@
</packing>
</child>
<child>
<object class="GtkToolButton" id="Default-SortAscending">
<object class="GtkToolButton" id="Default-DataSort">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SortAscending</property>
<property name="action_name">.uno:DataSort</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4757,6 +4783,7 @@
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom40">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_left">5</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -4770,8 +4797,21 @@
<property name="homogeneous">False</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-NotebookbarToolBox" id="SectionBottom27">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkMenuToolButton" id="DrawText-fontcolor">
<object class="GtkMenuToolButton" id="DrawText-fontcolor1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Color</property>
@@ -4785,7 +4825,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>
@@ -4857,18 +4897,33 @@
</packing>
</child>
<child>
<object class="GtkToolButton" id="DrawText-Strikeout">
<object class="GtkMenuToolButton" id="DrawText-SetBoarderStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:Strikeout</property>
<property name="action_name">.uno:SetBorderStyle</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</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-NotebookbarToolBox" id="ExtTop2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkMenuToolButton" id="DrawText-CharBackColor">
<object class="GtkMenuToolButton" id="DrawText-CharBackColor1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:CharBackColor</property>
@@ -4882,7 +4937,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index 68826d1..2eeb42f 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -4256,6 +4256,7 @@
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom9">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_left">5</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -5552,6 +5553,7 @@
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom10">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_left">5</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 5630e39..5d2b7c9 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -4174,7 +4174,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">1</property>
</packing>
</child>
<child>
@@ -4295,6 +4295,66 @@
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box92">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="first14">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Draw-LineEndStyle1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:LineEndStyle</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-NotebookbarToolBox" id="SectionBottom43">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Draw-FillShadow2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:FillShadow</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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<style>
<class name="priority-5"/>
</style>
@@ -4363,6 +4423,7 @@
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom9">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_left">5</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -5332,6 +5393,262 @@
</packing>
</child>
<child>
<object class="sfxlo-OptionalBox" id="Text-Section-FormatLineArea">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkSeparator" id="separator31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box87">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="third15">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">text</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Text-FormatLine">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:FormatLine</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</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-NotebookbarToolBox" id="third16">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">text</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Text-FormatArea">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:FormatArea</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</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">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box88">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box89">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="first12">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkMenuToolButton" id="Text-XLineStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:XLineStyle</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</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="sfxlo-NotebookbarToolBox" id="SectionBottom17">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkMenuToolButton" id="Text-XLineColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:XLineColor</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</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="box90">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom32">
<property name="width_request">200</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Text-FillStyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:FillStyle</property>
</object>
<packing>
<property name="expand">True</property>
<property name="homogeneous">False</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">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box91">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="first13">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Draw-LineEndStyle2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:LineEndStyle</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-NotebookbarToolBox" id="SectionBottom54">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="Draw-FillShadow1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:FillShadow</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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<style>
<class name="priority-4"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="sfxlo-OptionalBox" id="Text-Section-Font">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -5389,6 +5706,7 @@
<object class="sfxlo-NotebookbarToolBox" id="SectionBottom10">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_left">5</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -5564,7 +5882,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
<child>
@@ -5800,7 +6118,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">3</property>
</packing>
</child>
<child>
