sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 1357 ++++++++++------- 1 file changed, 870 insertions(+), 487 deletions(-)
New commits: commit b3f4cf6b256c1ed6f6645db009247ba08c44a53b Author: andreas kainz <kain...@gmail.com> AuthorDate: Tue Dec 11 16:26:39 2018 +0100 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Sun Dec 16 20:33:40 2018 +0100 nb groupedbar_compact fix table layout to sync with others Change-Id: Iac5a3144f9790457c2ccbe0fb916b66421443a6c Reviewed-on: https://gerrit.libreoffice.org/65216 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index d0c3d24c784a..68826d119c23 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -3797,7 +3797,6 @@ <style> <class name="context-Default"/> <class name="context-DrawPage"/> - <class name="context-TextObject"/> </style> </object> <packing> @@ -3840,10 +3839,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-InsertGraphic"> + <object class="GtkToolButton" id="Table-SplitCell"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:SplitCell</property> </object> <packing> <property name="expand">False</property> @@ -3851,10 +3850,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertObjectChart"> + <object class="GtkToolButton" id="Table-MergeCells"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertObjectChart</property> + <property name="action_name">.uno:MergeCells</property> </object> <packing> <property name="expand">False</property> @@ -3862,10 +3861,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertPage"> + <object class="GtkToolButton" id="Table-TableDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertPage</property> + <property name="action_name">.uno:TableDialog</property> </object> <packing> <property name="expand">False</property> @@ -3873,10 +3872,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertTable"> + <object class="GtkToolButton" id="Table-OptimizeTable"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertTable</property> + <property name="action_name">.uno:OptimizeTable</property> </object> <packing> <property name="expand">False</property> @@ -3895,8 +3894,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Table-Insert:MenuInsert"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|insertText">_Insert</property> + <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuRowsColumns"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|rowscolumnst">_Table</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -3933,11 +3932,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Font"> + <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator22"> + <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3952,51 +3951,96 @@ </packing> </child> <child> - <object class="GtkBox" id="Section15"> + <object class="GtkBox" id="box39"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box14"> + <object class="sfxlo-NotebookbarToolBox" id="third3"> + <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="Table-BorderDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Line</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="third6"> + <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="Table-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="box40"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box41"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> + <object class="sfxlo-NotebookbarToolBox" id="first21"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-CharFontName"> + <object class="GtkMenuToolButton" id="Table-SetBorderStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="action_name">.uno:CharFontName</property> + <property name="action_name">.uno:SetBorderStyle</property> </object> <packing> - <property name="expand">True</property> + <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="SectionBottom9"> - <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="Table-FontHeight"> + <object class="GtkMenuToolButton" id="Table-LineStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FontHeight</property> + <property name="action_name">.uno:LineStyle</property> </object> <packing> <property name="expand">False</property> @@ -4005,22 +4049,22 @@ </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> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom12"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Table-Color1"> + <object class="GtkMenuToolButton" id="Table-FrameLineColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Color</property> + <property name="action_name">.uno:FrameLineColor</property> </object> <packing> <property name="expand">False</property> @@ -4031,7 +4075,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -4042,74 +4086,24 @@ </packing> </child> <child> - <object class="GtkBox" id="box17"> + <object class="GtkBox" id="box42"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Table-Font:MenuFormat"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|formatt">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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79"> + <property name="width_request">200</property> <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="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-Bold"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Bold</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-Italic"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Italic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-Underline"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Underline</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-Strikeout"> + <object class="GtkToolButton" id="Table-FillStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Strikeout</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">False</property> </packing> </child> @@ -4120,30 +4114,64 @@ <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="box89"> + <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="SectionBottom36"> + <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="sfxlo-NotebookbarToolBox" id="ExtTop4"> + <object class="GtkToolButton" id="Draw-FillShadow2"> <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="Table-CharBackColor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CharBackColor</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -4157,7 +4185,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <style> @@ -4171,11 +4199,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Paragraph"> + <object class="sfxlo-OptionalBox" id="Table-Section-Font"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator23"> + <object class="GtkSeparator" id="separator22"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4190,36 +4218,51 @@ </packing> </child> <child> - <object class="GtkBox" id="Section16"> + <object class="GtkBox" id="Section15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box23"> + <object class="GtkBox" id="box14"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Table-DefaultBullet"> + <object class="GtkToolButton" id="Table-CharFontName"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultBullet</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:CharFontName</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</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="SectionBottom9"> + <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="Table-DefaultNumbering"> + <object class="GtkToolButton" id="Table-FontHeight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultNumbering</property> + <property name="action_name">.uno:FontHeight</property> </object> <packing> <property name="expand">False</property> @@ -4230,70 +4273,20 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator25"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</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="padding">5</property> <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom12"> <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="Table-LeftPara"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LeftPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-CenterPara"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CenterPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-RightPara"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RightPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-JustifyPara"> + <object class="GtkMenuToolButton" id="Table-Color1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:JustifyPara</property> + <property name="action_name">.uno:Color</property> </object> <packing> <property name="expand">False</property> @@ -4315,12 +4308,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box25"> + <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Table-Paragraph:MenuParagraph"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|paragrapht">_Paragraph</property> + <object class="svtlo-ManagedMenuButton" id="Table-Font:MenuFormat"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|formatt">F_ont</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -4330,12 +4323,12 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third2"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -4343,10 +4336,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-CellVertTop"> + <object class="GtkToolButton" id="Table-Bold"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertTop</property> + <property name="action_name">.uno:Bold</property> </object> <packing> <property name="expand">False</property> @@ -4354,10 +4347,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-CellVertCenter"> + <object class="GtkToolButton" id="Table-Italic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertCenter</property> + <property name="action_name">.uno:Italic</property> </object> <packing> <property name="expand">False</property> @@ -4365,10 +4358,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-CellVertBottom"> + <object class="GtkToolButton" id="Table-Underline"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CellVertBottom</property> + <property name="action_name">.uno:Underline</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-Strikeout"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Strikeout</property> </object> <packing> <property name="expand">False</property> @@ -4382,6 +4386,32 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop4"> + <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="Table-CharBackColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CharBackColor</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">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -4407,11 +4437,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-Table"> + <object class="sfxlo-OptionalBox" id="Table-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator124"> + <object class="GtkSeparator" id="separator23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4426,36 +4456,25 @@ </packing> </child> <child> - <object class="GtkBox" id="Section21"> + <object class="GtkBox" id="Section16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box46"> + <object class="GtkBox" id="box23"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14"> <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="Table-Section-MergeCells"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:MergeCells</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Table-Section-SplitCell"> + <object class="GtkMenuToolButton" id="Table-DefaultBullet"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SplitCell</property> + <property name="action_name">.uno:DefaultBullet</property> </object> <packing> <property name="expand">False</property> @@ -4463,10 +4482,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-Section-OptimizeTable"> + <object class="GtkMenuToolButton" id="Table-DefaultNumbering"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OptimizeTable</property> + <property name="action_name">.uno:DefaultNumbering</property> </object> <packing> <property name="expand">False</property> @@ -4481,7 +4500,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator3"> + <object class="GtkSeparator" id="separator25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -4498,16 +4517,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> <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="Table-InsertColumnsBefore"> + <object class="GtkToolButton" id="Table-LeftPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertColumnsBefore</property> + <property name="action_name">.uno:LeftPara</property> </object> <packing> <property name="expand">False</property> @@ -4515,10 +4534,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertColumnsAfter"> + <object class="GtkToolButton" id="Table-CenterPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertColumnsAfter</property> + <property name="action_name">.uno:CenterPara</property> </object> <packing> <property name="expand">False</property> @@ -4526,10 +4545,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteColumns"> + <object class="GtkToolButton" id="Table-RightPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteColumns</property> + <property name="action_name">.uno:RightPara</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-JustifyPara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:JustifyPara</property> </object> <packing> <property name="expand">False</property> @@ -4551,12 +4581,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box57"> + <object class="GtkBox" id="box25"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuRowsColumns"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|rowscolumnst">_Table</property> + <object class="svtlo-ManagedMenuButton" id="Table-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|paragrapht">_Paragraph</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -4566,24 +4596,23 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> + <object class="sfxlo-NotebookbarToolBox" id="third2"> <property name="visible">True</property> <property name="can_focus">True</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> <child> - <object class="GtkToolButton" id="Table-InsertRowsBefore"> + <object class="GtkToolButton" id="Table-CellVertTop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsBefore</property> + <property name="action_name">.uno:CellVertTop</property> </object> <packing> <property name="expand">False</property> @@ -4591,10 +4620,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertRowsAfter"> + <object class="GtkToolButton" id="Table-CellVertCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertRowsAfter</property> + <property name="action_name">.uno:CellVertCenter</property> </object> <packing> <property name="expand">False</property> @@ -4602,10 +4631,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteRows"> + <object class="GtkToolButton" id="Table-CellVertBottom"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteRows</property> + <property name="action_name">.uno:CellVertBottom</property> </object> <packing> <property name="expand">False</property> @@ -4644,11 +4673,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Table-Section-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Table-Section-Table"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator1"> + <object class="GtkSeparator" id="separator124"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4663,85 +4692,157 @@ </packing> </child> <child> - <object class="GtkBox" id="box39"> + <object class="GtkBox" id="Section21"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third3"> - <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="Table-BorderDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Line</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="third6"> + <object class="GtkBox" id="box46"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="Table-FormatArea"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Table-InsertColumnsBefore"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertColumnsBefore</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-InsertColumnsAfter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertColumnsAfter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DeleteColumns"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DeleteColumns</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">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="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</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="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40"> + <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="Table-EntireColumn"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:EntireColumn</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-SetMinimalColumnWidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SetMinimalColumnWidth</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-SetOptimalColumnWidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SetOptimalColumnWidth</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DistributeColumns"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DistributeColumns</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">3</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> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</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="GtkBox" id="box41"> + <object class="GtkBox" id="box57"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first21"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="opacity">0.92156862745098034</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Table-SetBorderStyle"> + <object class="GtkToolButton" id="Table-InsertRowsBefore"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SetBorderStyle</property> + <property name="action_name">.uno:InsertRowsBefore</property> </object> <packing> <property name="expand">False</property> @@ -4749,10 +4850,21 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Table-LineStyle"> + <object class="GtkToolButton" id="Table-InsertRowsAfter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineStyle</property> + <property name="action_name">.uno:InsertRowsAfter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</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> @@ -4761,22 +4873,72 @@ </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> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16"> + <object class="GtkSeparator" id="separator17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</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="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Table-FrameLineColor"> + <object class="GtkToolButton" id="Table-EntireRow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FrameLineColor</property> + <property name="action_name">.uno:EntireRow</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-SetMinimalRowHeight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SetMinimalRowHeight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-SetOptimalRowHeight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SetOptimalRowHeight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Table-DistributeRows"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DistributeRows</property> </object> <packing> <property name="expand">False</property> @@ -4787,135 +4949,421 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> <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> + </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-OptionalBox" id="Table-Section-Calc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator139"> + <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="Section23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box42"> + <object class="GtkBox" id="box60"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38"> + <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="Table-TableSort"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TableSort</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">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="Table-AutoSum"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AutoSum</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">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box61"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Table-Calc:MenuCalculate"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|calculatet">_Calc</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</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> + </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> + </packing> + </child> + <style> + <class name="context-Table"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-PriorityMergedHBox" id="DrawTextContainer"> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-OptionalBox" id="Text-Section-Insert"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator13"> + <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="Section9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1"> + <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="DrawText-InsertGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertGraphic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="DrawText-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">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="DrawText-InsertPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertPage</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="DrawText-InsertTable"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertTable</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="GtkBox" id="box8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="DrawText-Insert:MenuInsert"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|insertText">_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="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits