diff options
| author | andreas kainz <kainz.a@gmail.com> | 2018-10-15 18:47:36 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2018-10-16 14:25:57 +0200 |
| commit | 8c4facf89499ede01b43de34b4285c2f08a1708d (patch) | |
| tree | 592cacfe199faa22d70a3a0ccbd11f5298db87fc | |
| parent | 7415495021a2f63d2d05895f3f91d818ce77a7b9 (diff) | |
Notebookbar: update tabbed toolbar for calc
remove separator in other tabbedbars
Change-Id: I99c83cd09e5fa8bde2809680d5ef138c4ef499de
Reviewed-on: https://gerrit.libreoffice.org/61803
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
| -rw-r--r-- | sc/uiconfig/scalc/ui/notebookbar.ui | 1469 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/ui/notebookbar.ui | 263 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 234 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/notebookbar.ui | 163 |
4 files changed, 762 insertions, 1367 deletions
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 5f331d60e864..2564260cbf86 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -659,132 +659,6 @@ </object> </child> </object> - <object class="GtkMenu" id="MenuGraphic"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="CropD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ExternalEditD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ExternalEdit</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ChangePictureD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="CompressGraphicD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="SaveGraphicD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator65"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectMirrorVerticalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectMirrorVertical</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectMirrorHorizontalD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectMirrorHorizontal</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator124"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="EditShapeHyperlinkD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:EditShapeHyperlink</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="DeleteShapeHyperlinkD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DeleteShapeHyperlink</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="OpenHyperlinkOnCursorD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:OpenHyperlinkOnCursor</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator128"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ImageMapDialogD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ImageMapDialog</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="AssignMacroD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:AssignMacro</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator143"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ObjectTitleDescription1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectTitleDescription</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="RenameObjectD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:RenameObject</property> - </object> - </child> - </object> <object class="GtkMenu" id="MenuHelp"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -854,7 +728,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar|Help">_Check for Updates...</property> + <property name="label" translatable="yes" context="CalcNotebookbar|Help">_Check for Updates...</property> </object> </child> <child> @@ -1066,6 +940,99 @@ </object> </child> </object> + <object class="GtkMenu" id="MenuImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="MenuImage-Crop"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Crop</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ExternalEdit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ExternalEdit</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ChangePicture"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ChangePicture</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-CompressGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompressGraphic</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-SaveGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:SaveGraphic</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator29"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-OriginalSize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OriginalSize</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-FitCellSize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:OriginalSize</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ImageMapDialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ImageMapDialog</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separator139"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-NameGroup"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:NameGroup</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-ObjectTitleDescription"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectTitleDescription</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="MenuImage-AssignMacro"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AssignMacro</property> + </object> + </child> + </object> <object class="GtkMenu" id="MenuInsert"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1675,7 +1642,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar|Tools">_Check for Updates...</property> + <property name="label" translatable="yes" context="CalcNotebookbar|Tools">_Check for Updates...</property> </object> </child> <child> @@ -1866,7 +1833,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="FileSection"> + <object class="sfxlo-DropdownBox" id="File-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -1949,7 +1916,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="File-FileButton:MenuFile"> - <property name="label" translatable="yes" context="notebookbar|FileLabel">_File</property> + <property name="label" translatable="yes" context="CalcNotebookbar|FileMenuButton">_File</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1968,7 +1935,7 @@ </child> <child> <object class="svtlo-ManagedMenuButton" id="File-HelpButton:MenuHelp"> - <property name="label" translatable="yes" context="notebookbar|HelpMenuButton">_Help</property> + <property name="label" translatable="yes" context="CalcNotebookbar|HelpMenuButton">_Help</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -2001,58 +1968,66 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator7"> - <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="fill">True</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="FileContainer"> + <object class="sfxlo-PriorityMergedHBox" id="File-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="NewSectio"> + <object class="sfxlo-OptionalBox" id="File-Section-New"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="FileSection1"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <object class="GtkMenuToolButton" id="File-AddDirect"> <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="action_name">.uno:AddDirect</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</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="GroupB1"> + <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="LineA1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> - <property name="icon_size">3</property> <child> - <object class="GtkMenuToolButton" id="File-AddDirect"> + <object class="GtkToolButton" id="File-NewDoc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:AddDirect</property> + <property name="action_name">.uno:NewDoc</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -2063,57 +2038,21 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB1"> + <object class="sfxlo-NotebookbarToolBox" id="LineB1"> <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="LineA1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="File-NewDoc"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:NewDoc</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> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB1"> + <object class="GtkToolButton" id="File-SaveAsTemplate"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="File-SaveAsTemplate"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:SaveAsTemplate</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:SaveAsTemplate</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -2123,25 +2062,25 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator59"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> <property name="position">2</property> </packing> </child> @@ -2153,7 +2092,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="OpenSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Open"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2193,7 +2132,7 @@ <property name="valign">center</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="File-RecentFilesList"> + <object class="svtlo-ManagedMenuButton" id="File-RecentFileList"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -2263,7 +2202,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SaveSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Save"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2385,7 +2324,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ExportSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Export"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2507,7 +2446,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PrintSection"> + <object class="sfxlo-OptionalBox" id="File-Section-Print"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2604,7 +2543,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator9"> + <object class="GtkSeparator" id="separator35"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -2629,7 +2568,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="PropertySection"> + <object class="sfxlo-OptionalBox" id="File-Section-Property"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2726,7 +2665,7 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator35"> + <object class="GtkSeparator" id="separator59"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -2750,13 +2689,27 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator7"> + <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="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> @@ -2766,7 +2719,7 @@ <object class="GtkLabel" id="FileLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|FileLabel">File</property> + <property name="label" translatable="yes" context="CalcNotebookbar|FileLabel">File</property> <property name="use_underline">True</property> </object> <packing> @@ -2779,7 +2732,7 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="PasteBox"> + <object class="GtkBox" id="Home-PasteBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2908,13 +2861,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="HomeContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Home-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="StyleSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Style"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -2988,7 +2941,7 @@ </packing> </child> <child> - <object class="GtkBox" id="FormatSection"> + <object class="GtkBox" id="Home-Section-Format"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3154,7 +3107,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="notebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property> + <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property> <property name="halign">start</property> <property name="action_name">.uno:SetBorderStyle</property> </object> @@ -3327,7 +3280,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AlignSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Align"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3427,7 +3380,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="notebookbar|increaseindent1|tooltip_text">Increase Indent</property> + <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|increaseindent1|tooltip_text">Increase Indent</property> <property name="is_important">True</property> <property name="action_name">.uno:IncrementIndent</property> <property name="use_underline">True</property> @@ -3442,7 +3395,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="notebookbar|decreaseindent1|tooltip_text">Decrease Indent</property> + <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|decreaseindent1|tooltip_text">Decrease Indent</property> <property name="is_important">True</property> <property name="action_name">.uno:DecrementIndent</property> <property name="use_underline">True</property> @@ -3607,7 +3560,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NumberSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Number"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3799,7 +3752,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CellSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Cell"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -3962,7 +3915,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StyleSection2"> + <object class="sfxlo-OptionalBox" id="Home-Section-Style2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4231,7 +4184,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ConditionSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Condition"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -4287,7 +4240,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FindSection"> + <object class="sfxlo-OptionalBox" id="Home-Section-Find"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4382,21 +4335,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -4407,9 +4345,6 @@ <property name="position">7</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -4418,7 +4353,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="MenuSection"> + <object class="sfxlo-DropdownBox" id="Home-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -4433,7 +4368,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:MenuHome"> - <property name="label" translatable="yes" context="notebookbar|HomeMenuButton">_Home</property> + <property name="label" translatable="yes" context="CalcNotebookbar|HomeMenuButton">_Home</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -4541,7 +4476,7 @@ <object class="GtkLabel" id="HomeLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|CalcLabel">Home</property> + <property name="label" translatable="yes" context="CalcNotebookbar|CalcLabel">Home</property> <property name="use_underline">True</property> <style> <class name="context-default"/> @@ -4559,13 +4494,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="InsertContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Insert-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="FunctionSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Function"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4632,7 +4567,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ChartSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Chart"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4748,7 +4683,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ImageSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Image"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4864,7 +4799,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ReferenceSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Reference"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -4983,12 +4918,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FieldSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Field"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:MenuField"> - <property name="label" translatable="yes" context="notebookbar|FieldMenuButton">Fiel_d</property> + <property name="label" translatable="yes" context="CalcNotebookbar|FieldMenuButton">Fiel_d</property> <property name="width_request">70</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5032,7 +4967,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawTextSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-DrawText"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5217,7 +5152,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DrawSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Draw"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5349,7 +5284,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SymbolSection"> + <object class="sfxlo-OptionalBox" id="Insert-Section-Symbol"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5442,21 +5377,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator110"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -5467,9 +5387,6 @@ <property name="position">7</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -5478,7 +5395,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="InsertMenu"> + <object class="sfxlo-DropdownBox" id="Insert-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -5493,7 +5410,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:MenuInsert"> - <property name="label" translatable="yes" context="notebookbar|InsertMenuButton">_Insert</property> + <property name="label" translatable="yes" context="CalcNotebookbar|InsertMenuButton">_Insert</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -5578,7 +5495,7 @@ <object class="GtkLabel" id="InsertLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|InsertLabel">Insert</property> + <property name="label" translatable="yes" context="CalcNotebookbar|InsertLabel">Insert</property> </object> <packing> <property name="position">2</property> @@ -5592,7 +5509,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-DropdownBox" id="PageMenu"> + <object class="sfxlo-DropdownBox" id="Layout-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -5607,7 +5524,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Layout-LayoutButton:MenuPage"> - <property name="label" translatable="yes" context="notebookbar|reviewb">Pag_e</property> + <property name="label" translatable="yes" context="CalcNotebookbar|reviewb">Pag_e</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -5683,13 +5600,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="PageContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Layout-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="FileSection17"> + <object class="sfxlo-OptionalBox" id="Layout-Section-File"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5816,7 +5733,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FileSection19"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Print"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -5957,7 +5874,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FileSection15"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Style"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6013,7 +5930,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SelectGroupSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Group"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6105,7 +6022,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="WrapSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Allign"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6151,7 +6068,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="notebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property> + <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property> <property name="halign">start</property> <property name="action_name">.uno:ObjectAlign</property> </object> @@ -6200,7 +6117,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="BackFrontSection"> + <object class="sfxlo-OptionalBox" id="Layout-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6288,21 +6205,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator113"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -6313,9 +6215,6 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -6332,7 +6231,7 @@ <object class="GtkLabel" id="LayoutLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|PageLayoutLabel">Layout</property> + <property name="label" translatable="yes" context="CalcNotebookbar|PageLayoutLabel">Layout</property> </object> <packing> <property name="position">3</property> @@ -6345,13 +6244,13 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="DataContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Data-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="SourcesSection"> + <object class="sfxlo-OptionalBox" id="Data-Section-Source"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6484,7 +6383,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="CalculateSection"> + <object class="sfxlo-OptionalBox" id="Data-Section-Calculate"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6608,7 +6507,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SortSection"> + <object class="sfxlo-OptionalBox" id="Data-Section-Sort"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6732,7 +6631,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FilterSection"> + <object class="sfxlo-OptionalBox" id="Data-Section-Filter"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -6856,7 +6755,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="GroupSection"> + <object class="sfxlo-OptionalBox" id="Data-Section-Group"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7046,7 +6945,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DefineSection"> + <object class="sfxlo-OptionalBox" id="Data-Section-Define"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7170,7 +7069,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TextToColumnSection"> + <object class="sfxlo-OptionalBox" id="Data-Section-TextToColumn"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7228,12 +7127,12 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="StatisticSection"> + <object class="sfxlo-OptionalBox" id="Data-Section-Statistic"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="svtlo-ManagedMenuButton" id="Data-StatisticsMenu:MenuStatistic"> - <property name="label" translatable="yes" context="notebookbar|Statistics">_Statistics</property> + <property name="label" translatable="yes" context="CalcNotebookbar|Statistics">_Statistics</property> <property name="width_request">80</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -7250,21 +7149,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator29"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -7275,9 +7159,6 @@ <property name="position">7</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -7286,7 +7167,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="DataMenu"> + <object class="sfxlo-DropdownBox" id="Data-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -7301,7 +7182,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Data-DataButton:MenuData"> - <property name="label" translatable="yes" context="notebookbar|DataMenuButton">_Data</property> + <property name="label" translatable="yes" context="CalcNotebookbar|DataMenuButton">_Data</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -7409,7 +7290,7 @@ <object class="GtkLabel" id="DataLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|DataLabel">Data</property> + <property name="label" translatable="yes" context="CalcNotebookbar|DataLabel">Data</property> </object> <packing> <property name="position">4</property> @@ -7421,13 +7302,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="ReviewContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Review-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="LanguageSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Language"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7555,7 +7436,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="AnnotationSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Annotation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7756,7 +7637,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="TrackChangesSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-TrackChanges"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7825,7 +7706,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="DocumentSection"> + <object class="sfxlo-OptionalBox" id="Review-Section-Document"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7981,21 +7862,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator117"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -8006,9 +7872,6 @@ <property name="position">3</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -8017,7 +7880,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="ReferenceMenue"> + <object class="sfxlo-DropdownBox" id="Reference-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -8032,7 +7895,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:MenuReview"> - <property name="label" translatable="yes" context="notebookbar|ReviewMenuButton">_Review</property> + <property name="label" translatable="yes" context="CalcNotebookbar|ReviewMenuButton">_Review</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -8117,7 +7980,7 @@ <object class="GtkLabel" id="ReviewLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|ReviewLabel">Review</property> + <property name="label" translatable="yes" context="CalcNotebookbar|ReviewLabel">Review</property> </object> <packing> <property name="position">5</property> @@ -8129,13 +7992,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="ViewContainer"> + <object class="sfxlo-PriorityMergedHBox" id="View-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="ViewSection"> + <object class="sfxlo-OptionalBox" id="View-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8275,7 +8138,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8457,7 +8320,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SplitSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Split"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8620,7 +8483,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="VisibleSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Visible"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8810,7 +8673,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NewSection"> + <object class="sfxlo-OptionalBox" id="View-Section-New"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8842,21 +8705,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator56"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -8867,9 +8715,6 @@ <property name="position">4</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -8878,7 +8723,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="ViewMenu"> + <object class="sfxlo-DropdownBox" id="View-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -8893,7 +8738,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="View-ViewButton:MenuView"> - <property name="label" translatable="yes" context="notebookbar|ViewMenuButton">_View</property> + <property name="label" translatable="yes" context="CalcNotebookbar|ViewMenuButton">_View</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -8978,7 +8823,7 @@ <object class="GtkLabel" id="ViewLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|ViewLabel">View</property> + <property name="label" translatable="yes" context="CalcNotebookbar|ViewLabel">View</property> </object> <packing> <property name="position">6</property> @@ -8990,7 +8835,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="ImageMenue"> + <object class="sfxlo-DropdownBox" id="Image-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -9004,8 +8849,8 @@ <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuGraphic"> - <property name="label" translatable="yes" context="notebookbar|GraphicMenuButton">_Graphic</property> + <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuImage"> + <property name="label" translatable="yes" context="CalcNotebookbar|GraphicMenuButton">Image</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -9091,55 +8936,37 @@ </packing> </child> <child> - <object class="GtkSeparator" id="separator3"> - <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="fill">True</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="sfxlo-PriorityMergedHBox" id="ImageContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Image-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="ColorSection"> + <object class="sfxlo-OptionalBox" id="Image-Section-Crop"> <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="SectionBottom90"> + <object class="sfxlo-NotebookbarToolBox" id="Big"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_left">5</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="Image-ObjectTitleDescription"> + <object class="GtkToolButton" id="Image-AssignMacro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> - <property name="action_name">.uno:ObjectTitleDescription</property> + <property name="action_name">.uno:AssignMacro</property> </object> <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -9150,50 +8977,110 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB68"> + <object class="GtkBox" id="SecondGroup"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="first15"> + <object class="GtkBox" id="box13"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-Crop"> + <object class="sfxlo-NotebookbarToolBox" id="first11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:Crop</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-CompressGraphic"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:CompressGraphic</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="sfxlo-NotebookbarToolBox" id="first"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Image-Crop"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:Crop</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second17"> + <object class="sfxlo-NotebookbarToolBox" id="second3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-SaveGraphic"> + <object class="GtkToolButton" id="Image-ToggleObjectRotateMode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SaveGraphic</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:ToggleObjectRotateMode</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-FlipVertical"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipVertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-FlipHorizontal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:FlipHorizontal</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -9211,49 +9098,76 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB64"> + <object class="GtkSeparator" id="Image-Section-InsertCaptionDialog-Separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatLineArea"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="box3"> <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="first3"> + <object class="sfxlo-NotebookbarToolBox" id="third1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-CompressGraphic"> + <object class="GtkToolButton" id="Draw-FormatLine1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:CompressGraphic</property> + <property name="action_name">.uno:FormatLine</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second4"> + <object class="sfxlo-NotebookbarToolBox" id="third3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">text</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ChangePicture"> + <object class="GtkToolButton" id="Draw-FormatArea1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:ChangePicture</property> + <property name="action_name">.uno:FormatArea</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> @@ -9268,50 +9182,147 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="GroupB65"> + <object class="GtkBox" id="box6"> <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="first4"> + <object class="GtkBox" id="box8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkMenuToolButton" id="Draw-XLineStyle1"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="action_name">.uno:XLineStyle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + </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="first4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Draw-XLineColor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:XLineColor</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39"> + <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-FlipHorizontal"> + <object class="GtkToolButton" id="Draw-FillStyle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipHorizontal</property> + <property name="action_name">.uno:FillStyle</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sfxlo-NotebookbarToolBox" id="first5"> + <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-LineEndStyle1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:LineEndStyle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">True</property> + </packing> + </child> + </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="second5"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-FlipVertical"> + <object class="GtkToolButton" id="Draw-FillShadow1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FlipVertical</property> + <property name="action_name">.uno:FillShadow</property> </object> <packing> <property name="expand">False</property> @@ -9329,11 +9340,11 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator122"> + <object class="GtkSeparator" id="separator15"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9344,72 +9355,114 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSection2"> + <object class="sfxlo-OptionalBox" id="Image-Section-Anchor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="GroupB72"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="orientation">vertical</property> + <property name="vexpand">True</property> + <property name="toolbar_style">both</property> + <property name="show_arrow">False</property> + <property name="icon_size">3</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="GrafModeGroup"> + <object class="GtkMenuToolButton" id="Image-AnchorMenu"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Image-GrafMode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:GrafMode</property> - </object> - <packing> - <property name="expand">True</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="action_name">.uno:AnchorMenu</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">False</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="priority-4"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="sfxlo-OptionalBox" id="Image-Section-ObjectAlign"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="box10"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkBox" id="GroupB62"> + <object class="GtkBox" id="AlignGroup3"> <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="GraphicFilterToolboxGroup"> + <object class="sfxlo-NotebookbarToolBox" id="Align1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox"> + <object class="GtkToolButton" id="Image-ObjectAlignLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:GraphicFilterToolbox</property> + <property name="action_name">.uno:ObjectAlignLeft</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-AlignCenter"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignCenter</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-ObjectAlignRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:ObjectAlignRight</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -9420,16 +9473,16 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="GrafModeGroup1"> + <object class="sfxlo-NotebookbarToolBox" id="Align2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-FormatLineD"> + <object class="GtkToolButton" id="Image-AlignUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatLine</property> + <property name="action_name">.uno:AlignUp</property> </object> <packing> <property name="expand">False</property> @@ -9437,10 +9490,21 @@ </packing> </child> <child> - <object class="GtkToolButton" id="Image-FormatAreaD"> + <object class="GtkToolButton" id="Image-AlignDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FormatArea</property> + <property name="action_name">.uno:AlignDown</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="Image-AlignMiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:AlignMiddle</property> </object> <packing> <property name="expand">False</property> @@ -9458,201 +9522,137 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator123"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-6"/> + <class name="priority-2"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ColorSection1"> + <object class="sfxlo-OptionalBox" id="Image-Section-Arrange"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="margin_right">5</property> - <property name="hexpand">False</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB80"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_right">5</property> - <property name="orientation">vertical</property> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox3"> + <object class="sfxlo-NotebookbarToolBox" id="first2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafLuminance"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Image-BringToFront"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_right">5</property> - <property name="action_name">.uno:GrafLuminance</property> + <property name="action_name">.uno:BringToFront</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">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> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox4"> + <object class="sfxlo-NotebookbarToolBox" id="second4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafTransparence"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Image-SendToBack"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_right">5</property> - <property name="resize_mode">immediate</property> - <property name="action_name">.uno:GrafTransparence</property> + <property name="action_name">.uno:SendToBack</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="priority-5"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="sfxlo-OptionalBox" id="ColorSection3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <child> - <object class="GtkBox" id="GroupB85"> - <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-SidebarToolBox" id="colorbox5"> + <object class="sfxlo-NotebookbarToolBox" id="first7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafContrast"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Image-ObjectForwardOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafContrast</property> + <property name="action_name">.uno:ObjectForwardOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">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> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="sfxlo-SidebarToolBox" id="colorbox6"> + <object class="sfxlo-NotebookbarToolBox" id="Second7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkMenuToolButton" id="Image-GrafGamma"> - <property name="width_request">130</property> + <object class="GtkToolButton" id="Image-ObjectBackOne"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="action_name">.uno:GrafGamma</property> + <property name="action_name">.uno:ObjectBackOne</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator67"> + <object class="GtkSeparator" id="separator123"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_top">5</property> @@ -9663,41 +9663,36 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-4"/> + <class name="priority-1"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection3"> + <object class="sfxlo-OptionalBox" id="Image-Section-FormatImageFilter"> <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="SectionBottom45"> + <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup"> <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="GtkMenuToolButton" id="Image-AnchorMenu"> + <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="action_name">.uno:AnchorMenu</property> + <property name="action_name">.uno:GraphicFilterToolbox</property> </object> <packing> <property name="expand">False</property> @@ -9712,66 +9707,70 @@ </packing> </child> <style> - <class name="priority-3"/> + <class name="priority-7"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="SizeSection"> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="GroupB63"> + <object class="GtkBox" id="GroupB87"> <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="first2"> + <object class="sfxlo-SidebarToolBox" id="colorbox3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-OriginalSize"> + <object class="GtkMenuToolButton" id="Image-GrafLuminance"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OriginalSize</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafLuminance</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="second3"> + <object class="sfxlo-SidebarToolBox" id="colorbox4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-FitCellSize"> + <object class="GtkMenuToolButton" id="Image-GrafTransparence"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:FitCellSize</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafTransparence</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -9785,71 +9784,49 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator75"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <style> - <class name="priority-2"/> + <class name="priority-6"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="padding">5</property> + <property name="position">6</property> </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ArrangeSection1"> + <object class="sfxlo-OptionalBox" id="Image-Section-ColorSettings2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="GtkBox" id="SendToFrontGroup3"> + <object class="GtkBox" id="GroupB90"> <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="OneStep4"> + <object class="sfxlo-SidebarToolBox" id="colorbox5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ObjectForwardOne"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectForwardOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Image-BringToFront"> + <object class="GtkMenuToolButton" id="Image-GrafContrast"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:BringToFront</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafContrast</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -9860,31 +9837,22 @@ </packing> </child> <child> - <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront4"> + <object class="sfxlo-SidebarToolBox" id="colorbox6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> <child> - <object class="GtkToolButton" id="Image-ObjectBackOne"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:ObjectBackOne</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="Image-SendToBack"> + <object class="GtkMenuToolButton" id="Image-GrafGamma"> + <property name="width_request">130</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:SendToBack</property> + <property name="valign">center</property> + <property name="action_name">.uno:GrafGamma</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -9898,41 +9866,40 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator142"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> <style> - <class name="priority-1"/> + <class name="priority-5"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator3"> + <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="fill">True</property> + <property name="padding">5</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> @@ -9946,7 +9913,7 @@ <object class="GtkLabel" id="ImageLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|ImageLabel">Image</property> + <property name="label" translatable="yes" context="CalcNotebookbar|ImageLabel">Image</property> <property name="use_underline">True</property> <style> <class name="context-Graphic"/> @@ -9962,7 +9929,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="DrawContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Draw-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -11174,21 +11141,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator138"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -11199,9 +11151,6 @@ <property name="position">6</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -11210,7 +11159,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="DrawMenue"> + <object class="sfxlo-DropdownBox" id="Draw-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -11225,7 +11174,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:MenuDraw"> - <property name="label" translatable="yes" context="notebookbar|DrawMenuButton">D_raw</property> + <property name="label" translatable="yes" context="CalcNotebookbar|DrawMenuButton">D_raw</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -11337,7 +11286,7 @@ <object class="GtkLabel" id="DrawLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|DrawLabel">Draw</property> + <property name="label" translatable="yes" context="CalcNotebookbar|DrawLabel">Draw</property> <style> <class name="context-Draw"/> </style> @@ -11352,7 +11301,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-PriorityMergedHBox" id="ObjectContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Object-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12062,21 +12011,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator81"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -12087,9 +12021,6 @@ <property name="position">3</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -12098,7 +12029,7 @@ </packing> </child> <child> - <object class="sfxlo-DropdownBox" id="ObjectMenue"> + <object class="sfxlo-DropdownBox" id="Object-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12113,7 +12044,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Object-DrawMenu:MenuDraw"> - <property name="label" translatable="yes" context="notebookbar|frame:MenuDraw">Object</property> + <property name="label" translatable="yes" context="CalcNotebookbar|frame:MenuDraw">Object</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -12202,7 +12133,7 @@ <object class="GtkLabel" id="FrameLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|FrameLabel">Object</property> + <property name="label" translatable="yes" context="CalcNotebookbar|FrameLabel">Object</property> <style> <class name="context-Frame"/> <class name="context-OLE"/> @@ -12218,7 +12149,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="sfxlo-DropdownBox" id="ToolsMenu"> + <object class="sfxlo-DropdownBox" id="Tools-Menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -12233,7 +12164,7 @@ <property name="orientation">vertical</property> <child> <object class="svtlo-ManagedMenuButton" id="Tools-ToolsButton:MenuTools"> - <property name="label" translatable="yes" context="notebookbar|ToolsMenuButton">_Tools</property> + <property name="label" translatable="yes" context="CalcNotebookbar|ToolsMenuButton">_Tools</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -12309,13 +12240,13 @@ </packing> </child> <child> - <object class="sfxlo-PriorityMergedHBox" id="ToolBoxContainer"> + <object class="sfxlo-PriorityMergedHBox" id="Tool-Container"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="MacroSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Macro"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12444,7 +12375,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormularSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Formular"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12623,7 +12554,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormularSection1"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Formular2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12751,7 +12682,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -12875,7 +12806,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection6"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13078,7 +13009,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection1"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13215,7 +13146,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="FormSection2"> + <object class="sfxlo-OptionalBox" id="Tools-Section-Form3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -13326,21 +13257,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator46"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -13351,9 +13267,6 @@ <property name="position">6</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -13370,7 +13283,7 @@ <object class="GtkLabel" id="DevLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="notebookbar|DevLabel">Tools</property> + <property name="label" translatable="yes" context="CalcNotebookbar|DevLabel">Tools</property> <property name="use_underline">True</property> </object> <packing> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 90f65dff3b9e..5d99495067de 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -2893,21 +2893,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator35"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -4076,21 +4061,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator58"> - <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-1"/> </style> @@ -4828,21 +4798,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator110"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -5700,21 +5655,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator74"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -6139,21 +6079,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator109"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -6887,21 +6812,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator108"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -8102,31 +8012,55 @@ </packing> </child> <child> - <object class="GtkBox" id="Text-Section-TextArrangement"> + <object class="sfxlo-OptionalBox" id="Text-Section-TextArrangement"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="FileSection3"> + <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44"> <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="sfxlo-NotebookbarToolBox" id="SectionBottom44"> + <object class="GtkToolButton" id="Text-TextAttributes"> <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="action_name">.uno:TextAttributes</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="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="LineA9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">both-horiz</property> <property name="show_arrow">False</property> - <property name="icon_size">3</property> <child> - <object class="GtkToolButton" id="Text-TextAttributes"> + <object class="GtkToolButton" id="Text-TransformDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:TextAttributes</property> + <property name="action_name">.uno:TransformDialog</property> </object> <packing> <property name="expand">False</property> @@ -8141,57 +8075,20 @@ </packing> </child> <child> - <object class="GtkBox" id="GroupB12"> + <object class="sfxlo-NotebookbarToolBox" id="LineB17"> <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="LineA9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Text-TransformDialog"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:TransformDialog</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> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB17"> + <object class="GtkToolButton" id="Text-DrawCaption"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Text-DrawCaption"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:DrawCaption</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:DrawCaption</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> @@ -8201,33 +8098,18 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator64"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> @@ -9009,21 +8891,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator57"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -9034,9 +8901,6 @@ <property name="position">4</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -11383,21 +11247,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator138"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -12839,21 +12688,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator86"> - <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-5"/> </style> @@ -13932,21 +13766,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator84"> - <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-1"/> </style> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 5308080fd90c..98c7c508d3b5 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -2933,21 +2933,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator35"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -4453,92 +4438,64 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="FileSection2"> + <object class="GtkBox" id="GroupB39"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="vexpand">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="GroupB39"> + <object class="sfxlo-NotebookbarToolBox" id="LineA9"> <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="LineA9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Home-Presentation"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:Presentation</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> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> <child> - <object class="sfxlo-NotebookbarToolBox" id="LineB21"> + <object class="GtkToolButton" id="Home-Presentation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">both-horiz</property> - <property name="show_arrow">False</property> - <child> - <object class="GtkToolButton" id="Home-PresentationCurrentSlide"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">.uno:PresentationCurrentSlide</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="action_name">.uno:Presentation</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator" id="separator10"> + <object class="sfxlo-NotebookbarToolBox" id="LineB21"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> + <property name="toolbar_style">both-horiz</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="Home-PresentationCurrentSlide"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action_name">.uno:PresentationCurrentSlide</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="padding">5</property> - <property name="position">2</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> + <property name="position">0</property> </packing> </child> <style> @@ -5507,21 +5464,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator110"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -6379,21 +6321,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator74"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -6404,9 +6331,6 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -6868,21 +6792,6 @@ <property name="position">1</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">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -6893,9 +6802,6 @@ <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -7325,21 +7231,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator109"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -8251,21 +8142,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator108"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -9047,21 +8923,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator57"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -11354,21 +11215,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator138"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -12794,21 +12640,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator95"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">1</property> - </packing> - </child> <style> <class name="priority-5"/> </style> @@ -13896,21 +13727,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator90"> - <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-1"/> </style> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 68cc48dc75c2..7bd654fae13a 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -1482,7 +1482,7 @@ <property name="action_name">.uno:SetColumnWidth</property> </object> </child> - <child> + <child> <object class="GtkMenuItem" id="MenuTable-SetMinimalColumnWidth"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2764,21 +2764,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator35"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -4280,21 +4265,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator79"> - <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-1"/> </style> @@ -5357,21 +5327,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator110"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -7001,21 +6956,6 @@ <property name="position">2</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">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -7663,21 +7603,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator117"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -7815,7 +7740,7 @@ <property name="valign">center</property> <property name="vexpand">True</property> <child> - <object class="sfxlo-OptionalBox" id="ViewSection"> + <object class="sfxlo-OptionalBox" id="View-Section-View"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -7955,7 +7880,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="ZoomSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Zoom"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8137,7 +8062,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="VisibleSection"> + <object class="sfxlo-OptionalBox" id="View-Section-Visible"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8327,7 +8252,7 @@ </packing> </child> <child> - <object class="sfxlo-OptionalBox" id="NewSection"> + <object class="sfxlo-OptionalBox" id="View-Section-New"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -8359,21 +8284,6 @@ <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">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -9522,21 +9432,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator56"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -11956,21 +11851,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator138"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> <style> <class name="priority-1"/> </style> @@ -12511,21 +12391,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator105"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="orientation">vertical</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">3</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -13354,9 +13219,6 @@ <property name="position">5</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -15333,21 +15195,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkSeparator" id="separator145"> - <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-1"/> </style> |