tdf#157850 - UI: Part 10 - Unify lockdown behavior of Options dialog

for Online Update Page.

Change-Id: I48f66f786c165d3958d34cca17ee2837aa7a6c66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158490
Tested-by: Jenkins
Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>

3 files changed, 187 insertions, 113 deletions

diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index e6bc8bdfa224..1c396b1fc217 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -51,16 +51,20 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(weld::Container* pPage, weld::Dia
     : SfxTabPage(pPage, pController, "cui/ui/optonlineupdatepage.ui", "OptOnlineUpdatePage", &rSet)
     , m_xNeverChecked(m_xBuilder->weld_label("neverchecked"))
     , m_xAutoCheckCheckBox(m_xBuilder->weld_check_button("autocheck"))
+    , m_xAutoCheckImg(m_xBuilder->weld_widget("lockautocheck"))
     , m_xEveryDayButton(m_xBuilder->weld_radio_button("everyday"))
     , m_xEveryWeekButton(m_xBuilder->weld_radio_button("everyweek"))
     , m_xEveryMonthButton(m_xBuilder->weld_radio_button("everymonth"))
+    , m_xCheckIntervalImg(m_xBuilder->weld_widget("lockcheckinterval"))
     , m_xCheckNowButton(m_xBuilder->weld_button("checknow"))
     , m_xAutoDownloadCheckBox(m_xBuilder->weld_check_button("autodownload"))
+    , m_xAutoDownloadImg(m_xBuilder->weld_widget("lockautodownload"))
     , m_xDestPathLabel(m_xBuilder->weld_label("destpathlabel"))
     , m_xDestPath(m_xBuilder->weld_label("destpath"))
     , m_xChangePathButton(m_xBuilder->weld_button("changepath"))
     , m_xLastChecked(m_xBuilder->weld_label("lastchecked"))
     , m_xExtrasCheckBox(m_xBuilder->weld_check_button("extrabits"))
+    , m_xExtrasImg(m_xBuilder->weld_widget("lockextrabits"))
     , m_xUserAgentLabel(m_xBuilder->weld_label("useragent"))
     , m_xPrivacyPolicyButton(m_xBuilder->weld_link_button("btnPrivacyPolicy"))
 {
@@ -301,6 +305,7 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet* )
 
     m_xAutoCheckCheckBox->set_active(bValue);
     m_xAutoCheckCheckBox->set_sensitive(!bReadOnly);
+    m_xAutoCheckImg->set_visible(bReadOnly);
 
     sal_Int64 nValue = 0;
     m_xUpdateAccess->getByName( "CheckInterval" ) >>= nValue;
@@ -309,6 +314,7 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet* )
     m_xEveryDayButton->set_sensitive(bValue && !(bReadOnly || bReadOnly2));
     m_xEveryWeekButton->set_sensitive(bValue && !(bReadOnly || bReadOnly2));
     m_xEveryMonthButton->set_sensitive(bValue && !(bReadOnly || bReadOnly2));
+    m_xCheckIntervalImg->set_visible(bReadOnly2);
 
     if( nValue == 86400 )
         m_xEveryDayButton->set_active(true);
@@ -327,6 +333,7 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet* )
     bReadOnly = (aProperty.Attributes & beans::PropertyAttribute::READONLY) != 0;
     m_xAutoDownloadCheckBox->set_active(bValue);
     m_xAutoDownloadCheckBox->set_sensitive(!bReadOnly);
+    m_xAutoDownloadImg->set_visible(bReadOnly);
     m_xDestPathLabel->set_sensitive(true);
     m_xDestPath->set_sensitive(true);
 
@@ -344,6 +351,7 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet* )
     bReadOnly = (aProperty.Attributes & beans::PropertyAttribute::READONLY) != 0;
     m_xExtrasCheckBox->set_active(bValue);
     m_xExtrasCheckBox->set_sensitive(!bReadOnly);
+    m_xExtrasImg->set_visible(bReadOnly);
     m_xExtrasCheckBox->save_state();
     UpdateUserAgent();
 
@@ -362,6 +370,7 @@ IMPL_LINK(SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, weld::Toggleable&, rBox, vo
     m_xEveryDayButton->set_sensitive(bEnabled && !bReadOnly);
     m_xEveryWeekButton->set_sensitive(bEnabled && !bReadOnly);
     m_xEveryMonthButton->set_sensitive(bEnabled && !bReadOnly);
+    m_xCheckIntervalImg->set_visible(bReadOnly);
 }
 
 IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl, weld::Toggleable&, void)
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index bf2abfe38495..56739078e401 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -36,16 +36,20 @@ private:
 
     std::unique_ptr<weld::Label> m_xNeverChecked;
     std::unique_ptr<weld::CheckButton> m_xAutoCheckCheckBox;
+    std::unique_ptr<weld::Widget> m_xAutoCheckImg;
     std::unique_ptr<weld::RadioButton> m_xEveryDayButton;
     std::unique_ptr<weld::RadioButton> m_xEveryWeekButton;
     std::unique_ptr<weld::RadioButton> m_xEveryMonthButton;
+    std::unique_ptr<weld::Widget> m_xCheckIntervalImg;
     std::unique_ptr<weld::Button> m_xCheckNowButton;
     std::unique_ptr<weld::CheckButton> m_xAutoDownloadCheckBox;
+    std::unique_ptr<weld::Widget> m_xAutoDownloadImg;
     std::unique_ptr<weld::Label> m_xDestPathLabel;
     std::unique_ptr<weld::Label> m_xDestPath;
     std::unique_ptr<weld::Button> m_xChangePathButton;
     std::unique_ptr<weld::Label> m_xLastChecked;
     std::unique_ptr<weld::CheckButton> m_xExtrasCheckBox;
+    std::unique_ptr<weld::Widget> m_xExtrasImg;
     std::unique_ptr<weld::Label> m_xUserAgentLabel;
     std::unique_ptr<weld::LinkButton> m_xPrivacyPolicyButton;
 
diff --git a/cui/uiconfig/ui/optonlineupdatepage.ui b/cui/uiconfig/ui/optonlineupdatepage.ui
index a7edf3a3342e..e94217a5fdae 100644
--- a/cui/uiconfig/ui/optonlineupdatepage.ui
+++ b/cui/uiconfig/ui/optonlineupdatepage.ui
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkFrame" id="OptOnlineUpdatePage">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="hexpand">True</property>
-    <property name="border_width">6</property>
-    <property name="label_xalign">0</property>
-    <property name="shadow_type">none</property>
+    <property name="border-width">6</property>
+    <property name="label-xalign">0</property>
+    <property name="shadow-type">none</property>
     <child>
       <object class="GtkBox">
         <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>
-          <!-- n-columns=1 n-rows=1 -->
+          <!-- n-columns=3 n-rows=3 -->
           <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="row_spacing">3</property>
-            <property name="column_spacing">6</property>
+            <property name="can-focus">False</property>
             <property name="margin-start">12</property>
             <property name="margin-top">6</property>
+            <property name="hexpand">True</property>
+            <property name="row-spacing">3</property>
+            <property name="column-spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="autocheck">
                 <property name="label" translatable="yes" context="optonlineupdatepage|autocheck">_Check for updates automatically</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
                 <property name="halign">start</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="autocheck-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|autocheck">Mark to check for online updates periodically, then select the time interval how often to automatically check for online updates.</property>
@@ -41,27 +41,27 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">0</property>
                 <property name="width">2</property>
               </packing>
             </child>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=3 -->
               <object class="GtkGrid" id="grid4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">18</property>
                 <child>
                   <object class="GtkRadioButton" id="everyday">
                     <property name="label" translatable="yes" context="optonlineupdatepage|everyday">Every da_y</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
                     <property name="halign">start</property>
-                    <property name="use_underline">True</property>
+                    <property name="use-underline">True</property>
                     <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="everyday-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|everyday">A check will be performed once a day.</property>
@@ -69,19 +69,19 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="everyweek">
                     <property name="label" translatable="yes" context="optonlineupdatepage|everyweek">Every _week</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
                     <property name="halign">start</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <property name="group">everyday</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="everyweek-atkobject">
@@ -90,19 +90,19 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="everymonth">
                     <property name="label" translatable="yes" context="optonlineupdatepage|everymonth">Every _month</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
                     <property name="halign">start</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <property name="group">everyday</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="everymonth-atkobject">
@@ -111,14 +111,14 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
                 <property name="width">2</property>
               </packing>
             </child>
@@ -126,10 +126,10 @@
               <object class="GtkButton" id="checknow">
                 <property name="label" translatable="yes" context="optonlineupdatepage|checknow">Check _Now</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>
                 <property name="valign">center</property>
-                <property name="use_underline">True</property>
+                <property name="use-underline">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="checknow-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|checknow">A check will be performed now.</property>
@@ -137,26 +137,26 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">2</property>
+                <property name="top-attach">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="valign">center</property>
+                <property name="margin-start">18</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
-                <property name="margin-start">18</property>
                 <child>
                   <object class="GtkLabel" id="lastchecked">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="optonlineupdatepage|lastchecked">Last checked: %DATE%, %TIME%</property>
                     <property name="xalign">0</property>
                     <attributes>
-                      <attribute name="scale" value="0.9"/>
+                      <attribute name="scale" value="0.90000000000000002"/>
                     </attributes>
                   </object>
                   <packing>
@@ -167,12 +167,12 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="neverchecked">
-                    <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="optonlineupdatepage|neverchecked">Last checked: Not yet</property>
                     <property name="xalign">0</property>
                     <attributes>
-                      <attribute name="scale" value="0.9"/>
+                      <attribute name="scale" value="0.90000000000000002"/>
                     </attributes>
                   </object>
                   <packing>
@@ -183,10 +183,39 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="lockautocheck">
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="icon-name">res/lock.png</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">0</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkImage" id="lockcheckinterval">
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="icon-name">res/lock.png</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -197,28 +226,28 @@
         <child>
           <object class="GtkFrame">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=3 n-rows=2 -->
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="row_spacing">3</property>
-                <property name="column_spacing">6</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="hexpand">True</property>
+                <property name="row-spacing">3</property>
+                <property name="column-spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="autodownload">
                     <property name="label" translatable="yes" context="optonlineupdatepage|autodownload">_Download updates automatically</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
                     <property name="halign">start</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="autodownload-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|autodownload">Enable the automatic download of updates to the specified folder.</property>
@@ -226,27 +255,27 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
+                  <!-- n-columns=2 n-rows=1 -->
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">6</property>
+                    <property name="can-focus">False</property>
                     <property name="margin-start">18</property>
+                    <property name="row-spacing">6</property>
+                    <property name="column-spacing">6</property>
                     <child>
                       <object class="GtkButton" id="changepath">
                         <property name="label" translatable="yes" context="optonlineupdatepage|changepath">Ch_ange...</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>
                         <property name="halign">start</property>
-                        <property name="use_underline">True</property>
+                        <property name="use-underline">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="changepath-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|changepath">Click to select the destination folder for downloaded files.</property>
@@ -254,23 +283,23 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">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="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="destpathlabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="label" translatable="yes" context="optonlineupdatepage|destpathlabel">Download destination:</property>
                             <property name="xalign">0</property>
                             <attributes>
-                              <attribute name="scale" value="0.9"/>
+                              <attribute name="scale" value="0.90000000000000002"/>
                             </attributes>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="destpathlabel-atkobject">
@@ -287,11 +316,11 @@
                         <child>
                           <object class="GtkLabel" id="destpath">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="ellipsize">end</property>
                             <property name="xalign">0</property>
                             <attributes>
-                              <attribute name="scale" value="0.9"/>
+                              <attribute name="scale" value="0.90000000000000002"/>
                             </attributes>
                           </object>
                           <packing>
@@ -302,23 +331,39 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkImage" id="lockautodownload">
+                    <property name="can-focus">False</property>
+                    <property name="no-show-all">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="icon-name">res/lock.png</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
             <child type="label">
               <object class="GtkLabel" id="labeldest">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="optonlineupdatepage|labeldest">Download Destination</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -335,50 +380,50 @@
         <child>
           <object class="GtkFrame">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=3 n-rows=2 -->
               <object class="GtkGrid" id="grid5">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="row_spacing">3</property>
-                <property name="column_spacing">6</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="hexpand">True</property>
+                <property name="row-spacing">3</property>
+                <property name="column-spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="extrabits">
                     <property name="label" translatable="yes" context="optonlineupdatepage|extrabits">_Send OS version and basic hardware information</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes" context="optonlineupdatepage|extrabits|tooltip_text">This information lets us make optimizations for your hardware and operating system.</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="tooltip-text" translatable="yes" context="optonlineupdatepage|extrabits|tooltip_text">This information lets us make optimizations for your hardware and operating system.</property>
                     <property name="halign">start</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="hbox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
+                    <property name="can-focus">False</property>
                     <property name="margin-start">18</property>
+                    <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="useragent_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes" context="optonlineupdatepage|useragent_label">User Agent:</property>
                         <property name="yalign">0</property>
                         <attributes>
-                          <attribute name="scale" value="0.9"/>
+                          <attribute name="scale" value="0.90000000000000002"/>
                         </attributes>
                       </object>
                       <packing>
@@ -389,11 +434,11 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="useragent_changed">
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes" context="optonlineupdatepage|useragent_changed">Hit apply to update</property>
                         <property name="yalign">0</property>
                         <attributes>
-                          <attribute name="scale" value="0.9"/>
+                          <attribute name="scale" value="0.90000000000000002"/>
                         </attributes>
                       </object>
                       <packing>
@@ -405,10 +450,10 @@
                     <child>
                       <object class="GtkLabel" id="useragent">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="xalign">0</property>
                         <attributes>
-                          <attribute name="scale" value="0.9"/>
+                          <attribute name="scale" value="0.90000000000000002"/>
                         </attributes>
                       </object>
                       <packing>
@@ -419,17 +464,33 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
                     <property name="width">2</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkImage" id="lockextrabits">
+                    <property name="can-focus">False</property>
+                    <property name="no-show-all">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="icon-name">res/lock.png</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
             <child type="label">
               <object class="GtkLabel" id="labelagent">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="optonlineupdatepage|labelagent">User Agent</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -462,7 +523,7 @@
     <child type="label">
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes" context="optonlineupdatepage|label1">Online Update Options</property>
         <attributes>
           <attribute name="weight" value="bold"/>