Resolves tdf#131817 - Option to globally switch toolbar locking on/off

Reverts 6993d5d0f1079fe720a7da004b70b57361c99fc6 and
sets Locked in GlobalSettings to true
New UNO command ToolbarLock to toggle the state added to
the toolbars menu

Change-Id: I246280b2b7930f2bf686e6fc26383da4799b5028
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115797
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>

2 files changed, 78 insertions, 63 deletions

diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index dbe85f95eb48..ba5c7d2a3304 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -71,6 +71,9 @@ public:
         case svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU:
             reason_ = m_xBuilder->weld_widget("reason_mscompatible_formsmenu");
             break;
+        case svtools::RESTART_REASON_UI_CHANGE:
+            reason_ = m_xBuilder->weld_widget("reason_uichange");
+            break;
         default:
             assert(false); // this cannot happen
         }
diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui
index 3188ca4d219f..c49218c03bc8 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="svt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkDialog" id="RestartDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="title" translatable="yes" context="restartdialog|RestartDialog">Restart %PRODUCTNAME</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="default_width">0</property>
-    <property name="default_height">0</property>
-    <property name="type_hint">dialog</property>
+    <property name="default-width">0</property>
+    <property name="default-height">0</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="homogeneous">True</property>
-            <property name="layout_style">end</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="yes">
                 <property name="label" translatable="yes" context="restartdialog|yes">Restart Now</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -40,8 +40,8 @@
               <object class="GtkButton" id="no">
                 <property name="label" translatable="yes" context="restartdialog|no">Restart Later</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -53,23 +53,23 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkLabel" id="reason_java">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_java">For the selected Java runtime environment to work properly, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">30</property>
+                <property name="max-width-chars">30</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -80,11 +80,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_mailmerge_install">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_mailmerge_install">For mail merge to work properly, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -95,11 +95,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_pdf">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_pdf">For the modified default print job format to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -110,11 +110,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_bibliography_install">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_bibliography_install">For the bibliography to work properly, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -125,11 +125,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_assigning_folders">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_assigning_folders">For the assigned folders and archives to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -140,11 +140,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_assigning_javaparameters">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_assigning_javaparameters">For the assigned Java parameters to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -155,11 +155,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_adding_path">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_adding_path">For the added path to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -170,11 +170,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_language_change">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_language_change">For the updated language settings to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -185,11 +185,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_exp_features">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_exp_features">For the modified experimental features to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -200,11 +200,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_extension_install">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_extension_install">For the extension to work properly, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -214,12 +214,27 @@
               </packing>
             </child>
             <child>
+              <object class="GtkLabel" id="reason_uichange">
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_extension_install">To apply changes, %PRODUCTNAME must be restarted.</property>
+                <property name="wrap">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">10</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkLabel" id="reason_opencl">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_opencl">For the OpenCL changes to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -230,11 +245,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_threading">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_threading">For the multi-threaded calculation changes to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -245,11 +260,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_mscompatible_formsmenu">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_mscompatible_formsmenu">For restructuring the Form menu, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -261,7 +276,7 @@
             <child>
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="restartdialog|label">Do you want to restart %PRODUCTNAME now?</property>
                 <property name="wrap">True</property>
                 <property name="xalign">0</property>
@@ -274,11 +289,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="reason_skia">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="restartdialog|reason_skia">For the Skia changes to take effect, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
-                <property name="max_width_chars">50</property>
+                <property name="max-width-chars">50</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -300,8 +315,5 @@
       <action-widget response="-8">yes</action-widget>
       <action-widget response="-9">no</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>