Tag: cws_src680_evo2fixes User: mmeeks Date: 06/02/20 05:04:34 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx /dba/dbaccess/source/ui/inc/ dsntypes.hxx /dba/dbaccess/source/ui/misc/ dbumiscres.hrc, dbumiscres.src, dsntypes.cxx
Log: Issue number: i#62138# Submitted by: mmeeks Reviewed by: fr Add Evo G/W, LDAP backends to UI. File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.15&r2=1.15.40.1 Delta lines: +40 -24 --------------------- --- dbwizsetup.cxx 21 Dec 2005 13:36:41 -0000 1.15 +++ dbwizsetup.cxx 20 Feb 2006 13:04:30 -0000 1.15.40.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbwizsetup.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.40.1 $ * - * last change: $Author: obo $ $Date: 2005/12/21 13:36:41 $ + * last change: $Author: mmeeks $ $Date: 2006/02/20 13:04:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -242,11 +242,13 @@ #define OUTLOOK_PATH 14 #define MOZILLA_PATH 15 #define EVOLUTION_PATH 16 -#define KAB_PATH 17 -#define THUNDERBIRD_PATH 18 -#define CREATENEW_PATH 19 -#define USERDEFINED_PATH 20 -#define OPEN_DOC_PATH 21 +#define EVOLUTION_PATH_GROUPWISE 17 +#define EVOLUTION_PATH_LDAP 18 +#define KAB_PATH 19 +#define THUNDERBIRD_PATH 20 +#define CREATENEW_PATH 21 +#define USERDEFINED_PATH 22 +#define OPEN_DOC_PATH 23 OFinalDBPageSetup* pFinalPage; @@ -394,6 +396,16 @@ else declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_EVOLUTION_GROUPWISE)) + declarePath( EVOLUTION_PATH_GROUPWISE, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + else + declarePath( EVOLUTION_PATH_GROUPWISE, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + + if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LDAP)) + declarePath( EVOLUTION_PATH_LDAP, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + else + declarePath( EVOLUTION_PATH_LDAP, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_KAB)) declarePath( KAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); else @@ -540,6 +552,8 @@ { DST_MOZILLA, MOZILLA_PATH }, { DST_THUNDERBIRD, THUNDERBIRD_PATH }, { DST_EVOLUTION, EVOLUTION_PATH }, + { DST_EVOLUTION_GROUPWISE, EVOLUTION_PATH_GROUPWISE }, + { DST_EVOLUTION_LDAP, EVOLUTION_PATH_LDAP }, { DST_KAB, KAB_PATH }, { DST_USERDEFINE1, USERDEFINED_PATH }, { DST_USERDEFINE2, USERDEFINED_PATH }, @@ -613,6 +627,8 @@ { case DST_KAB: case DST_EVOLUTION: + case DST_EVOLUTION_GROUPWISE: + case DST_EVOLUTION_LDAP: case DST_OUTLOOK: case DST_OUTLOOKEXP: case DST_MOZILLA: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dsntypes.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dsntypes.hxx?r1=1.20&r2=1.20.42.1 Delta lines: +7 -5 ------------------- --- dsntypes.hxx 19 Dec 2005 17:17:46 -0000 1.20 +++ dsntypes.hxx 20 Feb 2006 13:04:31 -0000 1.20.42.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.20.42.1 $ * - * last change: $Author: obo $ $Date: 2005/12/19 17:17:46 $ + * last change: $Author: mmeeks $ $Date: 2006/02/20 13:04:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,8 +76,10 @@ DST_OUTLOOK = 15, DST_OUTLOOKEXP = 16, DST_EVOLUTION = 17, - DST_KAB = 18, - DST_EMBEDDED = 19, + DST_EVOLUTION_GROUPWISE = 18, + DST_EVOLUTION_LDAP = 19, + DST_KAB = 20, + DST_EMBEDDED = 21, DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dbumiscres.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dbumiscres.hrc?r1=1.8&r2=1.8.44.1 Delta lines: +9 -7 ------------------- --- dbumiscres.hrc 19 Dec 2005 17:18:00 -0000 1.8 +++ dbumiscres.hrc 20 Feb 2006 13:04:31 -0000 1.8.44.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.hrc,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.44.1 $ * - * last change: $Author: obo $ $Date: 2005/12/19 17:18:00 $ + * last change: $Author: mmeeks $ $Date: 2006/02/20 13:04:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,9 +55,11 @@ #define STR_OUTLOOK 14 #define STR_OUTLOOKEXP 15 #define STR_EVOLUTION 16 -#define STR_KAB 17 -#define STR_EMBEDDED 18 -#define STR_THUNDERBIRD 19 +#define STR_EVOLUTION_GROUPWISE 17 +#define STR_EVOLUTION_LDAP 18 +#define STR_KAB 19 +#define STR_EMBEDDED 20 +#define STR_THUNDERBIRD 21 #define STR_END STR_THUNDERBIRD + 1 File [changed]: dbumiscres.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dbumiscres.src?r1=1.70&r2=1.70.44.1 Delta lines: +24 -6 -------------------- --- dbumiscres.src 19 Dec 2005 17:18:13 -0000 1.70 +++ dbumiscres.src 20 Feb 2006 13:04:32 -0000 1.70.44.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.src,v $ * - * $Revision: 1.70 $ + * $Revision: 1.70.44.1 $ * - * last change: $Author: obo $ $Date: 2005/12/19 17:18:13 $ + * last change: $Author: mmeeks $ $Date: 2006/02/20 13:04:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -109,7 +109,15 @@ }; String STR_EVOLUTION { - Text ="sdbc:address:evolution"; + Text ="sdbc:address:evolution:local"; + }; + String STR_EVOLUTION_GROUPWISE + { + Text ="sdbc:address:evolution:groupwise"; + }; + String STR_EVOLUTION_LDAP + { + Text ="sdbc:address:evolution:ldap"; }; String STR_KAB { @@ -201,8 +209,18 @@ }; String STR_EVOLUTION { - Text [ de ] = "Evolution Adressbuch"; - Text[ en-US ] = "Evolution Address Book"; + Text [ de ] = "Evolution Local Adressbuch"; + Text[ en-US ] = "Evolution Local"; + }; + String STR_EVOLUTION_GROUPWISE + { + Text [ de ] = "Groupwise Adressbuch"; + Text[ en-US ] = "Groupwise"; + }; + String STR_EVOLUTION_LDAP + { + Text [ de ] = "Evolution LDAP Adressbuch"; + Text[ en-US ] = "Evolution LDAP"; }; String STR_KAB { File [changed]: dsntypes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsntypes.cxx?r1=1.28&r2=1.28.40.1 Delta lines: +18 -8 -------------------- --- dsntypes.cxx 19 Dec 2005 17:18:27 -0000 1.28 +++ dsntypes.cxx 20 Feb 2006 13:04:32 -0000 1.28.40.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.28.40.1 $ * - * last change: $Author: obo $ $Date: 2005/12/19 17:18:27 $ + * last change: $Author: mmeeks $ $Date: 2006/02/20 13:04:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -387,6 +387,8 @@ case DST_OUTLOOKEXP: case DST_FLAT: case DST_EVOLUTION: + case DST_EVOLUTION_GROUPWISE: + case DST_EVOLUTION_LDAP: case DST_KAB: case DST_THUNDERBIRD: case DST_CALC: @@ -433,6 +435,8 @@ case DST_OUTLOOKEXP: case DST_JDBC: case DST_EVOLUTION: + case DST_EVOLUTION_GROUPWISE: + case DST_EVOLUTION_LDAP: case DST_KAB: bEnableBrowseButton = FALSE; break; @@ -474,6 +478,8 @@ case DST_MOZILLA: case DST_THUNDERBIRD: case DST_EVOLUTION: + case DST_EVOLUTION_GROUPWISE: + case DST_EVOLUTION_LDAP: case DST_KAB: case DST_OUTLOOK: case DST_OUTLOOKEXP: //???? @@ -551,7 +557,11 @@ return DST_OUTLOOK; if (_rDsn.EqualsIgnoreCaseAscii("outlookexp", nSeparator,_rDsn.Len() - nSeparator)) return DST_OUTLOOKEXP; - if (_rDsn.EqualsIgnoreCaseAscii("evolution", nSeparator,_rDsn.Len() - nSeparator)) + if (_rDsn.EqualsIgnoreCaseAscii("evolution:ldap", nSeparator,_rDsn.Len() - nSeparator)) + return DST_EVOLUTION_LDAP; + if (_rDsn.EqualsIgnoreCaseAscii("evolution:groupwise", nSeparator,_rDsn.Len() - nSeparator)) + return DST_EVOLUTION_GROUPWISE; + if (_rDsn.EqualsIgnoreCaseAscii("evolution:local", nSeparator,_rDsn.Len() - nSeparator)) return DST_EVOLUTION; if (_rDsn.EqualsIgnoreCaseAscii("kab", nSeparator,_rDsn.Len() - nSeparator)) return DST_KAB; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
