[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jun 9 14:04:26 UTC 2020
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 124 +++++-----
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 172 +++++++-------
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 164 ++++++-------
3 files changed, 230 insertions(+), 230 deletions(-)
New commits:
commit e37bab8d55862620c25a6de44ff7909694f1d862
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Sun Jun 7 23:42:45 2020 +0200
Commit: Andreas Kainz <kainz.a at gmail.com>
CommitDate: Tue Jun 9 16:03:54 2020 +0200
tdf#127122 Sync View and Review group in groupedbar apps
Change-Id: I3b583ef79e651385a044f47b17684a21541467db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95771
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 🦅 <kainz.a at gmail.com>
(cherry picked from commit 08c3a7b74037812eda566924d3d8696768461fb8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95879
Reviewed-by: Andreas Kainz <kainz.a at gmail.com>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index 3d8998f4b711..0b580540e368 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -3950,11 +3950,11 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Default-Section-View">
+ <object class="VclOptionalBox" id="Default-Section-Review">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator12">
+ <object class="GtkSeparator" id="separator24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -3969,21 +3969,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section4">
+ <object class="GtkBox" id="Section8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Default-Zoom">
+ <object class="GtkToolButton" id="Default-SpellDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Zoom</property>
+ <property name="action_name">.uno:SpellDialog</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3991,10 +3991,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-PageMode">
+ <object class="GtkToolButton" id="Default-InsertAnnotation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:PageMode</property>
+ <property name="action_name">.uno:InsertAnnotation</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4002,10 +4002,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-MasterPage">
+ <object class="GtkToolButton" id="Default-GridVisible">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MasterPage</property>
+ <property name="action_name">.uno:GridVisible</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4020,12 +4020,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Default-View:Menu View">
- <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|viewT">_View</property>
+ <object class="svtlo-ManagedMenuButton" id="Default-Review:Menu Review">
+ <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|reviewb">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -4035,7 +4035,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -4043,7 +4043,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -4064,11 +4064,11 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Default-Section-Review">
+ <object class="VclOptionalBox" id="Default-Section-View">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator24">
+ <object class="GtkSeparator" id="separator12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -4083,21 +4083,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section8">
+ <object class="GtkBox" id="Section4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Default-SpellDialog">
+ <object class="GtkToolButton" id="Default-Zoom">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SpellDialog</property>
+ <property name="action_name">.uno:Zoom</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4105,10 +4105,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-InsertAnnotation">
+ <object class="GtkToolButton" id="Default-PageMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertAnnotation</property>
+ <property name="action_name">.uno:PageMode</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4116,10 +4116,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-GridVisible">
+ <object class="GtkToolButton" id="Default-MasterPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:GridVisible</property>
+ <property name="action_name">.uno:MasterPage</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4134,12 +4134,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Default-Review:Menu Review">
- <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|reviewb">_Review</property>
+ <object class="svtlo-ManagedMenuButton" id="Default-View:Menu View">
+ <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|viewT">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -4149,7 +4149,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -4157,7 +4157,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -13273,11 +13273,11 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Master-Section-View">
+ <object class="VclOptionalBox" id="Master-Section-Review">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator85">
+ <object class="GtkSeparator" id="separator101">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -13292,21 +13292,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section39">
+ <object class="GtkBox" id="Section60">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Master-Section-Zoom">
+ <object class="GtkToolButton" id="Default-SpellDialog2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Zoom</property>
+ <property name="action_name">.uno:SpellDialog</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13314,10 +13314,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Master-Section-PageMode">
+ <object class="GtkToolButton" id="Default-InsertAnnotation2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:PageMode</property>
+ <property name="action_name">.uno:InsertAnnotation</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13325,10 +13325,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Master-Section-MasterPage">
+ <object class="GtkToolButton" id="Default-GridVisible2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MasterPage</property>
+ <property name="action_name">.uno:GridVisible</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13343,12 +13343,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box72">
+ <object class="GtkBox" id="box114">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Master-View:Menu View">
- <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|viewT">_View</property>
+ <object class="svtlo-ManagedMenuButton" id="Master-Review:MenuReview">
+ <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|reviewb">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -13358,7 +13358,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -13366,7 +13366,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -13387,11 +13387,11 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Master-Section-Review">
+ <object class="VclOptionalBox" id="Master-Section-View">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator101">
+ <object class="GtkSeparator" id="separator85">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -13406,21 +13406,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section60">
+ <object class="GtkBox" id="Section39">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Default-SpellDialog2">
+ <object class="GtkToolButton" id="Master-Section-Zoom">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SpellDialog</property>
+ <property name="action_name">.uno:Zoom</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13428,10 +13428,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-InsertAnnotation2">
+ <object class="GtkToolButton" id="Master-Section-PageMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertAnnotation</property>
+ <property name="action_name">.uno:PageMode</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13439,10 +13439,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-GridVisible2">
+ <object class="GtkToolButton" id="Master-Section-MasterPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:GridVisible</property>
+ <property name="action_name">.uno:MasterPage</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13457,12 +13457,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box114">
+ <object class="GtkBox" id="box72">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Default-Review:MenuReview2">
- <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|reviewb">_Review</property>
+ <object class="svtlo-ManagedMenuButton" id="Master-View:Menu View">
+ <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|viewT">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -13472,7 +13472,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -13480,7 +13480,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index a4919093392a..26659b781cc2 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -4111,11 +4111,11 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Default-Section-View">
+ <object class="VclOptionalBox" id="Default-Section-Review">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator12">
+ <object class="GtkSeparator" id="separator24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -4130,32 +4130,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section4">
+ <object class="GtkBox" id="Section8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Default-Zoom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Zoom</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Default-NormalMultiPaneGUI">
+ <object class="GtkToolButton" id="Default-SpellDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:NormalMultiPaneGUI</property>
+ <property name="action_name">.uno:SpellDialog</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4163,10 +4152,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-DiaMode">
+ <object class="GtkToolButton" id="Default-InsertAnnotation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DiaMode</property>
+ <property name="action_name">.uno:InsertAnnotation</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4174,10 +4163,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-SlideMasterPage">
+ <object class="GtkToolButton" id="Default-GridVisible">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SlideMasterPage</property>
+ <property name="action_name">.uno:GridVisible</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4192,12 +4181,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Default-View:Menu View">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewT">_View</property>
+ <object class="svtlo-ManagedMenuButton" id="Default-Review:Menu Review">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -4207,7 +4196,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -4215,7 +4204,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -4236,11 +4225,11 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Default-Section-Review">
+ <object class="VclOptionalBox" id="Default-Section-View">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator24">
+ <object class="GtkSeparator" id="separator12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -4255,21 +4244,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section8">
+ <object class="GtkBox" id="Section4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Default-SpellDialog">
+ <object class="GtkToolButton" id="Default-Zoom">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SpellDialog</property>
+ <property name="action_name">.uno:Zoom</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4277,10 +4266,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-InsertAnnotation">
+ <object class="GtkToolButton" id="Default-NormalMultiPaneGUI">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertAnnotation</property>
+ <property name="action_name">.uno:NormalMultiPaneGUI</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4288,10 +4277,21 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-GridVisible">
+ <object class="GtkToolButton" id="Default-DiaMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:GridVisible</property>
+ <property name="action_name">.uno:DiaMode</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Default-SlideMasterPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SlideMasterPage</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4306,12 +4306,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Default-Review:Menu Review">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
+ <object class="svtlo-ManagedMenuButton" id="Default-View:Menu View">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewT">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -4321,7 +4321,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -4329,7 +4329,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -4340,7 +4340,7 @@
</packing>
</child>
<style>
- <class name="priority-1"/>
+ <class name="priority-2"/>
</style>
</object>
<packing>
@@ -4433,7 +4433,7 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-1"/>
</style>
</object>
<packing>
@@ -13338,11 +13338,11 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Master-Section-View">
+ <object class="VclOptionalBox" id="Master-Section-Review">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator85">
+ <object class="GtkSeparator" id="separator101">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -13357,32 +13357,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section39">
+ <object class="GtkBox" id="Section60">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Master-Section-Zoom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Zoom</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Master-Section-NormalMultiPaneGUI">
+ <object class="GtkToolButton" id="Default-SpellDialog2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:NormalMultiPaneGUI</property>
+ <property name="action_name">.uno:SpellDialog</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13390,10 +13379,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Master-Section-DiaMode">
+ <object class="GtkToolButton" id="Default-InsertAnnotation2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:DiaMode</property>
+ <property name="action_name">.uno:InsertAnnotation</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13401,10 +13390,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Master-Section-SlideMasterPage">
+ <object class="GtkToolButton" id="Default-GridVisible2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SlideMasterPage</property>
+ <property name="action_name">.uno:GridVisible</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13419,12 +13408,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box72">
+ <object class="GtkBox" id="box103">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Master-View:Menu View">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewT">_View</property>
+ <object class="svtlo-ManagedMenuButton" id="Master-Review:MenuReview">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -13434,7 +13423,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -13442,7 +13431,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -13463,11 +13452,11 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Master-Section-Review">
+ <object class="VclOptionalBox" id="Master-Section-View">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator101">
+ <object class="GtkSeparator" id="separator85">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -13482,21 +13471,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section60">
+ <object class="GtkBox" id="Section39">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Default-SpellDialog2">
+ <object class="GtkToolButton" id="Master-Section-Zoom">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SpellDialog</property>
+ <property name="action_name">.uno:Zoom</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13504,10 +13493,10 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-InsertAnnotation2">
+ <object class="GtkToolButton" id="Master-Section-NormalMultiPaneGUI">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertAnnotation</property>
+ <property name="action_name">.uno:NormalMultiPaneGUI</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13515,10 +13504,21 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-GridVisible2">
+ <object class="GtkToolButton" id="Master-Section-DiaMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:GridVisible</property>
+ <property name="action_name">.uno:DiaMode</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Master-Section-SlideMasterPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SlideMasterPage</property>
</object>
<packing>
<property name="expand">False</property>
@@ -13533,12 +13533,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box103">
+ <object class="GtkBox" id="box72">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Default-Review:MenuReview2">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
+ <object class="svtlo-ManagedMenuButton" id="Master-View:Menu View">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewT">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -13548,7 +13548,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -13556,7 +13556,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index 26654b027182..b45e0779bff1 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -4365,15 +4365,15 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="SectionView">
+ <object class="VclOptionalBox" id="SectionReview">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkBox" id="horizontal12">
+ <object class="GtkBox" id="horizontal49">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator11">
+ <object class="GtkSeparator" id="separator25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -4386,27 +4386,38 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vertical12">
+ <object class="GtkBox" id="vertical50">
<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="first11">
+ <object class="GtkBox" id="box84">
<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="Zoom">
+ <object class="sfxlo-NotebookbarToolBox" id="first18">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:Zoom</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="SpellDialog">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SpellDialog</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>
</object>
@@ -4417,42 +4428,31 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="second11">
+ <object class="GtkBox" id="box85">
<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="NormalMultiPaneGUI">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:NormalMultiPaneGUI</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
<child>
- <object class="GtkToolButton" id="DiaMode">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DiaMode</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="SlideMasterPage">
+ <object class="sfxlo-NotebookbarToolBox" id="second23">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SlideMasterPage</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="InsertAnnotation1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertAnnotation</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>
</object>
@@ -4463,12 +4463,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box20">
+ <object class="GtkBox" id="box86">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="viewb:MenuView">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewb">_View</property>
+ <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -4515,15 +4515,15 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="SectionReview">
+ <object class="VclOptionalBox" id="SectionView">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkBox" id="horizontal49">
+ <object class="GtkBox" id="horizontal12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator25">
+ <object class="GtkSeparator" id="separator11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -4536,38 +4536,27 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vertical50">
+ <object class="GtkBox" id="vertical12">
<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="box84">
+ <object class="sfxlo-NotebookbarToolBox" id="first11">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="first18">
+ <object class="GtkToolButton" id="Zoom">
<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="SpellDialog">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:SpellDialog</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="action_name">.uno:Zoom</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -4578,31 +4567,42 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box85">
+ <object class="sfxlo-NotebookbarToolBox" id="second11">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="second23">
+ <object class="GtkToolButton" id="NormalMultiPaneGUI">
<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="InsertAnnotation1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertAnnotation</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="action_name">.uno:NormalMultiPaneGUI</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="DiaMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DiaMode</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="SlideMasterPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SlideMasterPage</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -4613,12 +4613,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box86">
+ <object class="GtkBox" id="box20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_Review</property>
+ <object class="svtlo-ManagedMenuButton" id="viewb:MenuView">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewb">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
More information about the Libreoffice-commits
mailing list