diff options
| author | andreas kainz <kainz.a@gmail.com> | 2019-07-02 14:13:20 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2019-07-03 11:40:48 +0200 |
| commit | 22d98585cf8f9b2b8fb1ef915978e07422141c2b (patch) | |
| tree | 3148c32f61d4656cd7009d1d9fb85620ac001c03 /sw | |
| parent | 2162acb490c7e5a03ec2c3d4a71e6125f64cba14 (diff) | |
update groupedbar NB layouts for more consistent between different apps
split groups to smaller groups for a better priority- functionality
update Drop-Down GtkMenus and make them consistent
Change-Id: Iece18df3c1ed2e066e6820e67755d52a30d63b27
Reviewed-on: https://gerrit.libreoffice.org/74990
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
(cherry picked from commit 7f8e5077f62aebf758004ac478918f586a8cce15)
Reviewed-on: https://gerrit.libreoffice.org/74997
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_compact.ui | 106 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 1155 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 84 |
3 files changed, 933 insertions, 412 deletions
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index f7c8fd4697f1..3ad0789f58c4 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -15969,6 +15969,60 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Form-Section-Anchor"> + <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="separator153"> + <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="Anchor6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Object-AnchorMenu1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AnchorMenu</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> + <style> + <class name="priority-16"/> + </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="Form-Section-Wrap3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -16041,7 +16095,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -16103,7 +16157,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -16144,7 +16198,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -16195,7 +16249,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -16245,7 +16299,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -16306,7 +16360,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -16370,7 +16424,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -16419,7 +16473,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -16472,7 +16526,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> @@ -16509,7 +16563,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> @@ -16543,13 +16597,13 @@ </packing> </child> <style> - <class name="priority-19"/> + <class name="priority-20"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> <child> @@ -16583,13 +16637,13 @@ </packing> </child> <style> - <class name="priority-18"/> + <class name="priority-19"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">13</property> </packing> </child> <child> @@ -16639,13 +16693,13 @@ </packing> </child> <style> - <class name="priority-17"/> + <class name="priority-18"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">14</property> </packing> </child> <child> @@ -16679,13 +16733,13 @@ </packing> </child> <style> - <class name="priority-16"/> + <class name="priority-17"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">15</property> </packing> </child> <child> @@ -16762,7 +16816,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">15</property> + <property name="position">16</property> </packing> </child> <child> @@ -16824,7 +16878,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">16</property> + <property name="position">17</property> </packing> </child> <child> @@ -16890,7 +16944,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">17</property> + <property name="position">18</property> </packing> </child> <child> @@ -16967,7 +17021,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">18</property> + <property name="position">19</property> </packing> </child> <child> @@ -17029,7 +17083,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">19</property> + <property name="position">20</property> </packing> </child> <child> @@ -17084,7 +17138,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">20</property> + <property name="position">21</property> </packing> </child> <child> @@ -17150,7 +17204,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">21</property> + <property name="position">22</property> </packing> </child> <child> @@ -17216,7 +17270,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">22</property> + <property name="position">23</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index c8b137d6aa23..df45ffe7880d 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -427,6 +427,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowsToolbox</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuDraw-LineToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -434,24 +441,23 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <object class="GtkMenuItem" id="MenuDraw-ConnectorToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="action_name">.uno:ConnectorToolbox</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> @@ -462,10 +468,17 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <object class="GtkMenuItem" id="MenuDraw-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> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> </child> <child> @@ -476,14 +489,14 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:StarShapes</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -517,12 +530,19 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionToggle</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3832,7 +3852,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-8"/> </style> </object> <packing> @@ -4163,14 +4183,78 @@ <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="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> + <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section36"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box64"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Default-DefaultBullet"> + <object class="GtkMenuToolButton" id="Default-DefaultBullet1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DefaultBullet</property> @@ -4181,7 +4265,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Default-DefaultNumbering"> + <object class="GtkMenuToolButton" id="Default-DefaultNumbering1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DefaultNumbering</property> @@ -4206,35 +4290,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box66"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </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="ExtBottom8"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom7"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Default-LineSpacing"> + <object class="GtkMenuToolButton" id="Default-LineSpacing1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:LineSpacing</property> @@ -4245,7 +4313,7 @@ </packing> </child> <child> - <object class="GtkMenuToolButton" id="Default-BackgroundColor"> + <object class="GtkMenuToolButton" id="Default-BackgroundColor1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BackgroundColor</property> @@ -4283,7 +4351,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -4434,7 +4502,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -4559,7 +4627,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -4673,7 +4741,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -4787,7 +4855,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -4893,7 +4961,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <style> @@ -5033,6 +5101,9 @@ <property name="position">1</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> </object> <packing> <property name="expand">False</property> @@ -5253,9 +5324,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-6"/> - </style> </object> <packing> <property name="expand">False</property> @@ -5467,7 +5535,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -5577,14 +5645,80 @@ <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="box38"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> + <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuTable"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">_Table</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-5"/> + </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="Table-Section-Table1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section37"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box67"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57"> + <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="Table-EntireColumn"> + <object class="GtkToolButton" id="Table-EntireColumn1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:EntireColumn</property> @@ -5596,7 +5730,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertColumnsBefore"> + <object class="GtkToolButton" id="Table-InsertColumnsBefore1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertColumnsBefore</property> @@ -5607,7 +5741,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertColumnsAfter"> + <object class="GtkToolButton" id="Table-InsertColumnsAfter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertColumnsAfter</property> @@ -5618,7 +5752,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteColumns"> + <object class="GtkToolButton" id="Table-DeleteColumns1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DeleteColumns</property> @@ -5643,36 +5777,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box38"> + <object class="GtkBox" id="box71"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Table-Table:MenuTable"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">_Table</property> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop5"> <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">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop14"> - <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Table-EntireRow"> + <object class="GtkToolButton" id="Table-EntireRow1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:EntireRow</property> @@ -5684,7 +5801,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertRowsBefore"> + <object class="GtkToolButton" id="Table-InsertRowsBefore1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertRowsBefore</property> @@ -5695,7 +5812,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-InsertRowsAfter"> + <object class="GtkToolButton" id="Table-InsertRowsAfter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertRowsAfter</property> @@ -5706,7 +5823,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Table-DeleteRows"> + <object class="GtkToolButton" id="Table-DeleteRows1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DeleteRows</property> @@ -5744,7 +5861,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -5952,7 +6069,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -6067,7 +6184,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -6181,7 +6298,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <style> @@ -6334,8 +6451,6 @@ <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea2"> <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="separator29"> <property name="visible">True</property> @@ -6422,8 +6537,6 @@ <object class="sfxlo-OptionalBox" id="Draw-Section-FormatLineArea3"> <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="box9"> <property name="visible">True</property> @@ -6543,6 +6656,9 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="priority-11"/> + </style> </object> <packing> <property name="expand">False</property> @@ -6651,14 +6767,79 @@ <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="box49"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <object class="svtlo-ManagedMenuButton" id="Draw-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-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="Draw-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section51"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box78"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignLeft"> + <object class="GtkToolButton" id="Draw-ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -6669,7 +6850,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignCenter"> + <object class="GtkToolButton" id="Draw-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -6680,7 +6861,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ObjectAlignRight"> + <object class="GtkToolButton" id="Draw-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -6705,35 +6886,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box49"> + <object class="GtkBox" id="box79"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-Arrange:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Align3"> + <object class="sfxlo-NotebookbarToolBox" id="Align5"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-AlignUp"> + <object class="GtkToolButton" id="Draw-AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -6744,7 +6909,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignMiddle"> + <object class="GtkToolButton" id="Draw-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -6755,7 +6920,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-AlignDown"> + <object class="GtkToolButton" id="Draw-AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -6787,13 +6952,13 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-9"/> </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> @@ -6921,13 +7086,13 @@ </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">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -7021,14 +7186,80 @@ <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="box47"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="shapes1"> + <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">_Shape</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Draw1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section44"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box76"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="shapes3"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-BasicShapes"> + <object class="GtkToolButton" id="Draw-BasicShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BasicShapes</property> @@ -7039,7 +7270,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-SymbolShapes"> + <object class="GtkToolButton" id="Draw-SymbolShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SymbolShapes</property> @@ -7050,7 +7281,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ArrowShapes"> + <object class="GtkToolButton" id="Draw-ArrowShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ArrowShapes</property> @@ -7075,35 +7306,18 @@ </packing> </child> <child> - <object class="GtkBox" id="box47"> + <object class="GtkBox" id="box77"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-Draw:MenuDraw"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|draw">_Shape</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </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="shapes2"> + <object class="sfxlo-NotebookbarToolBox" id="shapes4"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <child> - <object class="GtkToolButton" id="Draw-StarShapes"> + <object class="GtkToolButton" id="Draw-StarShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StarShapes</property> @@ -7114,7 +7328,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-CalloutShapes"> + <object class="GtkToolButton" id="Draw-CalloutShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:CalloutShapes</property> @@ -7125,7 +7339,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-FlowChartShapes"> + <object class="GtkToolButton" id="Draw-FlowChartShapes1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FlowChartShapes</property> @@ -7157,13 +7371,13 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </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> @@ -7271,13 +7485,13 @@ </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">6</property> + <property name="position">8</property> </packing> </child> <child> @@ -7347,6 +7561,83 @@ <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">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box60"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</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-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="Draw-Section-3d1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="Section43"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box74"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater"> <property name="visible">True</property> @@ -7384,35 +7675,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box60"> + <object class="GtkBox" id="box75"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Draw-3D:Menu3D"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</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> - <child> - <object class="sfxlo-NotebookbarToolBox" id="third5"> + <object class="sfxlo-NotebookbarToolBox" id="third1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater"> + <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionDepthFloater</property> @@ -7423,7 +7698,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater"> + <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ExtrusionDirectionFloater</property> @@ -7461,7 +7736,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">10</property> </packing> </child> <child> @@ -7575,7 +7850,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">11</property> </packing> </child> <child> @@ -7689,7 +7964,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">12</property> </packing> </child> <style> @@ -8032,7 +8307,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-8"/> </style> </object> <packing> @@ -8142,14 +8417,79 @@ <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="box25"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align5"> + <object class="svtlo-ManagedMenuButton" id="Image-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-7"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-Arrange1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box72"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align4"> + <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="Image-Section-ObjectAlignLeft"> + <object class="GtkToolButton" id="Image-Section-ObjectAlignLeft1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignLeft</property> @@ -8160,7 +8500,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-Section-AlignCenter"> + <object class="GtkToolButton" id="Image-Section-AlignCenter1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignCenter</property> @@ -8171,7 +8511,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-Section-ObjectAlignRight"> + <object class="GtkToolButton" id="Image-Section-ObjectAlignRight1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectAlignRight</property> @@ -8196,35 +8536,19 @@ </packing> </child> <child> - <object class="GtkBox" id="box25"> + <object class="GtkBox" id="box73"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-Arrange:MenuArrange"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property> + <object class="sfxlo-NotebookbarToolBox" id="Align6"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Align1"> - <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="halign">end</property> <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-Section-AlignUp"> + <object class="GtkToolButton" id="Image-Section-AlignUp1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignUp</property> @@ -8235,7 +8559,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-Section-AlignMiddle"> + <object class="GtkToolButton" id="Image-Section-AlignMiddle1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignMiddle</property> @@ -8246,7 +8570,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-Section-AlignDown"> + <object class="GtkToolButton" id="Image-Section-AlignDown1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:AlignDown</property> @@ -8284,7 +8608,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -8418,7 +8742,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -8512,7 +8836,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -8592,7 +8916,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -8672,7 +8996,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -8788,7 +9112,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <style> @@ -9009,9 +9333,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-8"/> - </style> </object> <packing> <property name="expand">False</property> @@ -9942,7 +10263,7 @@ <object class="sfxlo-PriorityMergedHBox" id="MediaContainer"> <property name="can_focus">False</property> <child> - <object class="sfxlo-OptionalBox" id="Media-Section-Graphic"> + <object class="sfxlo-OptionalBox" id="Media-Section-Media"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="baseline_position">bottom</property> @@ -10065,11 +10386,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="MediaSection-FormatLineArea"> + <object class="sfxlo-OptionalBox" id="Media-Section-AVMediaToolBox"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator130"> + <object class="GtkSeparator" id="separator45"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10084,27 +10405,24 @@ </packing> </child> <child> - <object class="GtkBox" id="box61"> + <object class="GtkBox" id="box84"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="third12"> - <property name="width_request">1000</property> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom132"> + <property name="width_request">148</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Media-AVMediaToolBox"> - <property name="width_request">800</property> + <object class="GtkToolButton" id="Media-AVMediaToolBox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="action_name">.uno:AVMediaToolBox</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> @@ -10116,17 +10434,80 @@ </packing> </child> <child> - <object class="GtkBox" id="box63"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="arrange4"> + <object class="GtkToolButton" id="Media-AVMediaPlayer1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AVMediaPlayer</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> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Arrange2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator43"> + <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="Section52"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box80"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="arrange3"> + <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="Media-BringToFront"> + <object class="GtkToolButton" id="Draw-BringToFront1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BringToFront</property> @@ -10137,7 +10518,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-ObjectForwardOne"> + <object class="GtkToolButton" id="Draw-ObjectForwardOne1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectForwardOne</property> @@ -10148,7 +10529,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-ObjectBackOne"> + <object class="GtkToolButton" id="Draw-ObjectBackOne1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ObjectBackOne</property> @@ -10159,7 +10540,7 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-SendToBack"> + <object class="GtkToolButton" id="Draw-SendToBack1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SendToBack</property> @@ -10177,7 +10558,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator141"> + <object class="GtkSeparator" id="separator44"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -10191,17 +10572,82 @@ <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="box81"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap6"> + <object class="svtlo-ManagedMenuButton" id="Media-Arrange:MenuArrange"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ArrangeButton">_Arrange</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-3"/> + </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="Draw-Section-Arrange3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkBox" id="Section53"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box82"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> + <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="Media-WrapOff"> + <object class="GtkToolButton" id="Draw-ObjectAlignLeft2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOff</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> @@ -10209,10 +10655,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapOn"> + <object class="GtkToolButton" id="Draw-AlignCenter2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapOn</property> + <property name="action_name">.uno:AlignCenter</property> </object> <packing> <property name="expand">False</property> @@ -10220,10 +10666,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapIdeal"> + <object class="GtkToolButton" id="Draw-ObjectAlignRight2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapIdeal</property> + <property name="action_name">.uno:ObjectAlignRight</property> </object> <packing> <property name="expand">False</property> @@ -10237,32 +10683,30 @@ <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box83"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator148"> + <object class="sfxlo-NotebookbarToolBox" id="Align3"> <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> - </packing> - </child> - <child> - <object class="sfxlo-NotebookbarToolBox" id="Wrap8"> - <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="GtkToolButton" id="Media-WrapLeft"> + <object class="GtkToolButton" id="Draw-AlignUp2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapLeft</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> @@ -10270,10 +10714,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapThrough"> + <object class="GtkToolButton" id="Draw-AlignMiddle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapThrough</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -10281,10 +10725,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Media-WrapRight"> + <object class="GtkToolButton" id="Draw-AlignDown2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:WrapRight</property> + <property name="action_name">.uno:AlignDown</property> </object> <packing> <property name="expand">False</property> @@ -10293,131 +10737,143 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-2"/> + </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="Draw-Section-Wrap1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="baseline_position">bottom</property> + <child> + <object class="GtkSeparator" id="separator46"> + <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="WrapGroup3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="Wrap9"> + <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="GtkSeparator" id="separator149"> + <object class="GtkToolButton" id="Draw-WrapOff1"> <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> + <property name="action_name">.uno:WrapOff</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">5</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="Align9"> + <object class="GtkToolButton" id="Draw-WrapOn1"> <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="Media-ObjectAlignLeft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignLeft</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Media-AlignCenter"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignCenter</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Media-ObjectAlignRight"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectAlignRight</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:WrapOn</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator146"> + <object class="GtkToolButton" id="Draw-WrapIdeal1"> <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> + <property name="action_name">.uno:WrapIdeal</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">7</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="Wrap10"> + <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="sfxlo-NotebookbarToolBox" id="Align10"> + <object class="GtkToolButton" id="Draw-WrapLeft1"> <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="Media-AlignUp"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignUp</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Media-AlignMiddle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignMiddle</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Media-AlignDown"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AlignDown</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:WrapLeft</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">8</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-WrapThrough1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapThrough</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-WrapRight1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:WrapRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -10441,7 +10897,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> <style> @@ -11279,9 +11735,6 @@ <property name="position">1</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index cc4aa6c191d2..ed968f364d14 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -427,6 +427,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ArrowsToolbox</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuDraw-LineToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -434,24 +441,23 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowsToolbox"> + <object class="GtkMenuItem" id="MenuDraw-ConnectorToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowsToolbox</property> + <property name="action_name">.uno:ConnectorToolbox</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ArrowShapes"> + <object class="GtkMenuItem" id="MenuDraw-BasicShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> + <property name="action_name">.uno:BasicShapes</property> </object> </child> <child> @@ -462,10 +468,17 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-StarShapes"> + <object class="GtkMenuItem" id="MenuDraw-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> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlowChartShapes</property> </object> </child> <child> @@ -476,14 +489,14 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FlowChartShapes"> + <object class="GtkMenuItem" id="MenuDraw-StarShapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> + <property name="action_name">.uno:StarShapes</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -517,12 +530,19 @@ </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="MenuDraw-separator3"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionToggle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionToggle</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5189,7 +5209,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -5418,7 +5438,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -5620,7 +5640,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -5822,7 +5842,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -5998,7 +6018,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-2"/> </style> </object> <packing> @@ -9599,10 +9619,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="CommonAlignUp"> + <object class="GtkToolButton" id="CommonAlignTop"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignUp</property> + <property name="action_name">.uno:CommonAlignTop</property> </object> <packing> <property name="expand">False</property> @@ -9610,10 +9630,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CommonAlignMiddle"> + <object class="GtkToolButton" id="CommonAlignVerticalCenter"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignMiddle</property> + <property name="action_name">.uno:CommonAlignVerticalCenter</property> </object> <packing> <property name="expand">False</property> @@ -9621,10 +9641,10 @@ </packing> </child> <child> - <object class="GtkToolButton" id="CommonAlignDown"> + <object class="GtkToolButton" id="CommonAlignBottom"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CommonAlignDown</property> + <property name="action_name">.uno:CommonAlignBottom</property> </object> <packing> <property name="expand">False</property> @@ -10447,6 +10467,9 @@ <property name="position">0</property> </packing> </child> + <style> + <class name="priority-7"/> + </style> </object> <packing> <property name="expand">False</property> @@ -10729,7 +10752,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -10851,7 +10874,7 @@ <placeholder/> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -11053,7 +11076,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -11495,9 +11518,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-5"/> - </style> </object> <packing> <property name="expand">False</property> @@ -13287,9 +13307,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-4"/> - </style> </object> <packing> <property name="expand">False</property> @@ -14733,9 +14750,6 @@ <property name="position">0</property> </packing> </child> - <style> - <class name="priority-6"/> - </style> </object> <packing> <property name="expand">False</property> |