diff options
author | Mikhail Voitenko <mav@openoffice.org> | 2002-10-31 10:08:41 +0000 |
---|---|---|
committer | Mikhail Voitenko <mav@openoffice.org> | 2002-10-31 10:08:41 +0000 |
commit | bf9bda898ce9facfb1b41050fe6c043833f87ef8 (patch) | |
tree | fa383086027a014c935267ec595e00f46b7da3b0 | |
parent | 7e8a4211664bcc4325135456d071783330e0f15b (diff) |
#102191# password requests and interaction
-rw-r--r-- | uui/source/iahndl.cxx | 169 | ||||
-rw-r--r-- | uui/source/iahndl.hxx | 27 | ||||
-rw-r--r-- | uui/source/ids.hrc | 20 | ||||
-rw-r--r-- | uui/source/makefile.mk | 9 | ||||
-rw-r--r-- | uui/source/masterpasscrtdlg.cxx | 134 | ||||
-rw-r--r-- | uui/source/masterpasscrtdlg.hrc | 75 | ||||
-rw-r--r-- | uui/source/masterpasscrtdlg.hxx | 109 | ||||
-rw-r--r-- | uui/source/masterpasscrtdlg.src | 190 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.cxx | 119 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.hrc | 75 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.hxx | 107 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.src | 155 | ||||
-rw-r--r-- | uui/source/passcrtdlg.cxx | 52 | ||||
-rw-r--r-- | uui/source/passcrtdlg.hrc | 18 | ||||
-rw-r--r-- | uui/source/passcrtdlg.hxx | 22 | ||||
-rw-r--r-- | uui/source/passcrtdlg.src | 143 | ||||
-rw-r--r-- | uui/source/passworddlg.cxx | 26 | ||||
-rw-r--r-- | uui/source/passworddlg.hrc | 18 | ||||
-rw-r--r-- | uui/source/passworddlg.hxx | 14 | ||||
-rw-r--r-- | uui/source/passworddlg.src | 125 | ||||
-rw-r--r-- | uui/source/passworderrs.src | 127 |
21 files changed, 1416 insertions, 318 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index de564c08c986..76a16c1883d9 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: iahndl.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: mav $ $Date: 2002-10-25 09:04:32 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,6 +72,12 @@ #ifndef UUI_LOGINDLG_HXX #include "logindlg.hxx" #endif +#ifndef UUI_MASTERPASSWORDDLG_HXX +#include "masterpassworddlg.hxx" +#endif +#ifndef UUI_PASSCRTDLG_HXX +#include "masterpasscrtdlg.hxx" +#endif #ifndef UUI_PASSWORDDLG_HXX #include "passworddlg.hxx" #endif @@ -103,6 +109,12 @@ #ifndef _COM_SUN_STAR_TASK_PASSWORDREQUEST_HPP_ #include "com/sun/star/task/PasswordRequest.hpp" #endif +#ifndef _COM_SUN_STAR_TASK_MASTERPASSWORDREQUEST_HPP_ +#include "com/sun/star/task/MasterPasswordRequest.hpp" +#endif +#ifndef _COM_SUN_STAR_TASK_DOCUMENTPASSWORDREQUEST_HPP_ +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#endif #ifndef _COM_SUN_STAR_TASK_XINTERACTIONABORT_HPP_ #include "com/sun/star/task/XInteractionAbort.hpp" #endif @@ -175,6 +187,9 @@ #ifndef _COM_SUN_STAR_DOCUMENT_XINTERACTIONFILTEROPTIONS_HPP_ #include "com/sun/star/document/XInteractionFilterOptions.hpp" #endif +#ifndef _COM_SUN_STAR_TASK_XINTERACTIONPASSWORD_HPP_ +#include "com/sun/star/task/XInteractionPassword.hpp" +#endif #ifndef _COM_SUN_STAR_DOCUMENT_FILTEROPTIONSREQUEST_HPP_ #include "com/sun/star/document/FilterOptionsRequest.hpp" #endif @@ -354,7 +369,8 @@ getContinuations( star::uno::Reference< star::task::XInteractionRetry > * pRetry, star::uno::Reference< star::task::XInteractionAbort > * pAbort, star::uno::Reference< star::ucb::XInteractionSupplyAuthentication > * - pSupplyAuthentication) + pSupplyAuthentication, + star::uno::Reference< star::task::XInteractionPassword > * pPassword) SAL_THROW((star::uno::RuntimeException)) { for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i) @@ -398,6 +414,13 @@ getContinuations( if (pSupplyAuthentication->is()) continue; } + if (pPassword && !pPassword->is()) + { + *pPassword = star::uno::Reference< star::task::XInteractionPassword >( + rContinuations[i], star::uno::UNO_QUERY); + if (pPassword->is()) + continue; + } } } @@ -538,10 +561,27 @@ UUIInteractionHandler::handle( return; } + star::task::MasterPasswordRequest aMasterPasswordRequest; + if (aAnyRequest >>= aMasterPasswordRequest) + { + handleMasterPasswordRequest(aMasterPasswordRequest.Mode, + rRequest->getContinuations()); + return; + } + + star::task::DocumentPasswordRequest aDocumentPasswordRequest; + if (aAnyRequest >>= aDocumentPasswordRequest) + { + handlePasswordRequest(aDocumentPasswordRequest.Mode, + rRequest->getContinuations(), + aDocumentPasswordRequest.Name); + return; + } + star::task::PasswordRequest aPasswordRequest; if (aAnyRequest >>= aPasswordRequest) { - handlePasswordRequest(aPasswordRequest, + handlePasswordRequest(aPasswordRequest.Mode, rRequest->getContinuations()); return; } @@ -1131,9 +1171,9 @@ void UUIInteractionHandler::executeLoginDialog(LoginErrorInfo & rInfo, } void -UUIInteractionHandler::executePasswordDialog(LoginErrorInfo & rInfo, - star::task::PasswordRequestMode - nMode) +UUIInteractionHandler::executeMasterPasswordDialog(LoginErrorInfo & rInfo, + star::task::PasswordRequestMode + nMode) SAL_THROW((star::uno::RuntimeException)) { rtl::OString aMaster; @@ -1192,6 +1232,65 @@ UUIInteractionHandler::executePasswordDialog(LoginErrorInfo & rInfo, } void +UUIInteractionHandler::executePasswordDialog(LoginErrorInfo & rInfo, + star::task::PasswordRequestMode nMode, + ::rtl::OUString aDocName) + SAL_THROW((star::uno::RuntimeException)) +{ + try + { + vos::OGuard aGuard(Application::GetSolarMutex()); + + std::auto_ptr< ResMgr > + xManager(ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); + if( nMode == star::task::PasswordRequestMode_PASSWORD_CREATE ) + { + std::auto_ptr< PasswordCreateDialog > + xDialog(new PasswordCreateDialog( + getParentProperty(), xManager.get())); + + ::rtl::OUString aTitle( xDialog->GetText() ); + if( aDocName.getLength() ) + { + aTitle += ::rtl::OUString::createFromAscii( " [" ); + aTitle += aDocName; + aTitle += ::rtl::OUString::createFromAscii( "]" ); + xDialog->SetText( aTitle ); + } + + rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : + ERRCODE_BUTTON_CANCEL); + rInfo.SetPassword( xDialog->GetPassword() ); + } + else + { + std::auto_ptr< PasswordDialog > + xDialog(new PasswordDialog( + getParentProperty(), nMode, xManager.get())); + + ::rtl::OUString aTitle( xDialog->GetText() ); + if( aDocName.getLength() ) + { + aTitle += ::rtl::OUString::createFromAscii( " [" ); + aTitle += aDocName; + aTitle += ::rtl::OUString::createFromAscii( "]" ); + xDialog->SetText( aTitle ); + } + + rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : + ERRCODE_BUTTON_CANCEL); + rInfo.SetPassword( xDialog->GetPassword() ); + } + } + catch (std::bad_alloc const &) + { + throw star::uno::RuntimeException( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out of memory")), + *this); + } +} + +void UUIInteractionHandler::executeCookieDialog(CntHTTPCookieRequest & rRequest) SAL_THROW((star::uno::RuntimeException)) { @@ -1330,7 +1429,7 @@ UUIInteractionHandler::handleAuthenticationRequest( star::uno::Reference< star::ucb::XInteractionSupplyAuthentication > xSupplyAuthentication; getContinuations( - rContinuations, 0, 0, &xRetry, &xAbort, &xSupplyAuthentication); + rContinuations, 0, 0, &xRetry, &xAbort, &xSupplyAuthentication, 0); bool bRemember; bool bRememberPersistent; if (xSupplyAuthentication.is()) @@ -1504,8 +1603,8 @@ UUIInteractionHandler::handleAuthenticationRequest( } void -UUIInteractionHandler::handlePasswordRequest( - star::task::PasswordRequest const & rRequest, +UUIInteractionHandler::handleMasterPasswordRequest( + star::task::PasswordRequestMode nMode, star::uno::Sequence< star::uno::Reference< star::task::XInteractionContinuation > > const & rContinuations) @@ -1516,9 +1615,12 @@ UUIInteractionHandler::handlePasswordRequest( star::uno::Reference< star::ucb::XInteractionSupplyAuthentication > xSupplyAuthentication; getContinuations( - rContinuations, 0, 0, &xRetry, &xAbort, &xSupplyAuthentication); + rContinuations, 0, 0, &xRetry, &xAbort, &xSupplyAuthentication, 0); LoginErrorInfo aInfo; - executePasswordDialog(aInfo, rRequest.Mode); + + // in case of master password a hash code is returned + executeMasterPasswordDialog(aInfo, nMode); + switch (aInfo.GetResult()) { case ERRCODE_BUTTON_OK: @@ -1542,6 +1644,47 @@ UUIInteractionHandler::handlePasswordRequest( } void +UUIInteractionHandler::handlePasswordRequest( + star::task::PasswordRequestMode nMode, + star::uno::Sequence< star::uno::Reference< + star::task::XInteractionContinuation > > const & + rContinuations, + ::rtl::OUString aDocumentName ) + SAL_THROW((star::uno::RuntimeException)) +{ + star::uno::Reference< star::task::XInteractionRetry > xRetry; + star::uno::Reference< star::task::XInteractionAbort > xAbort; + star::uno::Reference< star::task::XInteractionPassword > + xPassword; + getContinuations( + rContinuations, 0, 0, &xRetry, &xAbort, 0, &xPassword); + LoginErrorInfo aInfo; + + executePasswordDialog(aInfo, nMode, aDocumentName); + + switch (aInfo.GetResult()) + { + case ERRCODE_BUTTON_OK: + if (xPassword.is()) + { + xPassword->setPassword(aInfo.GetPassword()); + xPassword->select(); + } + break; + + case ERRCODE_BUTTON_RETRY: + if (xRetry.is()) + xRetry->select(); + break; + + default: + if (xAbort.is()) + xAbort->select(); + break; + } +} + +void UUIInteractionHandler::handleCookiesRequest( star::ucb::HandleCookiesRequest const & rRequest, star::uno::Sequence< star::uno::Reference< @@ -1987,7 +2130,7 @@ UUIInteractionHandler::handleErrorRequest( star::uno::Reference< star::task::XInteractionRetry > xRetry; star::uno::Reference< star::task::XInteractionAbort > xAbort; getContinuations( - rContinuations, &xApprove, &xDisapprove, &xRetry, &xAbort, 0); + rContinuations, &xApprove, &xDisapprove, &xRetry, &xAbort, 0, 0); // The following mapping uses the bit mask // Approve = 8, // Disapprove = 4, diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 8b1f224d7181..ce5a84e1be45 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: iahndl.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: mav $ $Date: 2002-05-29 15:55:38 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -220,8 +220,14 @@ private: SAL_THROW((com::sun::star::uno::RuntimeException)); void + executeMasterPasswordDialog(LoginErrorInfo & rInfo, + com::sun::star::task::PasswordRequestMode nMode) + SAL_THROW((com::sun::star::uno::RuntimeException)); + + void executePasswordDialog(LoginErrorInfo & rInfo, - com::sun::star::task::PasswordRequestMode nMode) + com::sun::star::task::PasswordRequestMode nMode, + ::rtl::OUString aDocumentName) SAL_THROW((com::sun::star::uno::RuntimeException)); void executeCookieDialog(CntHTTPCookieRequest & rRequest) @@ -250,14 +256,25 @@ private: SAL_THROW((com::sun::star::uno::RuntimeException)); void - handlePasswordRequest( - com::sun::star::task::PasswordRequest const & rRequest, + handleMasterPasswordRequest( + com::sun::star::task::PasswordRequestMode nMode, com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > const & rContinuations) SAL_THROW((com::sun::star::uno::RuntimeException)); + + void + handlePasswordRequest( + com::sun::star::task::PasswordRequestMode nMode, + com::sun::star::uno::Sequence< + com::sun::star::uno::Reference< + com::sun::star::task::XInteractionContinuation > > const & + rContinuations, + ::rtl::OUString aDocumentName = ::rtl::OUString()) + SAL_THROW((com::sun::star::uno::RuntimeException)); + void handleCookiesRequest( com::sun::star::ucb::HandleCookiesRequest const & rRequest, diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index ed50fdce02e5..fe2507be7f18 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -2,9 +2,9 @@ * * $RCSfile: ids.hrc,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: mav $ $Date: 2002-10-25 09:04:33 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,12 +81,15 @@ #define STR_COOKIES_SEND_TITLE (RID_UUI_START + 9) #define DLG_FILTER_SELECT (RID_UUI_START + 10) // RID_UUI_START + 11 moved to ERRCODE_UUI_WRONGMEDIUM -#define DLG_UUI_PASSWORD (RID_UUI_START + 12) +#define DLG_UUI_MASTERPASSWORD (RID_UUI_START + 12) #define STR_ERROR_PASSWORDS_NOT_IDENTICAL (RID_UUI_START + 13) -#define STR_ERROR_PASSWORD_WRONG (RID_UUI_START + 14) +#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_PASSWORD_CRT (RID_UUI_START + 21) +#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_PASSWORD_WRONG (RID_UUI_START + 24) #define ERRCODE_UUI_IO_ABORT (ERRCODE_AREA_UUI + 0) #define ERRCODE_UUI_IO_ACCESSDENIED (ERRCODE_AREA_UUI + 1) @@ -141,11 +144,14 @@ #define HID_DLG_LOGIN (HID_UUI_START + 0) #define HID_DLG_COOKIES (HID_UUI_START + 1) -#define HID_DLG_PASSWORD_UUI (HID_UUI_START+2) -#define HID_DLG_PASSWORD_CRT (HID_UUI_START+3) +#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) // HID_UUI_END (aka HID_CHAOS_NEW_DATABASE) is reserved in // sfx2/util/hidother.src #endif // UUI_IDS_HRC + diff --git a/uui/source/makefile.mk b/uui/source/makefile.mk index 6b0beb6db34b..bbc978117284 100644 --- a/uui/source/makefile.mk +++ b/uui/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: as $ $Date: 2001-11-08 12:07:13 $ +# last change: $Author: mav $ $Date: 2002-10-31 11:08:28 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -74,6 +74,8 @@ SLOFILES = \ $(SLO)$/iahndl.obj \ $(SLO)$/logindlg.obj \ $(SLO)$/services.obj \ + $(SLO)$/masterpassworddlg.obj \ + $(SLO)$/masterpasscrtdlg.obj \ $(SLO)$/passworddlg.obj \ $(SLO)$/passcrtdlg.obj \ $(SLO)$/fltdlg.obj @@ -82,8 +84,11 @@ SRCFILES = \ cookiedg.src \ ids.src \ logindlg.src \ + masterpassworddlg.src \ + masterpasscrtdlg.src \ passworddlg.src \ passcrtdlg.src \ + passworderrs.src \ fltdlg.src .INCLUDE: target.mk diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx new file mode 100644 index 000000000000..11d030803d77 --- /dev/null +++ b/uui/source/masterpasscrtdlg.cxx @@ -0,0 +1,134 @@ +/************************************************************************* + * + * $RCSfile: masterpasscrtdlg.cxx,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2002-10-31 11:08:29 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef _SVT_FILEDLG_HXX +#include <svtools/filedlg.hxx> +#endif +#ifndef _SV_MSGBOX_HXX +#include <vcl/msgbox.hxx> +#endif + +#ifndef UUI_IDS_HRC +#include <ids.hrc> +#endif +#ifndef UUI_MASTERPASSCRTDLG_HRC +#include <masterpasscrtdlg.hrc> +#endif +#ifndef UUI_MASTERPASSCRTDLG_HXX +#include <masterpasscrtdlg.hxx> +#endif + +// MasterPasswordCreateDialog--------------------------------------------------- + +// ----------------------------------------------------------------------- + +IMPL_LINK( MasterPasswordCreateDialog, EditHdl_Impl, Edit *, EMPTYARG ) +{ + aOKBtn.Enable( aEDMasterPasswordCrt.GetText().Len() >= nMinLen ); + return 0; +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( MasterPasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +{ + // compare both passwords and show message box if there are not equal!! + if( aEDMasterPasswordCrt.GetText() == aEDMasterPasswordRepeat.GetText() ) + EndDialog( RET_OK ); + else + { + String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, pResourceMgr )); + ErrorBox aErrorBox( this, WB_OK, aErrorMsg ); + aErrorBox.Execute(); + aEDMasterPasswordCrt.SetText( String() ); + aEDMasterPasswordRepeat.SetText( String() ); + aEDMasterPasswordCrt.GrabFocus(); + } + return 1; +} + +// ----------------------------------------------------------------------- + +MasterPasswordCreateDialog::MasterPasswordCreateDialog +( + Window* pParent, + ResMgr* pResMgr +) : + + ModalDialog( pParent, ResId( DLG_UUI_MASTERPASSWORD_CRT, pResMgr ) ), + + aFTMasterPasswordCrt ( this, ResId( FT_MASTERPASSWORD_CRT ) ), + aEDMasterPasswordCrt ( this, ResId( ED_MASTERPASSWORD_CRT ) ), + aFTMasterPasswordRepeat ( this, ResId( FT_MASTERPASSWORD_REPEAT ) ), + aEDMasterPasswordRepeat ( this, ResId( ED_MASTERPASSWORD_REPEAT ) ), + aOKBtn ( this, ResId( BTN_MASTERPASSCRT_OK ) ), + aCancelBtn ( this, ResId( BTN_MASTERPASSCRT_CANCEL ) ), + aHelpBtn ( this, ResId( BTN_MASTERPASSCRT_HELP ) ), + pResourceMgr ( pResMgr ), + nMinLen(5) +{ + FreeResource(); + + aOKBtn.Enable( sal_False ); + aOKBtn.SetClickHdl( LINK( this, MasterPasswordCreateDialog, OKHdl_Impl ) ); + aEDMasterPasswordCrt.SetModifyHdl( LINK( this, MasterPasswordCreateDialog, EditHdl_Impl ) ); +}; + diff --git a/uui/source/masterpasscrtdlg.hrc b/uui/source/masterpasscrtdlg.hrc new file mode 100644 index 000000000000..54c309a5e00b --- /dev/null +++ b/uui/source/masterpasscrtdlg.hrc @@ -0,0 +1,75 @@ +/************************************************************************* + * + * $RCSfile: masterpasscrtdlg.hrc,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2002-10-31 11:08:31 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef UUI_MASTERPASSCRT_HRC +#define UUI_MASTERPASSCRT_HRC + +//============================================================================ +#define FT_MASTERPASSWORD_CRT 20 +#define ED_MASTERPASSWORD_CRT 21 +#define FT_MASTERPASSWORD_REPEAT 22 +#define ED_MASTERPASSWORD_REPEAT 23 + +#define BTN_MASTERPASSCRT_OK 50 +#define BTN_MASTERPASSCRT_CANCEL 51 +#define BTN_MASTERPASSCRT_HELP 52 + +#endif // UUI_MASTERPASSCRT_HRC diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx new file mode 100644 index 000000000000..d83931b37a33 --- /dev/null +++ b/uui/source/masterpasscrtdlg.hxx @@ -0,0 +1,109 @@ +/************************************************************************* + * + * $RCSfile: masterpasscrtdlg.hxx,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2002-10-31 11:08:31 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef UUI_MASTERPASSCRTDLG_HXX +#define UUI_MASTERPASSCRTDLG_HXX + +#ifndef _COM_SUN_STAR_TASK_PASSWORDREQUESTMODE_HPP +#include <com/sun/star/task/PasswordRequestMode.hpp> +#endif +#ifndef _STDCTRL_HXX +#include <svtools/stdctrl.hxx> +#endif +#ifndef _SV_BUTTON_HXX +#include <vcl/button.hxx> +#endif +#ifndef _SV_DIALOG_HXX +#include <vcl/dialog.hxx> +#endif +#ifndef _SV_EDIT_HXX +#include <vcl/edit.hxx> +#endif +#ifndef _SV_GROUP_HXX +#include <vcl/group.hxx> +#endif + +//============================================================================ +class MasterPasswordCreateDialog : public ModalDialog +{ + FixedText aFTMasterPasswordCrt; + Edit aEDMasterPasswordCrt; + FixedText aFTMasterPasswordRepeat; + Edit aEDMasterPasswordRepeat; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + + + DECL_LINK( OKHdl_Impl, OKButton * ); + DECL_LINK( EditHdl_Impl, Edit * ); + +public: + MasterPasswordCreateDialog( Window* pParent, ResMgr * pResMgr ); + + String GetMasterPassword() const { return aEDMasterPasswordCrt.GetText(); } + +private: + ResMgr* pResourceMgr; + sal_uInt16 nMinLen; +}; + +#endif // UUI_MASTERPASSCRTDLG_HXX diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src new file mode 100644 index 000000000000..44aac0a04731 --- /dev/null +++ b/uui/source/masterpasscrtdlg.src @@ -0,0 +1,190 @@ +/************************************************************************* + * + * $RCSfile: masterpasscrtdlg.src,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2002-10-31 11:08:33 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#define __RSC + +#ifndef UUI_IDS_HRC +#include <ids.hrc> +#endif +#ifndef UUI_MASTERPASSCRTDLG_HRC +#include <masterpasscrtdlg.hrc> +#endif + +ModalDialog DLG_UUI_MASTERPASSWORD_CRT +{ + HelpId = HID_DLG_MASTERPASSWORD_CRT ; + Border = TRUE ; + Moveable = TRUE ; + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 265 , 64 ) ; + Text = "Hauptkennwort festlegen"; + Text [ English ] = "Please enter master password"; + FixedText FT_MASTERPASSWORD_CRT + { + Pos = MAP_APPFONT ( 12 , 17 ) ; + Size = MAP_APPFONT ( 71 , 10 ) ; + Text = "Hauptkennwort" ; + Text [ English ] = "Master ~password" ; + Text[ english_us ] = "Master password"; + Text[ portuguese ] = "Senha principal"; + Text[ russian ] = " "; + Text[ greek ] = "Master ~password"; + Text[ dutch ] = "Hoofdwachtwoord"; + Text[ french ] = "Mot de passe principal"; + Text[ spanish ] = "Contrasea principal"; + Text[ finnish ] = "Master ~password"; + Text[ italian ] = "Password principale"; + Text[ danish ] = "Hovedadgangskode"; + Text[ swedish ] = "Huvudlsenord"; + Text[ polish ] = "Haso gwne"; + Text[ portuguese_brazilian ] = "Master ~password"; + Text[ japanese ] = "マスターパスワード"; + Text[ korean ] = "마스터 패스워드(P)"; + Text[ chinese_simplified ] = "主密码"; + Text[ chinese_traditional ] = "主密碼"; + Text[ turkish ] = "Master ~password"; + Text[ arabic ] = "Master ~password"; + Text[ catalan ] = "Contrasenya ~mestra"; + Text[ thai ] = "Master password"; + }; + Edit ED_MASTERPASSWORD_CRT + { + Border = TRUE ; + Pos = MAP_APPFONT ( 86 , 16 ) ; + Size = MAP_APPFONT ( 94 , 12 ) ; + PassWord = TRUE ; + }; + FixedText FT_MASTERPASSWORD_REPEAT + { + Pos = MAP_APPFONT ( 12 , 37 ) ; + Size = MAP_APPFONT ( 71 , 10 ) ; + Text = "Hauptkennwort ~besttigen" ; + Text [ English ] = "~Confirm master password" ; + Text[ english_us ] = "~Confirm master password"; + Text[ portuguese ] = "~Confirmar senha principal"; + Text[ russian ] = "~ "; + Text[ greek ] = "~Confirm master password"; + Text[ dutch ] = "~Hoofdwachtwoord bevestigen"; + Text[ french ] = "~Confirmer le mot de passe principal"; + Text[ spanish ] = "~Confirmar contrasea principal"; + Text[ finnish ] = "~Confirm master password"; + Text[ italian ] = "~Conferma password principale"; + Text[ danish ] = "~Bekrft hovedadgangskode"; + Text[ swedish ] = "~Bekrfta huvudlsenord"; + Text[ polish ] = "~Potwierd haso gwne"; + Text[ portuguese_brazilian ] = "~Confirm master password"; + Text[ japanese ] = "マスターパスワードの確認(~C)"; + Text[ korean ] = "마스터 패스워드 확인(C)"; + Text[ chinese_simplified ] = "确认主密码(~C)"; + Text[ chinese_traditional ] = "確認主密碼(~C)"; + Text[ turkish ] = "~Confirm master password"; + Text[ arabic ] = "~Confirm master password"; + Text[ catalan ] = "~Verificaci de la contrasenya"; + Text[ thai ] = "~Confirm master password"; + }; + Edit ED_MASTERPASSWORD_REPEAT + { + Border = TRUE ; + Pos = MAP_APPFONT ( 86 , 36 ) ; + Size = MAP_APPFONT ( 94 , 12 ) ; + PassWord = TRUE ; + }; + + OKButton BTN_MASTERPASSCRT_OK + { + Pos = MAP_APPFONT ( 209 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + DefButton = TRUE ; + }; + CancelButton BTN_MASTERPASSCRT_CANCEL + { + Pos = MAP_APPFONT ( 209 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + HelpButton BTN_MASTERPASSCRT_HELP + { + Pos = MAP_APPFONT ( 209 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + Text[ english_us ] = "Enter Master Password"; + Text[ portuguese ] = "Indique a senha principal."; + Text[ russian ] = " "; + Text[ greek ] = "Please enter master password"; + Text[ dutch ] = "Hoofwachtwoord invoeren"; + Text[ french ] = "Dfinition du mot de passe principal"; + Text[ spanish ] = "Determinar la contrasea principal"; + Text[ finnish ] = "Please enter master password"; + Text[ italian ] = "Digitate la password principale"; + Text[ danish ] = "Definer hovedadgangskode"; + Text[ swedish ] = "Definiera huvudlsenord"; + Text[ polish ] = "Zdefiniuj haso gwne"; + Text[ portuguese_brazilian ] = "Please enter master password"; + Text[ japanese ] = "マスターパスワードの指定"; + Text[ korean ] = "마스터 패스워드 정의"; + Text[ chinese_simplified ] = "指定主密码"; + Text[ chinese_traditional ] = "請輸入主密碼"; + Text[ turkish ] = "Please enter master password"; + Text[ arabic ] = "Please enter master password"; + Text[ catalan ] = "Introduu la contrasenya mestra"; + Text[ thai ] = "Enter Master Password"; +}; + diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx new file mode 100644 index 000000000000..34c781f46eb8 --- /dev/null +++ b/uui/source/masterpassworddlg.cxx @@ -0,0 +1,119 @@ +/************************************************************************* + * + * $RCSfile: masterpassworddlg.cxx,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2002-10-31 11:08:34 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef _SVT_FILEDLG_HXX +#include <svtools/filedlg.hxx> +#endif +#ifndef _SV_MSGBOX_HXX +#include <vcl/msgbox.hxx> +#endif + +#ifndef UUI_IDS_HRC +#include <ids.hrc> +#endif +#ifndef UUI_MASTERPASSWORDDLG_HRC +#include <masterpassworddlg.hrc> +#endif +#ifndef UUI_MASTERPASSWORDDLG_HXX +#include <masterpassworddlg.hxx> +#endif + +// MasterPasswordDialog--------------------------------------------------- + +// ----------------------------------------------------------------------- + +IMPL_LINK( MasterPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +{ + EndDialog( RET_OK ); + return 1; +} + +// ----------------------------------------------------------------------- + +MasterPasswordDialog::MasterPasswordDialog +( + Window* pParent, + ::com::sun::star::task::PasswordRequestMode aDialogMode, + ResMgr* pResMgr +) : + + ModalDialog( pParent, ResId( DLG_UUI_MASTERPASSWORD, pResMgr ) ), + + aFTMasterPassword ( this, ResId( FT_MASTERPASSWORD ) ), + aEDMasterPassword ( this, ResId( ED_MASTERPASSWORD ) ), + aOKBtn ( this, ResId( BTN_MASTERPASSWORD_OK ) ), + aCancelBtn ( this, ResId( BTN_MASTERPASSWORD_CANCEL ) ), + aHelpBtn ( this, ResId( BTN_MASTERPASSWORD_HELP ) ), + nDialogMode ( aDialogMode ), + pResourceMgr ( pResMgr ) +{ + if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER ) + { + String aErrorMsg( ResId( STR_ERROR_MASTERPASSWORD_WRONG, pResourceMgr )); + ErrorBox aErrorBox( this, WB_OK, aErrorMsg ); + aErrorBox.Execute(); + } + + FreeResource(); + + aOKBtn.SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) ); +}; + diff --git a/uui/source/masterpassworddlg.hrc b/uui/source/masterpassworddlg.hrc new file mode 100644 index 000000000000..b1c4c8c40e0c --- /dev/null +++ b/uui/source/masterpassworddlg.hrc @@ -0,0 +1,75 @@ +/************************************************************************* + * + * $RCSfile: masterpassworddlg.hrc,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2002-10-31 11:08:36 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef UUI_MASTERPASSWORD_HRC +#define UUI_MASTERPASSWORD_HRC + +//============================================================================ +#define FT_MASTERPASSWORD 20 +#define ED_MASTERPASSWORD 21 +#define FT_MASTERPASSWORD_REPEAT 22 +#define ED_MASTERPASSWORD_REPEAT 23 + +#define BTN_MASTERPASSWORD_OK 50 +#define BTN_MASTERPASSWORD_CANCEL 51 +#define BTN_MASTERPASSWORD_HELP 52 + +#endif // UUI_MASTERPASSWORD_HRC diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx new file mode 100644 index 000000000000..576f7c479973 --- /dev/null +++ b/uui/source/masterpassworddlg.hxx @@ -0,0 +1,107 @@ +/************************************************************************* + * + * $RCSfile: masterpassworddlg.hxx,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2002-10-31 11:08:36 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef UUI_MASTERPASSWORDDLG_HXX +#define UUI_MASTERPASSWORDDLG_HXX + +#ifndef _COM_SUN_STAR_TASK_PASSWORDREQUESTMODE_HPP +#include <com/sun/star/task/PasswordRequestMode.hpp> +#endif +#ifndef _STDCTRL_HXX +#include <svtools/stdctrl.hxx> +#endif +#ifndef _SV_BUTTON_HXX +#include <vcl/button.hxx> +#endif +#ifndef _SV_DIALOG_HXX +#include <vcl/dialog.hxx> +#endif +#ifndef _SV_EDIT_HXX +#include <vcl/edit.hxx> +#endif +#ifndef _SV_GROUP_HXX +#include <vcl/group.hxx> +#endif + +//============================================================================ +class MasterPasswordDialog : public ModalDialog +{ + FixedText aFTMasterPassword; + Edit aEDMasterPassword; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + + + DECL_LINK( OKHdl_Impl, OKButton * ); + +public: + MasterPasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); + + String GetMasterPassword() const { return aEDMasterPassword.GetText(); } + +private: + ::com::sun::star::task::PasswordRequestMode nDialogMode; + ResMgr* pResourceMgr; +}; + +#endif // UUI_MASTERPASSWORDDLG_HXX + diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src new file mode 100644 index 000000000000..b6b4fbb8a262 --- /dev/null +++ b/uui/source/masterpassworddlg.src @@ -0,0 +1,155 @@ +/************************************************************************* + * + * $RCSfile: masterpassworddlg.src,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2002-10-31 11:08:37 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#define __RSC + +#ifndef UUI_IDS_HRC +#include <ids.hrc> +#endif +#ifndef UUI_MASTERPASSWORDDLG_HRC +#include <masterpassworddlg.hrc> +#endif + +ModalDialog DLG_UUI_MASTERPASSWORD +{ + HelpId = HID_DLG_MASTERPASSWORD_UUI; + Border = TRUE ; + Moveable = TRUE ; + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 265 , 64 ) ; + Text = "Hauptkennwort festlegen"; + Text [ English ] = "Please enter master password"; + FixedText FT_MASTERPASSWORD + { + Pos = MAP_APPFONT ( 12 , 27 ) ; + Size = MAP_APPFONT ( 71 , 10 ) ; + Text = "Hauptkennwort" ; + Text [ English ] = "Master ~password" ; + Text[ english_us ] = "Master password"; + Text[ portuguese ] = "Senha principal"; + Text[ russian ] = " "; + Text[ greek ] = "Master ~password"; + Text[ dutch ] = "Hoofdwachtwoord"; + Text[ french ] = "Mot de passe principal"; + Text[ spanish ] = "Contrasea principal"; + Text[ finnish ] = "Master ~password"; + Text[ italian ] = "Password principale"; + Text[ danish ] = "Hovedadgangskode"; + Text[ swedish ] = "Huvudlsenord"; + Text[ polish ] = "Haso gwne"; + Text[ portuguese_brazilian ] = "Master ~password"; + Text[ japanese ] = "マスターパスワード"; + Text[ korean ] = "마스터 패스워드(P)"; + Text[ chinese_simplified ] = "主密码"; + Text[ chinese_traditional ] = "主密碼"; + Text[ turkish ] = "Master ~password"; + Text[ arabic ] = "Master ~password"; + Text[ catalan ] = "Contrasenya ~mestra"; + Text[ thai ] = "รหัสผ่านหลัก"; + }; + Edit ED_MASTERPASSWORD + { + Border = TRUE ; + Pos = MAP_APPFONT ( 86 , 26 ) ; + Size = MAP_APPFONT ( 94 , 12 ) ; + PassWord = TRUE ; + }; + + OKButton BTN_MASTERPASSWORD_OK + { + Pos = MAP_APPFONT ( 209 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + DefButton = TRUE ; + }; + CancelButton BTN_MASTERPASSWORD_CANCEL + { + Pos = MAP_APPFONT ( 209 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + HelpButton BTN_MASTERPASSWORD_HELP + { + Pos = MAP_APPFONT ( 209 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + Text[ english_us ] = "Enter Master Password"; + Text[ portuguese ] = "Indique a senha principal."; + Text[ russian ] = " "; + Text[ greek ] = "Please enter master password"; + Text[ dutch ] = "Hoofwachtwoord invoeren"; + Text[ french ] = "Dfinition du mot de passe principal"; + Text[ spanish ] = "Determinar la contrasea principal"; + Text[ finnish ] = "Please enter master password"; + Text[ italian ] = "Digitate la password principale"; + Text[ danish ] = "Definer hovedadgangskode"; + Text[ swedish ] = "Definiera huvudlsenord"; + Text[ polish ] = "Zdefiniuj haso gwne"; + Text[ portuguese_brazilian ] = "Please enter master password"; + Text[ japanese ] = "マスターパスワードの指定"; + Text[ korean ] = "마스터 패스워드 정의"; + Text[ chinese_simplified ] = "指定主密码"; + Text[ chinese_traditional ] = "輸入主密碼"; + Text[ turkish ] = "Please enter master password"; + Text[ arabic ] = "Please enter master password"; + Text[ catalan ] = "Introduu la contrasenya mestra"; + Text[ thai ] = "ใส่รหัสผ่านหลัก"; +}; + diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx index cb88836d21a1..42699aa9b577 100644 --- a/uui/source/passcrtdlg.cxx +++ b/uui/source/passcrtdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: passcrtdlg.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,30 +76,40 @@ #include <passcrtdlg.hxx> #endif -// MasterPasswordCreateDialog--------------------------------------------------- +#define MAX_PASSWORD_LEN ( (sal_uInt16) 16 ) + +// PasswordCreateDialog--------------------------------------------------- // ----------------------------------------------------------------------- -IMPL_LINK( MasterPasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +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( aEDMasterPasswordCrt.GetText() == aEDMasterPasswordRepeat.GetText() ) + 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(); - aEDMasterPasswordCrt.SetText( String() ); - aEDMasterPasswordRepeat.SetText( String() ); - aEDMasterPasswordCrt.GrabFocus(); + aEDPasswordCrt.SetText( String() ); + aEDPasswordRepeat.SetText( String() ); + aEDPasswordCrt.GrabFocus(); } return 1; } // ----------------------------------------------------------------------- -MasterPasswordCreateDialog::MasterPasswordCreateDialog +PasswordCreateDialog::PasswordCreateDialog ( Window* pParent, ResMgr* pResMgr @@ -107,17 +117,23 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog ModalDialog( pParent, ResId( DLG_UUI_PASSWORD_CRT, pResMgr ) ), - aFTMasterPasswordCrt ( this, ResId( FT_MASTERPASSWORD_CRT ) ), - aEDMasterPasswordCrt ( this, ResId( ED_MASTERPASSWORD_CRT ) ), - aFTMasterPasswordRepeat ( this, ResId( FT_MASTERPASSWORD_REPEAT ) ), - aEDMasterPasswordRepeat ( this, ResId( ED_MASTERPASSWORD_REPEAT ) ), - aOKBtn ( this, ResId( BTN_MASTERPASSCRT_OK ) ), - aCancelBtn ( this, ResId( BTN_MASTERPASSCRT_CANCEL ) ), - aHelpBtn ( this, ResId( BTN_MASTERPASSCRT_HELP ) ), - pResourceMgr ( pResMgr ) + aFTPasswordCrt ( this, ResId( FT_PASSWORD_CRT ) ), + aEDPasswordCrt ( this, ResId( ED_PASSWORD_CRT ) ), + aFTPasswordRepeat ( this, ResId( FT_PASSWORD_REPEAT ) ), + aEDPasswordRepeat ( this, ResId( ED_PASSWORD_REPEAT ) ), + aOKBtn ( this, ResId( BTN_PASSCRT_OK ) ), + aCancelBtn ( this, ResId( BTN_PASSCRT_CANCEL ) ), + aHelpBtn ( this, ResId( BTN_PASSCRT_HELP ) ), + pResourceMgr ( pResMgr ), + nMinLen(5) { FreeResource(); - aOKBtn.SetClickHdl( LINK( this, MasterPasswordCreateDialog, OKHdl_Impl ) ); + aOKBtn.SetClickHdl( LINK( this, PasswordCreateDialog, OKHdl_Impl ) ); + aEDPasswordCrt.SetModifyHdl( LINK( this, PasswordCreateDialog, EditHdl_Impl ) ); + + aOKBtn.Enable( sal_False ); + aEDPasswordCrt.SetMaxTextLen( MAX_PASSWORD_LEN ); + aEDPasswordRepeat.SetMaxTextLen( MAX_PASSWORD_LEN ); }; diff --git a/uui/source/passcrtdlg.hrc b/uui/source/passcrtdlg.hrc index 241fdbc943b8..585f23b69276 100644 --- a/uui/source/passcrtdlg.hrc +++ b/uui/source/passcrtdlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: passcrtdlg.hrc,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,13 +63,13 @@ #define UUI_PASSCRT_HRC //============================================================================ -#define FT_MASTERPASSWORD_CRT 20 -#define ED_MASTERPASSWORD_CRT 21 -#define FT_MASTERPASSWORD_REPEAT 22 -#define ED_MASTERPASSWORD_REPEAT 23 +#define FT_PASSWORD_CRT 20 +#define ED_PASSWORD_CRT 21 +#define FT_PASSWORD_REPEAT 22 +#define ED_PASSWORD_REPEAT 23 -#define BTN_MASTERPASSCRT_OK 50 -#define BTN_MASTERPASSCRT_CANCEL 51 -#define BTN_MASTERPASSCRT_HELP 52 +#define BTN_PASSCRT_OK 50 +#define BTN_PASSCRT_CANCEL 51 +#define BTN_PASSCRT_HELP 52 #endif // UUI_PASSCRT_HRC diff --git a/uui/source/passcrtdlg.hxx b/uui/source/passcrtdlg.hxx index 96461318152b..9dc6e1da919f 100644 --- a/uui/source/passcrtdlg.hxx +++ b/uui/source/passcrtdlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: passcrtdlg.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,26 +82,28 @@ #endif //============================================================================ -class MasterPasswordCreateDialog : public ModalDialog +class PasswordCreateDialog : public ModalDialog { - FixedText aFTMasterPasswordCrt; - Edit aEDMasterPasswordCrt; - FixedText aFTMasterPasswordRepeat; - Edit aEDMasterPasswordRepeat; + FixedText aFTPasswordCrt; + Edit aEDPasswordCrt; + FixedText aFTPasswordRepeat; + Edit aEDPasswordRepeat; OKButton aOKBtn; - CancelButton aCancelBtn; + CancelButton aCancelBtn; HelpButton aHelpBtn; DECL_LINK( OKHdl_Impl, OKButton * ); + DECL_LINK( EditHdl_Impl, Edit * ); public: - MasterPasswordCreateDialog( Window* pParent, ResMgr * pResMgr ); + PasswordCreateDialog( Window* pParent, ResMgr * pResMgr ); - String GetMasterPassword() const { return aEDMasterPasswordCrt.GetText(); } + String GetPassword() const { return aEDPasswordCrt.GetText(); } private: ResMgr* pResourceMgr; + sal_uInt16 nMinLen; }; #endif // UUI_PASSCRTDLG_HXX diff --git a/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src index 8c856c26224d..0bcea4a4ab83 100644 --- a/uui/source/passcrtdlg.src +++ b/uui/source/passcrtdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: passcrtdlg.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2002-09-05 15:07:51 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,146 +75,53 @@ ModalDialog DLG_UUI_PASSWORD_CRT Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 265 , 64 ) ; - Text = "Hauptkennwort festlegen"; - Text [ English ] = "Please enter master password"; - FixedText FT_MASTERPASSWORD_CRT + Size = MAP_APPFONT ( 165 , 67 ) ; + Text = "Kennwort"; + Text [ English ] = "Password"; + FixedText FT_PASSWORD_CRT { - Pos = MAP_APPFONT ( 12 , 17 ) ; - Size = MAP_APPFONT ( 71 , 10 ) ; - Text = "Hauptkennwort" ; - Text [ English ] = "Master ~password" ; - Text[ english_us ] = "Master password"; - Text[ portuguese ] = "Senha principal"; - Text[ russian ] = " "; - Text[ greek ] = "Master ~password"; - Text[ dutch ] = "Hoofdwachtwoord"; - Text[ french ] = "Mot de passe principal"; - Text[ spanish ] = "Contrasea principal"; - Text[ finnish ] = "Master ~password"; - Text[ italian ] = "Password principale"; - Text[ danish ] = "Hovedadgangskode"; - Text[ swedish ] = "Huvudlsenord"; - Text[ polish ] = "Haso gwne"; - Text[ portuguese_brazilian ] = "Master ~password"; - Text[ japanese ] = "マスターパスワード"; - Text[ korean ] = "마스터 패스워드(P)"; - Text[ chinese_simplified ] = "主密码"; - Text[ chinese_traditional ] = "主密碼"; - Text[ turkish ] = "Master ~password"; - Text[ arabic ] = "Master ~password"; - Text[ catalan ] = "Master ~password"; + Pos = MAP_APPFONT ( 6 , 5 ) ; + Size = MAP_APPFONT ( 94 , 10 ) ; + Text = "Kennwort ~festlegen"; + Text [ English ] = "~Enter password" ; }; - Edit ED_MASTERPASSWORD_CRT + Edit ED_PASSWORD_CRT { Border = TRUE ; - Pos = MAP_APPFONT ( 86 , 16 ) ; + Pos = MAP_APPFONT ( 6 , 15 ) ; Size = MAP_APPFONT ( 94 , 12 ) ; PassWord = TRUE ; }; - FixedText FT_MASTERPASSWORD_REPEAT + FixedText FT_PASSWORD_REPEAT { - Pos = MAP_APPFONT ( 12 , 37 ) ; - Size = MAP_APPFONT ( 71 , 10 ) ; - Text = "Hauptkennwort ~besttigen" ; - Text [ English ] = "~Confirm master password" ; - Text[ english_us ] = "~Confirm master password"; - Text[ portuguese ] = "~Confirmar senha principal"; - Text[ russian ] = "~ "; - Text[ greek ] = "~Confirm master password"; - Text[ dutch ] = "~Hoofdwachtwoord bevestigen"; - Text[ french ] = "~Confirmer le mot de passe principal"; - Text[ spanish ] = "~Confirmar contrasea principal"; - Text[ finnish ] = "~Confirm master password"; - Text[ italian ] = "~Conferma password principale"; - Text[ danish ] = "~Bekrft hovedadgangskode"; - Text[ swedish ] = "~Bekrfta huvudlsenord"; - Text[ polish ] = "~Potwierd haso gwne"; - Text[ portuguese_brazilian ] = "~Confirm master password"; - Text[ japanese ] = "マスターパスワードの確認(~C)"; - Text[ korean ] = "마스터 패스워드 확인(C)"; - Text[ chinese_simplified ] = "确认主密码(~C)"; - Text[ chinese_traditional ] = "確認主密碼(~C)"; - Text[ turkish ] = "~Confirm master password"; - Text[ arabic ] = "~Confirm master password"; - Text[ catalan ] = "~Confirm master password"; + Pos = MAP_APPFONT ( 6 , 34 ) ; + Size = MAP_APPFONT ( 94 , 10 ) ; + Text = "Kennwort ~besttigen" ; + Text [ English ] = "~Confirm password" ; }; - Edit ED_MASTERPASSWORD_REPEAT + Edit ED_PASSWORD_REPEAT { Border = TRUE ; - Pos = MAP_APPFONT ( 86 , 36 ) ; + Pos = MAP_APPFONT ( 6 , 44 ) ; Size = MAP_APPFONT ( 94 , 12 ) ; PassWord = TRUE ; }; - OKButton BTN_MASTERPASSCRT_OK + OKButton BTN_PASSCRT_OK { - Pos = MAP_APPFONT ( 209 , 6 ) ; + Pos = MAP_APPFONT ( 109 , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; DefButton = TRUE ; }; - CancelButton BTN_MASTERPASSCRT_CANCEL + CancelButton BTN_PASSCRT_CANCEL { - Pos = MAP_APPFONT ( 209 , 23 ) ; + Pos = MAP_APPFONT ( 109 , 23 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; }; - HelpButton BTN_MASTERPASSCRT_HELP + HelpButton BTN_PASSCRT_HELP { - Pos = MAP_APPFONT ( 209 , 43 ) ; + Pos = MAP_APPFONT ( 109 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; }; - Text[ english_us ] = "Enter Master Password"; - Text[ portuguese ] = "Indique a senha principal."; - Text[ russian ] = " "; - Text[ greek ] = "Please enter master password"; - Text[ dutch ] = "Hoofwachtwoord invoeren"; - Text[ french ] = "Dfinition du mot de passe principal"; - Text[ spanish ] = "Determinar la contrasea principal"; - Text[ finnish ] = "Please enter master password"; - Text[ italian ] = "Digitate la password principale"; - Text[ danish ] = "Definer hovedadgangskode"; - Text[ swedish ] = "Definiera huvudlsenord"; - Text[ polish ] = "Zdefiniuj haso gwne"; - Text[ portuguese_brazilian ] = "Please enter master password"; - Text[ japanese ] = "マスターパスワードの指定"; - Text[ korean ] = "마스터 패스워드 정의"; - Text[ chinese_simplified ] = "指定主密码"; - Text[ chinese_traditional ] = "請輸入主密碼"; - Text[ turkish ] = "Please enter master password"; - Text[ arabic ] = "Please enter master password"; - Text[ catalan ] = "Please enter master password"; }; -String STR_ERROR_PASSWORDS_NOT_IDENTICAL -{ - Text = "Die beiden Kennwrter stimmen nicht berein, bitte noch einmal eingeben!" ; - Text [ English ] = "Passwords are different, please enter again!" ; - Text[ english_us ] = "The passwords do not match. Please enter the password again."; - Text[ portuguese ] = "As senhas no so iguais. Indique-as novamente."; - Text[ russian ] = " . ."; - Text[ greek ] = "Passwords are different, please enter again!"; - Text[ dutch ] = "De beide wachtwoorden komen niet overeen. Nogmaals invoeren!"; - Text[ french ] = "Les deux mots de passe sont diffrents. Rptez la saisie !"; - Text[ spanish ] = "Las dos contraseas no coinciden. Introdzcalas otra vez."; - Text[ finnish ] = "Passwords are different, please enter again!"; - Text[ italian ] = "Le due password non coincidono. Digitate di nuovo la password."; - Text[ danish ] = "De to adgangskoder stemmer ikke overens, prv igen!"; - Text[ swedish ] = "De bda lsenorden stmmer inte verens, mata in lsenordet igen!"; - Text[ polish ] = "Podane hasa nie zgadzaj si! Naley wpisa je ponownie."; - Text[ portuguese_brazilian ] = "Passwords are different, please enter again!"; - Text[ japanese ] = "入力した2つのパスワードは一致しません。もう一度入力しなおしてください。"; - Text[ korean ] = "두 패스워드가 일치하지 않습니다. 다시 입력하십시오!"; - Text[ chinese_simplified ] = "这两个密码不一致,请重新输入密码!"; - Text[ chinese_traditional ] = "這兩個密碼不一致,請重新輸入!"; - Text[ turkish ] = "Passwords are different, please enter again!"; - Text[ arabic ] = "Passwords are different, please enter again!"; - Text[ catalan ] = "Passwords are different, please enter again!"; -}; - - - - - - - - diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 77894461d6a1..fdcddfdf1769 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: passworddlg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,11 +76,11 @@ #include <passworddlg.hxx> #endif -// MasterPasswordDialog--------------------------------------------------- +// PasswordDialog--------------------------------------------------------- // ----------------------------------------------------------------------- -IMPL_LINK( MasterPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) { EndDialog( RET_OK ); return 1; @@ -88,7 +88,7 @@ IMPL_LINK( MasterPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) // ----------------------------------------------------------------------- -MasterPasswordDialog::MasterPasswordDialog +PasswordDialog::PasswordDialog ( Window* pParent, ::com::sun::star::task::PasswordRequestMode aDialogMode, @@ -97,13 +97,13 @@ MasterPasswordDialog::MasterPasswordDialog ModalDialog( pParent, ResId( DLG_UUI_PASSWORD, pResMgr ) ), - aFTMasterPassword ( this, ResId( FT_MASTERPASSWORD ) ), - aEDMasterPassword ( this, ResId( ED_MASTERPASSWORD ) ), - aOKBtn ( this, ResId( BTN_MASTERPASSWORD_OK ) ), - aCancelBtn ( this, ResId( BTN_MASTERPASSWORD_CANCEL ) ), - aHelpBtn ( this, ResId( BTN_MASTERPASSWORD_HELP ) ), - nDialogMode ( aDialogMode ), - pResourceMgr ( pResMgr ) + aFTPassword ( this, ResId( FT_PASSWORD ) ), + aEDPassword ( this, ResId( ED_PASSWORD ) ), + aOKBtn ( this, ResId( BTN_PASSWORD_OK ) ), + aCancelBtn ( this, ResId( BTN_PASSWORD_CANCEL ) ), + aHelpBtn ( this, ResId( BTN_PASSWORD_HELP ) ), + nDialogMode ( aDialogMode ), + pResourceMgr ( pResMgr ) { if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER ) { @@ -114,6 +114,6 @@ MasterPasswordDialog::MasterPasswordDialog FreeResource(); - aOKBtn.SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) ); + aOKBtn.SetClickHdl( LINK( this, PasswordDialog, OKHdl_Impl ) ); }; diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc index d3645c220d42..c8f27ce4be9a 100644 --- a/uui/source/passworddlg.hrc +++ b/uui/source/passworddlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: passworddlg.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,13 +63,13 @@ #define UUI_PASSWORD_HRC //============================================================================ -#define FT_MASTERPASSWORD 20 -#define ED_MASTERPASSWORD 21 -#define FT_MASTERPASSWORD_REPEAT 22 -#define ED_MASTERPASSWORD_REPEAT 23 +#define FT_PASSWORD 20 +#define ED_PASSWORD 21 +#define FT_PASSWORD_REPEAT 22 +#define ED_PASSWORD_REPEAT 23 -#define BTN_MASTERPASSWORD_OK 50 -#define BTN_MASTERPASSWORD_CANCEL 51 -#define BTN_MASTERPASSWORD_HELP 52 +#define BTN_PASSWORD_OK 50 +#define BTN_PASSWORD_CANCEL 51 +#define BTN_PASSWORD_HELP 52 #endif // UUI_PASSWORD_HRC diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index f60c3964d919..6025520dbe8c 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: passworddlg.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,10 +82,10 @@ #endif //============================================================================ -class MasterPasswordDialog : public ModalDialog +class PasswordDialog : public ModalDialog { - FixedText aFTMasterPassword; - Edit aEDMasterPassword; + FixedText aFTPassword; + Edit aEDPassword; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; @@ -94,9 +94,9 @@ class MasterPasswordDialog : public ModalDialog DECL_LINK( OKHdl_Impl, OKButton * ); public: - MasterPasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); + PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); - String GetMasterPassword() const { return aEDMasterPassword.GetText(); } + String GetPassword() const { return aEDPassword.GetText(); } private: ::com::sun::star::task::PasswordRequestMode nDialogMode; diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src index bdcb30217724..b5757d4d7212 100644 --- a/uui/source/passworddlg.src +++ b/uui/source/passworddlg.src @@ -2,9 +2,9 @@ * * $RCSfile: passworddlg.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2001-12-14 19:00:37 $ + * last change: $Author: mav $ $Date: 2002-10-31 11:08:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,128 +75,39 @@ ModalDialog DLG_UUI_PASSWORD Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 265 , 64 ) ; - Text = "Hauptkennwort festlegen"; - Text [ English ] = "Please enter master password"; - FixedText FT_MASTERPASSWORD + Size = MAP_APPFONT ( 165 , 64 ) ; + Text = "Kennwort"; + Text [ English ] = "Password"; + FixedText FT_PASSWORD { - Pos = MAP_APPFONT ( 12 , 27 ) ; - Size = MAP_APPFONT ( 71 , 10 ) ; - Text = "Hauptkennwort" ; - Text [ English ] = "Master ~password" ; - Text[ english_us ] = "Master password"; - Text[ portuguese ] = "Senha principal"; - Text[ russian ] = " "; - Text[ greek ] = "Master ~password"; - Text[ dutch ] = "Hoofdwachtwoord"; - Text[ french ] = "Mot de passe principal"; - Text[ spanish ] = "Contrasea principal"; - Text[ finnish ] = "Master ~password"; - Text[ italian ] = "Password principale"; - Text[ danish ] = "Master ~password"; - Text[ swedish ] = "Huvudlsenord"; - Text[ polish ] = "Haso gwne"; - Text[ portuguese_brazilian ] = "Master ~password"; - Text[ japanese ] = "マスターパスワード"; - Text[ korean ] = "마스터 패스워드(P)"; - Text[ chinese_simplified ] = "主密码"; - Text[ chinese_traditional ] = "主密碼"; - Text[ turkish ] = "Master ~password"; - Text[ arabic ] = "Master ~password"; - Text[ catalan ] = "Master ~password"; + Pos = MAP_APPFONT ( 6 , 5 ) ; + Size = MAP_APPFONT ( 94 , 10 ) ; + Text = "Kennwort festlegen"; + Text [ English ] = "~Enter password"; }; - Edit ED_MASTERPASSWORD + Edit ED_PASSWORD { Border = TRUE ; - Pos = MAP_APPFONT ( 86 , 26 ) ; + Pos = MAP_APPFONT ( 6 , 15 ) ; Size = MAP_APPFONT ( 94 , 12 ) ; PassWord = TRUE ; }; - OKButton BTN_MASTERPASSWORD_OK + OKButton BTN_PASSWORD_OK { - Pos = MAP_APPFONT ( 209 , 6 ) ; + Pos = MAP_APPFONT ( 109 , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; DefButton = TRUE ; }; - CancelButton BTN_MASTERPASSWORD_CANCEL + CancelButton BTN_PASSWORD_CANCEL { - Pos = MAP_APPFONT ( 209 , 23 ) ; + Pos = MAP_APPFONT ( 109 , 23 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; }; - HelpButton BTN_MASTERPASSWORD_HELP + HelpButton BTN_PASSWORD_HELP { - Pos = MAP_APPFONT ( 209 , 43 ) ; + Pos = MAP_APPFONT ( 109 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; }; - Text[ english_us ] = "Enter Master Password"; - Text[ portuguese ] = "Indique a senha principal."; - Text[ russian ] = " "; - Text[ greek ] = "Please enter master password"; - Text[ dutch ] = "Hoofwachtwoord invoeren"; - Text[ french ] = "Dfinition du mot de passe principal"; - Text[ spanish ] = "Determinar la contrasea principal"; - Text[ finnish ] = "Please enter master password"; - Text[ italian ] = "Digitate la password principale"; - Text[ danish ] = "Please enter master password"; - Text[ swedish ] = "Definiera huvudlsenord"; - Text[ polish ] = "Zdefiniuj haso gwne"; - Text[ portuguese_brazilian ] = "Please enter master password"; - Text[ japanese ] = "マスターパスワードの指定"; - Text[ korean ] = "마스터 패스워드 정의"; - Text[ chinese_simplified ] = "指定主密码"; - Text[ chinese_traditional ] = "輸入主密碼"; - Text[ turkish ] = "Please enter master password"; - Text[ arabic ] = "Please enter master password"; - Text[ catalan ] = "Please enter master password"; }; -String STR_ERROR_PASSWORD_WRONG -{ - Text = "Sie haben ein falsches Hauptkennwort eingegeben, bitte noch einmal eingeben!" ; - Text [ English ] = "Wrong Master password was entered, please enter again!" ; - Text[ english_us ] = "An incorrect master password was entered. Please enter it again."; - Text[ portuguese ] = "Senha principal incorrecta. Indique-a de novo."; - Text[ russian ] = " . ."; - Text[ greek ] = "Wrong Master password was entered, please enter again!"; - Text[ dutch ] = "Dit hoofdwachtwoord is niet juist. Nogmaals invoeren!"; - Text[ french ] = "Le mot de passe n'est pas correct ! Rptez la saisie."; - Text[ spanish ] = "Ha introducido una contrasea principal falsa. Introduzca la correcta."; - Text[ finnish ] = "Wrong Master password was entered, please enter again!"; - Text[ italian ] = "La password principale indicata sbagliata; scrivetela di nuovo."; - Text[ danish ] = "Wrong Master password was entered, please enter again!"; - Text[ swedish ] = "Du har matat in ett felaktigt huvudlsenord, mata in ett nytt!"; - Text[ polish ] = "Nieprawidowe haso gwne! Wpisz ponownie!"; - Text[ portuguese_brazilian ] = "Wrong Master password was entered, please enter again!"; - Text[ japanese ] = "入力したマスターパスワードは正しくありません。もう一度入力してください。"; - Text[ korean ] = "잘못된 마스터 패스워드를 입력하였습니다. 다시 입력하십시오!"; - Text[ chinese_simplified ] = "输入的主密码无效。请重复输入密码!"; - Text[ chinese_traditional ] = "輸入的密碼無效,請重新輸入!"; - Text[ turkish ] = "Wrong Master password was entered, please enter again!"; - Text[ arabic ] = "Wrong Master password was entered, please enter again!"; - Text[ catalan ] = "Wrong Master password was entered, please enter again!"; -}; - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src new file mode 100644 index 000000000000..41480643c619 --- /dev/null +++ b/uui/source/passworderrs.src @@ -0,0 +1,127 @@ +/************************************************************************* + * + * $RCSfile: passworderrs.src,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2002-10-31 11:08:41 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#define __RSC + +#ifndef UUI_IDS_HRC +#include <ids.hrc> +#endif + +String STR_ERROR_PASSWORD_WRONG +{ + Text = "Sie haben ein falsches Kennwort eingegeben, bitte noch einmal eingeben!" ; + Text [ English ] = "Wrong password was entered, please enter again!" ; +}; + +String STR_ERROR_MASTERPASSWORD_WRONG +{ + Text = "Sie haben ein falsches Hauptkennwort eingegeben, bitte noch einmal eingeben!" ; + Text [ English ] = "Wrong Master password was entered, please enter again!" ; + Text[ english_us ] = "An incorrect master password was entered. Please enter it again."; + Text[ portuguese ] = "Senha principal incorrecta. Indique-a de novo."; + Text[ russian ] = " . ."; + Text[ greek ] = "Wrong Master password was entered, please enter again!"; + Text[ dutch ] = "Dit hoofdwachtwoord is niet juist. Nogmaals invoeren!"; + Text[ french ] = "Le mot de passe n'est pas correct ! Rptez la saisie."; + Text[ spanish ] = "Ha introducido una contrasea principal falsa. Introduzca la correcta."; + Text[ finnish ] = "Wrong Master password was entered, please enter again!"; + Text[ italian ] = "La password principale indicata sbagliata; scrivetela di nuovo."; + Text[ danish ] = "Du har indtastet en forkert hovedadgangskode, prv igen!"; + Text[ swedish ] = "Du har matat in ett felaktigt huvudlsenord, mata in ett nytt!"; + Text[ polish ] = "Nieprawidowe haso gwne! Wpisz ponownie!"; + Text[ portuguese_brazilian ] = "Wrong Master password was entered, please enter again!"; + Text[ japanese ] = "入力したマスターパスワードは正しくありません。もう一度入力してください。"; + Text[ korean ] = "잘못된 마스터 패스워드를 입력하였습니다. 다시 입력하십시오!"; + Text[ chinese_simplified ] = "输入的主密码无效。请重复输入密码!"; + Text[ chinese_traditional ] = "輸入的密碼無效,請重新輸入!"; + Text[ turkish ] = "Wrong Master password was entered, please enter again!"; + Text[ arabic ] = "Wrong Master password was entered, please enter again!"; + Text[ catalan ] = "La contrasenya mestra s incorrecta, torneu-la a escriure!"; + Text[ thai ] = "ใส่รหัสผ่านหลักไม่ถูกต้อง กรุณาใส่มันอีกครั้ง"; +}; + +String STR_ERROR_PASSWORDS_NOT_IDENTICAL +{ + Text = "Die beiden Kennwrter stimmen nicht berein, bitte noch einmal eingeben!" ; + Text [ English ] = "Passwords are different, please enter again!" ; + Text[ english_us ] = "The passwords do not match. Please enter the password again."; + Text[ portuguese ] = "As senhas no so iguais. Indique-as novamente."; + Text[ russian ] = " . ."; + Text[ greek ] = "Passwords are different, please enter again!"; + Text[ dutch ] = "De beide wachtwoorden komen niet overeen. Nogmaals invoeren!"; + Text[ french ] = "Les deux mots de passe sont diffrents. Rptez la saisie !"; + Text[ spanish ] = "Las dos contraseas no coinciden. Introdzcalas otra vez."; + Text[ finnish ] = "Passwords are different, please enter again!"; + Text[ italian ] = "Le due password non coincidono. Digitate di nuovo la password."; + Text[ danish ] = "De to adgangskoder stemmer ikke overens, prv igen!"; + Text[ swedish ] = "De bda lsenorden stmmer inte verens, mata in lsenordet igen!"; + Text[ polish ] = "Podane hasa nie zgadzaj si! Naley wpisa je ponownie."; + Text[ portuguese_brazilian ] = "Passwords are different, please enter again!"; + Text[ japanese ] = "入力した2つのパスワードは一致しません。もう一度入力しなおしてください。"; + Text[ korean ] = "두 패스워드가 일치하지 않습니다. 다시 입력하십시오!"; + Text[ chinese_simplified ] = "这两个密码不一致,请重新输入密码!"; + Text[ chinese_traditional ] = "這兩個密碼不一致,請重新輸入!"; + Text[ turkish ] = "Passwords are different, please enter again!"; + Text[ arabic ] = "Passwords are different, please enter again!"; + Text[ catalan ] = "Les contrasenyes sn diferents, torneu-les a escriure!"; + Text[ thai ] = "The passwords do not match. Please enter the password again."; +}; + |