sc/uiconfig/scalc/ui/notebookbar.ui | 503 +++++++++++++++--------- sd/uiconfig/sdraw/ui/notebookbar.ui | 664 ++++++++++++++++++++------------- sd/uiconfig/simpress/ui/notebookbar.ui | 603 +++++++++++++++++++---------- 3 files changed, 1138 insertions(+), 632 deletions(-)
New commits: commit b226cd3c2ed3a551f1631cb118456f1f80e32b6c Author: andreas kainz <kain...@gmail.com> AuthorDate: Sat Jun 1 00:29:57 2019 +0200 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Sun Jun 2 21:54:31 2019 +0200 NB tabbed finished sync between different apps Change-Id: Ia3e1be0656eb066bd18e21fe365dcf0adec150b4 Reviewed-on: https://gerrit.libreoffice.org/73293 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 f09a81b2320b..c8a230786225 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -3089,21 +3089,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator104"> - <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> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -3131,6 +3116,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator70"> + <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="GroupB13"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3191,6 +3191,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-10"/> + </style> </object> <packing> <property name="expand">False</property> @@ -3211,6 +3214,21 @@ <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> @@ -3373,17 +3391,32 @@ </packing> </child> <child> + <object class="GtkSeparator" id="separator67"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="sfxlo-NotebookbarToolBox" id="ExtTop5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="margin_left">5</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> <object class="GtkToolButton" id="Home-SubScript"> - <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SubScript</property> </object> @@ -3403,11 +3436,25 @@ <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> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -3424,7 +3471,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -3434,20 +3481,6 @@ <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> @@ -3474,7 +3507,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> @@ -3488,22 +3521,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <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">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -3527,6 +3545,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> @@ -3583,8 +3616,107 @@ <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="GroupB16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> <child> - <object class="GtkSeparator" id="separator97"> + <object class="sfxlo-NotebookbarToolBox" id="second6"> + <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-AlignLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignLeft</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-AlignHorizontalCenter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignHorizontalCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-AlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignRight</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-9"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Align1"> + <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="GroupB76"> + <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="GroupB80"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <child> + <object class="GtkSeparator" id="separator74"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3599,9 +3731,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first1"> + <object class="sfxlo-NotebookbarToolBox" id="first16"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3661,50 +3793,17 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB16"> + <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="second6"> + <object class="sfxlo-NotebookbarToolBox" id="second12"> <property name="visible">True</property> - <property name="can_focus">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-AlignLeft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignLeft</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-AlignHorizontalCenter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignHorizontalCenter</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-AlignRight"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignRight</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="Home-AlignBlock"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3723,7 +3822,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator23"> + <object class="GtkSeparator" id="separator77"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3738,9 +3837,9 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second1"> + <object class="sfxlo-NotebookbarToolBox" id="second14"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3775,29 +3874,14 @@ <property name="position">1</property> </packing> </child> - <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">2</property> - </packing> - </child> <style> - <class name="priority-6"/> + <class name="priority-8"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -3807,6 +3891,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator30"> + <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="GroupB18"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3967,29 +4066,14 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator30"> - <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> - </packing> - </child> <style> - <class name="priority-5"/> + <class name="priority-7"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -3999,6 +4083,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator53"> + <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="SectionBottom35"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -4022,9 +4121,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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">5</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Cell1"> + <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="GroupB20"> <property name="visible">True</property> @@ -4034,7 +4149,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineA10"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4080,7 +4195,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineB11"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -4127,32 +4242,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator53"> - <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> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">6</property> </packing> </child> <child> @@ -4162,6 +4262,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator25"> + <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="GroupB17"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -4399,29 +4514,14 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator25"> - <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> - </packing> - </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">7</property> </packing> </child> <child> @@ -4431,6 +4531,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator1"> + <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="SectionBottom37"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -4454,32 +4569,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator1"> - <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">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">8</property> </packing> </child> <child> @@ -4489,6 +4589,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator72"> + <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="SectionBottom26"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -4512,9 +4627,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="priority-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Find1"> + <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="GroupB47"> <property name="visible">True</property> @@ -4524,7 +4655,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineA17"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -4549,7 +4680,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="LineB19"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> @@ -4575,7 +4706,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <style> @@ -4585,7 +4716,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">10</property> </packing> </child> </object> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 1f5fc7dea160..ffe7dc5bd626 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -3344,21 +3344,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator104"> - <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> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -3410,6 +3395,7 @@ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="halign">end</property> <property name="valign">center</property> <property name="vexpand">True</property> <property name="toolbar_style">icons</property> @@ -3473,6 +3459,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator28"> + <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="SectionBottom97"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -3507,9 +3508,22 @@ <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">0</property> + </packing> + </child> + <child> + <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="GroupB25"> <property name="visible">True</property> @@ -3519,7 +3533,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="shapes1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3576,7 +3590,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="shapes3"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3634,11 +3648,24 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <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="separator28"> + <object class="GtkSeparator" id="separator95"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3649,22 +3676,9 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</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="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="GroupB82"> <property name="visible">True</property> @@ -3697,11 +3711,22 @@ <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes14"> + <property name="visible">True</property> + <property name="can_focus">True</property> <child> - <object class="GtkToolButton" id="Home-ArrowShapes"> + <object class="GtkToolButton" id="Home-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:StarShapes</property> </object> <packing> <property name="expand">True</property> @@ -3709,10 +3734,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-ConnectorToolbox"> + <object class="GtkToolButton" id="Home-CalloutShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ConnectorToolbox</property> + <property name="action_name">.uno:CalloutShapes</property> </object> <packing> <property name="expand">True</property> @@ -3723,18 +3748,47 @@ <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-10"/> + </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="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="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="sfxlo-NotebookbarToolBox" id="shapes14"> + <object class="sfxlo-NotebookbarToolBox" id="shapes2"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkToolButton" id="Home-StarShapes"> + <object class="GtkToolButton" id="Home-ArrowShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> + <property name="action_name">.uno:ArrowShapes</property> </object> <packing> <property name="expand">True</property> @@ -3742,16 +3796,27 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Home-CalloutShapes"> + <object class="GtkToolButton" id="Home-ConnectorToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> + <property name="action_name">.uno:ConnectorToolbox</property> </object> <packing> <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes4"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkToolButton" id="Home-FlowChartShapes"> <property name="visible">True</property> @@ -3788,29 +3853,14 @@ <property name="position">1</property> </packing> </child> - <child> - <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">4</property> - </packing> - </child> <style> - <class name="priority-5"/> + <class name="priority-9"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> <child> @@ -3820,6 +3870,21 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> + <object class="GtkSeparator" id="separator47"> + <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> @@ -3843,18 +3908,36 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</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> <child> <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="third7"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> @@ -3878,7 +3961,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="third8"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> @@ -3903,9 +3986,25 @@ <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-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</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> @@ -3918,7 +4017,7 @@ <child> <object class="sfxlo-NotebookbarToolBox" id="first6"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> @@ -3934,20 +4033,41 @@ <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">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="first10"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom136"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">both-horiz</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> @@ -3973,10 +4093,10 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41"> - <property name="width_request">200</property> + <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> @@ -3986,13 +4106,13 @@ <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -4001,11 +4121,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-6"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Arrange"> + <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="separator69"> + <object class="GtkSeparator" id="separator20"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4016,48 +4152,95 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">6</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom7"> + <property name="visible">True</property> + <property name="can_focus">False</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-SelectObject"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SelectObject</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-4"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">8</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Home-Section-Arrange"> + <object class="sfxlo-OptionalBox" id="Home-Section-Arrange1"> <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-OptionalBox" id="FileSection1"> + <object class="GtkBox" id="GroupB21"> <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="SectionBottom7"> + <object class="sfxlo-NotebookbarToolBox" id="LineA15"> <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="can_focus">False</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> - <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Home-SelectObject"> + <object class="GtkToolButton" id="Home-GridVisible"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SelectObject</property> + <property name="action_name">.uno:GridVisible</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-HelplinesVisible"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HelplinesVisible</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-HelplinesMove"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HelplinesMove</property> + </object> + <packing> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -4069,145 +4252,42 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB21"> + <object class="sfxlo-NotebookbarToolBox" id="LineB18"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineA15"> + <object class="GtkToolButton" id="Home-GridUse"> <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-GridVisible"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GridVisible</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-HelplinesVisible"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:HelplinesVisible</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-HelplinesMove"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:HelplinesMove</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-CapturePoint"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CapturePoint</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-GlueInsertPoint"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GlueInsertPoint</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:GridUse</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="LineB18"> + <object class="GtkToolButton" id="Home-HelplinesUse"> <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-GridUse"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GridUse</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-HelplinesUse"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:HelplinesUse</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-SnapFrame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SnapFrame</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-SnapPoints"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SnapPoints</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Home-SnapBorder"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SnapBorder</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:HelplinesUse</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Home-SnapFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SnapFrame</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -4217,26 +4297,111 @@ <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> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Home-Section-Arrange2"> + <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="GroupB68"> + <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="GtkSeparator" id="separator20"> + <object class="sfxlo-NotebookbarToolBox" id="LineA27"> <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> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits