author | ulf69 <ulf69> | 2004-07-14 14:55:56 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-14 14:55:56 (UTC) |
commit | f2779e5e7742103ce848ab11e6b9fe3661587f0b (patch) (unidiff) | |
tree | f858743398b61aa21eca09abc6d85a34a7d3f436 | |
parent | cf7175c9a6b96cd11fb7f3cba459f5223aa4aacb (diff) | |
download | kdepimpi-f2779e5e7742103ce848ab11e6b9fe3661587f0b.zip kdepimpi-f2779e5e7742103ce848ab11e6b9fe3661587f0b.tar.gz kdepimpi-f2779e5e7742103ce848ab11e6b9fe3661587f0b.tar.bz2 |
added changes to support qtopia import/export and improved resource support
-rw-r--r-- | Makefile.Embedded | 8 | ||||
-rw-r--r-- | kabc/converter/opie/opieconverter.h | 4 | ||||
-rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.cpp | 19 | ||||
-rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.h | 4 | ||||
-rw-r--r-- | kaddressbook/xxportmanager.cpp | 10 |
5 files changed, 26 insertions, 19 deletions
diff --git a/Makefile.Embedded b/Makefile.Embedded index 3160017..143e965 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded | |||
@@ -4,9 +4,9 @@ DISTDIR = $(shell basename $(DISTPATH)) | |||
4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ | 4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ |
5 | libkcal libkdepim kabc kabc/converter/opie kabc/converter/qtopia kabc/formats/binary \ | 5 | libkcal libkdepim kabc kabc/converter/opie kabc/converter/qtopia kabc/formats/binary \ |
6 | kabc/plugins/file kabc/plugins/dir \ | 6 | kabc/plugins/file kabc/plugins/dir \ |
7 | kabc/plugins/ldap kabc/plugins/opie kabc/plugins/qtopia \ | 7 | kabc/plugins/ldap kabc/plugins/opie kabc/plugins/qtopia \ |
8 | korganizer kalarmd kaddressbook/xxport/opie kaddressbook | 8 | korganizer kalarmd kaddressbook/xxport/opie kaddressbook/xxport/qtopia kaddressbook |
9 | all: tmake | 9 | all: tmake |
10 | for i in $(SUBDIRS); do pushd $$i; \ | 10 | for i in $(SUBDIRS); do pushd $$i; \ |
11 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 11 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
12 | done | 12 | done |
@@ -49,8 +49,9 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ | |||
49 | kabc/plugins/ldap/Makefile$(PLATFORM) \ | 49 | kabc/plugins/ldap/Makefile$(PLATFORM) \ |
50 | kabc/plugins/opie/Makefile$(PLATFORM) \ | 50 | kabc/plugins/opie/Makefile$(PLATFORM) \ |
51 | kabc/plugins/qtopia/Makefile$(PLATFORM) \ | 51 | kabc/plugins/qtopia/Makefile$(PLATFORM) \ |
52 | kaddressbook/xxport/opie/Makefile$(PLATFORM) \ | 52 | kaddressbook/xxport/opie/Makefile$(PLATFORM) \ |
53 | kaddressbook/xxport/qtopia/Makefile$(PLATFORM) \ | ||
53 | kaddressbook/Makefile$(PLATFORM) | 54 | kaddressbook/Makefile$(PLATFORM) |
54 | 55 | ||
55 | 56 | ||
56 | 57 | ||
@@ -107,8 +108,11 @@ kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro | |||
107 | cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) | 108 | cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) |
108 | 109 | ||
109 | kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro | 110 | kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro |
110 | cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) | 111 | cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) |
111 | 112 | ||
113 | kaddressbook/xxport/qtopia/Makefile$(PLATFORM): kaddressbook/xxport/qtopia/qtopiaE.pro | ||
114 | cd kaddressbook/xxport/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) | ||
115 | |||
112 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro | 116 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro |
113 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) | 117 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) |
114 | 118 | ||
diff --git a/kabc/converter/opie/opieconverter.h b/kabc/converter/opie/opieconverter.h index c7e691f..d251a24 100644 --- a/kabc/converter/opie/opieconverter.h +++ b/kabc/converter/opie/opieconverter.h | |||
@@ -50,10 +50,10 @@ public: | |||
50 | * Destructor. | 50 | * Destructor. |
51 | */ | 51 | */ |
52 | virtual ~OpieConverter(); | 52 | virtual ~OpieConverter(); |
53 | 53 | ||
54 | virtual bool init(); | 54 | bool init(); |
55 | virtual void deinit(); | 55 | void deinit(); |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * Converts a vcard string to an addressee. | 58 | * Converts a vcard string to an addressee. |
59 | * | 59 | * |
diff --git a/kabc/converter/qtopia/qtopiaconverter.cpp b/kabc/converter/qtopia/qtopiaconverter.cpp index e3dd3e6..f451b8b 100644 --- a/kabc/converter/qtopia/qtopiaconverter.cpp +++ b/kabc/converter/qtopia/qtopiaconverter.cpp | |||
@@ -48,17 +48,14 @@ QtopiaConverter::~QtopiaConverter() | |||
48 | 48 | ||
49 | bool QtopiaConverter::init() | 49 | bool QtopiaConverter::init() |
50 | { | 50 | { |
51 | catDB = new Categories(); | 51 | catDB = new Categories(); |
52 | if (catDB) | 52 | |
53 | { | 53 | if (!catDB) |
54 | catDB->load( categoryFileName() ); | ||
55 | return true; | ||
56 | } | ||
57 | else | ||
58 | { | ||
59 | return false; | 54 | return false; |
60 | } | 55 | |
56 | catDB->load( categoryFileName() ); | ||
57 | return true; | ||
61 | } | 58 | } |
62 | 59 | ||
63 | void QtopiaConverter::deinit() | 60 | void QtopiaConverter::deinit() |
64 | { | 61 | { |
@@ -208,9 +205,9 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a | |||
208 | 205 | ||
209 | if (contact.anniversary().isValid()) { | 206 | if (contact.anniversary().isValid()) { |
210 | QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); | 207 | QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); |
211 | //US | 208 | //US |
212 | qDebug("OpieConverter::opieToAddressee found:%s", dt.latin1()); | 209 | qDebug("OpieConverter::qtopiaToAddressee found:%s", dt.latin1()); |
213 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 210 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
214 | } | 211 | } |
215 | 212 | ||
216 | addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() ); | 213 | addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() ); |
@@ -229,18 +226,18 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a | |||
229 | 226 | ||
230 | 227 | ||
231 | //US QString groups() const { return find( Qtopia::Groups ); } | 228 | //US QString groups() const { return find( Qtopia::Groups ); } |
232 | //US QStringList groupList() const; | 229 | //US QStringList groupList() const; |
233 | 230 | ||
234 | QArray<int> catArray = contact.categories(); | 231 | QArray<int> catArray = contact.categories(); |
235 | QString cat; | 232 | QString cat; |
236 | 233 | ||
237 | for ( unsigned int i=0; i < catArray.size(); i++ ) { | 234 | for ( unsigned int i=0; i < catArray.size(); i++ ) { |
238 | cat = catDB->label("contact", catArray[i]); | 235 | cat = catDB->label("contact", catArray[i]); |
239 | if ( !cat.isEmpty() ) | 236 | if ( !cat.isEmpty() ) |
240 | addr.insertCategory( cat ); | 237 | addr.insertCategory( cat ); |
241 | } | 238 | } |
242 | 239 | ||
243 | return true; | 240 | return true; |
244 | } | 241 | } |
245 | 242 | ||
246 | bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &contact ) | 243 | bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &contact ) |
diff --git a/kabc/converter/qtopia/qtopiaconverter.h b/kabc/converter/qtopia/qtopiaconverter.h index 7397113..8f4c698 100644 --- a/kabc/converter/qtopia/qtopiaconverter.h +++ b/kabc/converter/qtopia/qtopiaconverter.h | |||
@@ -49,10 +49,10 @@ public: | |||
49 | * Destructor. | 49 | * Destructor. |
50 | */ | 50 | */ |
51 | virtual ~QtopiaConverter(); | 51 | virtual ~QtopiaConverter(); |
52 | 52 | ||
53 | virtual bool init(); | 53 | bool init(); |
54 | virtual void deinit(); | 54 | void deinit(); |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * Converts a vcard string to an addressee. | 57 | * Converts a vcard string to an addressee. |
58 | * | 58 | * |
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 248fcab..4798ffe 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp | |||
@@ -195,15 +195,22 @@ void XXPortManager::loadPlugins() | |||
195 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_csv_xxport())); | 195 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_csv_xxport())); |
196 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_kde2_xxport())); | 196 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_kde2_xxport())); |
197 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport())); | 197 | factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport())); |
198 | 198 | ||
199 | //now add the opie import library dynamically | 199 | //add the opie import library dynamically |
200 | KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" ); | 200 | KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" ); |
201 | if ( factory ) { | 201 | if ( factory ) { |
202 | XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); | 202 | XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); |
203 | factorylist.append(xxportFactory); | 203 | factorylist.append(xxportFactory); |
204 | } | 204 | } |
205 | 205 | ||
206 | //add the qtopia import library dynamically | ||
207 | factory = KLibLoader::self()->factory( "microkaddrbk_qtopia_xxport" ); | ||
208 | if ( factory ) { | ||
209 | XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); | ||
210 | factorylist.append(xxportFactory); | ||
211 | } | ||
212 | |||
206 | QListIterator<XXPortFactory> it(factorylist); | 213 | QListIterator<XXPortFactory> it(factorylist); |
207 | for ( ; it.current(); ++it ) | 214 | for ( ; it.current(); ++it ) |
208 | { | 215 | { |
209 | XXPortFactory *xxportFactory = it.current(); | 216 | XXPortFactory *xxportFactory = it.current(); |
@@ -218,9 +225,8 @@ void XXPortManager::loadPlugins() | |||
218 | connect( obj, SIGNAL( importActivated( const QString&, const QString& ) ), | 225 | connect( obj, SIGNAL( importActivated( const QString&, const QString& ) ), |
219 | this, SLOT( slotImport( const QString&, const QString& ) ) ); | 226 | this, SLOT( slotImport( const QString&, const QString& ) ) ); |
220 | } | 227 | } |
221 | } | 228 | } |
222 | |||
223 | } | 229 | } |
224 | 230 | ||
225 | 231 | ||
226 | PreviewDialog::PreviewDialog( const KABC::Addressee &addr, QWidget *parent, | 232 | PreviewDialog::PreviewDialog( const KABC::Addressee &addr, QWidget *parent, |