[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Fri Apr 5 13:29:37 UTC 2019
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 27 -
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 27 -
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 27 -
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 27 -
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 119 ++---
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 321 ++++++--------
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 27 -
7 files changed, 193 insertions(+), 382 deletions(-)
New commits:
commit 22d79472b6f395a2b4de74dc360bf8e61b1028e3
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Fri Apr 5 05:36:22 2019 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Fri Apr 5 15:29:02 2019 +0200
tdf#124392 remove undo/redo commands from groupedbar drop down
Change-Id: I7224eaf1b569d018a85fee6a65afe43d0d37bfbc
Reviewed-on: https://gerrit.libreoffice.org/70298
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index b9b46f1bf409..b53cfd7d356c 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -851,33 +851,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuEdit-Undo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Undo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Redo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Redo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Repeat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Repeat</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="MenuEdit-Cut">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index 6f8d64726a1c..85c5e7507dd0 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -944,33 +944,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuEdit-Undo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Undo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Redo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Redo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Repeat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Repeat</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="MenuEdit-Cut">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index f8f1da662c9e..2ca25453588d 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -520,33 +520,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuEdit-Undo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Undo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Redo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Redo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Repeat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Repeat</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="MenuEdit-Cut">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 84231cb519b5..ec031e762ede 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -520,33 +520,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuEdit-Undo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Undo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Redo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Redo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Repeat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Repeat</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="MenuEdit-Cut">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index e9c025ad944c..24194bf3fe52 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.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"/>
@@ -499,33 +499,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="undoi2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Undo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="redod2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Redo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="repeati2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Repeat</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="separator65">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="cutd2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2841,10 +2814,10 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|menub">_Menu</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2894,10 +2867,10 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|toolsb">_Tools</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2949,10 +2922,10 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|helpb">_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="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3057,11 +3030,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|fileb">_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="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>
@@ -3295,11 +3268,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|editb">_Edit</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>
@@ -3455,11 +3428,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowb">_Slide Show</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>
<property name="always_show_image">True</property>
</object>
<packing>
@@ -3653,11 +3626,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstylet">S_lide</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>
@@ -3805,11 +3778,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertText">_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="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>
@@ -4155,11 +4128,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|draw">D_raw</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>
@@ -4343,11 +4316,11 @@
<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>
<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>
@@ -4493,11 +4466,11 @@
<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>
<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>
@@ -4785,11 +4758,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -4944,11 +4917,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowt">_Slide Show</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>
<property name="always_show_image">True</property>
</object>
<packing>
@@ -5197,11 +5170,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ormat</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>
@@ -5522,11 +5495,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -5769,11 +5742,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextt">_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="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>
@@ -5935,11 +5908,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewt">_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="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>
@@ -6085,11 +6058,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewp">_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">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>
@@ -6226,11 +6199,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowtt">_Slide Show</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>
<property name="always_show_image">True</property>
</object>
<packing>
@@ -6479,11 +6452,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ormat</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>
@@ -6804,11 +6777,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -6984,11 +6957,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|tabled">T_able</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>
@@ -7253,11 +7226,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|rowscolumnst">R_ows</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>
@@ -7377,11 +7350,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|calculatet">_Calc</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>
@@ -7717,11 +7690,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawb">D_raw</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>
@@ -8012,11 +7985,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">_Edit</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>
@@ -8428,11 +8401,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -8583,11 +8556,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -8729,11 +8702,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewDrawb">Grou_p</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>
@@ -8872,11 +8845,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|3Db">3_D</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -9134,11 +9107,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">_Graphic</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>
@@ -9304,10 +9277,10 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|colorb">C_olor</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="relief">none</property>
<property name="use_underline">True</property>
- <property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -9707,11 +9680,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -9862,11 +9835,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -10269,11 +10242,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|media">_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>
@@ -10448,11 +10421,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|slideshowOLE">_Slide Show</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>
<property name="always_show_image">True</property>
</object>
<packing>
@@ -10732,11 +10705,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">F_rame</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>
@@ -11148,11 +11121,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -11303,11 +11276,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -11453,11 +11426,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewtOLE">_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="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>
@@ -11617,11 +11590,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|oleB">_Master Page</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>
@@ -11856,11 +11829,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextm">_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="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>
@@ -12089,11 +12062,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawm">D_raw</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>
@@ -12419,11 +12392,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="focus_on_click">False</property>
<property name="receives_default">False</property>
<property name="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>
@@ -12585,11 +12558,11 @@
<property name="label" translatable="yes" context="notebookbar_groupedbar_full|masterviewm">_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="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>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 6fa718f7fd85..f11561be55f7 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -674,33 +674,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuEdit-Undo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Undo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Redo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Redo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Repeat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Repeat</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="MenuEdit-Cut">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3895,11 +3868,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Default-Section-Insert">
+ <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator18">
+ <object class="GtkSeparator" id="separator6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -3914,58 +3887,120 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section6">
+ <object class="GtkBox" id="Section5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6">
+ <object class="GtkBox" id="box13">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Default-InsertGraphic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertGraphic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkMenuToolButton" id="Default-InsertTable">
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertTable</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="Default-LeftPara">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:LeftPara</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Default-CenterPara">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:CenterPara</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Default-RightPara">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:RightPara</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Default-JustifyPara">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:JustifyPara</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-CharmapControl">
+ <object class="GtkSeparator" id="separator140">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:CharmapControl</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="Default-InsertPagebreak">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPagebreak</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkMenuToolButton" id="Default-DefaultBullet">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DefaultBullet</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="Default-DefaultNumbering">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DefaultNumbering</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -3976,12 +4011,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box44">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|InsertButton">_Insert</property>
+ <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -3996,7 +4031,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="ExtTop6">
+ <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -4004,10 +4039,21 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Default-InsertDraw">
+ <object class="GtkMenuToolButton" id="Default-LineSpacing">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertDraw</property>
+ <property name="action_name">.uno:LineSpacing</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="Default-BackgroundColor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:BackgroundColor</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4036,7 +4082,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -4046,11 +4092,11 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="Default-Section-Paragraph">
+ <object class="sfxlo-OptionalBox" id="Default-Section-Insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkSeparator" id="separator6">
+ <object class="GtkSeparator" id="separator18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -4065,120 +4111,58 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="Section5">
+ <object class="GtkBox" id="Section6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box13">
+ <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="ExtBottom2">
+ <object class="GtkToolButton" id="Default-InsertGraphic">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Default-LeftPara">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:LeftPara</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Default-CenterPara">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:CenterPara</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Default-RightPara">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:RightPara</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="Default-JustifyPara">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:JustifyPara</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertGraphic</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator140">
+ <object class="GtkMenuToolButton" id="Default-InsertTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="hexpand">True</property>
- <property name="orientation">vertical</property>
+ <property name="action_name">.uno:InsertTable</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35">
+ <object class="GtkToolButton" id="Default-CharmapControl">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkMenuToolButton" id="Default-DefaultBullet">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DefaultBullet</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton" id="Default-DefaultNumbering">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DefaultNumbering</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:CharmapControl</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="Default-InsertPagebreak">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:InsertPagebreak</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -4189,12 +4173,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkBox" id="box44">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="svtlo-ManagedMenuButton" id="Default-Paragraph:MenuParagraph">
- <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|ParagraphButton">_Paragraph</property>
+ <object class="svtlo-ManagedMenuButton" id="Default-Insert:MenuInsert">
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|InsertButton">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="focus_on_click">False</property>
@@ -4209,7 +4193,7 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="ExtBottom8">
+ <object class="sfxlo-NotebookbarToolBox" id="ExtTop6">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -4217,21 +4201,10 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkMenuToolButton" id="Default-LineSpacing">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:LineSpacing</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton" id="Default-BackgroundColor">
+ <object class="GtkToolButton" id="Default-InsertDraw">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BackgroundColor</property>
+ <property name="action_name">.uno:InsertDraw</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4260,7 +4233,7 @@
</packing>
</child>
<style>
- <class name="priority-6"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 83dc336e629f..18dae5f80466 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -674,33 +674,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuEdit-Undo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Undo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Redo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Redo</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuEdit-Repeat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Repeat</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="MenuEdit-separator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="MenuEdit-Cut">
<property name="visible">True</property>
<property name="can_focus">False</property>
More information about the Libreoffice-commits
mailing list