sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 5579 +++++++++++------ 1 file changed, 3679 insertions(+), 1900 deletions(-)
New commits: commit 45e9d8b093ee3815ed1d02b31d8b9421f977c0cb Author: andreas kainz <kain...@gmail.com> AuthorDate: Mon Nov 19 01:29:01 2018 +0100 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Mon Nov 19 14:02:14 2018 +0100 NB calc groupedbar compact big update and sync Change-Id: I2c9babfd06694c319b387c53613f178e2ea538f8 Reviewed-on: https://gerrit.libreoffice.org/63557 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 10c7f4d580ce..3318e8cc30ef 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/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.22.1 --> <interface domain="sc"> <requires lib="gtk+" version="3.18"/> <requires lib="LibreOffice" version="1.0"/> @@ -2470,6 +2470,57 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuPrint"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuPrint-PreviousPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PreviousPage</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-NextPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NextPage</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuPrint-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-PageFormatDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PageFormatDialog</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuPrint-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-Print"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Print</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuPrint-ClosePreview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ClosePreview</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuReference"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3671,12 +3722,12 @@ <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="focus_on_click">False</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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -3727,10 +3778,10 @@ <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="focus_on_click">False</property> <property name="receives_default">False</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -3779,7 +3830,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Open"> + <object class="GtkMenuToolButton" id="File-Open"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Open</property> @@ -3790,7 +3841,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Save"> + <object class="GtkMenuToolButton" id="File-Save"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Save</property> @@ -3800,6 +3851,17 @@ <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="File-Print"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Print</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -3816,12 +3878,12 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -3838,17 +3900,6 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="Print"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Print</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -3971,12 +4022,12 @@ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -4052,7 +4103,7 @@ <object class="sfxlo-PriorityMergedHBox" id="DefaultContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="StylesSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Styles"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -4081,21 +4132,21 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="FormatPaintbrush"> + <object class="GtkMenuToolButton" id="Default-ConditionalFormatMenu"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatPaintbrush</property> + <property name="action_name">.uno:ConditionalFormatMenu</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="ResetAttributes"> + <object class="GtkToolButton" id="Default-FormatPaintbrush"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ResetAttributes</property> + <property name="action_name">.uno:FormatPaintbrush</property> </object> <packing> <property name="expand">False</property> @@ -4103,14 +4154,14 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="ConditionalFormatMenu"> + <object class="GtkToolButton" id="Default-ResetAttributes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ConditionalFormatMenu</property> + <property name="action_name">.uno:ResetAttributes</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -4125,14 +4176,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="paragraphstyleb:MenuStyle"> + <object class="svtlo-ManagedMenuButton" id="Default-Style:MenuStyle"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">St_yles</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -4140,23 +4191,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="opacity">0.92000000000000004</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> - </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> @@ -4182,7 +4216,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FontSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Font"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -4216,7 +4250,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="CharFontName"> + <object class="GtkToolButton" id="Default-CharFontName"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> @@ -4242,7 +4276,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="FontHeight"> + <object class="GtkToolButton" id="Default-FontHeight"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="action_name">.uno:FontHeight</property> @@ -4253,14 +4287,14 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="BackColor"> + <object class="GtkMenuToolButton" id="Default-Color"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> + <property name="action_name">.uno:Color</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4282,14 +4316,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="formatb:MenuFormat"> + <object class="svtlo-ManagedMenuButton" id="Default-Font:MenuFormat"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatb">F_ont</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -4307,7 +4341,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Bold"> + <object class="GtkToolButton" id="Default-Bold"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Bold</property> @@ -4318,7 +4352,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Italic"> + <object class="GtkToolButton" id="Default-Italic"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Italic</property> @@ -4329,7 +4363,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Underline"> + <object class="GtkToolButton" id="Default-Underline"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Underline</property> @@ -4340,7 +4374,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="bordertype"> + <object class="GtkMenuToolButton" id="Default-SetBoarderStyle"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -4354,14 +4388,14 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="fontcolor3"> + <object class="GtkMenuToolButton" id="Default-BackgroundColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Color</property> + <property name="action_name">.uno:BackgroundColor</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -4393,12 +4427,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NumberSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator151"> + <object class="GtkSeparator" id="separator6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -4411,62 +4445,47 @@ </packing> </child> <child> - <object class="GtkBox" id="Section40"> + <object class="GtkBox" id="Section5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box53"> + <object class="GtkBox" id="box13"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="NumberFormatCurrency"> + <object class="GtkToolButton" id="Default-AlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumberFormatCurrency</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="NumberFormatPercent"> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:NumberFormatPercent</property> + <property name="action_name">.uno:AlignLeft</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="NumberFormatDecimal"> + <object class="GtkToolButton" id="Default-AlignHorizontalCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:NumberFormatDecimal</property> + <property name="action_name">.uno:AlignHorizontalCenter</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="NumberFormatIncDecimals1"> + <object class="GtkToolButton" id="Default-AlignRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumberFormatIncDecimals</property> + <property name="action_name">.uno:AlignRight</property> </object> <packing> <property name="expand">False</property> @@ -4474,10 +4493,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="NumberFormatDecDecimals1"> + <object class="GtkToolButton" id="Default-AlignBlock"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:NumberFormatDecDecimals</property> + <property name="action_name">.uno:AlignBlock</property> </object> <packing> <property name="expand">False</property> @@ -4486,122 +4505,39 @@ </child> </object> <packing> - <property name="expand">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">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box50"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="numberb:MenuNumber"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|numberb">_Number</property> + <object class="GtkSeparator" id="separator102"> <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> - <property name="focus_on_click">False</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">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="padding">5</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">1</property> - </packing> - </child> - <style> - <class name="priority-7"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="AlignmentSection"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> - <child> - <object class="GtkSeparator" id="separator6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="Section5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="box13"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> + <object class="sfxlo-NotebookbarToolBox" id="third5"> <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> <child> - <object class="GtkToolButton" id="AlignLeft1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="AlignHorizontalCenter1"> + <object class="GtkToolButton" id="Default-CommonAlignTop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="AlignRight1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignRight</property> + <property name="action_name">.uno:CommonAlignTop</property> </object> <packing> <property name="expand">False</property> @@ -4609,34 +4545,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="AlignBlock"> + <object class="GtkToolButton" id="Default-CommonAlignVerticalCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AlignBlock</property> + <property name="action_name">.uno:CommonAlignVerticalCenter</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-NotebookbarToolBox" id="SectionBottom35"> - <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="WrapText"> + <object class="GtkToolButton" id="Default-CommonAlignBottom"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapText</property> + <property name="action_name">.uno:CommonAlignBottom</property> </object> <packing> <property name="expand">False</property> @@ -4662,14 +4585,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="paragraphb:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Alignment</property> + <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Paragraph</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -4687,7 +4610,7 @@ <property name="show_arrow">False</property> <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="IncrementIndent"> + <object class="GtkToolButton" id="Default-IncrementIndent"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:IncrementIndent</property> @@ -4697,11 +4620,35 @@ <property name="homogeneous">True</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <child> + <object class="GtkToolButton" id="Default-WrapText"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapText</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-ToggleMergeCells"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:ToggleMergeCells</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> @@ -4725,11 +4672,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CellSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Cell"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -4747,7 +4694,7 @@ </packing> </child> <child> - <object class="GtkBox" id="Section7"> + <object class="GtkBox" id="box42"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -4758,13 +4705,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="InsertColumnsBefore1"> + <object class="GtkToolButton" id="Table-InsertColumnsBefore"> <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> @@ -4772,13 +4716,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertRowsBefore1"> + <object class="GtkToolButton" id="Table-InsertColumnsAfter"> <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> + <property name="action_name">.uno:InsertColumnsAfter</property> </object> <packing> <property name="expand">False</property> @@ -4786,27 +4727,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="DeleteColumns1"> + <object class="GtkToolButton" id="Table-DeleteColumns"> <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> - <child> - <object class="GtkToolButton" id="DeleteRows1"> - <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> @@ -4821,53 +4745,43 @@ </packing> </child> <child> - <object class="GtkBox" id="box51"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="opacity">0.92156862745098034</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="cellb:MenuCell"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|cellb">_Cells</property> + <object class="GtkToolButton" id="Table-InsertRowsBefore"> <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> - <property name="focus_on_click">False</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertRowsBefore</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop10"> + <object class="GtkToolButton" id="Table-InsertRowsAfter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="opacity">0.92156862745098034</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="ToggleMergeCells"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:ToggleMergeCells</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:InsertRowsAfter</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DeleteRows"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteRows</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -4891,16 +4805,16 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="InsertSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Number"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator18"> + <object class="GtkSeparator" id="separator151"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -4913,47 +4827,72 @@ </packing> </child> <child> - <object class="GtkBox" id="Section6"> + <object class="GtkBox" id="Section40"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6"> + <object class="GtkBox" id="box53"> <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="InsertObjectChart"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObjectChart</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> <child> - <object class="GtkToolButton" id="InsertGraphic"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:InsertGraphic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="CharmapControl"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CharmapControl</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Default-NumberFormatCurrency"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumberFormatCurrency</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-NumberFormatDecimal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:NumberFormatDecimal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-NumberFormatIncDecimals"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumberFormatIncDecimals</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-NumberFormatDecDecimals"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumberFormatDecDecimals</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="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> @@ -4964,20 +4903,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box44"> + <object class="GtkBox" id="box50"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="insertb:MenuInsert"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">_Insert</property> + <object class="svtlo-ManagedMenuButton" id="Default-Number:MenuNumber"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|numberb">_Number</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -4985,22 +4922,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> - <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> - </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> @@ -5016,17 +4937,17 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-7"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DataSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Data"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -5055,7 +4976,7 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="DataDataPilotRun"> + <object class="GtkToolButton" id="Default-DataDataPilotRun"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DataDataPilotRun</property> @@ -5066,7 +4987,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="DataFilterAutoFilter"> + <object class="GtkToolButton" id="Default-DataFilterAutoFilter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -5078,7 +4999,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="SortAscending"> + <object class="GtkToolButton" id="Default-SortAscending"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> @@ -5101,15 +5022,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="datab:MenuData"> + <object class="svtlo-ManagedMenuButton" id="Default-Data:MenuData"> <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|datab">_Data</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> - <property name="yalign">0.49000000953674316</property> </object> <packing> <property name="expand">False</property> @@ -5138,16 +5058,16 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ReviewSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator27"> + <object class="GtkSeparator" id="separator18"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5160,21 +5080,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section9"> + <object class="GtkBox" id="Section6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6"> <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="SpellingAndGrammarDialog"> + <object class="GtkToolButton" id="Default-InsertObjectChart"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:SpellingAndGrammarDialog</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertObjectChart</property> </object> <packing> <property name="expand">False</property> @@ -5182,10 +5102,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="InsertAnnotation"> + <object class="GtkToolButton" id="Default-InsertGraphic"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:InsertAnnotation</property> + <property name="action_name">.uno:InsertGraphic</property> </object> <packing> <property name="expand">False</property> @@ -5193,14 +5113,14 @@ </packing> </child> <child> - <object class="GtkToolButton" id="TraceChangeMode"> + <object class="GtkToolButton" id="Default-CharmapControl"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TraceChangeMode</property> + <property name="action_name">.uno:CharmapControl</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -5211,20 +5131,20 @@ </packing> </child> <child> - <object class="GtkBox" id="box14"> + <object class="GtkBox" id="box44"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property> + <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">_Insert</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -5247,22 +5167,22 @@ </packing> </child> <style> - <class name="priority-2"/> + <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">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ViewSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-Review"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator24"> + <object class="GtkSeparator" id="separator27"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5275,21 +5195,21 @@ </packing> </child> <child> - <object class="GtkBox" id="Section8"> + <object class="GtkBox" id="Section9"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9"> <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="FreezePanes"> + <object class="GtkToolButton" id="Default-SpellingAndGrammarDialog"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:FreezePanes</property> + <property name="action_name">.uno:SpellingAndGrammarDialog</property> </object> <packing> <property name="expand">False</property> @@ -5297,10 +5217,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="PrintPreview"> + <object class="GtkToolButton" id="Default-InsertAnnotation"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:PrintPreview</property> + <property name="can_focus">True</property> + <property name="action_name">.uno:InsertAnnotation</property> </object> <packing> <property name="expand">False</property> @@ -5308,14 +5228,14 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Zoom2"> + <object class="GtkToolButton" id="Default-TraceChangeMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Zoom</property> + <property name="action_name">.uno:TraceChangeMode</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -5326,18 +5246,20 @@ </packing> </child> <child> - <object class="GtkBox" id="box10"> + <object class="GtkBox" id="box14"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="viewb:MenuView"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_View</property> + <object class="svtlo-ManagedMenuButton" id="Default-Review:MenuReview"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</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> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -5360,38 +5282,22 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">7</property> </packing> </child> - <style> - <class name="context-Cell"/> - <class name="context-default"/> - <class name="context-Empty"/> - <class name="context-EditCell"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="GraphicContainer"> - <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="GraphicSection"> + <object class="sfxlo-OptionalBox" id="Default-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> <child> - <object class="GtkSeparator" id="separator14"> + <object class="GtkSeparator" id="separator24"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -5404,61 +5310,47 @@ </packing> </child> <child> - <object class="GtkBox" id="Section18"> + <object class="GtkBox" id="Section8"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom20"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">end</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="InsertCaptionDialog4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:ObjectTitleDescription</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Crop"> + <object class="GtkToolButton" id="Default-FreezePanes"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="action_name">.uno:Crop</property> + <property name="action_name">.uno:FreezePanes</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="CompressGraphic"> + <object class="GtkToolButton" id="Default-PrintPreview"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:CompressGraphic</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PrintPreview</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkToolButton" id="FlipHorizontal"> + <object class="GtkToolButton" id="Default-Zoom"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Zoom</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -5469,19 +5361,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box5"> + <object class="GtkBox" id="box10"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Graphic</property> + <object class="svtlo-ManagedMenuButton" id="Default-View:MenuView"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_View</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> - <property name="focus_on_click">False</property> </object> <packing> <property name="expand">False</property> @@ -5489,35 +5380,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop5"> - <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="TransformDialog3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:TransformDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits