summaryrefslogtreecommitdiffabout
path: root/kabc
Unidiff
Diffstat (limited to 'kabc') (more/less context) (show whitespace changes)
-rw-r--r--kabc/field.cpp8
-rw-r--r--kabc/plugins/opie/resourceopie.cpp16
-rw-r--r--kabc/plugins/opie/resourceopieconfig.cpp11
-rw-r--r--kabc/plugins/opie/resourceopieconfig.h3
4 files changed, 20 insertions, 18 deletions
diff --git a/kabc/field.cpp b/kabc/field.cpp
index bc2e176..e27970e 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -261,10 +261,10 @@ QString Field::value( const KABC::Addressee &a )
261 if ( a.birthday().isValid() ) { 261 if ( a.birthday().isValid() ) {
262//the generated code had the following format: return a.birthday().date().toString( Qt::ISODate ); 262//the generated code had the following format: return a.birthday().date().toString( Qt::ISODate );
263// But Qt::IsoDate was not specified. 263// But Qt::IsoDate was not specified.
264 QString _oldFormat = KGlobal::locale()->dateFormat(); 264// QString _oldFormat = KGlobal::locale()->dateFormat();
265 KGlobal::locale()->setDateFormat("%Y-%m-%d"); // = Qt::ISODate 265// KGlobal::locale()->setDateFormat("%Y-%m-%d"); // = Qt::ISODate
266 QString dt = KGlobal::locale()->formatDate(a.birthday().date(), false); 266 QString dt = KGlobal::locale()->formatDate(a.birthday().date(), false, KLocale::ISODate);
267 KGlobal::locale()->setDateFormat(_oldFormat); 267// KGlobal::locale()->setDateFormat(_oldFormat);
268 return dt; 268 return dt;
269 } 269 }
270 else 270 else
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index 3b2a6b7..a7d271f 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -97,7 +97,7 @@ void ResourceOpie::init( const QString &fileName )
97 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); 97 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
98*/ 98*/
99 //US opie addressbook is always readonly 99 //US opie addressbook is always readonly
100 setReadOnly( true ); 100//US setReadOnly( true );
101 101
102 setFileName( fileName ); 102 setFileName( fileName );
103 103
@@ -112,7 +112,7 @@ ResourceOpie::~ResourceOpie()
112void ResourceOpie::writeConfig( KConfig *config ) 112void ResourceOpie::writeConfig( KConfig *config )
113{ 113{
114 //US opie addressbook is always readonly 114 //US opie addressbook is always readonly
115 setReadOnly( true ); 115//US setReadOnly( true );
116 116
117 Resource::writeConfig( config ); 117 Resource::writeConfig( config );
118 118
@@ -194,13 +194,23 @@ bool ResourceOpie::load()
194 194
195 access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available 195 access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
196 196
197 bool res = false;
197 if (mConverter == 0) 198 if (mConverter == 0)
199 {
198 mConverter = new OpieConverter(); 200 mConverter = new OpieConverter();
201 res = mConverter->init();
202 if ( !res )
203 {
204 qDebug("Unable to initialize opie converter. Most likely a problem with the category file");
205 addressBook()->error( i18n( "Unable to initialize opie converter. Most likely a problem with the category file" ) );
206 delete access;
207 return false;
208 }
209 }
199 210
200 211
201 OContactAccess::List::Iterator it; 212 OContactAccess::List::Iterator it;
202 OContactAccess::List allList = access->allRecords(); 213 OContactAccess::List allList = access->allRecords();
203 bool res = false;
204 for ( it = allList.begin(); it != allList.end(); ++it ) 214 for ( it = allList.begin(); it != allList.end(); ++it )
205 { 215 {
206 OContact c = (*it); 216 OContact c = (*it);
diff --git a/kabc/plugins/opie/resourceopieconfig.cpp b/kabc/plugins/opie/resourceopieconfig.cpp
index f4cc4f9..eef9cc9 100644
--- a/kabc/plugins/opie/resourceopieconfig.cpp
+++ b/kabc/plugins/opie/resourceopieconfig.cpp
@@ -62,15 +62,7 @@ ResourceOpieConfig::ResourceOpieConfig( QWidget* parent, const char* name )
62 62
63 mainLayout->addWidget( label, 0, 0 ); 63 mainLayout->addWidget( label, 0, 0 );
64 mainLayout->addWidget( mFileNameEdit, 0, 1 ); 64 mainLayout->addWidget( mFileNameEdit, 0, 1 );
65
66//US mInEditMode = false;
67}
68/*US
69void ResourceOpieConfig::setEditMode( bool value )
70{
71 mInEditMode = value;
72} 65}
73*/
74 66
75void ResourceOpieConfig::loadSettings( KRES::Resource *res ) 67void ResourceOpieConfig::loadSettings( KRES::Resource *res )
76{ 68{
@@ -85,6 +77,9 @@ void ResourceOpieConfig::loadSettings( KRES::Resource *res )
85 mFileNameEdit->setURL( resource->fileName() ); 77 mFileNameEdit->setURL( resource->fileName() );
86 if ( mFileNameEdit->url().isEmpty() ) 78 if ( mFileNameEdit->url().isEmpty() )
87 mFileNameEdit->setURL( QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml" ); 79 mFileNameEdit->setURL( QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml" );
80
81 //US Opie resources are ReadOnly by definition
82 emit setPersistentReadOnly( true );
88} 83}
89 84
90void ResourceOpieConfig::saveSettings( KRES::Resource *res ) 85void ResourceOpieConfig::saveSettings( KRES::Resource *res )
diff --git a/kabc/plugins/opie/resourceopieconfig.h b/kabc/plugins/opie/resourceopieconfig.h
index 533b7f4..8cc192c 100644
--- a/kabc/plugins/opie/resourceopieconfig.h
+++ b/kabc/plugins/opie/resourceopieconfig.h
@@ -42,8 +42,6 @@ class ResourceOpieConfig : public KRES::ConfigWidget
42public: 42public:
43 ResourceOpieConfig( QWidget* parent = 0, const char* name = 0 ); 43 ResourceOpieConfig( QWidget* parent = 0, const char* name = 0 );
44 44
45//US void setEditMode( bool value );
46
47public slots: 45public slots:
48 void loadSettings( KRES::Resource *resource ); 46 void loadSettings( KRES::Resource *resource );
49 void saveSettings( KRES::Resource *resource ); 47 void saveSettings( KRES::Resource *resource );
@@ -53,7 +51,6 @@ protected slots:
53 51
54private: 52private:
55 KURLRequester* mFileNameEdit; 53 KURLRequester* mFileNameEdit;
56//US bool mInEditMode;
57}; 54};
58 55
59} 56}