sc/uiconfig/scalc/ui/notebookbar.ui | 43 sc/uiconfig/scalc/ui/notebookbar_compact.ui | 12 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 2 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 4 sd/uiconfig/sdraw/ui/notebookbar.ui | 1224 ++++++---- sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 18 sd/uiconfig/simpress/ui/notebookbar.ui | 15 sd/uiconfig/simpress/ui/notebookbar_compact.ui | 12 sw/uiconfig/swriter/ui/notebookbar.ui | 1685 +++++++-------- sw/uiconfig/swriter/ui/notebookbar_compact.ui | 10 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 493 ++-- sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 766 +++++- 12 files changed, 2457 insertions(+), 1827 deletions(-)
New commits: commit db9965054d90c16f5c00a7726f2876301d4e3c2c Author: andreas kainz <kain...@gmail.com> AuthorDate: Thu Jun 27 00:27:30 2019 +0200 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Thu Jun 27 07:17:35 2019 +0200 Review all NB's and compare each other Change-Id: I1f6b18cb604059d890e9a3796b7b4dbca9d05134 Reviewed-on: https://gerrit.libreoffice.org/74769 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 4fe81d23d027..96fe93de8d8b 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -3288,21 +3288,6 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator10"> - <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="GroupB10"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3510,20 +3495,6 @@ <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkMenuToolButton" id="Home-SetBorderStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property> - <property name="halign">start</property> - <property name="action_name">.uno:SetBorderStyle</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -3555,6 +3526,20 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> + <object class="GtkMenuToolButton" id="Home-SetBorderStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property> + <property name="halign">start</property> + <property name="action_name">.uno:SetBorderStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkMenuToolButton" id="Home-BackgroundColor"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index eda195389b3a..c751884d21db 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -3502,10 +3502,11 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Home-FontColor"> + <object class="GtkMenuToolButton" id="Home-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> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -3513,11 +3514,10 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Home-BackgroundColor"> + <object class="GtkMenuToolButton" id="Home-FontColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> - <property name="use_underline">True</property> + <property name="action_name">.uno:Color</property> </object> <packing> <property name="expand">False</property> @@ -9628,7 +9628,7 @@ </child> <child> <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuGraphic"> - <property name="label" translatable="yes" context="notebookbar_compact|GraphicMenuButton">_Graphic</property> + <property name="label" translatable="yes" context="notebookbar_compact|GraphicMenuButton">Im_age</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 0ba84e295b23..8accaa28262c 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -7027,7 +7027,7 @@ <property name="can_focus">False</property> <child> <object class="svtlo-ManagedMenuButton" id="Image-Image:MenuGraphic"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ImageButton">_Image</property> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ImageButton">Im_age</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index 85c5e7507dd0..a42ce9fd3e72 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<!-- <?xml version="1.0" encoding="UTF-8"?> --> <!-- Generated with glade 3.22.1 --> <interface domain="sc"> <requires lib="gtk+" version="3.18"/> @@ -5601,7 +5601,7 @@ <property name="can_focus">False</property> <child> <object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">_Graphic</property> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">Im_age</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index ffe7dc5bd626..fe0aaa12275e 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -3453,13 +3453,13 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="Home-Section-DrawText"> + <object class="sfxlo-OptionalBox" id="Home-Section-DrawColor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator28"> + <object class="GtkSeparator" id="separator47"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3474,7 +3474,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom97"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom11"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="valign">center</property> @@ -3483,24 +3483,13 @@ <property name="show_arrow">False</property> <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Home-Text"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Text</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-VerticalText"> + <object class="GtkToolButton" id="Home-DesignerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:VerticalText</property> + <property name="action_name">.uno:DesignerDialog</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -3519,67 +3508,35 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Home-Section-Draw"> + <object class="sfxlo-OptionalBox" id="Home-Section-DrawColor1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB25"> + <object class="GtkBox" id="box23"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes1"> + <object class="sfxlo-NotebookbarToolBox" id="third7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Home-Line"> + <object class="GtkToolButton" id="Draw-FormatLine4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Line</property> + <property name="action_name">.uno:FormatLine</property> </object> <packing> <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> - <child> - <object class="GtkToolButton" id="Home-Polygon_Unfilled"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-Bezier_Unfilled"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Bezier_Unfilled</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-ArrowsToolbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -3588,49 +3545,148 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes3"> + <object class="sfxlo-NotebookbarToolBox" id="third8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Home-BasicShapes.rectangle"> + <object class="GtkToolButton" id="Draw-FormatArea4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes.rectangle</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-DrawColor2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="box10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box11"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="Home-BasicShapes.ellipse"> + <object class="sfxlo-NotebookbarToolBox" id="first6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes.ellipse</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-XLineStyle2"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-LineWidth2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineWidth</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="Home-DrawCaption"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom136"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-LineEndStyle3"> + <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> + <child> + <object class="GtkToolButton" id="Draw-XLineColor2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <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="sfxlo-NotebookbarToolBox" id="SectionBottom140"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Home-LineToolbox"> + <object class="GtkToolButton" id="Draw-FillStyle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:LineToolbox</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> <property name="expand">False</property> @@ -3639,7 +3695,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -3648,24 +3704,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> + <style> + <class name="priority-8"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Home-Section-Draw1"> + <object class="sfxlo-OptionalBox" id="Home-Section-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator95"> + <object class="GtkSeparator" id="separator28"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3680,75 +3739,34 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB82"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom97"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="valign">center</property> - <property name="orientation">vertical</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes13"> + <object class="GtkToolButton" id="Home-Text"> <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkToolButton" id="Home-BasicShapes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-SymbolShapes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SymbolShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:Text</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="shapes14"> + <object class="GtkToolButton" id="Home-VerticalText"> <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkToolButton" id="Home-StarShapes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-CalloutShapes"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:VerticalText</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> </object> @@ -3758,9 +3776,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-10"/> - </style> </object> <packing> <property name="expand">False</property> @@ -3769,26 +3784,28 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Home-Section-Draw2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Draw"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB72"> + <object class="GtkBox" id="GroupB25"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes2"> + <object class="sfxlo-NotebookbarToolBox" id="shapes1"> <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="Home-ArrowShapes"> + <object class="GtkToolButton" id="Home-Line"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:Line</property> </object> <packing> <property name="expand">True</property> @@ -3796,13 +3813,35 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-ConnectorToolbox"> + <object class="GtkToolButton" id="Home-Polygon_Unfilled"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ConnectorToolbox</property> + <property name="action_name">.uno:Polygon_Unfilled</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-Bezier_Unfilled"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Bezier_Unfilled</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-ArrowsToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowsToolbox</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -3814,14 +3853,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes4"> + <object class="sfxlo-NotebookbarToolBox" id="shapes3"> <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="Home-FlowChartShapes"> + <object class="GtkToolButton" id="Home-BasicShapes.rectangle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:BasicShapes.rectangle</property> </object> <packing> <property name="expand">True</property> @@ -3829,16 +3870,38 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-Objects3DToolbox"> + <object class="GtkToolButton" id="Home-BasicShapes.ellipse"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Objects3DToolbox</property> + <property name="action_name">.uno:BasicShapes.ellipse</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-DrawCaption"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DrawCaption</property> </object> <packing> <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="Home-LineToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineToolbox</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -3850,12 +3913,9 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> - <style> - <class name="priority-9"/> - </style> </object> <packing> <property name="expand">False</property> @@ -3864,87 +3924,52 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Home-Section-DrawColor"> + <object class="sfxlo-OptionalBox" id="Home-Section-Draw1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkSeparator" id="separator47"> + <object class="GtkSeparator" id="separator95"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom11"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="toolbar_style">both</property> - <property name="show_arrow">False</property> - <property name="icon_size">3</property> - <child> - <object class="GtkToolButton" id="Home-DesignerDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DesignerDialog</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-8"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Home-Section-DrawColor1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> + <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="box23"> + <object class="GtkBox" id="GroupB82"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third7"> + <object class="sfxlo-NotebookbarToolBox" id="shapes13"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> + <property name="can_focus">True</property> <child> - <object class="GtkToolButton" id="Draw-FormatLine4"> + <object class="GtkToolButton" id="Home-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:BasicShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-SymbolShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SymbolShapes</property> </object> <packing> <property name="expand">True</property> @@ -3959,16 +3984,25 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="third8"> + <object class="sfxlo-NotebookbarToolBox" id="shapes14"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">text</property> - <property name="show_arrow">False</property> + <property name="can_focus">True</property> <child> - <object class="GtkToolButton" id="Draw-FormatArea4"> + <object class="GtkToolButton" id="Home-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:StarShapes</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-CalloutShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CalloutShapes</property> </object> <packing> <property name="expand">True</property> @@ -3986,7 +4020,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <style> @@ -4000,89 +4034,41 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Home-Section-DrawColor2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Draw2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="box10"> + <object class="GtkBox" id="GroupB72"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box11"> + <object class="sfxlo-NotebookbarToolBox" id="shapes2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first6"> + <object class="GtkToolButton" id="Home-ArrowShapes"> <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="GtkMenuToolButton" id="Draw-XLineStyle2"> - <property name="width_request">100</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:XLineStyle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Draw-LineWidth2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineWidth</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:ArrowShapes</property> </object> <packing> <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom136"> + <object class="GtkToolButton" id="Home-ConnectorToolbox"> <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="Draw-LineEndStyle3"> - <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> - <child> - <object class="GtkToolButton" id="Draw-XLineColor2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:XLineColor</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:ConnectorToolbox</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -4093,26 +4079,34 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom140"> + <object class="sfxlo-NotebookbarToolBox" id="shapes4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-FillStyle2"> + <object class="GtkToolButton" id="Home-FlowChartShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FillStyle</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-Objects3DToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Objects3DToolbox</property> + </object> + <packing> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -4121,7 +4115,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> @@ -4131,7 +4125,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">6</property> </packing> </child> <child> @@ -8340,111 +8334,12 @@ <property name="tab_fill">False</property> </packing> </child> - <child> - <object class="sfxlo-PriorityHBox" id="TextBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="sfxlo-DropdownBox" id="Text-Menu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="GtkBox" id="GroupB29"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <child> - <object class="svtlo-ManagedMenuButton" id="Text-TextBotton:MenuText"> - <property name="label" translatable="yes" context="drawnotebookbar|TextMenuButton">T_ext</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">end</property> - <property name="hexpand">True</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="SectionBottom8"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="vexpand">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="Text-SearchDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SearchDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Text-Findbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Text-TransformDialog1"> - <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">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> + <child> + <object class="sfxlo-PriorityHBox" id="TextBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="sfxlo-PriorityMergedHBox" id="Text-Container"> <property name="visible">True</property> @@ -8545,6 +8440,19 @@ <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="sfxlo-OptionalBox" id="Text-Section-Style"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <child> <object class="GtkSeparator" id="separator14"> <property name="visible">True</property> @@ -8557,22 +8465,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="Text-Section-Style"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> <child> <object class="GtkBox" id="GroupB13"> <property name="visible">True</property> @@ -8635,7 +8530,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-8"/> </style> </object> <packing> @@ -8895,27 +8790,9 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator8"> - <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">2</property> + <property name="position">1</property> </packing> </child> - <style> - <class name="priority-5"/> - </style> </object> <packing> <property name="expand">False</property> @@ -8930,6 +8807,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator102"> + <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="GroupB14"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8990,32 +8882,31 @@ <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="GroupB15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator7"> - <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">1</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom91"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom13"> <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="Home-DefaultBullet"> + <object class="GtkToolButton" id="Home-LeftPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultBullet</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:LeftPara</property> </object> <packing> <property name="expand">False</property> @@ -9023,10 +8914,12 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-DefaultNumbering"> + <object class="GtkToolButton" id="Home-CenterPara"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultNumbering</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="action_name">.uno:CenterPara</property> </object> <packing> <property name="expand">False</property> @@ -9034,25 +8927,130 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-IncrementIndent"> + <object class="GtkToolButton" id="Home-RightPara"> <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:IncrementIndent</property> + <property name="action_name">.uno:RightPara</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> + </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">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Text-Section-Paragraph3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="GroupB79"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="GroupB81"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator82"> + <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">1</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom98"> + <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="Home-DefaultBullet1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DefaultBullet</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">2</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="GroupB85"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom145"> + <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="Home-DecrementIndent"> + <object class="GtkToolButton" id="Home-JustifyPara1"> <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:DecrementIndent</property> + <property name="action_name">.uno:JustifyPara</property> </object> <packing> <property name="expand">False</property> @@ -9063,47 +9061,78 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator83"> + <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">1</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-6"/> + </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="Text-Section-Paragraph2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="GroupB45"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="GroupB15"> + <object class="GtkBox" id="GroupB76"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom13"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom94"> <property name="visible">True</property> - <property name="can_focus">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="Home-LeftPara"> - <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:LeftPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-CenterPara"> + <object class="GtkToolButton" id="Home-DefaultNumbering1"> <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:CenterPara</property> + <property name="action_name">.uno:DefaultNumbering</property> </object> <packing> <property name="expand">False</property> @@ -9111,12 +9140,12 @@ </packing> </child> <child> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits