Tag: cws_src680_macaddressbook01 User: msicotte Date: 2007-07-08 19:08:16+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx dba/dbaccess/source/ui/dlg/ConnectionPage.cxx dba/dbaccess/source/ui/dlg/DriverSettings.cxx dba/dbaccess/source/ui/dlg/dbwiz.cxx dba/dbaccess/source/ui/dlg/dbwizsetup.cxx dba/dbaccess/source/ui/inc/dsntypes.hxx dba/dbaccess/source/ui/misc/dbumiscres.hrc dba/dbaccess/source/ui/misc/dbumiscres.src
Log: #i77591# initial commit File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.41&r2=1.41.22.1 Delta lines: +5 -5 ------------------- --- AppController.cxx 2007-05-09 13:24:34+0000 1.41 +++ AppController.cxx 2007-07-08 19:08:12+0000 1.41.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.41.22.1 $ * - * last change: $Author: kz $ $Date: 2007/05/09 13:24:34 $ + * last change: $Author: msicotte $ $Date: 2007/07/08 19:08:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -785,7 +785,7 @@ if ( aReturn.bEnabled ) { DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); - aReturn.bEnabled = DST_EMBEDDED != eType && DST_MOZILLA != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType; + aReturn.bEnabled = DST_EMBEDDED != eType && DST_MOZILLA != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_MACAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType; } break; case SID_DB_APP_DSCONNECTION_TYPE: @@ -801,7 +801,7 @@ if ( aReturn.bEnabled ) { DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); - aReturn.bEnabled = DST_EMBEDDED != eType && DST_LDAP != eType && DST_CALC != eType && DST_MOZILLA != eType && DST_THUNDERBIRD != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType; + aReturn.bEnabled = DST_EMBEDDED != eType && DST_LDAP != eType && DST_CALC != eType && DST_MOZILLA != eType && DST_THUNDERBIRD != eType && DST_EVOLUTION != eType && DST_KAB != eType && DST_MACAB != eType && DST_OUTLOOK != eType && DST_OUTLOOKEXP != eType; } break; case SID_DB_APP_CONVERTTOVIEW: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: AdvancedPageDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx?r1=1.12&r2=1.12.24.1 Delta lines: +4 -3 ------------------- --- AdvancedPageDlg.cxx 2007-05-10 10:20:50+0000 1.12 +++ AdvancedPageDlg.cxx 2007-07-08 19:08:13+0000 1.12.24.1 @@ -4,9 +4,9 @@ * * $RCSfile: AdvancedPageDlg.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.24.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:20:50 $ + * last change: $Author: msicotte $ $Date: 2007/07/08 19:08:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -145,6 +145,7 @@ case DST_THUNDERBIRD: case DST_EVOLUTION: case DST_KAB: + case DST_MACAB: case DST_OUTLOOK: case DST_OUTLOOKEXP: break; File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.18&r2=1.18.24.1 Delta lines: +4 -3 ------------------- --- ConnectionPage.cxx 2007-05-10 10:21:36+0000 1.18 +++ ConnectionPage.cxx 2007-07-08 19:08:13+0000 1.18.24.1 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.24.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:21:36 $ + * last change: $Author: msicotte $ $Date: 2007/07/08 19:08:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -304,6 +304,7 @@ case DST_OUTLOOKEXP: case DST_EVOLUTION: case DST_KAB: + case DST_MACAB: m_aFT_Connection.SetText(String(ModuleRes(STR_NO_ADDITIONAL_SETTINGS))); { String sText = m_aFT_Connection.GetText(); File [changed]: DriverSettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.cxx?r1=1.7&r2=1.7.68.1 Delta lines: +6 -3 ------------------- --- DriverSettings.cxx 2006-12-13 16:48:37+0000 1.7 +++ DriverSettings.cxx 2007-07-08 19:08:13+0000 1.7.68.1 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.68.1 $ * - * last change: $Author: kz $ $Date: 2006/12/13 16:48:37 $ + * last change: $Author: msicotte $ $Date: 2007/07/08 19:08:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -160,6 +160,9 @@ case DST_KAB: _rDetailsIds.push_back(DSID_DOSLINEENDS); break; + case DST_MACAB: + _rDetailsIds.push_back(DSID_DOSLINEENDS); + break; case DST_OUTLOOK: _rDetailsIds.push_back(DSID_DOSLINEENDS); break; File [changed]: dbwiz.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwiz.cxx?r1=1.14&r2=1.14.24.1 Delta lines: +6 -3 ------------------- --- dbwiz.cxx 2007-05-10 10:24:58+0000 1.14 +++ dbwiz.cxx 2007-07-08 19:08:13+0000 1.14.24.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbwiz.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.14.24.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:24:58 $ + * last change: $Author: msicotte $ $Date: 2007/07/08 19:08:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -183,6 +183,7 @@ case DST_OUTLOOKEXP: case DST_EVOLUTION: case DST_KAB: + case DST_MACAB: enableButtons(WZB_NEXT,sal_False); enableButtons(WZB_FINISH,sal_True); break; @@ -207,6 +208,7 @@ case DST_OUTLOOKEXP: case DST_EVOLUTION: case DST_KAB: + case DST_MACAB: nNextState = WZS_INVALID_STATE; break; default: @@ -223,6 +225,7 @@ case DST_OUTLOOKEXP: case DST_EVOLUTION: case DST_KAB: + case DST_MACAB: case DST_MSACCESS: case DST_JDBC: case DST_CALC: File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.25&r2=1.25.24.1 Delta lines: +15 -7 -------------------- --- dbwizsetup.cxx 2007-05-10 10:25:10+0000 1.25 +++ dbwizsetup.cxx 2007-07-08 19:08:13+0000 1.25.24.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbwizsetup.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.24.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:25:10 $ + * last change: $Author: msicotte $ $Date: 2007/07/08 19:08:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -264,10 +264,11 @@ #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 +#define MACAB_PATH 20 +#define THUNDERBIRD_PATH 21 +#define CREATENEW_PATH 22 +#define USERDEFINED_PATH 23 +#define OPEN_DOC_PATH 24 OFinalDBPageSetup* pFinalPage; @@ -435,6 +436,11 @@ else declarePath( KAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_MACAB)) + declarePath( MACAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + else + declarePath( MACAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(m_pCollection->getEmbeddedDatabaseType(getORB()))) declarePath( CREATENEW_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); else @@ -579,6 +585,7 @@ { DST_EVOLUTION_GROUPWISE, EVOLUTION_PATH_GROUPWISE }, { DST_EVOLUTION_LDAP, EVOLUTION_PATH_LDAP }, { DST_KAB, KAB_PATH }, + { DST_MACAB, MACAB_PATH }, { DST_USERDEFINE1, USERDEFINED_PATH }, { DST_USERDEFINE2, USERDEFINED_PATH }, { DST_USERDEFINE3, USERDEFINED_PATH }, @@ -649,6 +656,7 @@ switch ( m_eType ) { case DST_KAB: + case DST_MACAB: case DST_EVOLUTION: case DST_EVOLUTION_GROUPWISE: case DST_EVOLUTION_LDAP: 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.22&r2=1.22.26.1 Delta lines: +5 -4 ------------------- --- dsntypes.hxx 2007-05-10 10:32:28+0000 1.22 +++ dsntypes.hxx 2007-07-08 19:08:13+0000 1.22.26.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.26.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:32:28 $ + * last change: $Author: msicotte $ $Date: 2007/07/08 19:08:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,7 +79,8 @@ DST_EVOLUTION_GROUPWISE = 18, DST_EVOLUTION_LDAP = 19, DST_KAB = 20, - DST_EMBEDDED = 21, + DST_MACAB = 21, + DST_EMBEDDED = 22, 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.9&r2=1.9.208.1 Delta lines: +6 -5 ------------------- --- dbumiscres.hrc 2006-02-28 10:36:49+0000 1.9 +++ dbumiscres.hrc 2007-07-08 19:08:13+0000 1.9.208.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.hrc,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.208.1 $ * - * last change: $Author: kz $ $Date: 2006/02/28 10:36:49 $ + * last change: $Author: msicotte $ $Date: 2007/07/08 19:08:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,8 +58,9 @@ #define STR_EVOLUTION_GROUPWISE 17 #define STR_EVOLUTION_LDAP 18 #define STR_KAB 19 -#define STR_EMBEDDED 20 -#define STR_THUNDERBIRD 21 +#define STR_MACAB 20 +#define STR_EMBEDDED 21 +#define STR_THUNDERBIRD 22 #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.74&r2=1.74.28.1 Delta lines: +11 -3 -------------------- --- dbumiscres.src 2007-04-19 15:05:31+0000 1.74 +++ dbumiscres.src 2007-07-08 19:08:13+0000 1.74.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.src,v $ * - * $Revision: 1.74 $ + * $Revision: 1.74.28.1 $ * - * last change: $Author: ihi $ $Date: 2007/04/19 15:05:31 $ + * last change: $Author: msicotte $ $Date: 2007/07/08 19:08:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -123,6 +123,10 @@ { Text ="sdbc:address:kab"; }; + String STR_MACAB + { + Text ="sdbc:address:macab"; + }; String STR_EMBEDDED { Text = "sdbc:embedded:"; @@ -208,6 +212,10 @@ { Text[ en-US ] = "KDE Address Book"; }; + String STR_MACAB + { + Text[ en-US ] = "Mac OS X Address Book"; + }; String STR_EMBEDDED { Text[ en-US ] = "Embedded database"; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
