sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 1551 ++++++++--------- 1 file changed, 761 insertions(+), 790 deletions(-)
New commits: commit 78d11bb70a0f72d5c459ef0a4f483dba0cacf4e0 Author: andreas kainz <kain...@gmail.com> AuthorDate: Tue Dec 11 14:52:57 2018 +0100 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Fri Dec 14 08:39:01 2018 +0100 update groupedbar_compact draw Change-Id: Id00bcd45faa3d9e82d3ed23843f5c4320bfa8f79 Reviewed-on: https://gerrit.libreoffice.org/65135 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> (cherry picked from commit 744c82af55d0ef1bfae61d13e5cf32fbd83c8b6b) Reviewed-on: https://gerrit.libreoffice.org/65138 diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index 7bc75788ccf5..d0c3d24c784a 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -2078,6 +2078,26 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuSettings-RunMacro"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RunMacro</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuSettings-ScriptOrganizer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ScriptOrganizer</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuSettings-separator4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuSettings-HelpIndex"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2411,99 +2431,6 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuTools"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="MenuTools-MacroRecorder"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:MacroRecorder</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-RunMacro"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RunMacro</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BasicIDEAppear</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-MacroOrganizer"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ScriptOrganizer</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-MacroSignature"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:MacroSignature</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="MenuTools-separator1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-PresentationMinimizer"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:PresentationMinimizer</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-BmpMask"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BmpMask</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-AVMediaPlayer"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AVMediaPlayer</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="MenuTools-separator2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ViewDataSourceBrowser</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:OpenXMLFilterSettings</property> - </object> - </child> - </object> <object class="GtkMenu" id="MenuView"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2626,12 +2553,11 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-PriorityHBox" id="DefaultContainer"> + <object class="sfxlo-PriorityHBox" id="Box"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">5</property> <property name="margin_right">5</property> - <property name="baseline_position">bottom</property> <child> <object class="sfxlo-DropdownBox" id="ToolsSection"> <property name="visible">True</property> @@ -2644,50 +2570,42 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="Section2"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</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="SectionBottom2"> + <object class="GtkToolButton" id="Tools-SearchDialog"> <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="Tools-SearchDialog"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:SearchDialog</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:SearchDialog</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="svtlo-ManagedMenuButton" id="Tools-Menu:MenuSettings"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|menub">_Menu</property> + <object class="GtkToolButton" id="Tools-HelpIndex"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="relief">none</property> - <property name="use_underline">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HelpIndex</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Tools-CloseDoc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CloseDoc</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -2698,52 +2616,15 @@ </packing> </child> <child> - <object class="GtkBox" id="box34"> + <object class="svtlo-ManagedMenuButton" id="Tools-Menu:MenuSettings"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|menub">_Menu</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="sfxlo-NotebookbarToolBox" id="thirdExt2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="Tools-HelpIndex"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:HelpIndex</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="svtlo-ManagedMenuButton" id="Tools-Tools:MenuTools"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|toolsb">_Tools</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <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="relief">none</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -2771,50 +2652,48 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">5</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkBox" id="Section"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="baseline_position">top</property> <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="File-Open"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="action_name">.uno:Open</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> <object class="GtkMenuToolButton" id="File-Save"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="action_name">.uno:Save</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="File-Print"> + <object class="GtkToolButton" id="File-ExportToPDF"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:Print</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExportToPDF</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -2835,7 +2714,6 @@ <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -2870,12 +2748,12 @@ <object class="sfxlo-DropdownBox" id="ClipboardSection"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_bottom">3</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="orientation">vertical</property> </object> <packing> @@ -2893,40 +2771,40 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="Edit-Paste"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="action_name">.uno:Paste</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> <object class="GtkToolButton" id="Edit-Undo"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="action_name">.uno:Undo</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> <object class="GtkToolButton" id="Edit-Redo"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="action_name">.uno:Redo</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -2947,7 +2825,6 @@ <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -2957,44 +2834,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="Edit-Cut"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:Cut</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Edit-Copy"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="action_name">.uno:Copy</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -3021,8 +2860,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="valign">baseline</property> - <property name="margin_bottom">3</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> <property name="orientation">vertical</property> </object> <packing> @@ -3039,17 +2878,18 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="DefaultContaine"> + <object class="sfxlo-PriorityMergedHBox" id="DefaultContainer"> <property name="can_focus">False</property> <child> <object class="sfxlo-OptionalBox" id="Default-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator11"> <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> @@ -3067,7 +2907,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3100,7 +2940,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3111,7 +2951,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3132,7 +2972,6 @@ <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -3167,11 +3006,12 @@ <object class="sfxlo-OptionalBox" id="Default-Section-Draw"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator18"> <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> @@ -3193,7 +3033,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3204,7 +3044,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3215,7 +3055,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3226,7 +3066,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3237,7 +3077,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3248,7 +3088,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3275,53 +3115,117 @@ <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="box51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Default-Draw:MenuDraw"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|draw">D_raw</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">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-5"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Default-Section-Draw1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box10"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes13"> + <object class="sfxlo-NotebookbarToolBox" id="shapes5"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <child> - <object class="GtkToolButton" id="Default-BasicShapes"> + <object class="GtkToolButton" id="Default-BasicShapes1"> <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> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="Default-SymbolShapes"> + <object class="GtkToolButton" id="Default-SymbolShapes1"> <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> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="Default-ArrowShapes"> + <object class="GtkToolButton" id="Default-ArrowShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ArrowShapes</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="Default-ConnectorToolbox"> + <object class="GtkToolButton" id="Default-ConnectorToolbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ConnectorToolbox</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3332,7 +3236,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator27"> + <object class="GtkSeparator" id="separator20"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3347,20 +3251,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA20"> + <object class="sfxlo-NotebookbarToolBox" id="LineA8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Default-XLineColor"> + <object class="GtkToolButton" id="Default-XLineColor1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:XLineColor</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3378,76 +3282,56 @@ </packing> </child> <child> - <object class="GtkBox" id="box51"> + <object class="GtkBox" id="box11"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Default-Draw:MenuDraw"> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|draw">D_raw</property> + <object class="sfxlo-NotebookbarToolBox" id="shapes6"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </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="shapes14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> <property name="toolbar_style">icons</property> - <property name="icon_size">1</property> <child> - <object class="GtkToolButton" id="Default-StarShapes"> + <object class="GtkToolButton" id="Default-StarShapes1"> <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> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="Default-CalloutShapes"> + <object class="GtkToolButton" id="Default-CalloutShapes1"> <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> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="Default-FlowChartShapes"> + <object class="GtkToolButton" id="Default-FlowChartShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlowChartShapes</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="Default-Objects3DToolbox"> + <object class="GtkToolButton" id="Default-Objects3DToolbox1"> <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> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3458,7 +3342,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator62"> + <object class="GtkSeparator" id="separator51"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3473,21 +3357,20 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB22"> + <object class="sfxlo-NotebookbarToolBox" id="LineB8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">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="Default-FillColor"> + <object class="GtkToolButton" id="Default-FillColor1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FillColor</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3518,18 +3401,19 @@ <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="Default-Section-Snap"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator63"> <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> @@ -3547,7 +3431,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineB18"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3558,7 +3442,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3569,7 +3453,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3580,7 +3464,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3591,7 +3475,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3602,7 +3486,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3623,7 +3507,6 @@ <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -3636,12 +3519,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineA15"> <property name="visible">True</property> - <property name="can_focus">False</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> - <property name="icon_size">1</property> <child> <object class="GtkToolButton" id="Default-CapturePoint"> <property name="visible">True</property> @@ -3650,7 +3532,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3681,18 +3563,19 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> <object class="sfxlo-OptionalBox" id="Default-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator12"> <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> @@ -3710,7 +3593,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3721,7 +3604,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3732,7 +3615,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3743,7 +3626,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3764,7 +3647,6 @@ <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -3795,18 +3677,19 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> <object class="sfxlo-OptionalBox" id="Default-Section-Review"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator24"> <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> @@ -3824,7 +3707,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3835,7 +3718,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3846,7 +3729,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3857,7 +3740,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -3878,7 +3761,6 @@ <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -3931,11 +3813,12 @@ <object class="sfxlo-OptionalBox" id="Table-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</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> @@ -3953,7 +3836,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4053,11 +3936,12 @@ <object class="sfxlo-OptionalBox" id="Table-Section-Font"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator22"> <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> @@ -4079,7 +3963,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> @@ -4092,7 +3976,7 @@ </object> <packing> <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4105,7 +3989,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4116,25 +4000,38 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">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> + <child> + <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="GtkMenuToolButton" id="Table-Color"> + <object class="GtkMenuToolButton" id="Table-Color1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Color</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> @@ -4167,12 +4064,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="ExtTop1"> <property name="visible">True</property> - <property name="can_focus">False</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> - <property name="icon_size">1</property> <child> <object class="GtkToolButton" id="Table-Bold"> <property name="visible">True</property> @@ -4181,7 +4077,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4192,7 +4088,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4203,7 +4099,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4214,11 +4110,26 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">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> + <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-CharBackColor"> + <object class="GtkMenuToolButton" id="Table-CharBackColor1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CharBackColor</property> @@ -4232,7 +4143,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> @@ -4263,11 +4174,12 @@ <object class="sfxlo-OptionalBox" id="Table-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator23"> <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> @@ -4289,7 +4201,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4300,7 +4212,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4311,7 +4223,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4326,6 +4238,8 @@ <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> @@ -4339,7 +4253,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="ExtBottom3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4350,7 +4264,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4361,7 +4275,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4372,7 +4286,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4383,7 +4297,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4423,12 +4337,11 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third2"> <property name="visible">True</property> - <property name="can_focus">False</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> - <property name="icon_size">1</property> <child> <object class="GtkToolButton" id="Table-CellVertTop"> <property name="visible">True</property> @@ -4437,7 +4350,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4448,7 +4361,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4459,7 +4372,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4497,11 +4410,12 @@ <object class="sfxlo-OptionalBox" id="Table-Section-Table"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</property> <child> <object class="GtkSeparator" id="separator124"> <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> @@ -4523,9 +4437,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="hexpand">True</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4536,7 +4448,7 @@ </object> <packing> <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4547,7 +4459,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4558,7 +4470,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4588,7 +4500,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4599,7 +4511,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4610,7 +4522,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4621,7 +4533,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4649,7 +4561,6 @@ <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">False</property> - <property name="halign">start</property> <property name="relief">none</property> <property name="use_underline">True</property> </object> @@ -4662,13 +4573,12 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> <property name="visible">True</property> - <property name="can_focus">False</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> - <property name="icon_size">1</property> <child> <object class="GtkToolButton" id="Table-InsertRowsBefore"> <property name="visible">True</property> @@ -4677,7 +4587,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4688,7 +4598,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -4699,7 +4609,7 @@ </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4760,7 +4670,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> @@ -4784,7 +4694,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> @@ -4824,7 +4734,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="first21"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4859,7 +4769,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -4902,12 +4812,11 @@ <object class="GtkToolButton" id="Table-FillStyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> <property name="action_name">.uno:FillStyle</property> </object> <packing> <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -4945,11 +4854,12 @@ <object class="sfxlo-OptionalBox" id="Table-Section-Calc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="baseline_position">bottom</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> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits