sc/uiconfig/scalc/ui/notebookbar.ui | 45
sd/uiconfig/sdraw/ui/notebookbar.ui | 46
sd/uiconfig/simpress/ui/notebookbar.ui | 2559 ++++++++++++++++-----------------
sw/uiconfig/swriter/ui/notebookbar.ui | 51
4 files changed, 1331 insertions(+), 1370 deletions(-)
New commits:
commit 14408644f9927aa092df1a2ac681ef946feb8e12
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Wed Oct 17 02:06:19 2018 +0200
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Wed Oct 17 07:12:54 2018 +0200
Notebookbar: sync tabbedbar
Change-Id: I6441f66f7cd078dae0c81cb1a5c62b5130187536
Reviewed-on: https://gerrit.libreoffice.org/61858
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index a1c5cecedee6..ca39249bc22f 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -2001,13 +2001,13 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|FileMenuButton">_File</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="resize_mode">immediate</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2020,13 +2020,13 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|HelpMenuButton">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="resize_mode">immediate</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2217,11 +2217,11 @@
<object class="svtlo-ManagedMenuButton"
id="File-RecentFileList">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property
name="focus_on_click">False</property>
<property
name="receives_default">False</property>
<property
name="action_name">.uno:RecentFileList</property>
<property
name="image">RecentFilesImg</property>
<property name="use_underline">True</property>
- <property
name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4453,12 +4453,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|HomeMenuButton">_Home</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4564,6 +4564,7 @@
<class name="context-default"/>
<class name="context-any"/>
<class name="context-Text"/>
+ <class name="context-DrawText"/>
</style>
</object>
<packing>
@@ -5495,12 +5496,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|InsertMenuButton">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5609,12 +5610,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|reviewb">Pag_e</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7267,12 +7268,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|DataMenuButton">_Data</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7980,12 +7981,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|ReviewMenuButton">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8823,12 +8824,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|ViewMenuButton">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8935,11 +8936,11 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|GraphicMenuButton">Image</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -10962,12 +10963,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|DrawMenuButton">D_raw</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11059,9 +11060,6 @@
<property name="position">3</property>
</packing>
</child>
- <style>
- <class name="Context-Draw"/>
- </style>
</object>
<packing>
<property name="position">9</property>
@@ -11074,6 +11072,8 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|DrawLabel">Draw</property>
<style>
<class name="context-Draw"/>
+ <class name="context-DrawLine"/>
+ <class name="context-ThreeDObject"/>
</style>
</object>
<packing>
@@ -11580,11 +11580,11 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|MediaMenuButton">_Media</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11651,9 +11651,6 @@
<property name="position">3</property>
</packing>
</child>
- <style>
- <class name="context-Media"/>
- </style>
</object>
<packing>
<property name="position">10</property>
@@ -12380,12 +12377,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|frame:MenuDraw">Object</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -12477,10 +12474,6 @@
<property name="position">3</property>
</packing>
</child>
- <style>
- <class name="Context-Frame"/>
- <class name="Context-OLE"/>
- </style>
</object>
<packing>
<property name="position">10</property>
@@ -12766,12 +12759,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|PrintMenuButton">_Print</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -12877,12 +12870,12 @@
<property name="label" translatable="yes"
context="CalcNotebookbar|ToolsMenuButton">_Tools</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 5d99495067de..fb90567bf803 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sd">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -2129,13 +2129,13 @@
<property name="label" translatable="yes"
context="drawnotebookbar|FileLabel">_File</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="resize_mode">immediate</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2148,13 +2148,13 @@
<property name="label" translatable="yes"
context="drawnotebookbar|HelpMenuButton">_Help</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="resize_mode">immediate</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2364,11 +2364,11 @@
<object class="svtlo-ManagedMenuButton"
id="File-RecentFileList">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property
name="focus_on_click">False</property>
<property
name="receives_default">False</property>
<property
name="action_name">.uno:RecentFileList</property>
<property
name="image">RecentFilesImg</property>
<property name="use_underline">True</property>
- <property
name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3078,12 +3078,12 @@
<property name="label" translatable="yes"
context="drawnotebookbar|HomeMenuButton">_Home</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4834,12 +4834,12 @@
<property name="label" translatable="yes"
context="drawnotebookbar|InsertMenuButton">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4949,12 +4949,12 @@
<property name="label" translatable="yes"
context="drawnotebookbar|PageMenuButton">Page</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5714,11 +5714,11 @@
<property name="label" translatable="yes"
context="drawnotebookbar|ReviewMenuButton">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="halign">end</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6155,12 +6155,12 @@
<property name="label" translatable="yes"
context="drawnotebookbar|ViewMenuButton">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6888,11 +6888,11 @@
<property name="label" translatable="yes"
context="drawnotebookbar|TextMenuButton">Text</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
<property name="always_show_image">True</property>
</object>
<packing>
@@ -8136,9 +8136,6 @@
<property name="position">4</property>
</packing>
</child>
- <style>
- <class name="context-DrawText"/>
- </style>
</object>
<packing>
<property name="position">4</property>
@@ -8151,6 +8148,7 @@
<property name="label" translatable="yes"
context="drawnotebookbar|ReferencesLabel">Text</property>
<property name="use_underline">True</property>
<style>
+ <class name="context-Text"/>
<class name="context-DrawText"/>
</style>
</object>
@@ -8927,11 +8925,11 @@
<property name="label" translatable="yes"
context="drawnotebookbar|TableMenuButton">T_able</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -9972,11 +9970,11 @@
<property name="label" translatable="yes"
context="drawnotebookbar|GraphicMenuButton">Image</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11283,11 +11281,11 @@
<property name="label" translatable="yes"
context="drawnotebookbar|DrawMenuButton">D_raw</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11391,9 +11389,8 @@
<property name="label" translatable="yes"
context="drawnotebookbar|DrawLabel">Draw</property>
<style>
<class name="context-Draw"/>
- <class name="context-OLE"/>
- <class name="context-Frame"/>
<class name="context-DrawLine"/>
+ <class name="context-ThreeDObject"/>
</style>
</object>
<packing>
@@ -11911,11 +11908,11 @@
<property name="label" translatable="yes"
context="drawnotebookbar|MediaMenuButton">_Media</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11982,9 +11979,6 @@
<property name="position">3</property>
</packing>
</child>
- <style>
- <class name="context-Media"/>
- </style>
</object>
<packing>
<property name="position">10</property>
@@ -12724,12 +12718,12 @@
<property name="label" translatable="yes"
context="drawnotebookbar|ObjectMenuButton">Object</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -12821,10 +12815,6 @@
<property name="position">3</property>
</packing>
</child>
- <style>
- <class name="Context-Frame"/>
- <class name="Context-OLE"/>
- </style>
</object>
<packing>
<property name="position">10</property>
@@ -12870,12 +12860,12 @@
<property name="label" translatable="yes"
context="drawnotebookbar|ToolsMenuButton">_Tools</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 98c7c508d3b5..33f3df379ddb 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sd">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -2169,13 +2169,13 @@
<property name="label" translatable="yes"
context="impressnotebookbar|FileLabel">_File</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="resize_mode">immediate</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2188,13 +2188,13 @@
<property name="label" translatable="yes"
context="impressnotebookbar|HelpMenuButton">_Help</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="resize_mode">immediate</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2404,11 +2404,11 @@
<object class="svtlo-ManagedMenuButton"
id="File-RecentFileList">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property
name="focus_on_click">False</property>
<property
name="receives_default">False</property>
<property
name="action_name">.uno:RecentFileList</property>
<property
name="image">RecentFilesImg</property>
<property name="use_underline">True</property>
- <property
name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3118,12 +3118,12 @@
<property name="label" translatable="yes"
context="impressnotebookbar|HomeMenuButton">_Home</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4547,6 +4547,7 @@
<class name="context-default"/>
<class name="context-any"/>
<class name="context-Text"/>
+ <class name="context-DrawText"/>
</style>
</object>
<packing>
@@ -5500,12 +5501,12 @@
<property name="label" translatable="yes"
context="impressnotebookbar|InsertMenuButton">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5615,12 +5616,12 @@
<property name="label" translatable="yes"
context="impressnotebookbar|SlideMenuButton">S_lide</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6378,11 +6379,11 @@
<property name="label" translatable="yes"
context="impressnotebookbar|SlideShowMenuButton">_Slide Show</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
<property name="always_show_image">True</property>
</object>
<packing>
@@ -6866,11 +6867,11 @@
<property name="label" translatable="yes"
context="impressnotebookbar|ReviewMenuButton">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="halign">end</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -7305,12 +7306,12 @@
<property name="label" translatable="yes"
context="impressnotebookbar|ViewMenuButton">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8959,11 +8960,11 @@
<property name="label" translatable="yes"
context="impressnotebookbar|TableMenuButton">T_able</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -9942,11 +9943,11 @@
<property name="label" translatable="yes"
context="impressnotebookbar|GraphicMenuButton">Image</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11251,12 +11252,12 @@
<property name="label" translatable="yes"
context="impressnotebookbar|DrawMenuButton">D_raw</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11348,11 +11349,6 @@
<property name="position">3</property>
</packing>
</child>
- <style>
- <class name="context-Draw"/>
- <class name="context-OLE"/>
- <class name="context-Frame"/>
- </style>
</object>
<packing>
<property name="position">9</property>
@@ -11365,8 +11361,8 @@
<property name="label" translatable="yes"
context="impressnotebookbar|DrawLabel">Draw</property>
<style>
<class name="context-Draw"/>
- <class name="context-OLE"/>
- <class name="context-Frame"/>
+ <class name="context-DrawLine"/>
+ <class name="context-ThreeDObject"/>
</style>
</object>
<packing>
@@ -11375,23 +11371,23 @@
</packing>
</child>
<child>
- <object class="sfxlo-PriorityHBox" id="MediaBox">
+ <object class="sfxlo-PriorityHBox" id="ObjectBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-PriorityMergedHBox"
id="Media-Container">
+ <object class="sfxlo-PriorityMergedHBox"
id="Object-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="Media-Section-Edit">
+ <object class="sfxlo-OptionalBox"
id="Object-Section-Edit">
<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="SectionBottom27">
+ <object class="sfxlo-NotebookbarToolBox" id="Big2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -11401,7 +11397,7 @@
<property name="show_arrow">False</property>
<property name="icon_size">3</property>
<child>
- <object class="GtkToolButton"
id="Media-AnimationEffects">
+ <object class="GtkToolButton"
id="Object-AnimationEffects">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -11409,25 +11405,25 @@
<property
name="action_name">.uno:AnimationEffects</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>
<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="GtkBox" id="GroupB45">
+ <object class="GtkBox" id="GroupB55">
<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="SectionBottom28">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -11435,10 +11431,10 @@
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Media-AVMediaPlayer">
+ <object class="GtkToolButton"
id="Object-ToggleObjectBezierMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:AVMediaPlayer</property>
+ <property
name="action_name">.uno:AdvancedMode</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11453,15 +11449,15 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom31">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom30">
<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-horiz</property>
+ <property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Media-ToggleObjectRotateMode">
+ <object class="GtkToolButton"
id="Object-ToggleObjectRotateMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:ToggleObjectRotateMode</property>
@@ -11471,6 +11467,50 @@
<property
name="homogeneous">True</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolButton"
id="Object-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">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Object-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">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Object-Shear">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:Shear</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Object-CrookSlant">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:CrookSlant</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -11486,7 +11526,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator41">
+ <object class="GtkSeparator" id="separator37">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -11508,30 +11548,62 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Media-Section-AVMediaToolbox">
+ <object class="sfxlo-OptionalBox"
id="Object-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="sfxlo-NotebookbarToolBox" id="first6">
- <property name="width_request">1000</property>
+ <object class="GtkBox" id="box14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property
name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkToolButton"
id="Media-AVMediaToolBox">
- <property name="width_request">800</property>
+ <object class="sfxlo-NotebookbarToolBox"
id="third3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property
name="action_name">.uno:AVMediaToolBox</property>
+ <property name="toolbar_style">text</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-FormatLine3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FormatLine</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="third4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">text</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Draw-FormatArea3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FormatArea</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>
@@ -11542,103 +11614,31 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator31">
+ <object class="GtkBox" id="box15">
<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-3"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-OptionalBox"
id="Media-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="svtlo-ManagedMenuButton"
id="Media-ConvertButton:MenuConvert">
- <property name="label" translatable="yes"
context="impressnotebookbar|ConvertMenuButton">Convert</property>
- <property name="width_request">70</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="action_name">.uno:ChangeBezier</property>
- <property name="image">changebezierImg</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_right">5</property>
<child>
- <object class="GtkBox" id="AlignGroup2">
+ <object class="GtkBox" id="box16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Align3">
+ <object class="sfxlo-NotebookbarToolBox"
id="first16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="toolbar_style">icons</property>
<property
name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Media-ObjectAlignLeft">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:ObjectAlignLeft</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Media-AlignCenter">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="action_name">.uno:AlignCenter</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton"
id="Media-ObjectAlignRight">
+ <object class="GtkMenuToolButton"
id="Object-XLineStyle">
+ <property
name="width_request">100</property>
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:ObjectAlignRight</property>
+ <property
name="valign">center</property>
+ <property
name="action_name">.uno:XLineStyle</property>
</object>
<packing>
<property
name="expand">False</property>
- <property
name="homogeneous">True</property>
+ <property
name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -11649,13 +11649,240 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Align4">
+ <object class="sfxlo-NotebookbarToolBox"
id="first19">
<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="Media-AlignUp">
+ <object class="GtkToolButton"
id="Object-XLineColor">
+ <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="SectionBottom46">
+ <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="Object-FillStyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FillStyle</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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="first20">
+ <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="Object-LineEndStyle">
+ <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="SectionBottom47">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton"
id="Object-FillShadow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:FillShadow</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator32">
+ <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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-OptionalBox"
id="Object-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="svtlo-ManagedMenuButton"
id="Object-ConvertButton:MenuConvert">
+ <property name="label" translatable="yes"
context="impressnotebookbar|ConvertMenuButton">Convert</property>
+ <property name="width_request">70</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="action_name">.uno:ChangeBezier</property>
+ <property name="image">changebezierImg</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ <property name="image_position">top</property>
+ <property name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="AlignGroup4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">5</property>
+ <property
name="orientation">vertical</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="Align7">
+ <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="Object-ObjectAlignLeft">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="action_name">.uno:ObjectAlignLeft</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Object-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="Object-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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="Align8">
+ <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="Object-AlignUp">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="action_name">.uno:AlignUp</property>
@@ -11666,7 +11893,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-AlignDown">
+ <object class="GtkToolButton"
id="Object-AlignDown">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="action_name">.uno:AlignDown</property>
@@ -11677,7 +11904,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton"
id="Media-AlignMiddle">
+ <object class="GtkToolButton"
id="Object-AlignMiddle">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="action_name">.uno:AlignMiddle</property>
@@ -11709,7 +11936,7 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -11719,23 +11946,23 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox"
id="Media-Section-Arrange">
+ <object class="sfxlo-OptionalBox"
id="Object-Section-Arrange">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkGrid" id="grid4">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="first14">
+ <object class="sfxlo-NotebookbarToolBox"
id="first17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Media-BringToFront">
+ <object class="GtkToolButton"
id="Object-BringToFront">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:BringToFront</property>
@@ -11752,13 +11979,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="second5">
+ <object class="sfxlo-NotebookbarToolBox"
id="second4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Media-SendToBack">
+ <object class="GtkToolButton"
id="Object-SendToBack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:SendToBack</property>
@@ -11775,13 +12002,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="first15">
+ <object class="sfxlo-NotebookbarToolBox"
id="first18">
<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="Media-ObjectForwardOne">
+ <object class="GtkToolButton"
id="Object-ObjectForwardOne">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:ObjectForwardOne</property>
@@ -11798,13 +12025,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="Second3">
+ <object class="sfxlo-NotebookbarToolBox"
id="Second2">
<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="Media-ObjectBackOne">
+ <object class="GtkToolButton"
id="Object-ObjectBackOne">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:ObjectBackOne</property>
@@ -11828,7 +12055,7 @@
</packing>
</child>
<style>
- <class name="priority-1"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -11845,38 +12072,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-DropdownBox" id="Media-Menu">
+ <object class="sfxlo-DropdownBox" id="Object-Menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="GroupB53">
+ <object class="GtkBox" id="GroupB71">
<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="svtlo-ManagedMenuButton"
id="media:MenuMedia">
- <property name="label" translatable="yes"
context="impressnotebookbar|MediaMenuButton">_Media</property>
+ <object class="svtlo-ManagedMenuButton"
id="Object-ObjectButton:MenuObject">
+ <property name="label" translatable="yes"
context="impressnotebookbar|ObjectMenuButton">Object</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
- <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</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="SectionBottom25">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom49">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -11885,13 +12113,38 @@
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
- <object class="GtkToolButton"
id="Media-TransformDialog">
+ <object class="GtkToolButton"
id="Object-FormatArea">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property
name="action_name">.uno:FormatArea</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Object-FormatLine">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property
name="action_name">.uno:FormatLine</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton"
id="Object-TransformDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property
name="action_name">.uno:TransformDialog</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -11914,11 +12167,11 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator38">
+ <object class="GtkSeparator" id="separator88">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
@@ -11934,46 +12187,135 @@
<property name="position">3</property>
</packing>
</child>
- <style>
- <class name="context-Media"/>
- </style>
</object>
<packing>
<property name="position">10</property>
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="MediaLabel">
+ <object class="GtkLabel" id="ObjectLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="impressnotebookbar|MediaLabel">Media</property>
+ <property name="label" translatable="yes"
context="impressnotebookbar|ObjectLabel">Object</property>
<style>
- <class name="context-Media"/>
+ <class name="context-Frame"/>
+ <class name="context-OLE"/>
</style>
</object>
<packing>
- <property name="position">12</property>
+ <property name="position">10</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
