diff options
Diffstat (limited to 'uui/source')
| -rw-r--r-- | uui/source/iahndl.cxx | 31 | ||||
| -rw-r--r-- | uui/source/ids.hrc | 6 | ||||
| -rw-r--r-- | uui/source/makefile.mk | 10 | ||||
| -rw-r--r-- | uui/source/passcrtdlg.cxx | 123 | ||||
| -rw-r--r-- | uui/source/passcrtdlg.hrc | 75 | ||||
| -rw-r--r-- | uui/source/passcrtdlg.hxx | 107 | ||||
| -rw-r--r-- | uui/source/passcrtdlg.src | 213 | ||||
| -rw-r--r-- | uui/source/passworddlg.cxx | 43 | ||||
| -rw-r--r-- | uui/source/passworddlg.hrc | 6 | ||||
| -rw-r--r-- | uui/source/passworddlg.hxx | 8 | ||||
| -rw-r--r-- | uui/source/passworddlg.src | 102 |
11 files changed, 572 insertions, 152 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index afc7ca92e24c..24863ebbc1a3 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: iahndl.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: sb $ $Date: 2001-08-31 13:08:43 $ + * last change: $Author: mav $ $Date: 2001-10-11 06:55:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,6 +75,9 @@ #ifndef UUI_PASSWORDDLG_HXX #include "passworddlg.hxx" #endif +#ifndef UUI_PASSCRTDLG_HXX +#include "passcrtdlg.hxx" +#endif #ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include "com/sun/star/awt/XWindow.hpp" @@ -1054,13 +1057,27 @@ UUIInteractionHandler::executePasswordDialog(LoginErrorInfo & rInfo, std::auto_ptr< ResMgr > xManager(ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); - std::auto_ptr< MasterPasswordDialog > - xDialog(new MasterPasswordDialog( + if( nMode == star::task::PasswordRequestMode_PASSWORD_CREATE ) + { + std::auto_ptr< MasterPasswordCreateDialog > + xDialog(new MasterPasswordCreateDialog( + getParentProperty(), xManager.get())); + rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : + ERRCODE_BUTTON_CANCEL); + aMaster = rtl::OUStringToOString(xDialog->GetMasterPassword(), + RTL_TEXTENCODING_UTF8); + } + else + { + std::auto_ptr< MasterPasswordDialog > + xDialog(new MasterPasswordDialog( getParentProperty(), nMode, xManager.get())); - rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : + rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL); - aMaster = rtl::OUStringToOString(xDialog->GetMasterPassword(), - RTL_TEXTENCODING_UTF8); + aMaster = rtl::OUStringToOString(xDialog->GetMasterPassword(), + RTL_TEXTENCODING_UTF8); + } + } catch (std::bad_alloc const &) { diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 726f24e0ee85..49e28a8272b9 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -2,9 +2,9 @@ * * $RCSfile: ids.hrc,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: sb $ $Date: 2001-08-31 13:08:43 $ + * last change: $Author: mav $ $Date: 2001-10-11 06:55:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,6 +86,7 @@ #define STR_ERROR_PASSWORD_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 ERRCODE_UUI_IO_ABORT (ERRCODE_AREA_UUI + 0) #define ERRCODE_UUI_IO_ACCESSDENIED (ERRCODE_AREA_UUI + 1) @@ -140,6 +141,7 @@ #define HID_DLG_LOGIN (HID_UUI_START + 0) #define HID_DLG_COOKIES (HID_UUI_START + 1) #define HID_DLG_PASSWORD (HID_UUI_START+2) +#define HID_DLG_PASSWORD_CRT (HID_UUI_START+3) // HID_UUI_END (aka HID_CHAOS_NEW_DATABASE) is reserved in // sfx2/util/hidother.src diff --git a/uui/source/makefile.mk b/uui/source/makefile.mk index e5548dd43104..6348f47ab235 100644 --- a/uui/source/makefile.mk +++ b/uui/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: mav $ $Date: 2001-06-26 13:47:16 $ +# last change: $Author: mav $ $Date: 2001-10-11 06:55:40 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -74,12 +74,14 @@ SLOFILES = \ $(SLO)$/iahndl.obj \ $(SLO)$/logindlg.obj \ $(SLO)$/services.obj \ - $(SLO)$/passworddlg.obj + $(SLO)$/passworddlg.obj \ + $(SLO)$/passcrtdlg.obj SRCFILES = \ cookiedg.src \ ids.src \ logindlg.src \ - passworddlg.src + passworddlg.src \ + passcrtdlg.src .INCLUDE: target.mk diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx new file mode 100644 index 000000000000..cb88836d21a1 --- /dev/null +++ b/uui/source/passcrtdlg.cxx @@ -0,0 +1,123 @@ +/************************************************************************* + * + * $RCSfile: passcrtdlg.cxx,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * + * 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_PASSCRTDLG_HRC +#include <passcrtdlg.hrc> +#endif +#ifndef UUI_PASSCRTDLG_HXX +#include <passcrtdlg.hxx> +#endif + +// MasterPasswordCreateDialog--------------------------------------------------- + +// ----------------------------------------------------------------------- + +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_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 ) +{ + FreeResource(); + + aOKBtn.SetClickHdl( LINK( this, MasterPasswordCreateDialog, OKHdl_Impl ) ); +}; + diff --git a/uui/source/passcrtdlg.hrc b/uui/source/passcrtdlg.hrc new file mode 100644 index 000000000000..241fdbc943b8 --- /dev/null +++ b/uui/source/passcrtdlg.hrc @@ -0,0 +1,75 @@ +/************************************************************************* + * + * $RCSfile: passcrtdlg.hrc,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * + * 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_PASSCRT_HRC +#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 BTN_MASTERPASSCRT_OK 50 +#define BTN_MASTERPASSCRT_CANCEL 51 +#define BTN_MASTERPASSCRT_HELP 52 + +#endif // UUI_PASSCRT_HRC diff --git a/uui/source/passcrtdlg.hxx b/uui/source/passcrtdlg.hxx new file mode 100644 index 000000000000..96461318152b --- /dev/null +++ b/uui/source/passcrtdlg.hxx @@ -0,0 +1,107 @@ +/************************************************************************* + * + * $RCSfile: passcrtdlg.hxx,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * + * 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_PASSCRTDLG_HXX +#define UUI_PASSCRTDLG_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 * ); + +public: + MasterPasswordCreateDialog( Window* pParent, ResMgr * pResMgr ); + + String GetMasterPassword() const { return aEDMasterPasswordCrt.GetText(); } + +private: + ResMgr* pResourceMgr; +}; + +#endif // UUI_PASSCRTDLG_HXX diff --git a/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src new file mode 100644 index 000000000000..a2ce1cf66a68 --- /dev/null +++ b/uui/source/passcrtdlg.src @@ -0,0 +1,213 @@ +/************************************************************************* + * + * $RCSfile: passcrtdlg.src,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ + * + * 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_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 ( 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 ] = "Hoofd~wachtwoord"; + 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"; + }; + 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 ] = "~Confirm master password"; + 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"; + }; + 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 ] = "Saisissez un mot de passe principal."; + Text[ spanish ] = "Introduzca la contrasea principal"; + Text[ finnish ] = "Please enter master password"; + Text[ italian ] = "Digitate la password principale"; + Text[ danish ] = "Please enter master password"; + Text[ swedish ] = "Ange ett huvudlsenord"; + Text[ polish ] = "Wpisz 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 ] = "Passwords are different, please enter again!"; + 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 ] = "入力した２つのﾊﾟｽﾜｰﾄﾞは一致しません。もう一度入力しなおしてください。"; + 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 ecc90ac83473..77894461d6a1 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: passworddlg.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mav $ $Date: 2001-06-26 13:35:41 $ + * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,19 +82,7 @@ IMPL_LINK( MasterPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) { - // todo: compare both passwords and show message box if there are not equal!! - if( nDialogMode != ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE - || aEDMasterPassword.GetText() == aEDMasterPasswordRepeat.GetText() ) - EndDialog( RET_OK ); - else - { - String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, pResourceMgr )); - ErrorBox aErrorBox( this, WB_OK, aErrorMsg ); - aErrorBox.Execute(); - aEDMasterPassword.SetText( String() ); - aEDMasterPasswordRepeat.SetText( String() ); - aEDMasterPassword.GrabFocus(); - } + EndDialog( RET_OK ); return 1; } @@ -109,38 +97,23 @@ MasterPasswordDialog::MasterPasswordDialog ModalDialog( pParent, ResId( DLG_UUI_PASSWORD, pResMgr ) ), - aInfoEnterPassword ( this, ResId( INFO_ENTER_PASSWORD ) ), aFTMasterPassword ( this, ResId( FT_MASTERPASSWORD ) ), aEDMasterPassword ( this, ResId( ED_MASTERPASSWORD ) ), - aFTMasterPasswordRepeat ( this, ResId( FT_MASTERPASSWORD_REPEAT ) ), - aEDMasterPasswordRepeat ( this, ResId( ED_MASTERPASSWORD_REPEAT ) ), aOKBtn ( this, ResId( BTN_MASTERPASSWORD_OK ) ), aCancelBtn ( this, ResId( BTN_MASTERPASSWORD_CANCEL ) ), aHelpBtn ( this, ResId( BTN_MASTERPASSWORD_HELP ) ), nDialogMode ( aDialogMode ), pResourceMgr ( pResMgr ) { - // hide until a help is avalable - aHelpBtn.Hide(); - - if ( nDialogMode != ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE ) + if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER ) { - if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER ) - { - String aErrorMsg( ResId( STR_ERROR_PASSWORD_WRONG, pResourceMgr )); - ErrorBox aErrorBox( this, WB_OK, aErrorMsg ); - aErrorBox.Execute(); - } - - aFTMasterPasswordRepeat.Hide(); - aEDMasterPasswordRepeat.Hide(); - - Size aNewSiz = GetSizePixel(); - aNewSiz.Height() -= 20; - SetSizePixel( aNewSiz ); + String aErrorMsg( ResId( STR_ERROR_PASSWORD_WRONG, pResourceMgr )); + ErrorBox aErrorBox( this, WB_OK, aErrorMsg ); + aErrorBox.Execute(); } FreeResource(); aOKBtn.SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) ); }; + diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc index 8e004e0d665d..d3645c220d42 100644 --- a/uui/source/passworddlg.hrc +++ b/uui/source/passworddlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: passworddlg.hrc,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mav $ $Date: 2001-06-26 13:35:41 $ + * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,8 +63,6 @@ #define UUI_PASSWORD_HRC //============================================================================ -#define INFO_ENTER_PASSWORD 10 - #define FT_MASTERPASSWORD 20 #define ED_MASTERPASSWORD 21 #define FT_MASTERPASSWORD_REPEAT 22 diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index 2d2a119a2ae7..f60c3964d919 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: passworddlg.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mav $ $Date: 2001-06-26 13:35:41 $ + * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,11 +84,8 @@ //============================================================================ class MasterPasswordDialog : public ModalDialog { - FixedText aInfoEnterPassword; FixedText aFTMasterPassword; Edit aEDMasterPassword; - FixedText aFTMasterPasswordRepeat; - Edit aEDMasterPasswordRepeat; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; @@ -107,3 +104,4 @@ private: }; #endif // UUI_PASSWORDDLG_HXX + diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src index 1ae60e635c6b..9dd746317b4c 100644 --- a/uui/source/passworddlg.src +++ b/uui/source/passworddlg.src @@ -2,9 +2,9 @@ * * $RCSfile: passworddlg.src,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2001-09-25 21:03:42 $ + * last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,42 +75,14 @@ ModalDialog DLG_UUI_PASSWORD Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 265 , 100 ) ; - Text = "Bitte Hauptkennwort eingeben"; + Size = MAP_APPFONT ( 265 , 64 ) ; + Text = "Hauptkennwort festlegen"; Text [ English ] = "Please enter master password"; - FixedText INFO_ENTER_PASSWORD - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 185 , 18 ) ; - WordBreak = TRUE ; - Text = "Bitte geben sie ein Hauptkennwort ein oder beenden Sie diesen Dialog mit abbrechen um nicht mit den gespeicherten Passwrtern zu arbeiten" ; - Text [ English ] = "Please enter master password or press cancel to stop working with passwords storage" ; - Text[ english_us ] = "Please enter a master password. Only click 'Cancel' if you do not want to have any passwords stored."; - Text[ portuguese ] = "Indique uma senha principal ou clique em Cancelar para sair desta caixa de dilogo, se no desejar trabalhar com as senhas guardadas."; - Text[ russian ] = " 'OK'. , ''."; - Text[ greek ] = "Please enter master password or press cancel to stop working with passwords storage"; - Text[ dutch ] = "Typ het hoofdwachtwoord of beindig deze dialoog met Annuleren als u niet met de opgeslagen wachtwoorden wilt werken."; - Text[ french ] = "Saisissez un mot de passe principal ou cliquez sur Annuler pour quitter la bote de dialogue si vous ne souhaitez pas enregistrer de mot de passe."; - Text[ spanish ] = "Introduzca por favor una contrasea principal o cierre este dilogo con Cancelar para no trabajar con las contraseas guardadas."; - Text[ finnish ] = "Please enter master password or press cancel to stop working with passwords storage"; - Text[ italian ] = "Digitate la password principale oppure chiudete il dialogo con Annulla per non lavorare con la password registrata."; - Text[ danish ] = "Please enter master password or press cancel to stop working with passwords storage"; - Text[ swedish ] = "Ange ett huvudlsenord eller avsluta den hr dialogrutan med \"Avbryt\" om du inte vill arbeta med de sparade lsenorden"; - Text[ polish ] = "Wpisz haso gwne. Przycisk 'Anuluj' naley klikn tylko wtedy, jeeli hasa nie maj zosta zapisane."; - Text[ portuguese_brazilian ] = "Please enter master password or press cancel to stop working with passwords storage"; - Text[ japanese ] = "ﾏｽﾀｰﾊﾟｽﾜｰﾄﾞを入力してください。あるいは保存したﾊﾟｽﾜｰﾄﾞを設定しないよう［ｷｬﾝｾﾙ］ﾎﾞﾀﾝでこのﾀﾞｲｱﾛｸﾞを閉じてください。"; - Text[ korean ] = "마스터 패스워드를 입력하거나 취소 버튼을 눌러 패스워드 저장 작업을 중지하십시오"; - Text[ chinese_simplified ] = "请输入一个主密码。如不想使用存盘的密码就点击对话框内的取消按钮，关闭这个对话框。"; - Text[ chinese_traditional ] = "請輸入一個主密碼。若不想使用儲存的密碼，就按對話方塊内的取消按鈕，關閉這個對話方塊。"; - Text[ turkish ] = "Please enter master password or press cancel to stop working with passwords storage"; - Text[ arabic ] = "Please enter master password or press cancel to stop working with passwords storage"; - Text[ catalan ] = "Please enter master password or press cancel to stop working with passwords storage"; - }; FixedText FT_MASTERPASSWORD { - Pos = MAP_APPFONT ( 12 , 52 ) ; + Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 71 , 10 ) ; - Text = "Haupkennwort" ; + Text = "Hauptkennwort" ; Text [ English ] = "Master ~password" ; Text[ english_us ] = "Master password"; Text[ portuguese ] = "Senha principal"; @@ -136,41 +108,7 @@ ModalDialog DLG_UUI_PASSWORD Edit ED_MASTERPASSWORD { Border = TRUE ; - Pos = MAP_APPFONT ( 86 , 51 ) ; - Size = MAP_APPFONT ( 94 , 12 ) ; - PassWord = TRUE ; - }; - FixedText FT_MASTERPASSWORD_REPEAT - { - Pos = MAP_APPFONT ( 12 , 72 ) ; - 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 ] = "~Confirm master password"; - 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"; - }; - Edit ED_MASTERPASSWORD_REPEAT - { - Border = TRUE ; - Pos = MAP_APPFONT ( 86 , 71 ) ; + Pos = MAP_APPFONT ( 86 , 26 ) ; Size = MAP_APPFONT ( 94 , 12 ) ; PassWord = TRUE ; }; @@ -213,32 +151,6 @@ ModalDialog DLG_UUI_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 ] = "Passwords are different, please enter again!"; - 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 ] = "入力した２つのﾊﾟｽﾜｰﾄﾞは一致しません。もう一度入力しなおしてください。"; - 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!"; -}; - String STR_ERROR_PASSWORD_WRONG { Text = "Sie haben ein falsches Hauptkennwort eingegeben, bitte noch einmal eingeben!" ; |