diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-14 23:04:56 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-15 08:50:08 +0000 |
commit | c163123e1f1ffb7bcaa8f2f09f2830fdfabcaef3 (patch) | |
tree | 3b614e9ce8deed886d844799b8c6f73fd59d821f | |
parent | 62726df969887cf6578a0f69c6c3dc8f689a3b06 (diff) |
adapt macro security dialog code to .ui
Change-Id: I0527ff30508bd7fd9182ff0bfec87aef7907f1fb
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/global.hrc | 3 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 27 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/dialogs.hrc | 1 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/helpids.hrc | 1 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 37 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.src | 53 | ||||
-rw-r--r-- | xmlsecurity/uiconfig/ui/macrosecuritydialog.ui | 11 | ||||
-rw-r--r-- | xmlsecurity/uiconfig/ui/securitylevelpage.ui | 9 |
8 files changed, 47 insertions, 95 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc index e4393b24f682..4675f7e6e1e3 100644 --- a/xmlsecurity/inc/xmlsecurity/global.hrc +++ b/xmlsecurity/inc/xmlsecurity/global.hrc @@ -25,9 +25,6 @@ #define RID_XMLSECTP_GENERAL 1003 #define RID_XMLSECTP_DETAILS 1004 #define RID_XMLSECTP_CERTPATH 1005 -#define RID_XMLSECTP_MACROSEC 1006 -#define RID_XMLSECTP_SECLEVEL 1007 -#define RID_XMLSECTP_TRUSTSOURCES 1008 #define RID_XMLSECTP_MACROWARN 1009 #define RID_XMLSECTP_READONLY_CONFIG_TIP 1010 #define RID_XMLSECTP_LOCK 1011 diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 4b500dcda4d1..42cc9a741cbb 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -58,32 +58,33 @@ private: friend class MacroSecurityLevelTP; friend class MacroSecurityTrustedSourcesTP; - TabControl maTabCtrl; - OKButton maOkBtn; - CancelButton maCancelBtn; - HelpButton maHelpBtn; - PushButton maResetBtn; + TabControl* m_pTabCtrl; + OKButton* m_pOkBtn; + PushButton* m_pResetBtn; cssu::Reference< cssu::XComponentContext > mxCtx; cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; SvtSecurityOptions maSecOptions; + sal_uInt16 m_nSecLevelId; + sal_uInt16 m_nSecTrustId; + MacroSecurityTP* mpLevelTP; MacroSecurityTP* mpTrustSrcTP; DECL_LINK( OkBtnHdl, void* ); public: - MacroSecurity( Window* pParent, const cssu::Reference< cssu::XComponentContext>& rxCtx, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment ); - virtual ~MacroSecurity(); + MacroSecurity(Window* pParent, + const cssu::Reference< cssu::XComponentContext>& rxCtx, + const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment); + virtual ~MacroSecurity(); - inline void EnableReset( bool _bEnable = true ); + inline void EnableReset(bool _bEnable = true) + { + m_pResetBtn->Enable ( _bEnable ); + } }; -inline void MacroSecurity::EnableReset( bool _bEnable ) -{ - maResetBtn.Enable ( _bEnable ); -} - class MacroSecurityTP : public TabPage { protected: diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc index e2224f29a0bc..ffcf5d06d24a 100644 --- a/xmlsecurity/source/dialogs/dialogs.hrc +++ b/xmlsecurity/source/dialogs/dialogs.hrc @@ -26,7 +26,6 @@ #define FL_BOTTOM_SEP 50 #define BTN_OK 51 -#define BTN_CANCEL 52 #define BTN_HELP 53 #define LB_SIGNATURES 54 #define BTN_VIEWCERT 55 diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc index 9ce5a4f15d27..637e9dbc8aa6 100644 --- a/xmlsecurity/source/dialogs/helpids.hrc +++ b/xmlsecurity/source/dialogs/helpids.hrc @@ -23,7 +23,6 @@ // Help-Ids -------------------------------------------------------------- -#define HID_XMLSEC_TP_MACROSEC "XMLSECURITY_HID_XMLSEC_TP_MACROSEC" #define HID_XMLSEC_DLG_CERTVIEWER "XMLSECURITY_HID_XMLSEC_DLG_CERTVIEWER" #define HID_XMLSEC_TP_GENERAL "XMLSECURITY_HID_XMLSEC_TP_GENERAL" #define HID_XMLSEC_TP_DETAILS "XMLSECURITY_HID_XMLSEC_TP_DETAILS" diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index b4c8b41fa2bd..3b3d92445dca 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -62,33 +62,34 @@ IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl) return 0; } -MacroSecurity::MacroSecurity( Window* _pParent, const cssu::Reference< cssu::XComponentContext> &_rxCtx, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment ) - :TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROSEC ) ) - ,maTabCtrl ( this, XMLSEC_RES( 1 ) ) - ,maOkBtn ( this, XMLSEC_RES( BTN_OK ) ) - ,maCancelBtn ( this, XMLSEC_RES( BTN_CANCEL ) ) - ,maHelpBtn ( this, XMLSEC_RES( BTN_HELP ) ) - ,maResetBtn ( this, XMLSEC_RES( BTN_RESET ) ) +MacroSecurity::MacroSecurity( Window* _pParent, + const cssu::Reference< cssu::XComponentContext> &_rxCtx, + const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment) + : TabDialog(_pParent, "MacroSecurityDialog", "xmlsec/ui/macrosecuritydialog.ui") + , mxCtx(_rxCtx) + , mxSecurityEnvironment(_rxSecurityEnvironment) { - FreeResource(); + get(m_pTabCtrl, "tabcontrol"); + get(m_pResetBtn, "reset"); + get(m_pOkBtn, "ok"); - mxCtx = _rxCtx; - mxSecurityEnvironment = _rxSecurityEnvironment; + mpLevelTP = new MacroSecurityLevelTP(m_pTabCtrl, this); + mpTrustSrcTP = new MacroSecurityTrustedSourcesTP(m_pTabCtrl, this); - mpLevelTP = new MacroSecurityLevelTP( &maTabCtrl, this ); - mpTrustSrcTP = new MacroSecurityTrustedSourcesTP( &maTabCtrl, this ); + m_nSecLevelId = m_pTabCtrl->GetPageId("SecurityLevelPage"); + m_nSecTrustId = m_pTabCtrl->GetPageId("SecurityTrustPage"); - maTabCtrl.SetTabPage( RID_XMLSECTP_SECLEVEL, mpLevelTP ); - maTabCtrl.SetTabPage( RID_XMLSECTP_TRUSTSOURCES, mpTrustSrcTP ); - maTabCtrl.SetCurPageId( RID_XMLSECTP_SECLEVEL ); + m_pTabCtrl->SetTabPage(m_nSecLevelId, mpLevelTP); + m_pTabCtrl->SetTabPage(m_nSecTrustId, mpTrustSrcTP); + m_pTabCtrl->SetCurPageId(m_nSecLevelId); - maOkBtn.SetClickHdl( LINK( this, MacroSecurity, OkBtnHdl ) ); + m_pOkBtn->SetClickHdl( LINK( this, MacroSecurity, OkBtnHdl ) ); } MacroSecurity::~MacroSecurity() { - delete maTabCtrl.GetTabPage( RID_XMLSECTP_TRUSTSOURCES ); - delete maTabCtrl.GetTabPage( RID_XMLSECTP_SECLEVEL ); + delete m_pTabCtrl->GetTabPage(m_nSecTrustId); + delete m_pTabCtrl->GetTabPage(m_nSecLevelId); } MacroSecurityTP::MacroSecurityTP(Window* _pParent, const OString& rID, diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src index eaece23cc410..21088465724e 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.src +++ b/xmlsecurity/source/dialogs/macrosecurity.src @@ -19,59 +19,6 @@ #include "dialogs.hrc" #include "helpids.hrc" -TabDialog RID_XMLSECTP_MACROSEC -{ - HelpID = HID_XMLSEC_TP_MACROSEC; - Size = MAP_APPFONT( TD_WIDTH, TD_HEIGHT ); - OutputSize = TRUE; - Closeable = TRUE; - Moveable = TRUE; - SVLook = TRUE; - - Text [ en-US ] = "Macro Security"; - TabControl 1 - { - Pos = MAP_APPFONT( TD_SP_INNERBORDER_LEFT, TD_SP_INNERBORDER_TOP ); - Size = MAP_APPFONT( TP_WIDTH, TP_HEIGHT+RIDDER_HEIGHT ); - SVLook = TRUE ; - PageList = - { - PageItem - { - Identifier = RID_XMLSECTP_SECLEVEL; - Text [ en-US ] = "Security Level"; - }; - PageItem - { - Identifier = RID_XMLSECTP_TRUSTSOURCES; - Text [ en-US ] = "Trusted Sources"; - }; - }; - }; - OKButton BTN_OK - { - Pos = MAP_APPFONT( MS_COL_H, CV_ROW_A ); - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - DefButton = TRUE; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT( MS_COL_F, CV_ROW_A ); - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT( MS_COL_D, CV_ROW_A ); - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - }; - PushButton BTN_RESET - { - Pos = MAP_APPFONT( MS_COL_B, CV_ROW_A ); - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - Text [ en-US ] = "Reset"; - }; -}; - String RID_XMLSECTP_READONLY_CONFIG_TIP { Text [ en-US ] = "This setting is protected by the Administrator"; diff --git a/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui b/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui index dd489269d94c..08cc2540b2ee 100644 --- a/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui +++ b/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui @@ -20,6 +20,8 @@ <property name="label">gtk-ok</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="receives_default">True</property> <property name="use_stock">True</property> </object> @@ -59,10 +61,11 @@ </child> <child> <object class="GtkButton" id="reset"> - <property name="label" translatable="yes">~Reset</property> + <property name="label">gtk-revert-to-saved</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> @@ -79,9 +82,11 @@ </packing> </child> <child> - <object class="GtkNotebook" id="notebook1"> + <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <child> <placeholder/> </child> @@ -99,7 +104,7 @@ <placeholder/> </child> <child type="tab"> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="SecurityTrustPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Trusted Sources</property> diff --git a/xmlsecurity/uiconfig/ui/securitylevelpage.ui b/xmlsecurity/uiconfig/ui/securitylevelpage.ui index 9e004dd5a94f..321418c0e7b1 100644 --- a/xmlsecurity/uiconfig/ui/securitylevelpage.ui +++ b/xmlsecurity/uiconfig/ui/securitylevelpage.ui @@ -11,7 +11,8 @@ <child> <object class="GtkRadioButton" id="low:wrap"> <property name="label" translatable="yes">_Low (not recommended). -All macros will be executed without confirmation. Use this setting only if you are certain that all documents that will be opened are safe.</property> +All macros will be executed without confirmation. +Use this setting only if you are certain that all documents that will be opened are safe.</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -49,7 +50,8 @@ Confirmation required before executing macros from untrusted sources.</property> <child> <object class="GtkRadioButton" id="high:wrap"> <property name="label" translatable="yes">H_igh. -Only signed macros from trusted sources are allowed to run. Unsigned macros are disabled.</property> +Only signed macros from trusted sources are allowed to run. +Unsigned macros are disabled.</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -69,7 +71,8 @@ Only signed macros from trusted sources are allowed to run. Unsigned macros are <child> <object class="GtkRadioButton" id="vhigh:wrap"> <property name="label" translatable="yes">_Very high. -Only macros from trusted file locations are allowed to run. All other macros, regardless whether signed or not, are disabled.</property> +Only macros from trusted file locations are allowed to run. +All other macros, regardless whether signed or not, are disabled.</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> |