weld SvxSecurityTabPage

Change-Id: I4cace9417f1f036921b3e95d946f431ec072ce3a
Reviewed-on: https://gerrit.libreoffice.org/76586
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 127 insertions, 188 deletions

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index a6476b60b950..ce76fc2521b5 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -532,91 +532,68 @@ IMPL_STATIC_LINK(SvxProxyTabPage, LoseFocusHdl_Impl, weld::Widget&, rControl, vo
 /*  SvxSecurityTabPage                                             */
 /*                                                                  */
 /********************************************************************/
-
-SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", &rSet)
+SvxSecurityTabPage::SvxSecurityTabPage(TabPageParent pParent, const SfxItemSet& rSet)
+    : SfxTabPage(pParent, "cui/ui/optsecuritypage.ui", "OptSecurityPage", &rSet)
     , mpSecOptions(new SvtSecurityOptions)
+    , m_xSecurityOptionsPB(m_xBuilder->weld_button("options"))
+    , m_xSavePasswordsCB(m_xBuilder->weld_check_button("savepassword"))
+    , m_xShowConnectionsPB(m_xBuilder->weld_button("connections"))
+    , m_xMasterPasswordCB(m_xBuilder->weld_check_button("usemasterpassword"))
+    , m_xMasterPasswordFT(m_xBuilder->weld_label("masterpasswordtext"))
+    , m_xMasterPasswordPB(m_xBuilder->weld_button("masterpassword"))
+    , m_xMacroSecFrame(m_xBuilder->weld_container("macrosecurity"))
+    , m_xMacroSecPB(m_xBuilder->weld_button("macro"))
+    , m_xCertFrame(m_xBuilder->weld_container("certificatepath"))
+    , m_xCertPathPB(m_xBuilder->weld_button("cert"))
+    , m_xTSAURLsFrame(m_xBuilder->weld_container("tsaurls"))
+    , m_xTSAURLsPB(m_xBuilder->weld_button("tsas"))
+    , m_xNoPasswordSaveFT(m_xBuilder->weld_label("nopasswordsave"))
 {
-    get(m_pSecurityOptionsPB, "options");
-    get(m_pSavePasswordsCB, "savepassword");
-
     //fdo#65595, we need height-for-width support here, but for now we can
     //bodge it
-    Size aPrefSize(m_pSavePasswordsCB->get_preferred_size());
-    Size aSize(m_pSavePasswordsCB->CalcMinimumSize(56*approximate_char_width()));
-    if (aPrefSize.Width() > aSize.Width())
+    Size aPrefSize(m_xSavePasswordsCB->get_preferred_size());
+    int nMaxWidth = m_xSavePasswordsCB->get_approximate_digit_width() * 40;
+    if (aPrefSize.Width() > nMaxWidth)
     {
-        m_pSavePasswordsCB->set_width_request(aSize.Width());
-        m_pSavePasswordsCB->set_height_request(aSize.Height());
+        m_xSavePasswordsCB->set_label_line_wrap(true);
+        m_xSavePasswordsCB->set_size_request(nMaxWidth, -1);
     }
 
-    get(m_pShowConnectionsPB, "connections");
-    get(m_pMasterPasswordCB, "usemasterpassword");
-    get(m_pMasterPasswordFT, "masterpasswordtext");
-    get(m_pMasterPasswordPB, "masterpassword");
-    get(m_pMacroSecFrame, "macrosecurity");
-    get(m_pMacroSecPB, "macro");
-    get(m_pCertFrame, "certificatepath");
-    get(m_pCertPathPB, "cert");
-    get(m_pTSAURLsFrame, "tsaurls");
-    get(m_pTSAURLsPB, "tsas");
-    m_sPasswordStoringDeactivateStr = get<FixedText>("nopasswordsave")->GetText();
+    m_sPasswordStoringDeactivateStr = m_xNoPasswordSaveFT->get_label();
 
     InitControls();
 
-    m_pSecurityOptionsPB->SetClickHdl( LINK( this, SvxSecurityTabPage, SecurityOptionsHdl ) );
-    m_pSavePasswordsCB->SetClickHdl( LINK( this, SvxSecurityTabPage, SavePasswordHdl ) );
-    m_pMasterPasswordPB->SetClickHdl( LINK( this, SvxSecurityTabPage, MasterPasswordHdl ) );
-    m_pMasterPasswordCB->SetClickHdl( LINK( this, SvxSecurityTabPage, MasterPasswordCBHdl ) );
-    m_pShowConnectionsPB->SetClickHdl( LINK( this, SvxSecurityTabPage, ShowPasswordsHdl ) );
-    m_pMacroSecPB->SetClickHdl( LINK( this, SvxSecurityTabPage, MacroSecPBHdl ) );
-    m_pCertPathPB->SetClickHdl( LINK( this, SvxSecurityTabPage, CertPathPBHdl ) );
-    m_pTSAURLsPB->SetClickHdl( LINK( this, SvxSecurityTabPage, TSAURLsPBHdl ) );
+    m_xSecurityOptionsPB->connect_clicked( LINK( this, SvxSecurityTabPage, SecurityOptionsHdl ) );
+    m_xSavePasswordsCB->connect_clicked( LINK( this, SvxSecurityTabPage, SavePasswordHdl ) );
+    m_xMasterPasswordPB->connect_clicked( LINK( this, SvxSecurityTabPage, MasterPasswordHdl ) );
+    m_xMasterPasswordCB->connect_clicked( LINK( this, SvxSecurityTabPage, MasterPasswordCBHdl ) );
+    m_xShowConnectionsPB->connect_clicked( LINK( this, SvxSecurityTabPage, ShowPasswordsHdl ) );
+    m_xMacroSecPB->connect_clicked( LINK( this, SvxSecurityTabPage, MacroSecPBHdl ) );
+    m_xCertPathPB->connect_clicked( LINK( this, SvxSecurityTabPage, CertPathPBHdl ) );
+    m_xTSAURLsPB->connect_clicked( LINK( this, SvxSecurityTabPage, TSAURLsPBHdl ) );
 
     ActivatePage( rSet );
 }
 
 SvxSecurityTabPage::~SvxSecurityTabPage()
 {
-    disposeOnce();
-}
-
-void SvxSecurityTabPage::dispose()
-{
-    mpSecOptions.reset();
-    mpCertPathDlg.reset();
-    m_xSecOptDlg.reset();
-    m_pSecurityOptionsPB.clear();
-    m_pSavePasswordsCB.clear();
-    m_pShowConnectionsPB.clear();
-    m_pMasterPasswordCB.clear();
-    m_pMasterPasswordFT.clear();
-    m_pMasterPasswordPB.clear();
-    m_pMacroSecFrame.clear();
-    m_pMacroSecPB.clear();
-    m_pCertFrame.clear();
-    m_pCertPathPB.clear();
-    m_pTSAURLsFrame.clear();
-    m_pTSAURLsPB.clear();
-
-    SfxTabPage::dispose();
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, weld::Button&, void)
 {
     if (!m_xSecOptDlg)
-        m_xSecOptDlg.reset(new svx::SecurityOptionsDialog(GetFrameWeld(), mpSecOptions.get()));
-    (void)m_xSecOptDlg->run();
+        m_xSecOptDlg.reset(new svx::SecurityOptionsDialog(GetDialogFrameWeld(), mpSecOptions.get()));
+    m_xSecOptDlg->run();
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, Button*, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, weld::Button&, void)
 {
     try
     {
         Reference< task::XPasswordContainer2 > xMasterPasswd(
             task::PasswordContainer::create(comphelper::getProcessComponentContext()));
 
-        if ( m_pSavePasswordsCB->IsChecked() )
+        if ( m_xSavePasswordsCB->get_active() )
         {
             bool bOldValue = xMasterPasswd->allowPersistentStoring( true );
             xMasterPasswd->removeMasterPassword();
@@ -626,16 +603,16 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, Button*, void)
 
             if ( xMasterPasswd->changeMasterPassword(xTmpHandler) )
             {
-                m_pMasterPasswordPB->Enable();
-                m_pMasterPasswordCB->Check();
-                m_pMasterPasswordCB->Enable();
-                m_pMasterPasswordFT->Enable();
-                m_pShowConnectionsPB->Enable();
+                m_xMasterPasswordPB->set_sensitive(true);
+                m_xMasterPasswordCB->set_active(true);
+                m_xMasterPasswordCB->set_sensitive(true);
+                m_xMasterPasswordFT->set_sensitive(true);
+                m_xShowConnectionsPB->set_sensitive(true);
             }
             else
             {
                 xMasterPasswd->allowPersistentStoring( bOldValue );
-                m_pSavePasswordsCB->Check( false );
+                m_xSavePasswordsCB->set_active( false );
             }
         }
         else
@@ -650,27 +627,27 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, Button*, void)
             if( RET_YES == nRet )
             {
                 xMasterPasswd->allowPersistentStoring( false );
-                m_pMasterPasswordCB->Check();
-                m_pMasterPasswordPB->Enable( false );
-                m_pMasterPasswordCB->Enable( false );
-                m_pMasterPasswordFT->Enable( false );
-                m_pShowConnectionsPB->Enable( false );
+                m_xMasterPasswordCB->set_active(true);
+                m_xMasterPasswordPB->set_sensitive( false );
+                m_xMasterPasswordCB->set_sensitive( false );
+                m_xMasterPasswordFT->set_sensitive( false );
+                m_xShowConnectionsPB->set_sensitive( false );
             }
             else
             {
-                m_pSavePasswordsCB->Check();
-                m_pMasterPasswordPB->Enable();
-                m_pShowConnectionsPB->Enable();
+                m_xSavePasswordsCB->set_active(true);
+                m_xMasterPasswordPB->set_sensitive(true);
+                m_xShowConnectionsPB->set_sensitive(true);
             }
         }
     }
     catch (const Exception&)
     {
-        m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() );
+        m_xSavePasswordsCB->set_active( !m_xSavePasswordsCB->get_active() );
     }
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl, Button*, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl, weld::Button&, void)
 {
     try
     {
@@ -688,7 +665,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl, Button*, void)
     {}
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl, weld::Button&, void)
 {
     try
     {
@@ -698,42 +675,42 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void)
         uno::Reference<task::XInteractionHandler> xTmpHandler(task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(),
                                                               VCLUnoHelper::GetInterface(GetParentDialog())));
 
-        if ( m_pMasterPasswordCB->IsChecked() )
+        if ( m_xMasterPasswordCB->get_active() )
         {
             if (xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->changeMasterPassword(xTmpHandler))
             {
-                m_pMasterPasswordPB->Enable();
-                m_pMasterPasswordFT->Enable();
+                m_xMasterPasswordPB->set_sensitive(true);
+                m_xMasterPasswordFT->set_sensitive(true);
             }
             else
             {
-                m_pMasterPasswordCB->Check( false );
-                m_pMasterPasswordPB->Enable();
-                m_pMasterPasswordFT->Enable();
+                m_xMasterPasswordCB->set_active( false );
+                m_xMasterPasswordPB->set_sensitive(true);
+                m_xMasterPasswordFT->set_sensitive(true);
             }
         }
         else
         {
             if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->useDefaultMasterPassword(xTmpHandler) )
             {
-                m_pMasterPasswordPB->Enable( false );
-                m_pMasterPasswordFT->Enable( false );
+                m_xMasterPasswordPB->set_sensitive( false );
+                m_xMasterPasswordFT->set_sensitive( false );
             }
             else
             {
-                m_pMasterPasswordCB->Check();
-                m_pMasterPasswordPB->Enable();
-                m_pShowConnectionsPB->Enable();
+                m_xMasterPasswordCB->set_active(true);
+                m_xMasterPasswordPB->set_sensitive(true);
+                m_xShowConnectionsPB->set_sensitive(true);
             }
         }
     }
     catch (const Exception&)
     {
-        m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() );
+        m_xSavePasswordsCB->set_active( !m_xSavePasswordsCB->get_active() );
     }
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl, weld::Button&, void)
 {
     try
     {
@@ -753,7 +730,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void)
     {}
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, Button*, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, weld::Button&, void)
 {
     if (!mpCertPathDlg)
         mpCertPathDlg.reset(new CertPathDialog(GetDialogFrameWeld()));
@@ -769,7 +746,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, Button*, void)
     }
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl, weld::Button&, void)
 {
     // Unlike the mpCertPathDlg, we *don't* keep the same dialog object around between
     // invocations. Seems clearer to my little brain that way.
@@ -777,7 +754,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void)
     aTSAURLsDlg.run();
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl, Button*, void)
+IMPL_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl, weld::Button&, void)
 {
     try
     {
@@ -792,7 +769,6 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl, Button*, void)
     }
 }
 
-
 void SvxSecurityTabPage::InitControls()
 {
     // Hide all controls which belong to the macro security button in case the macro
@@ -806,18 +782,18 @@ void SvxSecurityTabPage::InitControls()
               && mpSecOptions->IsReadOnly( SvtSecurityOptions::EOption::SecureUrls ) ) )
     {
         //Hide these
-        m_pMacroSecFrame->Hide();
+        m_xMacroSecFrame->hide();
     }
 
 #ifndef UNX
-    m_pCertFrame->Hide();
+    m_xCertFrame->hide();
 #endif
 
-    m_pMasterPasswordPB->Enable( false );
-    m_pMasterPasswordCB->Enable( false );
-    m_pMasterPasswordCB->Check();
-    m_pMasterPasswordFT->Enable( false );
-    m_pShowConnectionsPB->Enable( false );
+    m_xMasterPasswordPB->set_sensitive( false );
+    m_xMasterPasswordCB->set_sensitive( false );
+    m_xMasterPasswordCB->set_active(true);
+    m_xMasterPasswordFT->set_sensitive( false );
+    m_xShowConnectionsPB->set_sensitive( false );
 
     // initialize the password saving checkbox
     try
@@ -827,29 +803,29 @@ void SvxSecurityTabPage::InitControls()
 
         if ( xMasterPasswd->isPersistentStoringAllowed() )
         {
-            m_pMasterPasswordCB->Enable();
-            m_pShowConnectionsPB->Enable();
-            m_pSavePasswordsCB->Check();
+            m_xMasterPasswordCB->set_sensitive(true);
+            m_xShowConnectionsPB->set_sensitive(true);
+            m_xSavePasswordsCB->set_active(true);
 
             if ( xMasterPasswd->isDefaultMasterPasswordUsed() )
-                m_pMasterPasswordCB->Check( false );
+                m_xMasterPasswordCB->set_active( false );
             else
             {
-                m_pMasterPasswordPB->Enable();
-                m_pMasterPasswordCB->Check();
-                m_pMasterPasswordFT->Enable();
+                m_xMasterPasswordPB->set_sensitive(true);
+                m_xMasterPasswordCB->set_active(true);
+                m_xMasterPasswordFT->set_sensitive(true);
             }
         }
     }
     catch (const Exception&)
     {
-        m_pSavePasswordsCB->Enable( false );
+        m_xSavePasswordsCB->set_sensitive( false );
     }
 }
 
 VclPtr<SfxTabPage> SvxSecurityTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxSecurityTabPage>::Create(pParent.pParent, *rAttrSet);
+    return VclPtr<SvxSecurityTabPage>::Create(pParent, *rAttrSet);
 }
 
 void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index b19cb2cd30f6..03bf52ad9116 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -86,45 +86,46 @@ class SvxSecurityTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
     friend class VclPtr<SvxSecurityTabPage>;
 private:
-    VclPtr<PushButton>         m_pSecurityOptionsPB;
+    std::unique_ptr<SvtSecurityOptions>         mpSecOptions;
+    std::unique_ptr<svx::SecurityOptionsDialog> m_xSecOptDlg;
 
-    VclPtr<CheckBox>           m_pSavePasswordsCB;
-    VclPtr<PushButton>         m_pShowConnectionsPB;
+    std::unique_ptr<CertPathDialog> mpCertPathDlg;
 
-    VclPtr<CheckBox>           m_pMasterPasswordCB;
-    VclPtr<FixedText>          m_pMasterPasswordFT;
-    VclPtr<PushButton>         m_pMasterPasswordPB;
+    OUString m_sPasswordStoringDeactivateStr;
 
-    VclPtr<VclContainer>       m_pMacroSecFrame;
-    VclPtr<PushButton>         m_pMacroSecPB;
+    std::unique_ptr<weld::Button> m_xSecurityOptionsPB;
 
-    VclPtr<VclContainer>       m_pCertFrame;
-    VclPtr<PushButton>         m_pCertPathPB;
+    std::unique_ptr<weld::CheckButton> m_xSavePasswordsCB;
+    std::unique_ptr<weld::Button> m_xShowConnectionsPB;
 
-    VclPtr<VclContainer>       m_pTSAURLsFrame;
-    VclPtr<PushButton>         m_pTSAURLsPB;
+    std::unique_ptr<weld::CheckButton> m_xMasterPasswordCB;
+    std::unique_ptr<weld::Label> m_xMasterPasswordFT;
+    std::unique_ptr<weld::Button> m_xMasterPasswordPB;
 
-    std::unique_ptr<SvtSecurityOptions>         mpSecOptions;
-    std::unique_ptr<svx::SecurityOptionsDialog> m_xSecOptDlg;
+    std::unique_ptr<weld::Container> m_xMacroSecFrame;
+    std::unique_ptr<weld::Button> m_xMacroSecPB;
 
-    std::unique_ptr<CertPathDialog> mpCertPathDlg;
+    std::unique_ptr<weld::Container> m_xCertFrame;
+    std::unique_ptr<weld::Button> m_xCertPathPB;
+
+    std::unique_ptr<weld::Container> m_xTSAURLsFrame;
+    std::unique_ptr<weld::Button> m_xTSAURLsPB;
 
-    OUString            m_sPasswordStoringDeactivateStr;
+    std::unique_ptr<weld::Label> m_xNoPasswordSaveFT;
 
-    DECL_LINK(SecurityOptionsHdl, Button*, void);
-    DECL_LINK(SavePasswordHdl, Button*, void);
-    DECL_LINK(MasterPasswordHdl, Button*, void);
-    DECL_LINK(MasterPasswordCBHdl, Button*, void);
-    DECL_LINK(ShowPasswordsHdl, Button*, void);
-    DECL_LINK(MacroSecPBHdl, Button*, void );
-    DECL_LINK(CertPathPBHdl, Button*, void );
-    DECL_LINK(TSAURLsPBHdl, Button*, void );
+    DECL_LINK(SecurityOptionsHdl, weld::Button&, void);
+    DECL_LINK(SavePasswordHdl, weld::Button&, void);
+    DECL_LINK(MasterPasswordHdl, weld::Button&, void);
+    DECL_LINK(MasterPasswordCBHdl, weld::Button&, void);
+    DECL_LINK(ShowPasswordsHdl, weld::Button&, void);
+    DECL_LINK(MacroSecPBHdl, weld::Button&, void );
+    DECL_LINK(CertPathPBHdl, weld::Button&, void );
+    DECL_LINK(TSAURLsPBHdl, weld::Button&, void );
 
     void                InitControls();
 
-                SvxSecurityTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
-    virtual     ~SvxSecurityTabPage() override;
-    virtual void dispose() override;
+    SvxSecurityTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    virtual ~SvxSecurityTabPage() override;
 
 protected:
     virtual void        ActivatePage( const SfxItemSet& rSet ) override;
diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui
index b97a03d4c0a5..aa815c6ebf1b 100644
--- a/cui/uiconfig/ui/optsecuritypage.ui
+++ b/cui/uiconfig/ui/optsecuritypage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkGrid" id="OptSecurityPage">
@@ -32,16 +32,15 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="optsecuritypage|label9">Maintain a list of Time Stamping Authority (TSA) URLs to be used for digital signatures in PDF export.</property>
                     <property name="wrap">True</property>
+                    <property name="width_chars">56</property>
                     <property name="max_width_chars">56</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -56,8 +55,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -78,8 +75,6 @@
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">4</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -90,7 +85,7 @@
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
-          <object class="GtkAlignment" id="alignment5">
+          <object class="GtkAlignment" id="alignment1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
@@ -107,16 +102,15 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="optsecuritypage|label7">Select the Network Security Services certificate directory to use for digital signatures.</property>
                     <property name="wrap">True</property>
+                    <property name="width_chars">56</property>
                     <property name="max_width_chars">56</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -131,8 +125,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -153,8 +145,6 @@
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -182,16 +172,15 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="optsecuritypage|label5">Adjust the security level for executing macros and specify trusted macro developers.</property>
                     <property name="wrap">True</property>
+                    <property name="width_chars">56</property>
                     <property name="max_width_chars">56</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -206,8 +195,6 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -228,8 +215,6 @@
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">2</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -259,7 +244,7 @@
                     <property name="hexpand">True</property>
                     <property name="row_spacing">12</property>
                     <child>
-                      <object class="GtkCheckButton" id="savepassword:wrap">
+                      <object class="GtkCheckButton" id="savepassword">
                         <property name="label" translatable="yes" context="optsecuritypage|savepassword">Persistently _save passwords for web connections</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -271,8 +256,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -300,8 +283,6 @@
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -309,16 +290,15 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes" context="optsecuritypage|masterpasswordtext">Passwords are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list.</property>
                                 <property name="wrap">True</property>
+                                <property name="width_chars">56</property>
                                 <property name="max_width_chars">56</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                             <child>
@@ -326,18 +306,17 @@
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
                                 <property name="hexpand">True</property>
-                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes" context="optsecuritypage|nopasswordsave">Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.
 
 Do you want to delete password list and reset master password?</property>
                                 <property name="wrap">True</property>
+                                <property name="width_chars">56</property>
                                 <property name="max_width_chars">56</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
                               </packing>
                             </child>
                           </object>
@@ -346,16 +325,12 @@ Do you want to delete password list and reset master password?</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -375,8 +350,6 @@ Do you want to delete password list and reset master password?</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -392,16 +365,12 @@ Do you want to delete password list and reset master password?</property>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -422,8 +391,6 @@ Do you want to delete password list and reset master password?</property>
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">1</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -434,7 +401,7 @@ Do you want to delete password list and reset master password?</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
-          <object class="GtkAlignment" id="alignment1">
+          <object class="GtkAlignment" id="alignment6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
@@ -451,16 +418,15 @@ Do you want to delete password list and reset master password?</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="optsecuritypage|label4">Adjust security related options and define warnings for hidden information in documents.  </property>
                     <property name="wrap">True</property>
+                    <property name="width_chars">56</property>
                     <property name="max_width_chars">56</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -475,8 +441,6 @@ Do you want to delete password list and reset master password?</property>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -497,8 +461,6 @@ Do you want to delete password list and reset master password?</property>
       <packing>
         <property name="left_attach">0</property>
         <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
   </object>