diff options
Diffstat (limited to 'uui')
31 files changed, 609 insertions, 510 deletions
diff --git a/uui/prj/d.lst b/uui/prj/d.lst index 30c6f812fd5b..46b0118319fb 100644 --- a/uui/prj/d.lst +++ b/uui/prj/d.lst @@ -7,3 +7,4 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid ..\%__SRC%\lib\iuui.lib %_DEST%\lib%_EXT%\iuui.lib ..\util\uui.xml %_DEST%\xml%_EXT%\uui.xml +..\%__SRC%\misc\uui.component %_DEST%\xml%_EXT%\uui.component diff --git a/uui/source/cookiedg.src b/uui/source/cookiedg.src index 9df0d481d6ae..156da50c160c 100644 --- a/uui/source/cookiedg.src +++ b/uui/source/cookiedg.src @@ -64,18 +64,21 @@ ModalDialog DLG_COOKIES }; RadioButton RB_INFUTURE_SEND { + HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_SEND"; Pos = MAP_APPFONT ( 12 , 171 ) ; Size = MAP_APPFONT ( 52 , 10 ) ; Text [ en-US ] = "~Send" ; }; RadioButton RB_INFUTURE_IGNORE { + HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_IGNORE"; Pos = MAP_APPFONT ( 67 , 171 ) ; Size = MAP_APPFONT ( 52 , 10 ) ; Text [ en-US ] = "I~gnore" ; }; RadioButton RB_INFUTURE_INTERACTIVE { + HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_INTERACTIVE"; Pos = MAP_APPFONT ( 122 , 171 ) ; Size = MAP_APPFONT ( 52 , 10 ) ; Text [ en-US ] = "I~nteractive" ; @@ -90,12 +93,14 @@ ModalDialog DLG_COOKIES }; PushButton BTN_COOKIES_CANCEL { + HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_CANCEL"; Pos = MAP_APPFONT ( 186 , 173 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Ignore" ; }; PushButton BTN_COOKIES_OK { + HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_OK"; Pos = MAP_APPFONT ( 239 , 173 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; DefButton = TRUE ; diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src index 84e27cd1be1f..6e25266e95ed 100644 --- a/uui/source/fltdlg.src +++ b/uui/source/fltdlg.src @@ -53,6 +53,7 @@ ModalDialog DLG_FILTER_SELECT ListBox LB_FILTERS { + HelpID = "uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 19 ) ; Size = MAP_APPFONT ( 182 , 175 ) ; diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 95c2b45749ac..1185dd1eb57d 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -52,7 +52,6 @@ #include "logindlg.hxx" #include "masterpasscrtdlg.hxx" #include "masterpassworddlg.hxx" -#include "passcrtdlg.hxx" #include "passworddlg.hxx" #include "iahndl.hxx" @@ -520,7 +519,8 @@ executePasswordDialog( task::PasswordRequestMode nMode, ::rtl::OUString aDocName, bool bMSCryptoMode, - bool bIsPasswordToModify ) + bool bIsPasswordToModify, + bool bIsSimplePasswordRequest ) SAL_THROW((uno::RuntimeException)) { try @@ -531,21 +531,36 @@ executePasswordDialog( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if( nMode == task::PasswordRequestMode_PASSWORD_CREATE ) { - const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0; // 0 -> allow any length + if (bIsSimplePasswordRequest) + { + std::auto_ptr< PasswordDialog > pDialog( + new PasswordDialog( pParent, nMode, xManager.get(), aDocName, + bIsPasswordToModify, bIsSimplePasswordRequest ) ); + pDialog->SetMinLen(0); + + rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); + rInfo.SetPassword( pDialog->GetPassword() ); + } + else + { + const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0; // 0 -> allow any length - VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create(); - AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify ); - std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp ); + VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create(); + AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify ); + std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp ); - rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); - rInfo.SetPassword( pDialog->GetPasswordToOpen() ); - rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() ); - rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() ); + rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); + rInfo.SetPassword( pDialog->GetPasswordToOpen() ); + rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() ); + rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() ); + } } - else + else // enter password or reenter password { std::auto_ptr< PasswordDialog > pDialog( - new PasswordDialog( pParent, nMode, xManager.get(), aDocName, bIsPasswordToModify ) ); + new PasswordDialog( pParent, nMode, xManager.get(), aDocName, + bIsPasswordToModify, bIsSimplePasswordRequest ) ); + pDialog->SetMinLen(0); rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); rInfo.SetPassword( bIsPasswordToModify ? String() : pDialog->GetPassword() ); @@ -568,7 +583,8 @@ handlePasswordRequest_( rContinuations, ::rtl::OUString aDocumentName, bool bMSCryptoMode, - bool bIsPasswordToModify ) + bool bIsPasswordToModify, + bool bIsSimplePasswordRequest = false ) SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionRetry > xRetry; @@ -583,7 +599,7 @@ handlePasswordRequest_( LoginErrorInfo aInfo; executePasswordDialog( pParent, aInfo, nMode, - aDocumentName, bMSCryptoMode, bIsPasswordToModify ); + aDocumentName, bMSCryptoMode, bIsPasswordToModify, bIsSimplePasswordRequest ); switch (aInfo.GetResult()) { @@ -743,7 +759,8 @@ UUIInteractionHelper::handlePasswordRequest( rRequest->getContinuations(), rtl::OUString(), false /* bool bMSCryptoMode */, - false /* bool bIsPasswordToModify */); + false /* bool bIsPasswordToModify */, + true /* bool bIsSimplePasswordRequest */ ); return true; } diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 0879e3574da3..ee233f5ac9de 100755 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -89,6 +89,7 @@ #include "newerverwarn.hxx" #include "iahndl.hxx" +#include "nameclashdlg.hxx" /** === begin UNO using === **/ using ::com::sun::star::uno::Sequence; @@ -867,8 +868,6 @@ UUIInteractionHelper::handleRequest_impl( if ( handleCertificateValidationRequest( rRequest ) ) return true; -// @@@ Todo #i29340#: activate! -#if 0 ucb::NameClashResolveRequest aNameClashResolveRequest; if (aAnyRequest >>= aNameClashResolveRequest) { @@ -876,7 +875,7 @@ UUIInteractionHelper::handleRequest_impl( rRequest->getContinuations()); return true; } -#endif + if ( handleMasterPasswordRequest( rRequest ) ) return true; @@ -1188,40 +1187,26 @@ executeMessageBox( return aResult; } -// @@@ Todo #i29340#: activate! -#if 0 -enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; - -NameClashResolveDialogResult -executeNameClashResolveDialog( - Window * /*pParent*/, - rtl::OUString const & /*rTargetFolderURL*/, - rtl::OUString const & /*rClashingName*/, - rtl::OUString & /*rProposedNewName*/) +NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParent, + rtl::OUString const & rTargetFolderURL, + rtl::OUString const & rClashingName, + rtl::OUString & rProposedNewName, + bool bAllowOverwrite ) { - // @@@ Todo DV: execute overwrite-rename dialog, deliver result - OSL_ENSURE( false, - "executeNameClashResolveDialog not yet implemented!" ); - return ABORT; -} + std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) ); + if ( !xManager.get() ) + return ABORT; -NameClashResolveDialogResult -executeSimpleNameClashResolveDialog( - Window * /*pParent*/, - rtl::OUString const & /*rTargetFolderURL*/, - rtl::OUString const & /*rClashingName*/, - rtl::OUString & /*rProposedNewName*/) -{ - // @@@ Todo DV: execute rename-only dialog, deliver result - OSL_ENSURE( false, - "executeSimpleNameClashResolveDialog not yet implemented!" ); - return ABORT; + NameClashDialog aDialog( pParent, xManager.get(), rTargetFolderURL, + rClashingName, rProposedNewName, bAllowOverwrite ); + + NameClashResolveDialogResult eResult = (NameClashResolveDialogResult) aDialog.Execute(); + rProposedNewName = aDialog.getNewName(); + return eResult; } -#endif + } // namespace -// @@@ Todo #i29340#: activate! -#if 0 void UUIInteractionHelper::handleNameClashResolveRequest( ucb::NameClashResolveRequest const & rRequest, @@ -1251,18 +1236,12 @@ UUIInteractionHelper::handleNameClashResolveRequest( NameClashResolveDialogResult eResult = ABORT; rtl::OUString aProposedNewName( rRequest.ProposedNewName ); - if ( xReplaceExistingData.is() ) - eResult = executeNameClashResolveDialog( - getParentProperty(), - rRequest.TargetFolderURL, - rRequest.ClashingName, - aProposedNewName); - else - eResult = executeSimpleNameClashResolveDialog( - getParentProperty(), - rRequest.TargetFolderURL, - rRequest.ClashingName, - aProposedNewName); + + eResult = executeSimpleNameClashResolveDialog( getParentProperty(), + rRequest.TargetFolderURL, + rRequest.ClashingName, + aProposedNewName, + xReplaceExistingData.is() ); switch ( eResult ) { @@ -1282,14 +1261,8 @@ UUIInteractionHelper::handleNameClashResolveRequest( "No ReplaceExistingData continuation available!" ); xReplaceExistingData->select(); break; - - default: - OSL_ENSURE( false, "Unknown NameClashResolveDialogResult value. " - "Interaction Request not handled!" ); - break; } } -#endif void UUIInteractionHelper::handleGenericErrorRequest( diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 581099462845..6402653d3bda 100755 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -215,8 +215,6 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); -// @@@ Todo #i29340#: activate! -#if 0 void handleNameClashResolveRequest( com::sun::star::ucb::NameClashResolveRequest const & rRequest, @@ -225,7 +223,6 @@ private: com::sun::star::task::XInteractionContinuation > > const & rContinuations) SAL_THROW((com::sun::star::uno::RuntimeException)); -#endif bool handleMasterPasswordRequest( diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 796186fd5140..c292befb1663 100755..100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -48,13 +48,15 @@ #define DLG_FILTER_SELECT (RID_UUI_START + 10) // RID_UUI_START + 11 moved to ERRCODE_UUI_WRONGMEDIUM #define DLG_UUI_MASTERPASSWORD (RID_UUI_START + 12) +#define DLG_SIMPLE_NAME_CLASH (RID_UUI_START + 13) #define STR_ERROR_PASSWORDS_NOT_IDENTICAL (RID_UUI_START + 13) #define STR_ERROR_MASTERPASSWORD_WRONG (RID_UUI_START + 14) // RID_UUI_START + 15, 16, 17 are misused by syncaccess/source/ui/resids.hrc + #define RID_UUI_ERRHDL (RID_UUI_START + 20) #define DLG_UUI_MASTERPASSWORD_CRT (RID_UUI_START + 21) #define DLG_UUI_PASSWORD (RID_UUI_START + 22) -#define DLG_UUI_PASSWORD_CRT (RID_UUI_START + 23) +#define STR_ERROR_SIMPLE_PASSWORD_WRONG (RID_UUI_START + 23) #define STR_ERROR_PASSWORD_TO_OPEN_WRONG (RID_UUI_START + 24) #define STR_ERROR_PASSWORD_TO_MODIFY_WRONG (RID_UUI_START + 25) #define DLG_UUI_UNKNOWNAUTH (RID_UUI_START + 26) @@ -89,6 +91,11 @@ #define STR_WARNING_BROKENSIGNATURE_TITLE (RID_UUI_START + 55) #define STR_ENTER_PASSWORD_TO_OPEN (RID_UUI_START + 56) #define STR_ENTER_PASSWORD_TO_MODIFY (RID_UUI_START + 57) +#define STR_RENAME_OR_REPLACE (RID_UUI_START + 58) +#define STR_NAME_CLASH_RENAME_ONLY (RID_UUI_START + 59) +#define STR_SAME_NAME_USED (RID_UUI_START + 60) +#define STR_ENTER_SIMPLE_PASSWORD (RID_UUI_START + 61) +#define STR_CONFIRM_SIMPLE_PASSWORD (RID_UUI_START + 62) #define ERRCODE_UUI_IO_ABORT (ERRCODE_AREA_UUI + 0) #define ERRCODE_UUI_IO_ACCESSDENIED (ERRCODE_AREA_UUI + 1) @@ -170,25 +177,26 @@ #define ERRCODE_UUI_SSLWARN_INVALID_1 (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 1) #define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3) -#define HID_DLG_LOGIN (HID_UUI_START + 0) -#define HID_DLG_COOKIES (HID_UUI_START + 1) -#define HID_DLG_MASTERPASSWORD_UUI (HID_UUI_START + 2) -#define HID_DLG_MASTERPASSWORD_CRT (HID_UUI_START + 3) -#define HID_DLG_FILTER_SELECT (HID_UUI_START + 4) -#define HID_DLG_PASSWORD_UUI (HID_UUI_START + 5) -#define HID_DLG_PASSWORD_CRT (HID_UUI_START + 6) -#define HID_DLG_UNKNOWNAUTH_UUI (HID_UUI_START + 7) -#define HID_DLG_SSLWARN_UUI (HID_UUI_START + 8) -#define HID_XMLSECDLG_MACROWARN (HID_UUI_START + 9) -#define HID_DLG_NEWERVERSIONWARNING (HID_UUI_START +10) +#define HID_DLG_LOGIN "UUI_HID_DLG_LOGIN" +#define HID_DLG_COOKIES "UUI_HID_DLG_COOKIES" +#define HID_DLG_MASTERPASSWORD_UUI "UUI_HID_DLG_MASTERPASSWORD_UUI" +#define HID_DLG_MASTERPASSWORD_CRT "UUI_HID_DLG_MASTERPASSWORD_CRT" +#define HID_DLG_FILTER_SELECT "UUI_HID_DLG_FILTER_SELECT" +#define HID_DLG_PASSWORD_UUI "UUI_HID_DLG_PASSWORD_UUI" +#define HID_DLG_PASSWORD_CRT "UUI_HID_DLG_PASSWORD_CRT" +#define HID_DLG_UNKNOWNAUTH_UUI "UUI_HID_DLG_UNKNOWNAUTH_UUI" +#define HID_DLG_SSLWARN_UUI "UUI_HID_DLG_SSLWARN_UUI" +#define HID_XMLSECDLG_MACROWARN "UUI_HID_XMLSECDLG_MACROWARN" +#define HID_DLG_NEWERVERSIONWARNING "UUI_HID_DLG_NEWERVERSIONWARNING" -#define HID_LOGIN_DLG_PATH (HID_UUI_START +11) -#define HID_LOGIN_DLG_BROWSE (HID_UUI_START +12) -#define HID_LOGIN_DLG_USER_NAME (HID_UUI_START +13) -#define HID_LOGIN_DLG_PASSWORD (HID_UUI_START +14) -#define HID_LOGIN_DLG_ACCOUNT (HID_UUI_START +15) -#define HID_LOGIN_DLG_REMEMBER_PASSWORD (HID_UUI_START +16) -#define HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS (HID_UUI_START +17) +#define HID_LOGIN_DLG_PATH "UUI_HID_LOGIN_DLG_PATH" +#define HID_LOGIN_DLG_BROWSE "UUI_HID_LOGIN_DLG_BROWSE" +#define HID_LOGIN_DLG_USER_NAME "UUI_HID_LOGIN_DLG_USER_NAME" +#define HID_LOGIN_DLG_PASSWORD "UUI_HID_LOGIN_DLG_PASSWORD" +#define HID_LOGIN_DLG_ACCOUNT "UUI_HID_LOGIN_DLG_ACCOUNT" +#define HID_LOGIN_DLG_REMEMBER_PASSWORD "UUI_HID_LOGIN_DLG_REMEMBER_PASSWORD" +#define HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS "UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS" +#define HID_DLG_SIMPLE_NAME_CLASH "UUI_HID_DLG_SIMPLE_NAME_CLASH" // HID_UUI_END (aka HID_CHAOS_NEW_DATABASE) is reserved in // sfx2/util/hidother.src diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src index bf6a97c3b0ff..736e0f9ae1df 100755..100644 --- a/uui/source/logindlg.src +++ b/uui/source/logindlg.src @@ -175,20 +175,20 @@ ModalDialog DLG_UUI_LOGIN Size = MAP_APPFONT( 177 , 8 ) ; }; - OKButton BTN_LOGIN_OK + HelpButton BTN_LOGIN_HELP { Pos = MAP_APPFONT( 6 , 227 ) ; Size = MAP_APPFONT( 50 , 14 ) ; - DefButton = TRUE ; }; - CancelButton BTN_LOGIN_CANCEL + OKButton BTN_LOGIN_OK { Pos = MAP_APPFONT( 66 , 227 ) ; Size = MAP_APPFONT( 50 , 14 ) ; + DefButton = TRUE ; }; - HelpButton BTN_LOGIN_HELP + CancelButton BTN_LOGIN_CANCEL { Pos = MAP_APPFONT( 121 , 227 ) ; Size = MAP_APPFONT( 50 , 14 ) ; diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx index ec1317dbd805..39bbfb7d820c 100755..100644 --- a/uui/source/loginerr.hxx +++ b/uui/source/loginerr.hxx @@ -68,7 +68,7 @@ public: const String& GetUserName() const { return m_aUserName; } const String& GetPassword() const { return m_aPassword; } const String& GetPasswordToModify() const { return m_aPasswordToModify; } - const bool IsRecommendToOpenReadonly() const { return m_bRecommendToOpenReadonly; } + bool IsRecommendToOpenReadonly() const { return m_bRecommendToOpenReadonly; } const String& GetPath() const { return m_aPath; } const String& GetErrorText() const { return m_aErrorText; } BOOL GetCanRememberPassword() const { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); } diff --git a/uui/source/makefile.mk b/uui/source/makefile.mk index 5c20e593046a..e09f5c01e967 100644..100755 --- a/uui/source/makefile.mk +++ b/uui/source/makefile.mk @@ -48,7 +48,6 @@ SLOFILES = \ $(SLO)$/masterpasscrtdlg.obj \ $(SLO)$/openlocked.obj \ $(SLO)$/passworddlg.obj \ - $(SLO)$/passcrtdlg.obj \ $(SLO)$/fltdlg.obj \ $(SLO)$/interactionhandler.obj \ $(SLO)$/requeststringresolver.obj \ @@ -60,6 +59,7 @@ SLOFILES = \ $(SLO)$/lockfailed.obj \ $(SLO)$/trylater.obj \ $(SLO)$/newerverwarn.obj \ + $(SLO)$/nameclashdlg.obj \ $(SLO)$/passwordcontainer.obj SRS1NAME=$(TARGET) @@ -71,7 +71,6 @@ SRC1FILES = \ masterpasscrtdlg.src \ openlocked.src \ passworddlg.src \ - passcrtdlg.src \ passworderrs.src \ fltdlg.src \ unknownauthdlg.src\ @@ -81,6 +80,7 @@ SRC1FILES = \ alreadyopen.src\ lockfailed.src\ trylater.src\ + nameclashdlg.src\ newerverwarn.src .INCLUDE: target.mk diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index af2ef194f22e..1622be0b38ab 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -93,7 +93,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog aHelpBtn ( this, ResId( BTN_MASTERPASSCRT_HELP, *pResMgr ) ), pResourceMgr ( pResMgr ), - nMinLen ( 5 ) + nMinLen ( 1 ) { FreeResource(); diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src index 870cc8a2456f..1ed1e9507b96 100644 --- a/uui/source/masterpasscrtdlg.src +++ b/uui/source/masterpasscrtdlg.src @@ -63,6 +63,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT }; Edit ED_MASTERPASSWORD_CRT { + HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT"; Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ; Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; Border = TRUE ; @@ -76,6 +77,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT }; Edit ED_MASTERPASSWORD_REPEAT { + HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT"; Pos = MAP_APPFONT ( COL_0 , ROW_5 ) ; Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; Border = TRUE ; @@ -86,7 +88,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT Pos = MAP_APPFONT ( COL_0 , ROW_6 ) ; Size = MAP_APPFONT ( CTRL_WIDTH , 8*RSC_CD_FIXEDTEXT_HEIGHT ) ; WordBreak = TRUE ; - Text [ en-US ] = "Caution: Make sure you remember the Master Password you have set. If you forget your Master Password, you will be unable to access any of the information protected by it. Passwords are case-sensitive and at least five characters long."; + Text [ en-US ] = "Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case-sensitive."; }; FixedLine FL_CAUTIONTEXT { diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src index c7bc835d92ee..2919a85ab488 100644 --- a/uui/source/masterpassworddlg.src +++ b/uui/source/masterpassworddlg.src @@ -50,6 +50,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD }; Edit ED_MASTERPASSWORD { + HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD:ED_MASTERPASSWORD"; Border = TRUE ; Pos = MAP_APPFONT ( 3 , 17 ) ; Size = MAP_APPFONT ( 169 , 13 ) ; diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx new file mode 100755 index 000000000000..593398d53640 --- /dev/null +++ b/uui/source/nameclashdlg.cxx @@ -0,0 +1,107 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "vcl/msgbox.hxx" +#include "osl/file.hxx" + +#include "ids.hrc" +#include "nameclashdlg.hrc" +#include "nameclashdlg.hxx" + +// NameClashDialog --------------------------------------------------------- + +IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn ) +{ + long nRet = (long) ABORT; + if ( &maBtnRename == pBtn ) + { + nRet = (long) RENAME; + rtl::OUString aNewName = maEDNewName.GetText(); + if ( ( aNewName == maNewName ) || !aNewName.getLength() ) + { + ErrorBox aError( NULL, WB_OK, maSameName ); + aError.Execute(); + return 1; + } + maNewName = aNewName; + } + else if ( &maBtnOverwrite == pBtn ) + nRet = (long) OVERWRITE; + + EndDialog( nRet ); + + return 1; +} + +// ----------------------------------------------------------------------- +NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr, + rtl::OUString const & rTargetFolderURL, + rtl::OUString const & rClashingName, + rtl::OUString const & rProposedNewName, + bool bAllowOverwrite ) + : ModalDialog( pParent, ResId( DLG_SIMPLE_NAME_CLASH, *pResMgr ) ), + maFTMessage ( this, ResId( FT_FILE_EXISTS_WARNING, *pResMgr ) ), + maEDNewName ( this, ResId( EDIT_NEW_NAME, *pResMgr ) ), + maBtnOverwrite ( this, ResId( BTN_OVERWRITE, *pResMgr ) ), + maBtnRename ( this, ResId( BTN_RENAME, *pResMgr ) ), + maBtnCancel ( this, ResId( BTN_CANCEL, *pResMgr ) ), + maBtnHelp ( this, ResId( BTN_HELP, *pResMgr ) ), + maNewName ( rClashingName ) +{ + FreeResource(); + + Link aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) ); + maBtnOverwrite.SetClickHdl( aLink ); + maBtnRename.SetClickHdl( aLink ); + maBtnCancel.SetClickHdl( aLink ); + + String aInfo; + if ( bAllowOverwrite ) + { + aInfo = String( ResId( STR_RENAME_OR_REPLACE, *pResMgr ) ); + } + else + { + aInfo = String( ResId( STR_NAME_CLASH_RENAME_ONLY, *pResMgr ) ); + maBtnOverwrite.Hide(); + } + + rtl::OUString aPath; + if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( rTargetFolderURL, aPath ) ) + aPath = rTargetFolderURL; + + maSameName = String ( ResId( STR_SAME_NAME_USED, *pResMgr ) ); + + aInfo.SearchAndReplaceAscii( "%NAME", rClashingName ); + aInfo.SearchAndReplaceAscii( "%FOLDER", aPath ); + maFTMessage.SetText( aInfo ); + if ( rProposedNewName.getLength() ) + maEDNewName.SetText( rProposedNewName ); + else + maEDNewName.SetText( rClashingName ); +} + diff --git a/uui/source/passcrtdlg.hrc b/uui/source/nameclashdlg.hrc index 5a999aa99209..1bfdc01de5ab 100644..100755 --- a/uui/source/passcrtdlg.hrc +++ b/uui/source/nameclashdlg.hrc @@ -25,19 +25,17 @@ * ************************************************************************/ -#ifndef UUI_PASSCRTDLG_HRC -#define UUI_PASSCRTDLG_HRC +#ifndef UUI_NAMECLASHDLG_HRC +#define UUI_NAMECLASHDLG_HRC -// local identifiers -#define BTN_PASSCRT_CANCEL 1 -#define ED_PASSWORD_CRT 2 -#define FT_PASSWORD_REPEAT 3 -#define FT_PASSWORD_WARNING 4 -#define ED_PASSWORD_REPEAT 5 -#define FL_FIXED_LINE_1 6 -#define BTN_PASSCRT_OK 7 -#define BTN_PASSCRT_HELP 8 -#define FT_PASSWORD_CRT 9 -#define FT_MSPASSWORD_WARNING 10 +//============================================================================ + +#define FT_FILE_EXISTS_WARNING 20 +#define EDIT_NEW_NAME 21 +#define BTN_OVERWRITE 22 +#define BTN_RENAME 23 +#define BTN_CANCEL 24 +#define BTN_HELP 25 + +#endif // UUI_NAMECLASHDLG_HRC -#endif // UUI_PASSCRTDLG_HRC diff --git a/uui/source/passcrtdlg.hxx b/uui/source/nameclashdlg.hxx index 8ad19c59924d..1e234008a229 100644..100755 --- a/uui/source/passcrtdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -25,39 +25,39 @@ * ************************************************************************/ -#ifndef UUI_PASSCRTDLG_HXX -#define UUI_PASSCRTDLG_HXX +#ifndef UUI_NAMECLASHDLG_HXX +#define UUI_NAMECLASHDLG_HXX -#include <com/sun/star/task/PasswordRequestMode.hpp> -#include <svtools/stdctrl.hxx> -#include <vcl/dialog.hxx> -#include <vcl/edit.hxx> -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> +#include "vcl/button.hxx" +#include "vcl/dialog.hxx" +#include "vcl/fixed.hxx" +#include "vcl/edit.hxx" //============================================================================ -class PasswordCreateDialog : public ModalDialog + +enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; + +class NameClashDialog : public ModalDialog { - FixedText aFTPasswordCrt; - Edit aEDPasswordCrt; - FixedText aFTPasswordRepeat; - Edit aEDPasswordRepeat; - FixedText aFTWarning; - FixedLine aFixedLine1; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - - ResMgr* pResourceMgr; - sal_uInt16 nMinLen; - - DECL_LINK( OKHdl_Impl, OKButton * ); - DECL_LINK( EditHdl_Impl, Edit * ); + FixedText maFTMessage; + Edit maEDNewName; + PushButton maBtnOverwrite; + PushButton maBtnRename; + CancelButton maBtnCancel; + HelpButton maBtnHelp; + rtl::OUString maSameName; + rtl::OUString maNewName; -public: - PasswordCreateDialog( Window* pParent, ResMgr * pResMgr, bool bMSCryptoMode = false ); + DECL_LINK( ButtonHdl_Impl, PushButton * ); - String GetPassword() const { return aEDPasswordCrt.GetText(); } +public: + NameClashDialog( Window* pParent, ResMgr* pResMgr, + rtl::OUString const & rTargetFolderURL, + rtl::OUString const & rClashingName, + rtl::OUString const & rProposedNewName, + bool bAllowOverwrite ); + rtl::OUString getNewName() const { return maNewName; } }; -#endif // UUI_PASSCRTDLG_HXX +#endif // UUI_COOKIEDG_HXX + diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src new file mode 100644 index 000000000000..b0e5ab5d15bf --- /dev/null +++ b/uui/source/nameclashdlg.src @@ -0,0 +1,116 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#define __RSC + +#ifndef UUI_IDS_HRC +#include "ids.hrc" +#endif + +#ifndef UUI_NAMECLASHDLG_HRC +#include "nameclashdlg.hrc" +#endif + +#define DLG_WIDTH 250 +#define DLG_HEIGTH 75 +#define BORDER_OFFSET 6 +#define EDIT_HEIGTH 12 +#define BTN_WIDTH 50 +#define BTN_HEIGTH 14 + +ModalDialog DLG_SIMPLE_NAME_CLASH +{ + HelpId = HID_DLG_SIMPLE_NAME_CLASH ; + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGTH ) ; + Moveable = TRUE ; + Text [ en-US ] = "File Exists" ; + + FixedText FT_FILE_EXISTS_WARNING + { + Pos = MAP_APPFONT ( BORDER_OFFSET, BORDER_OFFSET ) ; + Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 4*BORDER_OFFSET ) ; + WordBreak = TRUE ; + }; + + Edit EDIT_NEW_NAME + { + HelpID = "uui:Edit:DLG_SIMPLE_NAME_CLASH:EDIT_NEW_NAME"; + Border = TRUE ; + Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 2*BORDER_OFFSET ) ; + Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET , EDIT_HEIGTH ) ; + }; + + PushButton BTN_OVERWRITE + { + HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_OVERWRITE"; + Pos = MAP_APPFONT ( DLG_WIDTH - 3*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ; + Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ; + TabStop = TRUE ; + Text [ en-US ] = "Replace" ; + }; + + PushButton BTN_RENAME + { + HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_RENAME"; + Pos = MAP_APPFONT ( DLG_WIDTH - 2*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ; + Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ; + TabStop = TRUE ; + Text [ en-US ] = "Rename" ; + DefButton = TRUE ; + }; + + CancelButton BTN_CANCEL + { + Pos = MAP_APPFONT ( DLG_WIDTH - BTN_WIDTH - BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ; + Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ; + TabStop = TRUE ; + }; + + HelpButton BTN_HELP + { + Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ; + Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ; + TabStop = TRUE ; + }; +}; + +String STR_RENAME_OR_REPLACE +{ + Text = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nChoose Replace to overwrite the existing file or provide a new name."; +}; + +String STR_NAME_CLASH_RENAME_ONLY +{ + Text = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nPlease enter a new name."; +}; + +String STR_SAME_NAME_USED +{ + Text = "Please provide a different file name!"; +}; diff --git a/uui/source/newerverwarn.src b/uui/source/newerverwarn.src index 3de289d69baa..94ee6be7db12 100644 --- a/uui/source/newerverwarn.src +++ b/uui/source/newerverwarn.src @@ -66,6 +66,7 @@ ModalDialog RID_DLG_NEWER_VERSION_WARNING }; PushButton PB_UPDATE { + HelpID = "uui:PushButton:RID_DLG_NEWER_VERSION_WARNING:PB_UPDATE"; Pos = MAP_APPFONT ( COL_3 , ROW_3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx deleted file mode 100644 index 1fc6024bcd19..000000000000 --- a/uui/source/passcrtdlg.cxx +++ /dev/null @@ -1,128 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <svtools/filedlg.hxx> -#include <vcl/msgbox.hxx> - -#ifndef UUI_IDS_HRC -#include <ids.hrc> -#endif -#ifndef UUI_PASSCRTDLG_HRC -#include <passcrtdlg.hrc> -#endif -#include <passcrtdlg.hxx> - -// PasswordCreateDialog--------------------------------------------------- - -// ----------------------------------------------------------------------- - -IMPL_LINK( PasswordCreateDialog, EditHdl_Impl, Edit *, EMPTYARG ) -{ - aOKBtn.Enable( aEDPasswordCrt.GetText().Len() >= nMinLen ); - return 0; -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( PasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG ) -{ - // compare both passwords and show message box if there are not equal!! - if( aEDPasswordCrt.GetText() == aEDPasswordRepeat.GetText() ) - EndDialog( RET_OK ); - else - { - String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr )); - ErrorBox aErrorBox( this, WB_OK, aErrorMsg ); - aErrorBox.Execute(); - aEDPasswordCrt.SetText( String() ); - aEDPasswordRepeat.SetText( String() ); - aEDPasswordCrt.GrabFocus(); - } - return 1; -} - -// ----------------------------------------------------------------------- - -PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr, bool bMSCryptoMode) - :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD_CRT, *pResMgr ) ) - ,aFTPasswordCrt ( this, ResId( FT_PASSWORD_CRT, *pResMgr ) ) - ,aEDPasswordCrt ( this, ResId( ED_PASSWORD_CRT, *pResMgr ) ) - ,aFTPasswordRepeat ( this, ResId( FT_PASSWORD_REPEAT, *pResMgr ) ) - ,aEDPasswordRepeat ( this, ResId( ED_PASSWORD_REPEAT, *pResMgr ) ) - ,aFTWarning ( this, ResId( bMSCryptoMode ? FT_MSPASSWORD_WARNING : FT_PASSWORD_WARNING, *pResMgr ) ) - ,aFixedLine1 ( this, ResId( FL_FIXED_LINE_1, *pResMgr ) ) - ,aOKBtn ( this, ResId( BTN_PASSCRT_OK, *pResMgr ) ) - ,aCancelBtn ( this, ResId( BTN_PASSCRT_CANCEL, *pResMgr ) ) - ,aHelpBtn ( this, ResId( BTN_PASSCRT_HELP, *pResMgr ) ) - ,pResourceMgr ( pResMgr ) - ,nMinLen(1) // if it should be changed for ODF, it must stay 1 for bMSCryptoMode -{ - FreeResource(); - - aOKBtn.SetClickHdl( LINK( this, PasswordCreateDialog, OKHdl_Impl ) ); - aEDPasswordCrt.SetModifyHdl( LINK( this, PasswordCreateDialog, EditHdl_Impl ) ); - - aOKBtn.Enable( sal_False ); - - if ( bMSCryptoMode ) - { - aEDPasswordCrt.SetMaxTextLen( 15 ); - aEDPasswordRepeat.SetMaxTextLen( 15 ); - } - - long nLabelWidth = aFTWarning.GetSizePixel().Width(); - long nLabelHeight = aFTWarning.GetSizePixel().Height(); - long nTextWidth = aFTWarning.GetCtrlTextWidth( aFTWarning.GetText() ); - long nTextHeight = aFTWarning.GetTextHeight(); - - Rectangle aLabelRect( aFTWarning.GetPosPixel(), aFTWarning.GetSizePixel() ); - Rectangle aRect = aFTWarning.GetTextRect( aLabelRect, aFTWarning.GetText() ); - - long nNewLabelHeight = 0; - for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight; - nNewLabelHeight < aRect.GetHeight(); - nNewLabelHeight += nTextHeight ) {} ; - - long nDelta = nNewLabelHeight - nLabelHeight; - - Size aNewDlgSize = GetSizePixel(); - aNewDlgSize.Height() += nDelta; - SetSizePixel( aNewDlgSize ); - - Size aNewWarningSize = aFTWarning.GetSizePixel(); - aNewWarningSize.Height() = nNewLabelHeight; - aFTWarning.SetPosSizePixel( aFTWarning.GetPosPixel(), aNewWarningSize ); - - Window* pControls[] = { &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn }; - const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] ); - for ( int i = 0; i < nCCount; ++i ) - { - Point aNewPos =(*pControls[i]).GetPosPixel(); - aNewPos.Y() += nDelta; - pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() ); - } -} diff --git a/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src deleted file mode 100644 index a74752ed589e..000000000000 --- a/uui/source/passcrtdlg.src +++ /dev/null @@ -1,108 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define __RSC - -#ifndef UUI_IDS_HRC -#include <ids.hrc> -#endif -#ifndef UUI_PASSCRTDLG_HRC -#include "passcrtdlg.hrc" -#endif - -ModalDialog DLG_UUI_PASSWORD_CRT -{ - HelpId = HID_DLG_PASSWORD_CRT ; - Border = TRUE ; - Moveable = TRUE ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT( 145, 129 ); - FixedText FT_PASSWORD_CRT - { - Pos = MAP_APPFONT( 3, 4 ); - Size = MAP_APPFONT( 139, 9 ); - Text [ en-US ] = "Enter password"; - }; - Edit ED_PASSWORD_CRT - { - Border = TRUE ; - Pos = MAP_APPFONT( 3, 17 ); - Size = MAP_APPFONT( 139, 13 ); - PassWord = TRUE ; - }; - Edit ED_PASSWORD_REPEAT - { - Border = TRUE ; - Pos = MAP_APPFONT( 3, 47 ); - Size = MAP_APPFONT( 139, 13 ); - PassWord = TRUE ; - }; - OKButton BTN_PASSCRT_OK - { - Pos = MAP_APPFONT( 27, 110 ); - Size = MAP_APPFONT( 37, 15 ); - DefButton = TRUE ; - }; - CancelButton BTN_PASSCRT_CANCEL - { - Pos = MAP_APPFONT( 66, 110 ); - Size = MAP_APPFONT( 37, 15 ); - }; - HelpButton BTN_PASSCRT_HELP - { - Pos = MAP_APPFONT( 105, 110 ); - Size = MAP_APPFONT( 37, 15 ); - }; - FixedText FT_PASSWORD_REPEAT - { - Pos = MAP_APPFONT( 3, 34 ); - Size = MAP_APPFONT( 139, 9 ); - Text [ en-US ] = "Reenter password"; - }; - FixedText FT_PASSWORD_WARNING - { - Pos = MAP_APPFONT( 4, 64 ); - Size = MAP_APPFONT( 137, 40 ); - Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive."; - WordBreak = TRUE; - }; - FixedText FT_MSPASSWORD_WARNING - { - Pos = MAP_APPFONT( 4, 64 ); - Size = MAP_APPFONT( 137, 40 ); - Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive and at most fifteen characters long."; - WordBreak = TRUE; - }; - FixedLine FL_FIXED_LINE_1 - { - Pos = MAP_APPFONT( 0, 104 ); - Size = MAP_APPFONT( 145, 6 ); - }; - Text [ en-US ] = "Enter Password"; -}; - diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index c89184f54bc1..348d2f833e15 100755..100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -25,67 +25,119 @@ * ************************************************************************/ +#include "passworddlg.hxx" +#include "passworddlg.hrc" +#include "ids.hrc" + #include <svtools/filedlg.hxx> #include <vcl/msgbox.hxx> -#ifndef UUI_IDS_HRC -#include <ids.hrc> -#endif -#ifndef UUI_PASSWORDDLG_HRC -#include <passworddlg.hrc> -#endif -#include <passworddlg.hxx> -// PasswordDialog--------------------------------------------------------- +using namespace ::com::sun::star; + // ----------------------------------------------------------------------- -IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +static void lcl_Move( Window &rWin, long nOffset ) { - EndDialog( RET_OK ); - return 1; + Point aTmp( rWin.GetPosPixel() ); + aTmp.Y() += nOffset; + rWin.SetPosPixel( aTmp ); } // ----------------------------------------------------------------------- PasswordDialog::PasswordDialog( Window* _pParent, - ::com::sun::star::task::PasswordRequestMode nDlgMode, + task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, rtl::OUString& aDocURL, - bool bOpenToModify ) + bool bOpenToModify, + bool bIsSimplePasswordRequest ) :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD, *pResMgr ) ) ,aFTPassword( this, ResId( FT_PASSWORD, *pResMgr )) ,aEDPassword( this, ResId( ED_PASSWORD, *pResMgr )) + ,aFTConfirmPassword( this, ResId( FT_CONFIRM_PASSWORD, *pResMgr )) + ,aEDConfirmPassword( this, ResId( ED_CONFIRM_PASSWORD, *pResMgr )) ,aOKBtn ( this, ResId( BTN_PASSWORD_OK, *pResMgr )) ,aCancelBtn ( this, ResId( BTN_PASSWORD_CANCEL, *pResMgr )) ,aHelpBtn ( this, ResId( BTN_PASSWORD_HELP, *pResMgr )) ,aFixedLine1( this, ResId( FL_FIXED_LINE_1, *pResMgr )) + ,nMinLen(1) + ,aPasswdMismatch( ResId( STR_PASSWORD_MISMATCH, *pResMgr )) ,nDialogMode( nDlgMode ) ,pResourceMgr ( pResMgr ) { - if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER ) + if( nDialogMode == task::PasswordRequestMode_PASSWORD_REENTER ) { - USHORT nErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG; + const USHORT nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG; + const USHORT nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId; String aErrorMsg( ResId( nErrStrId, *pResourceMgr )); - ErrorBox aErrorBox( _pParent, WB_OK, aErrorMsg ); + ErrorBox aErrorBox( this, WB_OK, aErrorMsg ); aErrorBox.Execute(); } + // default settings for enter password or reenter passwd... + String aTitle( ResId( STR_TITLE_ENTER_PASSWORD, *pResourceMgr ) ); + aFTConfirmPassword.Hide(); + aEDConfirmPassword.Hide(); + aFTConfirmPassword.Enable( FALSE ); + aEDConfirmPassword.Enable( FALSE ); + + // settings for create password + if (nDialogMode == task::PasswordRequestMode_PASSWORD_CREATE) + { + aTitle = String( ResId( STR_TITLE_CREATE_PASSWORD, *pResourceMgr ) ); + + aFTConfirmPassword.SetText( String( ResId( STR_CONFIRM_SIMPLE_PASSWORD, *pResourceMgr ) ) ); + + aFTConfirmPassword.Show(); + aEDConfirmPassword.Show(); + aFTConfirmPassword.Enable( TRUE ); + aEDConfirmPassword.Enable( TRUE ); + } + else + { + // shrink dialog by size of hidden controls and move rest up accordingly + + long nDelta = aFixedLine1.GetPosPixel().Y() - aFTConfirmPassword.GetPosPixel().Y(); + + lcl_Move( aFixedLine1, -nDelta ); + lcl_Move( aOKBtn, -nDelta ); + lcl_Move( aCancelBtn, -nDelta ); + lcl_Move( aHelpBtn, -nDelta ); + + Size aNewDlgSize = GetSizePixel(); + aNewDlgSize.Height() -= nDelta; + SetSizePixel( aNewDlgSize ); + } + + SetText( aTitle ); + USHORT nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN; aFTPassword.SetText( String( ResId( nStrId, *pResourceMgr ) ) ); + aFTPassword.SetText( aFTPassword.GetText() + aDocURL ); + if (bIsSimplePasswordRequest) + { + DBG_ASSERT( aDocURL.getLength() == 0, "A simple password request should not have a document URL! Use document password request instead." ); + aFTPassword.SetText( String( ResId( STR_ENTER_SIMPLE_PASSWORD, *pResourceMgr ) ) ); + } FreeResource(); - aFTPassword.SetText( aFTPassword.GetText() + aDocURL ); - aOKBtn.SetClickHdl( LINK( this, PasswordDialog, OKHdl_Impl ) ); - long nLabelWidth = aFTPassword.GetSizePixel().Width(); - long nLabelHeight = aFTPassword.GetSizePixel().Height(); - long nTextWidth = aFTPassword.GetCtrlTextWidth( aFTPassword.GetText() ); - long nTextHeight = aFTPassword.GetTextHeight(); + + // + // move controls down by extra height needed for aFTPassword + // (usually only needed if a URL was provided) + // + + long nLabelWidth = aFTPassword.GetSizePixel().Width(); + long nLabelHeight = aFTPassword.GetSizePixel().Height(); + long nTextWidth = aFTPassword.GetCtrlTextWidth( aFTPassword.GetText() ); + long nTextHeight = aFTPassword.GetTextHeight(); Rectangle aLabelRect( aFTPassword.GetPosPixel(), aFTPassword.GetSizePixel() ); Rectangle aRect = aFTPassword.GetTextRect( aLabelRect, aFTPassword.GetText() ); @@ -105,13 +157,31 @@ PasswordDialog::PasswordDialog( aNewLabelSize.Height() = nNewLabelHeight; aFTPassword.SetPosSizePixel( aFTPassword.GetPosPixel(), aNewLabelSize ); - Window* pControls[] = { &aEDPassword, &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn }; - const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] ); - for ( int i = 0; i < nCCount; ++i ) + lcl_Move( aEDPassword, nDelta ); + lcl_Move( aFTConfirmPassword, nDelta ); + lcl_Move( aEDConfirmPassword, nDelta ); + lcl_Move( aFixedLine1, nDelta ); + lcl_Move( aOKBtn, nDelta ); + lcl_Move( aCancelBtn, nDelta ); + lcl_Move( aHelpBtn, nDelta ); +} + + +IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +{ + bool bEDPasswdValid = aEDPassword.GetText().Len() >= nMinLen; + bool bPasswdMismatch = aEDConfirmPassword.GetText() != aEDPassword.GetText(); + bool bValid = (!aEDConfirmPassword.IsVisible() && bEDPasswdValid) || + (aEDConfirmPassword.IsVisible() && bEDPasswdValid && !bPasswdMismatch); + + if (aEDConfirmPassword.IsVisible() && bPasswdMismatch) { - Point aNewPos =(*pControls[i]).GetPosPixel(); - aNewPos.Y() += nDelta; - pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() ); + ErrorBox aErrorBox( this, WB_OK, aPasswdMismatch ); + aErrorBox.Execute(); } + else if (bValid) + EndDialog( RET_OK ); + return 1; } + diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc index ad7517b7a62b..e9a8bb5b5b04 100644 --- a/uui/source/passworddlg.hrc +++ b/uui/source/passworddlg.hrc @@ -29,12 +29,18 @@ #define PASSWORDDLG_HRC // local identifiers -#define BTN_PASSWORD_OK 1 -#define ED_PASSWORD 2 -#define FT_PASSWORD 3 -#define FL_FIXED_LINE_1 4 -#define BTN_PASSWORD_HELP 5 -#define BTN_PASSWORD_CANCEL 6 +#define BTN_PASSWORD_OK 1 +#define ED_PASSWORD 2 +#define FT_PASSWORD 3 +#define FT_CONFIRM_PASSWORD 4 +#define ED_CONFIRM_PASSWORD 5 +#define FL_FIXED_LINE_1 6 +#define BTN_PASSWORD_HELP 7 +#define BTN_PASSWORD_CANCEL 8 + +#define STR_TITLE_CREATE_PASSWORD 9 +#define STR_TITLE_ENTER_PASSWORD 10 +#define STR_PASSWORD_MISMATCH 11 #endif // PASSWORDDLG_HRC diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index fe5fe7f2ef84..b94dbab82444 100755..100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -37,21 +37,28 @@ #include <vcl/fixed.hxx> //============================================================================ + class PasswordDialog : public ModalDialog { FixedText aFTPassword; Edit aEDPassword; + FixedText aFTConfirmPassword; + Edit aEDConfirmPassword; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; FixedLine aFixedLine1; + USHORT nMinLen; + String aPasswdMismatch; DECL_LINK( OKHdl_Impl, OKButton * ); public: - PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, bool bOpenToModify = false ); + PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, + bool bOpenToModify = false, bool bIsSimplePasswordRequest = false ); + void SetMinLen( USHORT nMin ) { nMinLen = nMin; } String GetPassword() const { return aEDPassword.GetText(); } private: @@ -60,3 +67,4 @@ private: }; #endif // PASSWORDDLG_HXX + diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src index 33767057e1bd..41c90dfabcab 100755..100644 --- a/uui/source/passworddlg.src +++ b/uui/source/passworddlg.src @@ -41,48 +41,63 @@ ModalDialog DLG_UUI_PASSWORD Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT( 145, 91 ); - Text [ en-US ] = "Enter password"; + Size = MAP_APPFONT( 165, 95 ); FixedText FT_PASSWORD { - Pos = MAP_APPFONT( 3, 4 ); - Size = MAP_APPFONT( 139, 28 ); + Pos = MAP_APPFONT( 3, 6 ); + Size = MAP_APPFONT( 159, 8 ); WordBreak = TRUE; }; Edit ED_PASSWORD { - Pos = MAP_APPFONT( 3, 51 ); - Size = MAP_APPFONT( 139, 13 ); + HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD"; + Pos = MAP_APPFONT( 3, 17 ); + Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; PassWord = TRUE ; }; - FixedLine FL_FIXED_LINE_1 + FixedText FT_CONFIRM_PASSWORD { - Pos = MAP_APPFONT( 0, 66 ); - Size = MAP_APPFONT( 145, 6 ); + Pos = MAP_APPFONT( 3, 34 ); + Size = MAP_APPFONT( 159, 8 ); + WordBreak = TRUE; }; - OKButton BTN_PASSWORD_OK + Edit ED_CONFIRM_PASSWORD { - Pos = MAP_APPFONT( 27, 72 ); - Size = MAP_APPFONT( 37, 15 ); - DefButton = TRUE ; - DefButton = TRUE; + HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_CONFIRM_PASSWORD"; + Pos = MAP_APPFONT( 3, 45 ); + Size = MAP_APPFONT( 159, 12 ); + Border = TRUE ; + PassWord = TRUE ; }; - CancelButton BTN_PASSWORD_CANCEL + FixedLine FL_FIXED_LINE_1 { - Pos = MAP_APPFONT( 66, 72 ); - Size = MAP_APPFONT( 37, 15 ); + Pos = MAP_APPFONT( 0, 63 ); + Size = MAP_APPFONT( 165, 8 ); }; HelpButton BTN_PASSWORD_HELP { - Pos = MAP_APPFONT( 105, 72 ); - Size = MAP_APPFONT( 37, 15 ); + Pos = MAP_APPFONT( 3, 76 ); + Size = MAP_APPFONT( 50, 14 ); + }; + + OKButton BTN_PASSWORD_OK + { + Pos = MAP_APPFONT( 59, 76 ); + Size = MAP_APPFONT( 50, 14 ); + DefButton = TRUE ; + }; + + CancelButton BTN_PASSWORD_CANCEL + { + Pos = MAP_APPFONT( 112, 76 ); + Size = MAP_APPFONT( 50, 14 ); }; String STR_ENTER_PASSWORD_TO_OPEN @@ -94,5 +109,30 @@ ModalDialog DLG_UUI_PASSWORD { Text [ en-US ] = "Enter password to modify file: \n"; }; + + String STR_ENTER_SIMPLE_PASSWORD + { + Text [ en-US ] = "Enter password: "; + }; + + String STR_CONFIRM_SIMPLE_PASSWORD + { + Text [ en-US ] = "Confirm password: "; + }; + + String STR_TITLE_CREATE_PASSWORD + { + Text [ en-US ] = "Set Password"; + }; + + String STR_TITLE_ENTER_PASSWORD + { + Text [ en-US ] = "Enter Password"; + }; + + String STR_PASSWORD_MISMATCH + { + Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ; + }; }; diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src index 91b244ae543e..3d4307ad4f80 100755..100644 --- a/uui/source/passworderrs.src +++ b/uui/source/passworderrs.src @@ -43,7 +43,12 @@ String STR_ERROR_PASSWORD_TO_MODIFY_WRONG String STR_ERROR_MASTERPASSWORD_WRONG { - Text [ en-US ] = "The wrong Master Password has been entered. %PRODUCTNAME could not access web login information protected by Master Password.\n\nNote: Passwords are case-sensitive and at least five characters long."; + Text [ en-US ] = "The master password is incorrect."; +}; + +String STR_ERROR_SIMPLE_PASSWORD_WRONG +{ + Text [ en-US ] = "The password is incorrect."; }; String STR_ERROR_PASSWORDS_NOT_IDENTICAL diff --git a/uui/source/secmacrowarnings.src b/uui/source/secmacrowarnings.src index 6d0039da7746..f19694054281 100644 --- a/uui/source/secmacrowarnings.src +++ b/uui/source/secmacrowarnings.src @@ -74,6 +74,7 @@ ModalDialog RID_XMLSECDLG_MACROWARN }; PushButton PB_VIEWSIGNS { + HelpID = "uui:PushButton:RID_XMLSECDLG_MACROWARN:PB_VIEWSIGNS"; Pos = MAP_APPFONT( MW_COL_3, MW_ROW_2 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "View Signatures..."; @@ -87,6 +88,7 @@ ModalDialog RID_XMLSECDLG_MACROWARN }; CheckBox CB_ALWAYSTRUST { + HelpID = "uui:CheckBox:RID_XMLSECDLG_MACROWARN:CB_ALWAYSTRUST"; Pos = MAP_APPFONT( MW_COL_1, MW_ROW_4 ); Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Always trust macros from this source"; diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 95d4d65b6faf..4ceb59c4c389 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -41,49 +41,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -namespace { - -sal_Bool writeInfo( void * pRegistryKey, - const OUString & rImplementationName, - Sequence< OUString > const & rServiceNames ) -{ - OUString aKeyName( OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); - - Reference< XRegistryKey > xKey; - try - { - xKey = static_cast< XRegistryKey * >( - pRegistryKey )->createKey( aKeyName ); - } - catch ( InvalidRegistryException const & ) - { - } - - if ( !xKey.is() ) - { - return sal_False; - } - sal_Bool bSuccess = sal_True; - - for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) - { - try - { - xKey->createKey( rServiceNames[ n ] ); - } - catch ( InvalidRegistryException const & ) - { - bSuccess = sal_False; - break; - } - } - return bSuccess; -} - -} // namespace - //============================================================================ // // component_getImplementationEnvironment @@ -99,43 +56,6 @@ component_getImplementationEnvironment(sal_Char const ** pEnvTypeName, //============================================================================ // -// component_writeInfo -// -//============================================================================ - -extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void * pRegistryKey) -{ - return pRegistryKey && - - ////////////////////////////////////////////////////////////////////// - // UUI Interaction Handler. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - OUString::createFromAscii( - UUIInteractionHandler::m_aImplementationName ), - UUIInteractionHandler::getSupportedServiceNames_static() ) && - - ////////////////////////////////////////////////////////////////////// - // UUI Interaction Request String Resolver. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - OUString::createFromAscii( - UUIInteractionRequestStringResolver::m_aImplementationName ), - UUIInteractionRequestStringResolver::getSupportedServiceNames_static() ) && - - ////////////////////////////////////////////////////////////////////// - // UUI Password Container Interaction Handler. - ////////////////////////////////////////////////////////////////////// - - writeInfo( pRegistryKey, - uui::PasswordContainerInteractionHandler::getImplementationName_Static(), - uui::PasswordContainerInteractionHandler::getSupportedServiceNames_Static() ); -} - -//============================================================================ -// // component_getFactory // //============================================================================ diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src index acae9453a971..cbcdeef3a8b1 100644 --- a/uui/source/sslwarndlg.src +++ b/uui/source/sslwarndlg.src @@ -41,7 +41,6 @@ ModalDialog DLG_UUI_SSLWARN Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - Pos = MAP_APPFONT( 221, 158 ); Size = MAP_APPFONT( DLG_WIDTH, DLG_HEIGHT ); Text [ en-US ] = "Security Warning: "; @@ -59,6 +58,7 @@ ModalDialog DLG_UUI_SSLWARN PushButton PB_VIEW__CERTIFICATE { + HelpID = "uui:PushButton:DLG_UUI_SSLWARN:PB_VIEW__CERTIFICATE"; Pos = MAP_APPFONT( DLG_CTLBTN_CERT_START_X, DLG_CTLBTN_START_Y ); Size = MAP_APPFONT( DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); @@ -77,6 +77,7 @@ ModalDialog DLG_UUI_SSLWARN PushButton PB_OK { + HelpID = "uui:PushButton:DLG_UUI_SSLWARN:PB_OK"; Pos = MAP_APPFONT( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); diff --git a/uui/source/unknownauthdlg.src b/uui/source/unknownauthdlg.src index d20a28a00704..37613939565e 100644 --- a/uui/source/unknownauthdlg.src +++ b/uui/source/unknownauthdlg.src @@ -62,6 +62,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH PushButton PB_VIEW__CERTIFICATE { + HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_VIEW__CERTIFICATE"; Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP + DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_GROUP_Y ); Size = MAP_APPFONT( 70, RSC_CD_PUSHBUTTON_HEIGHT ); @@ -80,6 +81,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH PushButton PB_OK { + HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_OK"; Pos = MAP_APPFONT( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); @@ -96,6 +98,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH RadioButton RB_ACCEPT_1 { + HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_ACCEPT_1"; Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y ); Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT ); @@ -106,6 +109,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH RadioButton RB_DONTACCEPT_2 { + HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_DONTACCEPT_2"; Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT ); diff --git a/uui/util/makefile.mk b/uui/util/makefile.mk index 163a7bb5502e..8a77e71b5e8d 100644 --- a/uui/util/makefile.mk +++ b/uui/util/makefile.mk @@ -62,3 +62,11 @@ RESLIB1SRSFILES = \ $(SRS)$/source.srs .INCLUDE: target.mk + +ALLTAR : $(MISC)/uui.component + +$(MISC)/uui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + uui.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt uui.component diff --git a/uui/util/uui.component b/uui/util/uui.component new file mode 100644 index 000000000000..0a15ad6eb8e5 --- /dev/null +++ b/uui/util/uui.component @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation + name="com.sun.star.comp.uui.PasswordContainerInteractionHandler"> + <service name="com.sun.star.task.PasswordContainerInteractionHandler"/> + </implementation> + <implementation name="com.sun.star.comp.uui.UUIInteractionHandler"> + <service name="com.sun.star.configuration.backend.InteractionHandler"/> + <service name="com.sun.star.task.InteractionHandler"/> + <service name="com.sun.star.uui.InteractionHandler"/> + </implementation> + <implementation + name="com.sun.star.comp.uui.UUIInteractionRequestStringResolver"> + <service name="com.sun.star.task.InteractionRequestStringResolver"/> + </implementation> +</component> |