[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UI_cui.mk sw/uiconfig
Caolán McNamara
caolanm at redhat.com
Wed Feb 13 09:38:39 PST 2013
cui/UI_cui.mk | 1
cui/source/options/optinet2.cxx | 215 +++++-----------
cui/source/options/optinet2.hrc | 43 ---
cui/source/options/optinet2.hxx | 33 +-
cui/source/options/optinet2.src | 122 ---------
cui/uiconfig/ui/optsecuritypage.ui | 436 +++++++++++++++++++++++++++++++++
cui/uiconfig/ui/personalization_tab.ui | 6
sw/uiconfig/swriter/ui/libsecurity.ui | 305 -----------------------
8 files changed, 525 insertions(+), 636 deletions(-)
New commits:
commit 1f352a97590a1511788c2c62f71efe0fa45c9673
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 13 17:37:07 2013 +0000
HIG spacing for personalization_tab
Change-Id: Ia791942f77df024a90224a706847300643d5a74e
diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui
index f3e012e..415a6fb 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -4,6 +4,8 @@
<object class="GtkVBox" id="PersonalizationTabPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -14,6 +16,7 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox3">
@@ -110,7 +113,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
@@ -124,6 +126,7 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox2">
@@ -220,7 +223,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
commit e099246c5f6ffecff8578aa508e7cba5379a70d2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 13 14:07:13 2013 +0000
move security options to cui and adapt code
Change-Id: I7f53b9486d95f539fe893f7ab72c2eee64449064
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index 820dcf2..f4af231 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/optappearancepage \
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optpathspage \
+ cui/uiconfig/ui/optsecuritypage \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index c21db1d..4b2db82 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -626,46 +626,33 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
/* */
/********************************************************************/
-SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet )
- :SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet )
-
- ,maSecurityOptionsFL( this, CUI_RES( FL_SEC_SECURITYOPTIONS ) )
- ,maSecurityOptionsFI( this, CUI_RES( FI_SEC_SECURITYOPTIONS ) )
- ,maSecurityOptionsPB( this, CUI_RES( PB_SEC_SECURITYOPTIONS ) )
-
- ,maPasswordsFL ( this, CUI_RES( FL_SEC_PASSWORDS ) )
- ,maSavePasswordsCB ( this, CUI_RES( CB_SEC_SAVEPASSWORDS ) )
- ,maShowConnectionsPB( this, CUI_RES( PB_SEC_CONNECTIONS ) )
- ,maMasterPasswordCB ( this, CUI_RES( CB_SEC_MASTERPASSWORD ) )
- ,maMasterPasswordFI ( this, CUI_RES( FI_SEC_MASTERPASSWORD ) )
- ,maMasterPasswordPB ( this, CUI_RES( PB_SEC_MASTERPASSWORD ) )
-
- ,maMacroSecFL ( this, CUI_RES( FL_SEC_MACROSEC ) )
- ,maMacroSecFI ( this, CUI_RES( FI_SEC_MACROSEC ) )
- ,maMacroSecPB ( this, CUI_RES( PB_SEC_MACROSEC ) )
-
- ,m_aCertPathFL ( this, CUI_RES( FL_SEC_CERTPATH ) )
- ,m_aCertPathFI ( this, CUI_RES( FI_SEC_CERTPATH ) )
- ,m_aCertPathPB ( this, CUI_RES( PB_SEC_CERTPATH ) )
-
- ,mpSecOptions ( new SvtSecurityOptions )
- ,mpSecOptDlg ( NULL )
- ,mpCertPathDlg ( NULL )
-
- ,msPasswordStoringDeactivateStr( CUI_RES( STR_SEC_NOPASSWDSAVE ) )
-
+SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", rSet)
+ , mpSecOptions(new SvtSecurityOptions)
+ , mpSecOptDlg(NULL)
+ , mpCertPathDlg(NULL)
{
- FreeResource();
+ get(m_pSecurityOptionsPB, "options");
+ get(m_pSavePasswordsCB, "savepassword");
+ 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");
+ m_sPasswordStoringDeactivateStr = get<FixedText>("nopasswordsave")->GetText();
InitControls();
- maSecurityOptionsPB.SetClickHdl( LINK( this, SvxSecurityTabPage, SecurityOptionsHdl ) );
- maSavePasswordsCB.SetClickHdl( LINK( this, SvxSecurityTabPage, SavePasswordHdl ) );
- maMasterPasswordPB.SetClickHdl( LINK( this, SvxSecurityTabPage, MasterPasswordHdl ) );
- maMasterPasswordCB.SetClickHdl( LINK( this, SvxSecurityTabPage, MasterPasswordCBHdl ) );
- maShowConnectionsPB.SetClickHdl( LINK( this, SvxSecurityTabPage, ShowPasswordsHdl ) );
- maMacroSecPB.SetClickHdl( LINK( this, SvxSecurityTabPage, MacroSecPBHdl ) );
- m_aCertPathPB.SetClickHdl( LINK( this, SvxSecurityTabPage, CertPathPBHdl ) );
+ 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 ) );
ActivatePage( rSet );
}
@@ -693,49 +680,49 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl)
Reference< task::XPasswordContainer2 > xMasterPasswd(
task::PasswordContainer::create(comphelper::getProcessComponentContext()));
- if ( maSavePasswordsCB.IsChecked() )
+ if ( m_pSavePasswordsCB->IsChecked() )
{
sal_Bool bOldValue = xMasterPasswd->allowPersistentStoring( sal_True );
xMasterPasswd->removeMasterPassword();
if ( xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) )
{
- maMasterPasswordPB.Enable( sal_True );
- maMasterPasswordCB.Check( sal_True );
- maMasterPasswordCB.Enable( sal_True );
- maMasterPasswordFI.Enable( sal_True );
- maShowConnectionsPB.Enable( sal_True );
+ m_pMasterPasswordPB->Enable( sal_True );
+ m_pMasterPasswordCB->Check( sal_True );
+ m_pMasterPasswordCB->Enable( sal_True );
+ m_pMasterPasswordFT->Enable( sal_True );
+ m_pShowConnectionsPB->Enable( sal_True );
}
else
{
xMasterPasswd->allowPersistentStoring( bOldValue );
- maSavePasswordsCB.Check( sal_False );
+ m_pSavePasswordsCB->Check( sal_False );
}
}
else
{
- QueryBox aQuery( this, WB_YES_NO|WB_DEF_NO, msPasswordStoringDeactivateStr );
+ QueryBox aQuery( this, WB_YES_NO|WB_DEF_NO, m_sPasswordStoringDeactivateStr );
sal_uInt16 nRet = aQuery.Execute();
if( RET_YES == nRet )
{
xMasterPasswd->allowPersistentStoring( sal_False );
- maMasterPasswordCB.Check( sal_True );
- maMasterPasswordPB.Enable( sal_False );
- maMasterPasswordCB.Enable( sal_False );
- maMasterPasswordFI.Enable( sal_False );
- maShowConnectionsPB.Enable( sal_False );
+ m_pMasterPasswordCB->Check( sal_True );
+ m_pMasterPasswordPB->Enable( sal_False );
+ m_pMasterPasswordCB->Enable( sal_False );
+ m_pMasterPasswordFT->Enable( sal_False );
+ m_pShowConnectionsPB->Enable( sal_False );
}
else
{
- maSavePasswordsCB.Check( sal_True );
- maMasterPasswordPB.Enable( sal_True );
- maShowConnectionsPB.Enable( sal_True );
+ m_pSavePasswordsCB->Check( sal_True );
+ m_pMasterPasswordPB->Enable( sal_True );
+ m_pShowConnectionsPB->Enable( sal_True );
}
}
}
catch (const Exception&)
{
- maSavePasswordsCB.Check( !maSavePasswordsCB.IsChecked() );
+ m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() );
}
return 0;
@@ -764,38 +751,38 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl)
Reference< task::XPasswordContainer2 > xMasterPasswd(
task::PasswordContainer::create(comphelper::getProcessComponentContext()));
- if ( maMasterPasswordCB.IsChecked() )
+ if ( m_pMasterPasswordCB->IsChecked() )
{
if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) )
{
- maMasterPasswordPB.Enable( sal_True );
- maMasterPasswordFI.Enable( sal_True );
+ m_pMasterPasswordPB->Enable( sal_True );
+ m_pMasterPasswordFT->Enable( sal_True );
}
else
{
- maMasterPasswordCB.Check( sal_False );
- maMasterPasswordPB.Enable( sal_True );
- maMasterPasswordFI.Enable( sal_True );
+ m_pMasterPasswordCB->Check( sal_False );
+ m_pMasterPasswordPB->Enable( sal_True );
+ m_pMasterPasswordFT->Enable( sal_True );
}
}
else
{
if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->useDefaultMasterPassword( Reference< task::XInteractionHandler >() ) )
{
- maMasterPasswordPB.Enable( sal_False );
- maMasterPasswordFI.Enable( sal_False );
+ m_pMasterPasswordPB->Enable( sal_False );
+ m_pMasterPasswordFT->Enable( sal_False );
}
else
{
- maMasterPasswordCB.Check( sal_True );
- maMasterPasswordPB.Enable( sal_True );
- maShowConnectionsPB.Enable( sal_True );
+ m_pMasterPasswordCB->Check( sal_True );
+ m_pMasterPasswordPB->Enable( sal_True );
+ m_pShowConnectionsPB->Enable( sal_True );
}
}
}
catch (const Exception&)
{
- maSavePasswordsCB.Check( !maSavePasswordsCB.IsChecked() );
+ m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() );
}
return 0;
@@ -865,76 +852,19 @@ void SvxSecurityTabPage::InitControls()
&& mpSecOptions->IsReadOnly( SvtSecurityOptions::E_MACRO_TRUSTEDAUTHORS )
&& mpSecOptions->IsReadOnly( SvtSecurityOptions::E_SECUREURLS ) ) )
{
- //Move these up
- m_aCertPathFL.SetPosPixel(maMacroSecFL.GetPosPixel());
- m_aCertPathFI.SetPosPixel(maMacroSecFI.GetPosPixel());
- m_aCertPathPB.SetPosPixel(maMacroSecPB.GetPosPixel());
-
//Hide these
- maMacroSecFL.Hide();
- maMacroSecFI.Hide();
- maMacroSecPB.Hide();
- }
-
- // one button too small for its text?
- long nBtnTextWidth = 0;
- Window* pButtons[] = { &maSecurityOptionsPB, &maMasterPasswordPB,
- &maShowConnectionsPB, &maMacroSecPB, &m_aCertPathPB };
- Window** pButton = pButtons;
- const sal_Int32 nBCount = SAL_N_ELEMENTS( pButtons );
- for (sal_Int32 i = 0; i < nBCount; ++i, ++pButton )
- {
- long nTemp = (*pButton)->GetCtrlTextWidth( (*pButton)->GetText() );
- if ( nTemp > nBtnTextWidth )
- nBtnTextWidth = nTemp;
+ m_pMacroSecFrame->Hide();
}
- nBtnTextWidth = nBtnTextWidth * 115 / 100; // a little offset
- const long nButtonWidth = maSecurityOptionsPB.GetSizePixel().Width();
- const long nMaxWidth = nButtonWidth * 140 / 100;
- long nExtra = ( nBtnTextWidth > nMaxWidth ) ? nBtnTextWidth - nMaxWidth : 0;
- nBtnTextWidth = std::min( nBtnTextWidth, nMaxWidth );
-
- if ( nBtnTextWidth > nButtonWidth )
- {
- // so make the buttons broader and its control in front of it smaller
- long nDelta = nBtnTextWidth - nButtonWidth;
- pButton = pButtons;
-
- if ( nExtra > 0 )
- {
- long nPos = (*pButton)->GetPosPixel().X() - nDelta;
- long nWidth = (*pButton)->GetSizePixel().Width() + nDelta;
- long nMaxExtra = GetOutputSizePixel().Width() - ( nPos + nWidth ) - 2;
- nExtra = ( nExtra < nMaxExtra ) ? nExtra : nMaxExtra;
- }
-
- for (sal_Int32 i = 0; i < nBCount; ++i, ++pButton )
- {
- Point aNewPos = (*pButton)->GetPosPixel();
- aNewPos.X() -= nDelta;
- Size aNewSize = (*pButton)->GetSizePixel();
- aNewSize.Width() += ( nDelta + nExtra );
- (*pButton)->SetPosSizePixel( aNewPos, aNewSize );
- }
-
- Window* pControls[] = { &maSecurityOptionsFI, &maSavePasswordsCB,
- &maMasterPasswordFI, &maMacroSecFI, &m_aCertPathFI };
- Window** pControl = pControls;
- const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls );
- for (sal_Int32 i = 0; i < nCCount; ++i, ++pControl )
- {
- Size aNewSize = (*pControl)->GetSizePixel();
- aNewSize.Width() -= nDelta;
- (*pControl)->SetSizePixel( aNewSize );
- }
- }
+#ifndef UNX
+ m_pCertFrame->Hide();
+#endif
- maMasterPasswordPB.Enable( sal_False );
- maMasterPasswordCB.Enable( sal_False );
- maMasterPasswordCB.Check( sal_True );
- maMasterPasswordFI.Enable( sal_False );
- maShowConnectionsPB.Enable( sal_False );
+ m_pMasterPasswordPB->Enable( sal_False );
+ m_pMasterPasswordCB->Enable( sal_False );
+ m_pMasterPasswordCB->Check( sal_True );
+ m_pMasterPasswordFT->Enable( sal_False );
+ m_pShowConnectionsPB->Enable( sal_False );
// initialize the password saving checkbox
try
@@ -944,31 +874,24 @@ void SvxSecurityTabPage::InitControls()
if ( xMasterPasswd->isPersistentStoringAllowed() )
{
- maMasterPasswordCB.Enable( sal_True );
- maShowConnectionsPB.Enable( sal_True );
- maSavePasswordsCB.Check( sal_True );
+ m_pMasterPasswordCB->Enable( sal_True );
+ m_pShowConnectionsPB->Enable( sal_True );
+ m_pSavePasswordsCB->Check( sal_True );
if ( xMasterPasswd->isDefaultMasterPasswordUsed() )
- maMasterPasswordCB.Check( sal_False );
+ m_pMasterPasswordCB->Check( sal_False );
else
{
- maMasterPasswordPB.Enable( sal_True );
- maMasterPasswordCB.Check( sal_True );
- maMasterPasswordFI.Enable( sal_True );
+ m_pMasterPasswordPB->Enable( sal_True );
+ m_pMasterPasswordCB->Check( sal_True );
+ m_pMasterPasswordFT->Enable( sal_True );
}
}
}
catch (const Exception&)
{
- maSavePasswordsCB.Enable( sal_False );
+ m_pSavePasswordsCB->Enable( sal_False );
}
-
-#ifndef UNX
- m_aCertPathFL.Hide();
- m_aCertPathFI.Hide();
- m_aCertPathPB.Hide();
-#endif
-
}
SfxTabPage* SvxSecurityTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet )
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 11c1df4..e6fa7ac 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -55,49 +55,6 @@
#define ST_MSG_255_0 111
#define ST_MSG_255_1 112
-// Security -------------------------------------------------------------
-
-#define FL_SEC_SECURITYOPTIONS 10
-#define FI_SEC_SECURITYOPTIONS 11
-#define PB_SEC_SECURITYOPTIONS 12
-#define FL_SEC_PASSWORDS 13
-#define CB_SEC_SAVEPASSWORDS 14
-#define PB_SEC_CONNECTIONS 15
-#define CB_SEC_MASTERPASSWORD 16
-#define FI_SEC_MASTERPASSWORD 17
-#define PB_SEC_MASTERPASSWORD 18
-#define FL_SEC_MACROSEC 19
-#define FI_SEC_MACROSEC 20
-#define PB_SEC_MACROSEC 21
-#define FL_SEC_CERTPATH 22
-#define FI_SEC_CERTPATH 23
-#define PB_SEC_CERTPATH 24
-
-#define STR_SEC_NOPASSWDSAVE 12
-
-#define BORDER_OFFSET 8
-#define COL_0 (RSC_SP_TBPG_INNERBORDER_LEFT)
-#define COL_1 (COL_0+RSC_SP_FLGR_SPACE_X)
-#define COL_1a (COL_1+RSC_SP_CHK_TEXTINDENT)
-#define COL_4 (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
-#define COL_3 (COL_4-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_2 (COL_3-RSC_SP_CTRL_DESC_X)
-
-#define ROW_0 (RSC_SP_FLGR_INNERBORDER_TOP)
-#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_2 (ROW_1+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_2a (ROW_2-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT)
-#define ROW_3 (ROW_2+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_4 (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_DESC_Y-1)
-#define ROW_4a (ROW_4+RSC_CD_CHECKBOX_HEIGHT+1)
-#define ROW_5 (ROW_4a+4*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_6 (ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_7 (ROW_6+3*RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_7a (ROW_7-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT)
-#define ROW_8 (ROW_7+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_9 (ROW_8+3*RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_9a (ROW_9-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT)
-
// Defines - JavaScriptDisableQueryBox_Impl -------------------------------
#define IMG_JSCPT_WARNING 220
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 9e7919b..42b1206 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -20,9 +20,10 @@
#define _SVX_OPTINET_HXX
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <vcl/lstbox.hxx>
-#include <vcl/group.hxx>
#include <vcl/field.hxx>
+#include <vcl/group.hxx>
+#include <vcl/layout.hxx>
+#include <vcl/lstbox.hxx>
#include <svtools/stdctrl.hxx>
#include <svtools/svtabbx.hxx>
#include <sfx2/tabdlg.hxx>
@@ -145,31 +146,27 @@ class SvxSecurityTabPage : public SfxTabPage
using TabPage::DeactivatePage;
private:
- FixedLine maSecurityOptionsFL;
- FixedInfo maSecurityOptionsFI;
- PushButton maSecurityOptionsPB;
+ PushButton* m_pSecurityOptionsPB;
+
+ CheckBox* m_pSavePasswordsCB;
+ PushButton* m_pShowConnectionsPB;
- FixedLine maPasswordsFL;
- CheckBox maSavePasswordsCB;
- PushButton maShowConnectionsPB;
- CheckBox maMasterPasswordCB;
- FixedInfo maMasterPasswordFI;
- PushButton maMasterPasswordPB;
+ CheckBox* m_pMasterPasswordCB;
+ FixedText* m_pMasterPasswordFT;
+ PushButton* m_pMasterPasswordPB;
- FixedLine maMacroSecFL;
- FixedInfo maMacroSecFI;
- PushButton maMacroSecPB;
+ VclContainer* m_pMacroSecFrame;
+ PushButton* m_pMacroSecPB;
- FixedLine m_aCertPathFL;
- FixedInfo m_aCertPathFI;
- PushButton m_aCertPathPB;
+ VclContainer* m_pCertFrame;
+ PushButton* m_pCertPathPB;
SvtSecurityOptions* mpSecOptions;
svx::SecurityOptionsDialog* mpSecOptDlg;
CertPathDialog* mpCertPathDlg;
- String msPasswordStoringDeactivateStr;
+ OUString m_sPasswordStoringDeactivateStr;
DECL_LINK(SecurityOptionsHdl, void *);
DECL_LINK(SavePasswordHdl, void* );
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 14e609c..0652afc 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -265,128 +265,6 @@ TabPage RID_SVXPAGE_INET_PROXY
};
};
-
-/************************************************************************/
-/* */
-/* Scripting */
-/* */
-/************************************************************************/
-
-TabPage RID_SVXPAGE_INET_SECURITY
-{
- HelpID = "cui:TabPage:RID_SVXPAGE_INET_SECURITY";
- OutputSize = TRUE ;
- Size = MAP_APPFONT( TP_WIDTH , TP_HEIGHT );
- SVLook = TRUE;
- Hide = TRUE;
- Text [ en-US ] = "Security";
- FixedLine FL_SEC_SECURITYOPTIONS
- {
- Pos = MAP_APPFONT( COL_0, ROW_0 );
- Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Security options and warnings";
- };
- FixedText FI_SEC_SECURITYOPTIONS
- {
- Pos = MAP_APPFONT( COL_1, ROW_1 );
- Size = MAP_APPFONT( COL_2-COL_1, 3*RSC_CD_FIXEDLINE_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "Adjust security related options and define warnings for hidden information in documents.";
- };
- PushButton PB_SEC_SECURITYOPTIONS
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS";
- Pos = MAP_APPFONT( COL_3, ROW_2a );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
- Text [ en-US ] = "Options...";
- };
- FixedLine FL_SEC_PASSWORDS
- {
- Pos = MAP_APPFONT( COL_0, ROW_2 - 2 );
- Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Passwords for web connections";
- };
- CheckBox CB_SEC_SAVEPASSWORDS
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS";
- Pos = MAP_APPFONT( COL_1, ROW_3 - 4 );
- Size = MAP_APPFONT( COL_2-COL_1, 16 );
- Wordbreak = TRUE;
- Text [ en-US ] = "Persistently save passwords for web connections";
- };
- PushButton PB_SEC_CONNECTIONS
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS";
- Pos = MAP_APPFONT( COL_3, ROW_3-1 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
- Text [ en-US ] = "Connections...";
- };
- CheckBox CB_SEC_MASTERPASSWORD
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_MASTERPASSWORD";
- Pos = MAP_APPFONT( COL_1a, ROW_4 );
- Size = MAP_APPFONT( COL_2-COL_1a, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Protected by a master password (recommended)";
- };
- FixedText FI_SEC_MASTERPASSWORD
- {
- Pos = MAP_APPFONT( COL_1a, ROW_4a );
- Size = MAP_APPFONT( COL_2-COL_1a, 4*RSC_CD_FIXEDLINE_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "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.";
- };
- PushButton PB_SEC_MASTERPASSWORD
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD";
- Pos = MAP_APPFONT( COL_3, ROW_4a );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
- Text [ en-US ] = "Master Password...";
- };
- FixedLine FL_SEC_MACROSEC
- {
- Pos = MAP_APPFONT( COL_0, ROW_5 );
- Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Macro security";
- };
- FixedText FI_SEC_MACROSEC
- {
- Pos = MAP_APPFONT( COL_1, ROW_6 );
- Size = MAP_APPFONT( COL_2-COL_1, 3*RSC_CD_FIXEDLINE_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "Adjust the security level for executing macros and specify trusted macro developers.";
- };
- PushButton PB_SEC_MACROSEC
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC";
- Pos = MAP_APPFONT( COL_3, ROW_7a );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
- Text [ en-US ] = "Macro Security...";
- };
- FixedLine FL_SEC_CERTPATH
- {
- Pos = MAP_APPFONT( COL_0, ROW_7 );
- Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Certificate Path";
- };
- FixedText FI_SEC_CERTPATH
- {
- Pos = MAP_APPFONT( COL_1, ROW_8 );
- Size = MAP_APPFONT( COL_2-COL_1, 3*RSC_CD_FIXEDLINE_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "Select the Network Security Services certificate directory to use for digital signatures.";
- };
- PushButton PB_SEC_CERTPATH
- {
- Pos = MAP_APPFONT( COL_3, ROW_9a );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
- Text [ en-US ] = "Certificate...";
- };
- String STR_SEC_NOPASSWDSAVE
- {
- Text [ en-US ] = "Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.\n\nDo you want to delete password list and reset master password?";
- };
-};
-
ErrorBox RID_SVXERR_OPT_PROXYPORTS
{
BUTTONS = WB_OK ;
diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui
new file mode 100644
index 0000000..deb6d8c
--- /dev/null
+++ b/cui/uiconfig/ui/optsecuritypage.ui
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="OptSecurityPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">24</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <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">Adjust security related options and define warnings for hidden information in documents. </property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">56</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>
+ <object class="GtkButton" id="options">
+ <property name="label" translatable="yes">O_ptions...</property>
+ <property name="visible">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>
+ </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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Security options and warnings</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">24</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="savepassword">
+ <property name="label" translatable="yes">Persistently _save passwords for web connections</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</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>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <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">6</property>
+ <child>
+ <object class="GtkCheckButton" id="usemasterpassword">
+ <property name="label" translatable="yes">Protected _by a master passwords (recomended)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</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>
+ <object class="GtkLabel" id="masterpasswordtext">
+ <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">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="max_width_chars">56</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>
+ <object class="GtkLabel" id="nopasswordsave">
+ <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">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="max_width_chars">56</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>
+ </child>
+ </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>
+ </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>
+ <object class="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkButton" id="connections">
+ <property name="label" translatable="yes">Connect_ions...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="use_underline">True</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>
+ <object class="GtkButton" id="masterpassword">
+ <property name="label" translatable="yes">_Master Password...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="use_underline">True</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>
+ </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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Passwords for web connections</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="macrosecurity">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">24</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <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">Adjust the security level for executing macros and specify trusted macro developers.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">56</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>
+ <object class="GtkButton" id="macro">
+ <property name="label" translatable="yes">Macro Securit_y...</property>
+ <property name="visible">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>
+ </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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Macro security</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="certificatepath">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">24</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <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">Select the Network Security Services certificate directory to use for digital signatures.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">56</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>
+ <object class="GtkButton" id="cert">
+ <property name="label" translatable="yes">_Certificate...</property>
+ <property name="visible">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>
+ </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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Certificate Path</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="options"/>
+ <widget name="connections"/>
+ <widget name="masterpassword"/>
+ <widget name="macro"/>
+ <widget name="cert"/>
+ </widgets>
+ </object>
+</interface>
diff --git a/sw/uiconfig/swriter/ui/libsecurity.ui b/sw/uiconfig/swriter/ui/libsecurity.ui
deleted file mode 100644
index 79f60e5..0000000
--- a/sw/uiconfig/swriter/ui/libsecurity.ui
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="column_spacing">42</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Adjust security related options and define warnings for hidden
-information in documents. </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>
- <object class="GtkButton" id="button1">
- <property name="label" translatable="yes">O~ptions...</property>
- <property name="use_action_appearance">False</property>
- <property name="width_request">150</property>
- <property name="height_request">36</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- </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>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Security options and warnings</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkButtonBox" id="buttonbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <property name="layout_style">start</property>
- <child>
- <object class="GtkButton" id="button2">
- <property name="label" translatable="yes">Connect~ions...</property>
- <property name="use_action_appearance">False</property>
- <property name="width_request">150</property>
- <property name="height_request">36</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button3">
- <property name="label" translatable="yes">~Master Password...</property>
- <property name="use_action_appearance">False</property>
- <property name="width_request">100</property>
- <property name="height_request">36</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">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>
- <child>
- <object class="GtkGrid" id="grid4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">12</property>
- <child>
- <object class="GtkGrid" id="grid5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">24</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton2">
- <property name="label" translatable="yes">Protected ~by a master passwords (recomended)</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</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>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Passwords are protected by a master password. You will asked
-to enter it once per session,if LibreOffice retrieves a password
-from the protected password list.</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>
- </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>
- <object class="GtkCheckButton" id="checkbutton1">
- <property name="label" translatable="yes">Persistently ~save passwords for web connections</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</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>
- </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>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Passwords for web connections</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="column_spacing">24</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Adjust the security level for executing macros and specify trusted
-macro developers.</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>
- <object class="GtkButton" id="button4">
- <property name="label" translatable="yes">Macro Securit~y...</property>
- <property name="use_action_appearance">False</property>
- <property name="width_request">150</property>
- <property name="height_request">36</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- </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>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Macro security</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
-</interface>
More information about the Libreoffice-commits
mailing list