diff options
| author | andreas kainz <kainz.a@gmail.com> | 2019-04-07 00:53:17 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2019-04-07 09:18:27 +0200 |
| commit | e967aea2d8cc4f9fc608cb726cb474c184fb61de (patch) | |
| tree | e515308d0e6a749e3e6166962c438a665b13e666 | |
| parent | 6da9c6249e54a4514f92ffb24526cf880349ac4c (diff) | |
tdf#122751 add fontwork and bullet stuff to NB's
Change-Id: I4c5f628052ab7a6940b5b7a7e7eaefa0e2038940
Reviewed-on: https://gerrit.libreoffice.org/70356
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar.ui | 174 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 253 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 130 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 336 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 149 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 242 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui | 250 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_compact.ui | 289 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 453 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 20 |
10 files changed, 1895 insertions, 401 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 64dc2d982336..9ddbd5e79f33 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -262,24 +262,31 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ToggleObjectRotateMode"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> + <property name="action_name">.uno:ExtrusionTiltDown</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ObjectMirrorVertical"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:ExtrusionTiltUp</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ObjectMirrorHorizontal"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:ExtrusionTiltLeft</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionTiltRight</property> </object> </child> <child> @@ -6223,7 +6230,7 @@ <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="tooltip_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property> <property name="halign">start</property> <property name="action_name">.uno:ObjectAlign</property> </object> @@ -10866,7 +10873,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -11001,7 +11008,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -11124,7 +11131,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -11230,6 +11237,151 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator48"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="priority-2"/> + </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="Draw-Section-Fontwork"> + <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-NotebookbarToolBox" id="SectionBottom98"> + <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="Draw-FontworkGalleryFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkGalleryFloater</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> + <child> + <object class="GtkBox" id="GroupB68"> + <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="SectionBottom108"> + <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">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkSameLetterHeights</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="SectionBottom116"> + <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">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -11240,7 +11392,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index b53cfd7d356c..5c85cab151b0 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -1173,6 +1173,17 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuFontwork"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuFontwork-FontworkSameLetterHeights"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkSameLetterHeights</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuForm"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -5920,7 +5931,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-7"/> </style> </object> <packing> @@ -6165,7 +6176,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> @@ -6400,13 +6411,13 @@ </packing> </child> <style> - <class name="priority-3"/> + <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">3</property> </packing> </child> <child> @@ -6515,13 +6526,13 @@ </packing> </child> <style> - <class name="priority-2"/> + <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">4</property> </packing> </child> <child> @@ -6700,7 +6711,121 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-3"/> + </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="Draw-Section-Fontwork"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator37"> + <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="Section47"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom59"> + <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-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box57"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Fontwork:MenuFontwork"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Fontwork</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-2"/> </style> </object> <packing> @@ -6709,6 +6834,120 @@ <property name="position">6</property> </packing> </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator4"> + <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="Section25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47"> + <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-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="Draw-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="Draw-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> + </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-Grid:MenuGrid"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Grid</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-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> <style> <class name="context-Draw"/> <class name="context-DrawLine"/> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 2667dda148da..c0a990a9f417 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -12051,6 +12051,136 @@ <property name="position">6</property> </packing> </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork"> + <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-NotebookbarToolBox" id="SectionBottom100"> + <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="Draw-FontworkGalleryFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkGalleryFloater</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> + <child> + <object class="GtkBox" id="GroupB64"> + <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="SectionBottom108"> + <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">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkSameLetterHeights</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="SectionBottom102"> + <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">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="priority-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index 2ca25453588d..35540fe077ec 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -801,6 +801,17 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuFontwork"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuFontwork-FontworkSameLetterHeights"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkSameLetterHeights</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuForm"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1295,6 +1306,91 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuGrid-Ruler"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Ruler</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuGrid-VRuler"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:VRuler</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuGrid-separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuGrid-ViewBounds"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ViewBounds</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuGrid-TableBoundaries"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:TableBoundaries</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuGrid-ShowGraphics"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ShowGraphics</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuGrid-separator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuGrid-GridVisible"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GridVisible</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuGrid-GridUse"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:GridUse</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuGrid-HelplinesMove"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HelplinesMove</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuGrid-separator3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuGrid-HideWhitespace"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:HideWhitespace</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuGroup"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -6607,7 +6703,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-8"/> </style> </object> <packing> @@ -6852,7 +6948,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-7"/> </style> </object> <packing> @@ -7014,7 +7110,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> @@ -7293,7 +7389,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> @@ -7407,7 +7503,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> @@ -7591,7 +7687,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-3"/> </style> </object> <packing> @@ -7600,6 +7696,234 @@ <property name="position">6</property> </packing> </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator62"> + <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="Section47"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom59"> + <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-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box90"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Fontwork:MenuFontwork"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|GridButton">_Fontwork</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-2"/> + </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="Draw-Section-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator65"> + <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="Section46"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> + <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-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="Draw-GridUse1"> + <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="Draw-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box91"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Grid:MenuGrid"> + <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|GridButton">_Grid</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-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> <style> <class name="context-Draw"/> <class name="context-DrawLine"/> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index b871596a1513..340d92171459 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -11643,7 +11643,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -11749,6 +11749,151 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator24"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</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">6</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork"> + <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-NotebookbarToolBox" id="SectionBottom96"> + <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="Draw-FontworkGalleryFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkGalleryFloater</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> + <child> + <object class="GtkBox" id="GroupB75"> + <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="SectionBottom108"> + <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">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkSameLetterHeights</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="SectionBottom99"> + <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">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -11759,7 +11904,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> </object> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index ec031e762ede..9a352cdc3517 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -6770,7 +6770,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-9"/> </style> </object> <packing> @@ -7015,7 +7015,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-8"/> </style> </object> <packing> @@ -7177,7 +7177,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-7"/> </style> </object> <packing> @@ -7324,7 +7324,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-6"/> </style> </object> <packing> @@ -7502,7 +7502,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-5"/> </style> </object> <packing> @@ -7616,7 +7616,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-4"/> </style> </object> <packing> @@ -7800,7 +7800,7 @@ </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-3"/> </style> </object> <packing> @@ -7809,6 +7809,234 @@ <property name="position">7</property> </packing> </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator88"> + <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="Section53"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom59"> + <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-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box94"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Fontwork:MenuFontwork"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Fontwork</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-2"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator92"> + <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="Section54"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55"> + <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-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="Draw-GridUse1"> + <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="Draw-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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box95"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Grid:MenuGrid"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Grid</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-1"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> <style> <class name="context-Draw"/> <class name="context-DrawLine"/> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index ecbb847ae938..88901390cd6a 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -21,24 +21,31 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-ToggleObjectRotateMode"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectRotateMode</property> + <property name="action_name">.uno:ExtrusionTiltDown</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FlipVertical"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:ExtrusionTiltUp</property> </object> </child> <child> - <object class="GtkMenuItem" id="MenuDraw-FlipHorizontal"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:ExtrusionTiltLeft</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExtrusionTiltRight</property> </object> </child> <child> @@ -591,6 +598,67 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuHome-DecrementLevel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DecrementLevel</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-IncrementLevel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:IncrementLevel</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-DecrementSubLevels"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DecrementSubLevels</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-IncrementSubLevels"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:IncrementSubLevels</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-InsertNeutralParagraph"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertNeutralParagraph</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-NumberingStart"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumberingStart</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-ContinueNumbering"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ContinueNumbering</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuHome-InsertNonBreakingSpace"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3712,12 +3780,13 @@ <object class="GtkSeparator" id="separator97"> <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="orientation">vertical</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="padding">5</property> <property name="position">1</property> @@ -3994,6 +4063,18 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> + <object class="GtkToolButton" id="Home-TitleStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:StyleApply?Style:string=Title&FamilyName:string=ParagraphStyles</property> + <property name="icon_name">cmd/sc_titleparastyle.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> <object class="GtkToolButton" id="Home-H1Style"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -11517,7 +11598,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-7"/> </style> </object> <packing> @@ -11697,7 +11778,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -11829,7 +11910,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -12086,7 +12167,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -12192,6 +12273,151 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">0</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">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">7</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork"> + <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-NotebookbarToolBox" id="SectionBottom98"> + <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="Draw-FontworkGalleryFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkGalleryFloater</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> + <child> + <object class="GtkBox" id="GroupB12"> + <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="SectionBottom108"> + <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">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkSameLetterHeights</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="SectionBottom116"> + <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">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -12202,7 +12428,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 4dc63301849e..bd7576df6852 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -154,188 +154,64 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="LineD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Line</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="Freeline_UnfilledD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline_Unfilled</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="FreelineD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Freeline</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="Bezier_UnfilledD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Bezier_Unfilled</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="BezierFillD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BezierFill</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="Polygon_UnfilledD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Unfilled</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="Polygon_Diagonal_UnfilledD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal_Unfilled</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="Polygon_DiagonalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Polygon_Diagonal</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator131"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="BasicShapesD"> - <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="SymbolShapesD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SymbolShapes</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ArrowShapesD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ArrowShapes</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="StarShapesD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:StarShapes</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="CalloutShapesD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CalloutShapes</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="FlowChartShapesD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:FlowChartShapes</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator134"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="DrawCaptionD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="VerticalCaptionD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:VerticalCaption</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator135"> + <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:ToggleObjectBezierMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="DrawText3"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:DrawText</property> </object> </child> <child> - <object class="GtkMenuItem" id="VerticalTextD"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:VerticalText</property> + <property name="action_name">.uno:ExtrusionTiltDown</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertGraphicD2"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> + <property name="action_name">.uno:ExtrusionTiltUp</property> </object> </child> <child> - <object class="GtkMenuItem" id="FontworkGalleryFloaterD1"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FontworkGalleryFloater</property> + <property name="action_name">.uno:ExtrusionTiltLeft</property> </object> </child> <child> - <object class="GtkMenuItem" id="Text_MarqueeD"> + <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Text_Marquee</property> + <property name="action_name">.uno:ExtrusionTiltRight</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator136"> + <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ToggleObjectBezierModeD"> + <object class="GtkMenuItem" id="MenuDraw-NameGroup"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ToggleObjectBezierMode</property> + <property name="action_name">.uno:NameGroup</property> </object> </child> <child> - <object class="GtkMenuItem" id="ExtrusionToggleD"> + <object class="GtkMenuItem" id="MenuDraw-ObjectTitleDescription"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ExtrusionToggle</property> + <property name="action_name">.uno:ObjectTitleDescription</property> </object> </child> </object> @@ -772,245 +648,306 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="ShadowedD"> + <object class="GtkMenuItem" id="MenuHome-Shadowed"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Shadowed</property> </object> </child> <child> - <object class="GtkMenuItem" id="OutlineFontD"> + <object class="GtkMenuItem" id="MenuHome-OutlineFont"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:OutlineFont</property> </object> </child> <child> - <object class="GtkMenuItem" id="OverlineD"> + <object class="GtkMenuItem" id="MenuHome-Overline"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Overline</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator52"> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator1"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChangeCaseToUpperD"> + <object class="GtkMenuItem" id="MenuHome-ChangeCaseToUpper"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ChangeCaseToUpper</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChangeCaseToLowerD"> + <object class="GtkMenuItem" id="MenuHome-ChangeCaseToLower"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ChangeCaseToLower</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChangeCaseRotateCaseD"> + <object class="GtkMenuItem" id="MenuHome-ChangeCaseRotateCase"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ChangeCaseRotateCase</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator47"> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChangeCaseToSentenceCaseD"> + <object class="GtkMenuItem" id="MenuHome-ChangeCaseToSentenceCase"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ChangeCaseToSentenceCase</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChangeCaseToTitleCaseD"> + <object class="GtkMenuItem" id="MenuHome-ChangeCaseToTitleCase"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ChangeCaseToTitleCase</property> </object> </child> <child> - <object class="GtkMenuItem" id="ChangeCaseToToggleCaseD"> + <object class="GtkMenuItem" id="MenuHome-ChangeCaseToToggleCase"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ChangeCaseToToggleCase</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator55"> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-DecrementLevel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="action_name">.uno:DecrementLevel</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertNonBreakingSpaceD"> + <object class="GtkMenuItem" id="MenuHome-IncrementLevel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:IncrementLevel</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-DecrementSubLevels"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DecrementSubLevels</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-IncrementSubLevels"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:IncrementSubLevels</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-InsertNeutralParagraph"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertNeutralParagraph</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-NumberingStart"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NumberingStart</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-InsertNonBreakingSpace"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertNonBreakingSpace</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertHardHyphenD"> + <object class="GtkMenuItem" id="MenuHome-ContinueNumbering"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ContinueNumbering</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuHome-InsertHardHyphen"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertHardHyphen</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertSoftHyphenD"> + <object class="GtkMenuItem" id="MenuHome-InsertSoftHyphen"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertSoftHyphen</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertZWSPD"> + <object class="GtkMenuItem" id="MenuHome-InsertZWSP"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertZWSP</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertZWNBSPD"> + <object class="GtkMenuItem" id="MenuHome-InsertZWNBSP"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertZWNBSP</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertLRMD"> + <object class="GtkMenuItem" id="MenuHome-InsertLRM"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertLRM</property> </object> </child> <child> - <object class="GtkMenuItem" id="InsertRLMD"> + <object class="GtkMenuItem" id="MenuHome-InsertRLM"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertRLM</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator78"> + <object class="GtkSeparatorMenuItem" id="separator2"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="FontDialog"> + <object class="GtkMenuItem" id="MenuHome-FontDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:FontDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="BulletsAndNumberingDialogD"> + <object class="GtkMenuItem" id="MenuHome-BulletsAndNumberingDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:BulletsAndNumberingDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="ParagraphDialogD"> + <object class="GtkMenuItem" id="MenuHome-ParagraphDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ParagraphDialog</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator2"> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="ParaLeftToRightD"> + <object class="GtkMenuItem" id="MenuHome-ParaLeftToRight"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ParaLeftToRight</property> </object> </child> <child> - <object class="GtkMenuItem" id="ParaRightToLeftD"> + <object class="GtkMenuItem" id="MenuHome-ParaRightToLeft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ParaRightToLeft</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator72"> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator5"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="SelectAlld2"> + <object class="GtkMenuItem" id="MenuHome-SelectAll"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SelectAll</property> </object> </child> <child> - <object class="GtkMenuItem" id="SelectionModeDefaultD2"> + <object class="GtkMenuItem" id="MenuHome-SelectionModeDefault"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SelectionModeDefault</property> </object> </child> <child> - <object class="GtkMenuItem" id="SelectionModeBlockD2"> + <object class="GtkMenuItem" id="MenuHome-SelectionModeBlock"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SelectionModeBlock</property> </object> </child> <child> - <object class="GtkMenuItem" id="SelectTextModeD2"> + <object class="GtkMenuItem" id="MenuHome-SelectTextMode"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SelectTextMode</property> </object> </child> <child> - <object class="GtkMenuItem" id="ShadowCursorD2"> + <object class="GtkMenuItem" id="MenuHome-ShadowCursor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ShadowCursor</property> </object> </child> <child> - <object class="GtkSeparatorMenuItem" id="separator79"> + <object class="GtkSeparatorMenuItem" id="MenuHome-separator6"> <property name="visible">True</property> <property name="can_focus">False</property> </object> </child> <child> - <object class="GtkMenuItem" id="FocusToFindbarD2"> + <object class="GtkMenuItem" id="MenuHome-FocusToFindbar"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property> </object> </child> <child> - <object class="GtkMenuItem" id="SearchDialogD2"> + <object class="GtkMenuItem" id="MenuHome-SearchDialog"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:SearchDialog</property> </object> </child> <child> - <object class="GtkMenuItem" id="GotoPageD2"> + <object class="GtkMenuItem" id="MenuHome-GotoPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:GotoPage</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index f11561be55f7..4d3dad28cd8b 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -983,6 +983,17 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuFontwork"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuFontwork-FontworkSameLetterHeights"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkSameLetterHeights</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuForm"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1977,19 +1988,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuParagraph-BulletsAndNumberingDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BulletsAndNumberingDialog</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> <object class="GtkMenuItem" id="MenuParagraph-DecrementLevel"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2105,6 +2103,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuParagraph-BulletsAndNumberingDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BulletsAndNumberingDialog</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuParagraph-ParagraphDialog"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -3868,11 +3873,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph"> + <object class="sfxlo-OptionalBox" id="Default-Section-Insert"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator6"> + <object class="GtkSeparator" id="separator18"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -3887,120 +3892,58 @@ </packing> </child> <child> - <object class="GtkBox" id="Section5"> + <object class="GtkBox" id="Section6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box13"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> + <object class="GtkToolButton" id="Default-InsertGraphic"> <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="Default-LeftPara"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LeftPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Default-CenterPara"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CenterPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Default-RightPara"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RightPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Default-JustifyPara"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:JustifyPara</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertGraphic</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="GtkSeparator" id="separator140"> + <object class="GtkMenuToolButton" id="Default-InsertTable"> <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="hexpand">True</property> - <property name="orientation">vertical</property> + <property name="action_name">.uno:InsertTable</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> + <object class="GtkToolButton" id="Default-CharmapControl"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkMenuToolButton" id="Default-DefaultBullet"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultBullet</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="Default-DefaultNumbering"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DefaultNumbering</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:CharmapControl</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-InsertPagebreak"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:InsertPagebreak</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -4011,12 +3954,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box44"> <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> + <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|InsertButton">_Insert</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> @@ -4031,7 +3974,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8"> + <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -4039,21 +3982,10 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Default-LineSpacing"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:LineSpacing</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id="Default-BackgroundColor"> + <object class="GtkToolButton" id="Default-InsertDraw"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BackgroundColor</property> + <property name="action_name">.uno:InsertDraw</property> </object> <packing> <property name="expand">False</property> @@ -4082,7 +4014,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-5"/> </style> </object> <packing> @@ -4092,11 +4024,11 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="Default-Section-Insert"> + <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkSeparator" id="separator18"> + <object class="GtkSeparator" id="separator6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -4111,58 +4043,120 @@ </packing> </child> <child> - <object class="GtkBox" id="Section6"> + <object class="GtkBox" id="Section5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6"> + <object class="GtkBox" id="box13"> <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="Default-InsertGraphic"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertGraphic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="can_focus">False</property> <child> - <object class="GtkMenuToolButton" id="Default-InsertTable"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertTable</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Default-LeftPara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LeftPara</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-CenterPara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CenterPara</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-RightPara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:RightPara</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Default-JustifyPara"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:JustifyPara</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="Default-CharmapControl"> + <object class="GtkSeparator" id="separator140"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CharmapControl</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="homogeneous">True</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkToolButton" id="Default-InsertPagebreak"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:InsertPagebreak</property> + <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Default-DefaultBullet"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DefaultBullet</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Default-DefaultNumbering"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:DefaultNumbering</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> @@ -4173,12 +4167,12 @@ </packing> </child> <child> - <object class="GtkBox" id="box44"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert"> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|InsertButton">_Insert</property> + <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> @@ -4193,7 +4187,7 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="ExtTop6"> + <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">end</property> @@ -4201,10 +4195,21 @@ <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Default-InsertDraw"> + <object class="GtkMenuToolButton" id="Default-LineSpacing"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:InsertDraw</property> + <property name="action_name">.uno:LineSpacing</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id="Default-BackgroundColor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BackgroundColor</property> </object> <packing> <property name="expand">False</property> @@ -4233,7 +4238,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -6324,7 +6329,7 @@ </packing> </child> <style> - <class name="priority-7"/> + <class name="priority-8"/> </style> </object> <packing> @@ -6570,7 +6575,7 @@ </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-7"/> </style> </object> <packing> @@ -6704,7 +6709,7 @@ </packing> </child> <style> - <class name="priority-5"/> + <class name="priority-6"/> </style> </object> <packing> @@ -6940,7 +6945,7 @@ </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-5"/> </style> </object> <packing> @@ -7054,7 +7059,7 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-4"/> </style> </object> <packing> @@ -7238,7 +7243,7 @@ </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-3"/> </style> </object> <packing> @@ -7248,6 +7253,120 @@ </packing> </child> <child> + <object class="sfxlo-OptionalBox" id="Draw-Section-Fontwork"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSeparator" id="separator37"> + <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="Section47"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom59"> + <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-FontworkShapeType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkShapeType</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkAlignmentFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FontworkCharacterSpacingFloater</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box41"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="svtlo-ManagedMenuButton" id="Draw-Fontwork:MenuFontwork"> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridButton">_Fontwork</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-2"/> + </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="Draw-Section-Grid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -7358,7 +7477,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> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 18dae5f80466..f98e0d301e90 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -1954,19 +1954,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuParagraph-BulletsAndNumberingDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:BulletsAndNumberingDialog</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="MenuParagraph-separator5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> <object class="GtkMenuItem" id="MenuParagraph-DecrementLevel"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2082,6 +2069,13 @@ </object> </child> <child> + <object class="GtkMenuItem" id="MenuParagraph-BulletsAndNumberingDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:BulletsAndNumberingDialog</property> + </object> + </child> + <child> <object class="GtkMenuItem" id="MenuParagraph-ParagraphDialog"> <property name="visible">True</property> <property name="can_focus">False</property> |