[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig

andreas kainz kainz.a at gmail.com
Sat May 19 10:29:04 UTC 2018


 sc/uiconfig/scalc/ui/notebookbar.ui                       |  224 +++++-------
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui    |    9 
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui       |   27 -
 sd/uiconfig/simpress/ui/notebookbar.ui                    |  261 ++++++--------
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |    4 
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui    |   19 -
 6 files changed, 221 insertions(+), 323 deletions(-)

New commits:
commit 669911e93088a6b876a9a6272419c30f36ead814
Author: andreas kainz <kainz.a at gmail.com>
Date:   Sat May 19 01:23:20 2018 +0200

    NB: update IDs
    
    Change-Id: I41e16c68709a85c4d06a6a0de737b5eb59d2a5d9
    Reviewed-on: https://gerrit.libreoffice.org/54558
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>
    Tested-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index beddaa6e45c6..8d18c754b15d 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1889,7 +1889,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="CloseDoc">
+                              <object class="GtkToolButton" id="File-CloseDoc">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:CloseDoc</property>
@@ -1916,7 +1916,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="HelpIndex">
+                              <object class="GtkToolButton" id="File-HelpIndex">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:HelpIndex</property>
@@ -1948,8 +1948,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="filetab:MenuFile">
-                            <property name="label" translatable="yes" context="notebookbar_compact|fileb">_File</property>
+                          <object class="svtlo-ManagedMenuButton" id="File-FileButton:MenuFile">
+                            <property name="label" translatable="yes" context="notebookbar|FileLabel">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -1967,8 +1967,8 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="helpb:MenuHelp">
-                            <property name="label" translatable="yes" context="notebookbar|fileb">_Help</property>
+                          <object class="svtlo-ManagedMenuButton" id="File-HelpButton:MenuHelp">
+                            <property name="label" translatable="yes" context="notebookbar|HelpMenuButton">_Help</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -2045,7 +2045,7 @@
                                 <property name="show_arrow">False</property>
                                 <property name="icon_size">3</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="AddDirect">
+                                  <object class="GtkMenuToolButton" id="File-AddDirect">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AddDirect</property>
@@ -2075,7 +2075,7 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="NewDoc">
+                                      <object class="GtkToolButton" id="File-NewDoc">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NewDoc</property>
@@ -2099,7 +2099,7 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="SaveAsTemplate">
+                                      <object class="GtkToolButton" id="File-SaveAsTemplate">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SaveAsTemplate</property>
@@ -2168,7 +2168,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Open">
+                              <object class="GtkToolButton" id="File-Open">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Open</property>
@@ -2193,8 +2193,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="svtlo-ManagedMenuButton" id="RecentFilesB">
-                                <property name="use_action_appearance">False</property>
+                              <object class="svtlo-ManagedMenuButton" id="File-RecentFilesList">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -2216,7 +2215,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="OpenRemote">
+                                  <object class="GtkToolButton" id="File-OpenRemote">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:OpenRemote</property>
@@ -2279,7 +2278,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Save">
+                              <object class="GtkToolButton" id="File-Save">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Save</property>
@@ -2310,7 +2309,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveAs">
+                                  <object class="GtkToolButton" id="File-SaveAs">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAs</property>
@@ -2335,7 +2334,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveAsRemote">
+                                  <object class="GtkToolButton" id="File-SaveAsRemote">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAsRemote</property>
@@ -2401,7 +2400,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="ExportTo1">
+                              <object class="GtkToolButton" id="File-ExportTo">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ExportTo</property>
@@ -2432,7 +2431,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ExportDirectToPDF">
+                                  <object class="GtkToolButton" id="File-ExportDirectToPDF">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExportDirectToPDF</property>
@@ -2457,7 +2456,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ExportDirectToEPUB">
+                                  <object class="GtkToolButton" id="File-ExportDirectToEPUB">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExportDirectToEPUB</property>
@@ -2523,7 +2522,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Print">
+                              <object class="GtkToolButton" id="File-Print">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Print</property>
@@ -2554,7 +2553,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="PrintDefault">
+                                  <object class="GtkToolButton" id="File-PrintDefault">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PrintDefault</property>
@@ -2579,7 +2578,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="PrintPreview">
+                                  <object class="GtkToolButton" id="File-PrintPreview">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PrintPreview</property>
@@ -2645,7 +2644,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="SetDocumentProperties">
+                              <object class="GtkToolButton" id="File-SetDocumentProperties">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SetDocumentProperties</property>
@@ -2676,7 +2675,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Signature">
+                                  <object class="GtkToolButton" id="File-Signature">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Signature</property>
@@ -2701,7 +2700,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SignPDF">
+                                  <object class="GtkToolButton" id="File-SignPDF">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SignPDF</property>
@@ -2801,7 +2800,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="Paste1">
+                              <object class="GtkMenuToolButton" id="Home-Paste">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Paste</property>
@@ -2831,7 +2830,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Cut1">
+                                  <object class="GtkToolButton" id="Home-Cut">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Cut</property>
@@ -2855,7 +2854,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Copy1">
+                                  <object class="GtkToolButton" id="Home-Copy">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Copy</property>
@@ -2933,7 +2932,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FormatPaintbrush1">
+                                  <object class="GtkToolButton" id="Home-FormatPaintbrush">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatPaintbrush</property>
@@ -2957,7 +2956,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ResetAttributes">
+                                  <object class="GtkToolButton" id="Home-ResetAttributes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ResetAttributes</property>
@@ -3016,7 +3015,7 @@
                                         <property name="can_focus">False</property>
                                         <property name="hexpand">True</property>
                                         <child>
-                                          <object class="GtkToolButton" id="fontname1">
+                                          <object class="GtkToolButton" id="Home-CharFontName">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="hexpand">True</property>
@@ -3041,7 +3040,7 @@
                                         <property name="margin_left">5</property>
                                         <property name="margin_right">5</property>
                                         <child>
-                                          <object class="GtkToolButton" id="fontsize1">
+                                          <object class="GtkToolButton" id="Home-FontHeight">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:FontHeight</property>
@@ -3077,7 +3076,7 @@
                                         <property name="toolbar_style">icons</property>
                                         <property name="show_arrow">False</property>
                                         <child>
-                                          <object class="GtkToolButton" id="Bold">
+                                          <object class="GtkToolButton" id="Home-Bold">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Bold</property>
@@ -3088,7 +3087,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkToolButton" id="Italic">
+                                          <object class="GtkToolButton" id="Home-Italic">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Italic</property>
@@ -3099,7 +3098,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkToolButton" id="Underline">
+                                          <object class="GtkToolButton" id="Home-Underline">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:UnderlineSimple</property>
@@ -3110,7 +3109,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkToolButton" id="Strikeout">
+                                          <object class="GtkToolButton" id="Home-Strikeout">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Strikeout</property>
@@ -3151,7 +3150,7 @@
                                         <property name="toolbar_style">icons</property>
                                         <property name="show_arrow">False</property>
                                         <child>
-                                          <object class="GtkMenuToolButton" id="SetBorderStyle">
+                                          <object class="GtkMenuToolButton" id="Home-SetBorderStyle">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="has_tooltip">True</property>
@@ -3165,7 +3164,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkMenuToolButton" id="BackgroundColor2">
+                                          <object class="GtkMenuToolButton" id="Home-BackgroundColor">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:BackgroundColor</property>
@@ -3177,7 +3176,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkMenuToolButton" id="FontColor">
+                                          <object class="GtkMenuToolButton" id="Home-FontColor">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:Color</property>
@@ -3223,7 +3222,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="Grow">
+                                      <object class="GtkToolButton" id="Home-Grow">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:Grow</property>
@@ -3234,7 +3233,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="Shrink">
+                                      <object class="GtkToolButton" id="Home-Shrink">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:Shrink</property>
@@ -3260,7 +3259,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="SubScript">
+                                      <object class="GtkToolButton" id="Home-SubScript">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SubScript</property>
@@ -3271,7 +3270,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="SuperScript">
+                                      <object class="GtkToolButton" id="Home-SuperScript">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SuperScript</property>
@@ -3351,7 +3350,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignTop3">
+                                      <object class="GtkToolButton" id="Home-AlignTop">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignTop</property>
@@ -3362,7 +3361,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignVCenter1">
+                                      <object class="GtkToolButton" id="Home-AlignVCenter">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignVCenter</property>
@@ -3373,7 +3372,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignBottom6">
+                                      <object class="GtkToolButton" id="Home-AlignBottom">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignBottom</property>
@@ -3412,8 +3411,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkMenuToolButton" id="spacing">
-                                        <property name="use_action_appearance">False</property>
+                                      <object class="GtkMenuToolButton" id="Home-Spacing">
                                         <property name="can_focus">False</property>
                                         <property name="is_important">True</property>
                                         <property name="action_name">.uno:Spacing</property>
@@ -3425,8 +3423,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="IncrementIndent">
-                                        <property name="use_action_appearance">False</property>
+                                      <object class="GtkToolButton" id="Home-IncrementIndent">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="has_tooltip">True</property>
@@ -3441,8 +3438,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="DecrementIndent">
-                                        <property name="use_action_appearance">False</property>
+                                      <object class="GtkToolButton" id="Home-DecrementIndent">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="has_tooltip">True</property>
@@ -3482,7 +3478,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignLeft3">
+                                      <object class="GtkToolButton" id="Home-AlignLeft">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignLeft</property>
@@ -3493,7 +3489,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignHorizontalCenter3">
+                                      <object class="GtkToolButton" id="Home-AlignHorizontalCenter">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignHorizontalCenter</property>
@@ -3504,7 +3500,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignRight3">
+                                      <object class="GtkToolButton" id="Home-AlignRight">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignRight</property>
@@ -3515,7 +3511,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="AlignBlock1">
+                                      <object class="GtkToolButton" id="Home-AlignBlock">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:AlignBlock</property>
@@ -3554,7 +3550,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="WrapText">
+                                      <object class="GtkToolButton" id="Home-WrapText">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:WrapText</property>
@@ -3634,7 +3630,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="NumberFormatType1">
+                                      <object class="GtkToolButton" id="Home-NumberFormatType">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NumberFormatType</property>
@@ -3670,7 +3666,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkMenuToolButton" id="NumberFormatCurrency">
+                                      <object class="GtkMenuToolButton" id="Home-NumberFormatCurrency">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NumberFormatCurrency</property>
@@ -3681,7 +3677,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="NumberFormatPercent">
+                                      <object class="GtkToolButton" id="Home-NumberFormatPercent">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3694,7 +3690,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="NumberFormatDecimal">
+                                      <object class="GtkToolButton" id="Home-NumberFormatDecimal">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -3735,7 +3731,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="NumberFormatIncDecimals2">
+                                      <object class="GtkToolButton" id="Home-NumberFormatIncDecimals">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NumberFormatIncDecimals</property>
@@ -3746,7 +3742,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="NumberFormatDecDecimals2">
+                                      <object class="GtkToolButton" id="Home-NumberFormatDecDecimals">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NumberFormatDecDecimals</property>
@@ -3818,7 +3814,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="MergeCells">
+                              <object class="GtkToolButton" id="Home-MergeCells">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:MergeCells</property>
@@ -3848,7 +3844,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertRowsBefore">
+                                  <object class="GtkToolButton" id="Home-InsertRowsBefore">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertRowsBefore</property>
@@ -3859,7 +3855,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertRowsAfter">
+                                  <object class="GtkToolButton" id="Home-InsertRowsAfter">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertRowsAfter</property>
@@ -3870,7 +3866,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="DeleteRows">
+                                  <object class="GtkToolButton" id="Home-DeleteRows">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteRows</property>
@@ -3894,7 +3890,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertColumnsBefore">
+                                  <object class="GtkToolButton" id="Home-InsertColumnsBefore">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertColumnsBefore</property>
@@ -3905,7 +3901,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertColumnsAfter">
+                                  <object class="GtkToolButton" id="Home-InsertColumnsAfter">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertColumnsAfter</property>
@@ -3916,7 +3912,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="DeleteColumns">
+                                  <object class="GtkToolButton" id="Home-DeleteColumns">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteColumns</property>
@@ -3989,7 +3985,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="DesignerDialog">
+                                      <object class="GtkToolButton" id="Home-DesignerDialog">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -4015,7 +4011,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="StyleApply3">
+                                      <object class="GtkToolButton" id="Home-StyleApply">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">center</property>
@@ -4054,7 +4050,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="StandardStyle">
+                                      <object class="GtkToolButton" id="Home-StandardStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Default&FamilyName:string=CellStyles</property>
@@ -4096,7 +4092,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="H1">
+                                      <object class="GtkToolButton" id="Home-H1Style">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Heading 1&FamilyName:string=CellStyles</property>
@@ -4108,7 +4104,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="H2">
+                                      <object class="GtkToolButton" id="Home-H2Style">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Heading 2&FamilyName:string=CellStyles</property>
@@ -4150,7 +4146,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="GoodStyle">
+                                      <object class="GtkToolButton" id="Home-GoodStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Good&FamilyName:string=CellStyles</property>
@@ -4162,7 +4158,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="NeutralStyle">
+                                      <object class="GtkToolButton" id="Home-NeutralStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Neutral&FamilyName:string=CellStyles</property>
@@ -4174,7 +4170,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToolButton" id="BadStyle">
+                                      <object class="GtkToolButton" id="Home-BadStyle">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:StyleApply?Style:string=Bad&FamilyName:string=CellStyles</property>
@@ -4248,7 +4244,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="ConditionalFormatMenu">
+                              <object class="GtkMenuToolButton" id="Home-ConditionalFormatMenu">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ConditionalFormatMenu</property>
@@ -4306,7 +4302,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="SearchDialog2">
+                              <object class="GtkToolButton" id="SearchDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SearchDialog</property>
@@ -4336,7 +4332,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SortAscending2">
+                                  <object class="GtkToolButton" id="Home-SortAscending2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -4361,7 +4357,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DataFilterAutoFilter2">
+                                  <object class="GtkToolButton" id="Home-DataFilterAutoFilter2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -4436,10 +4432,10 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="menut:MenuHome">
-                            <property name="label" translatable="yes" context="notebookbar_compact|menub">_Home</property>
+                          <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:MenuHome">
+                            <property name="label" translatable="yes" context="notebookbar|HomeMenuButton">_Home</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
                             <property name="valign">center</property>
                             <property name="vexpand">True</property>
@@ -4463,7 +4459,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="SearchDialog1">
+                              <object class="GtkToolButton" id="Home-SearchDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SearchDialog</property>
@@ -4474,7 +4470,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="SortAscending3">
+                              <object class="GtkToolButton" id="Home-SortAscending">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -4486,7 +4482,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="DataFilterAutoFilter3">
+                              <object class="GtkToolButton" id="Home-DataFilterAutoFilter">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -4991,8 +4987,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="insert:MenuField">
-                            <property name="label" translatable="yes" context="notebookbar|Field">Fiel_d</property>
+                          <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:MenuField">
+                            <property name="label" translatable="yes" context="notebookbar|FieldMenuButton">Fiel_d</property>
                             <property name="width_request">70</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -5496,8 +5492,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="insertb:MenuInsert">
-                            <property name="label" translatable="yes" context="notebookbar_compact|menub">_Insert</property>
+                          <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:MenuInsert">
+                            <property name="label" translatable="yes" context="notebookbar|InsertMenuButton">_Insert</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -5611,7 +5607,7 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="svtlo-ManagedMenuButton" id="reviewb:MenuPage">
-                            <property name="label" translatable="yes" context="notebookbar_compact|reviewb">Pag_e</property>
+                            <property name="label" translatable="yes" context="notebookbar|reviewb">Pag_e</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -7304,8 +7300,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="viewb:MenuData">
-                            <property name="label" translatable="yes" context="notebookbar_compact|viewb">_Data</property>
+                          <object class="svtlo-ManagedMenuButton" id="Data-DataButton:MenuData">
+                            <property name="label" translatable="yes" context="notebookbar|DataMenuButton">_Data</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -8035,8 +8031,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="reviewR:MenuReview">
-                            <property name="label" translatable="yes" context="notebookbar_compact|reviewR">_Review</property>
+                          <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:MenuReview">
+                            <property name="label" translatable="yes" context="notebookbar|ReviewMenuButton">_Review</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -8896,8 +8892,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="viewI:MenuView">
-                            <property name="label" translatable="yes" context="notebookbar_compact|viewb">_View</property>
+                          <object class="svtlo-ManagedMenuButton" id="View-ViewButton:MenuView">
+                            <property name="label" translatable="yes" context="notebookbar|ViewMenuButton">_View</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -9008,8 +9004,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic">
-                            <property name="label" translatable="yes" context="notebookbar|graphicB">_Graphic</property>
+                          <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:MenuGraphic">
+                            <property name="label" translatable="yes" context="notebookbar|GraphicMenuButton">_Graphic</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -9407,7 +9403,6 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkMenuToolButton" id="GraphicFilterToolbox1">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:GraphicFilterToolbox</property>
@@ -9521,7 +9516,6 @@
                                 <property name="show_arrow">False</property>
                                 <child>
                                   <object class="GtkMenuToolButton" id="GrafLuminance2">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -9549,7 +9543,6 @@
                                 <property name="show_arrow">False</property>
                                 <child>
                                   <object class="GtkMenuToolButton" id="GrafTransparence1">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -9607,7 +9600,6 @@
                                 <property name="show_arrow">False</property>
                                 <child>
                                   <object class="GtkMenuToolButton" id="GrafContrast3">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -9634,7 +9626,6 @@
                                 <property name="show_arrow">False</property>
                                 <child>
                                   <object class="GtkMenuToolButton" id="GrafGamma3">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="width_request">130</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -9702,7 +9693,6 @@
                             <property name="icon_size">3</property>
                             <child>
                               <object class="GtkMenuToolButton" id="AnchorMenu1">
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -10577,7 +10567,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkMenuToolButton" id="XLineStyle">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="width_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -10602,7 +10591,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkMenuToolButton" id="LineWidth2">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="width_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -10697,7 +10685,6 @@
                             <property name="icon_size">3</property>
                             <child>
                               <object class="GtkMenuToolButton" id="AnchorMenu3">
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -11153,7 +11140,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkMenuToolButton" id="Extrusion3DColor">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Extrusion3DColor</property>
@@ -11165,7 +11151,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkMenuToolButton" id="ExtrusionSurfaceFloater">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ExtrusionSurfaceFloater</property>
@@ -11239,8 +11224,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="drab:MenuDraw">
-                            <property name="label" translatable="yes" context="notebookbar|drab">D_raw</property>
+                          <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:MenuDraw">
+                            <property name="label" translatable="yes" context="notebookbar|DrawMenuButton">D_raw</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -11349,10 +11334,10 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="ShapeLabel">
+              <object class="GtkLabel" id="DrawLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar|ShapeLabel">Draw</property>
+                <property name="label" translatable="yes" context="notebookbar|DrawLabel">Draw</property>
                 <style>
                   <class name="context-Draw"/>
                 </style>
@@ -11590,7 +11575,6 @@
                             <property name="icon_size">3</property>
                             <child>
                               <object class="GtkMenuToolButton" id="AnchorMenu2">
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -12125,8 +12109,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="develop:MenuTools">
-                            <property name="label" translatable="yes" context="notebookbar_compact|referenceb">_Tools</property>
+                          <object class="svtlo-ManagedMenuButton" id="Tools-ToolsButton:MenuTools">
+                            <property name="label" translatable="yes" context="notebookbar|ToolsMenuButton">_Tools</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -13263,7 +13247,7 @@
               <object class="GtkLabel" id="DevLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="notebookbar_compact|DevLabel">Tools</property>
+                <property name="label" translatable="yes" context="notebookbar|DevLabel">Tools</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 4baefcf93620..63298f0ef976 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -4387,7 +4387,6 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkMenuToolButton" id="NumberFormatCurrency">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:NumberFormatCurrency</property>
@@ -4719,7 +4718,6 @@
                                 <property name="show_arrow">False</property>
                                 <child>
                                   <object class="GtkToolButton" id="InsertColumnsBefore1">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
@@ -4734,7 +4732,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkToolButton" id="InsertRowsBefore1">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
@@ -4749,7 +4746,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkToolButton" id="DeleteColumns1">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
@@ -4764,7 +4760,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkToolButton" id="DeleteRows1">
-                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
@@ -7706,7 +7701,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkMenuToolButton" id="SetBorderStyle3">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:SetBorderStyle</property>
@@ -7718,7 +7712,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkMenuToolButton" id="FrameLineColor1">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:FrameLineColor</property>
@@ -7785,7 +7778,6 @@
                                     <property name="icon_size">1</property>
                                     <child>
                                       <object class="GtkMenuToolButton" id="LineStyle1">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:LineStyle</property>
@@ -8449,7 +8441,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkMenuToolButton" id="BackgroundColor">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:BackgroundColor</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
index e6ae16d4afef..dee6edd53cf7 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui
@@ -4465,7 +4465,6 @@
                                                 </child>
                                                 <child>
                                                   <object class="GtkMenuToolButton" id="Underline2">
-                                                    <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="action_name">.uno:Underline</property>
@@ -4503,7 +4502,6 @@
                                                 <property name="show_arrow">False</property>
                                                 <child>
                                                   <object class="GtkMenuToolButton" id="fontcolor">
-                                                    <property name="use_action_appearance">False</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="action_name">.uno:Color</property>
@@ -4727,7 +4725,6 @@
                                         <property name="show_arrow">False</property>
                                         <child>
                                           <object class="GtkMenuToolButton" id="NumberFormatCurrency">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:NumberFormatCurrency</property>
@@ -5106,7 +5103,6 @@
                                         <property name="show_arrow">False</property>
                                         <child>
                                           <object class="GtkToolButton" id="InsertColumnsBefore1">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="has_tooltip">True</property>
@@ -5121,7 +5117,6 @@
                                         </child>
                                         <child>
                                           <object class="GtkToolButton" id="InsertRowsBefore1">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="has_tooltip">True</property>
@@ -5186,7 +5181,6 @@
                                         <property name="show_arrow">False</property>
                                         <child>
                                           <object class="GtkToolButton" id="DeleteColumns1">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="has_tooltip">True</property>
@@ -5201,7 +5195,6 @@
                                         </child>
                                         <child>
                                           <object class="GtkToolButton" id="DeleteRows1">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="has_tooltip">True</property>
@@ -6575,7 +6568,6 @@
                                         <property name="icon_size">1</property>
                                         <child>
                                           <object class="GtkMenuToolButton" id="AnchorMenu">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:AnchorMenu</property>
@@ -6683,7 +6675,6 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkMenuToolButton" id="GraphicFilterToolbox">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:GraphicFilterToolbox</property>
@@ -6739,7 +6730,6 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkMenuToolButton" id="GrafLuminance1">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="width_request">130</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -6753,7 +6743,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkMenuToolButton" id="GrafContrast1">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="width_request">130</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -6780,7 +6769,6 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkMenuToolButton" id="GrafTransparence1">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="width_request">130</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -6794,7 +6782,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkMenuToolButton" id="GrafGamma1">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="width_request">130</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -8661,7 +8648,6 @@
                                             </child>
                                             <child>
                                               <object class="GtkMenuToolButton" id="XLineStyle">
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="width_request">100</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
@@ -8686,7 +8672,6 @@
                                             </child>
                                             <child>
                                               <object class="GtkMenuToolButton" id="LineWidth2">
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="width_request">100</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
@@ -9128,7 +9113,6 @@
                                         <property name="icon_size">1</property>
                                         <child>
                                           <object class="GtkMenuToolButton" id="AnchorMenu1">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="vexpand">False</property>
@@ -9578,7 +9562,6 @@
                                     <property name="show_arrow">False</property>
                                     <child>
                                       <object class="GtkMenuToolButton" id="FillColor">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:FillColor</property>
@@ -9590,7 +9573,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkMenuToolButton" id="Extrusion3DColor">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:Extrusion3DColor</property>
@@ -9602,7 +9584,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkMenuToolButton" id="ExtrusionSurfaceFloater">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:ExtrusionSurfaceFloater</property>
@@ -9814,7 +9795,6 @@
                                             </child>
                                             <child>
                                               <object class="GtkMenuToolButton" id="Underline3">
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <property name="action_name">.uno:Underline</property>
@@ -9888,7 +9868,6 @@
                                             <property name="show_arrow">False</property>
                                             <child>
                                               <object class="GtkMenuToolButton" id="fontcolor2">
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
                                                 <property name="action_name">.uno:Color</property>
@@ -10179,7 +10158,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkMenuToolButton" id="LineSpacing">
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:LineSpacing</property>
@@ -10740,7 +10718,6 @@
                                         </child>
                                         <child>
                                           <object class="GtkMenuToolButton" id="AnchorMenu2">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:AnchorMenu</property>
@@ -10890,7 +10867,6 @@
                                         <property name="show_arrow">False</property>
                                         <child>
                                           <object class="GtkMenuToolButton" id="SetBorderStyle2">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:SetBorderStyle</property>
@@ -10902,7 +10878,6 @@
                                         </child>
                                         <child>
                                           <object class="GtkMenuToolButton" id="LineStyle1">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:LineStyle</property>
@@ -10914,7 +10889,6 @@
                                         </child>
                                         <child>
                                           <object class="GtkMenuToolButton" id="FrameLineColor1">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:FrameLineColor</property>
@@ -11401,7 +11375,6 @@
                                         <property name="icon_size">1</property>
                                         <child>
                                           <object class="GtkMenuToolButton" id="AnchorMenu3">
-                                            <property name="use_action_appearance">False</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="action_name">.uno:AnchorMenu</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 7ceeacc1d78d..ab7b213f2f11 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1659,7 +1659,6 @@
     </child>
     <child>
       <object class="GtkMenuItem" id="ImportSlideFromFileD">
-        <property name="use_action_appearance">True</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ImportSlideFromFile</property>
@@ -1705,7 +1704,6 @@
     <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="PresentationD">
-        <property name="use_action_appearance">True</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Presentation</property>
@@ -2360,7 +2358,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="CloseDoc">
+                              <object class="GtkToolButton" id="File-CloseDoc">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:CloseDoc</property>
@@ -2387,7 +2385,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="HelpIndex">
+                              <object class="GtkToolButton" id="File-HelpIndex">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:HelpIndex</property>
@@ -2420,8 +2418,8 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="filetab:MenuFile">
-                            <property name="label" translatable="yes" context="notebookbar_compact|fileb">_File</property>
+                          <object class="svtlo-ManagedMenuButton" id="File-FileButton:MenuFile">
+                            <property name="label" translatable="yes" context="notebookbar|FileLabel">_File</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -2439,8 +2437,8 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="helpb:MenuHelp">
-                            <property name="label" translatable="yes" context="notebookbar_compact|fileb">_Help</property>
+                          <object class="svtlo-ManagedMenuButton" id="File-HelpButton:MenuHelp">
+                            <property name="label" translatable="yes" context="notebookbar|HelpMenuButton">_Help</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="receives_default">False</property>
@@ -2513,7 +2511,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkMenuToolButton" id="New">
+                              <object class="GtkMenuToolButton" id="File-AddDirect">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:AddDirect</property>
@@ -2543,7 +2541,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="NewDoc">
+                                  <object class="GtkToolButton" id="File-NewDoc">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:NewDoc</property>
@@ -2568,7 +2566,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveAsTemplate">
+                                  <object class="GtkToolButton" id="File-SaveAsTemplate">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAsTemplate</property>
@@ -2631,7 +2629,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Open">
+                              <object class="GtkToolButton" id="File-Open">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Open</property>
@@ -2656,8 +2654,7 @@
                             <property name="valign">center</property>
                             <property name="orientation">vertical</property>
                             <child>
-                              <object class="svtlo-ManagedMenuButton" id="RecentFilesB">
-                                <property name="use_action_appearance">False</property>
+                              <object class="svtlo-ManagedMenuButton" id="File-RecentFileList">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
@@ -2679,7 +2676,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="OpenRemote">
+                                  <object class="GtkToolButton" id="File-OpenRemote">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:OpenRemote</property>
@@ -2742,7 +2739,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Save">
+                              <object class="GtkToolButton" id="File-Save">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Save</property>
@@ -2773,7 +2770,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveAs">
+                                  <object class="GtkToolButton" id="File-SaveAs">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAs</property>
@@ -2798,7 +2795,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveAsRemote">
+                                  <object class="GtkToolButton" id="File-SaveAsRemote">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveAsRemote</property>
@@ -2864,7 +2861,7 @@
                             <property name="show_arrow">False</property>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list