summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/dir/resourcedir.cpp10
-rw-r--r--kabc/plugins/file/resourcefile.cpp10
-rw-r--r--kabc/plugins/opie/resourceopie.cpp12
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp9
-rw-r--r--kaddressbook/details/detailsviewcontainer.cpp3
-rw-r--r--kaddressbook/kabcore.cpp1
6 files changed, 33 insertions, 12 deletions
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 7825c6f..52863d5 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -1,154 +1,153 @@
1/* 1/*
2 This file is part of libkabc. 2 This file is part of libkabc.
3 Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> 3 Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21/* 21/*
22Enhanced Version of the file for platform independent KDE tools. 22Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27 27
28 28
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/stat.h> 30#include <sys/stat.h>
31#ifndef _WIN32_ 31#ifndef _WIN32_
32#include <unistd.h> 32#include <unistd.h>
33#endif 33#endif
34 34
35#include <qregexp.h> 35#include <qregexp.h>
36#include <qtimer.h> 36#include <qtimer.h>
37#include <qwidget.h> 37#include <qwidget.h>
38 38
39#include <kapplication.h> 39#include <kapplication.h>
40#include <kconfig.h> 40#include <kconfig.h>
41#include <kdebug.h> 41#include <kdebug.h>
42//US #include <kgenericfactory.h> 42//US #include <kgenericfactory.h>
43#include <kglobal.h> 43#include <kglobal.h>
44#include <klocale.h> 44#include <klocale.h>
45#include <kstandarddirs.h> 45#include <kstandarddirs.h>
46#include <kurlrequester.h> 46#include <kurlrequester.h>
47#include <kmessagebox.h>
47 48
48#include "addressbook.h" 49#include "addressbook.h"
49 50
50#include "formatfactory.h" 51#include "formatfactory.h"
51 52
52#include "resourcedirconfig.h" 53#include "resourcedirconfig.h"
53#include "stdaddressbook.h" 54#include "stdaddressbook.h"
54 55
55//US 56//US
56#include <qdir.h> 57#include <qdir.h>
57//US #include "../../formats/vcardformatplugin2.h"
58//US #include "../../formats/binaryformat.h"
59 58
60#include "resourcedir.h" 59#include "resourcedir.h"
61 60
62using namespace KABC; 61using namespace KABC;
63 62
64extern "C" 63extern "C"
65#ifdef _WIN32_ 64#ifdef _WIN32_
66__declspec(dllexport) 65__declspec(dllexport)
67#else 66#else
68{ 67{
69#endif 68#endif
70 69
71//US void *init_kabc_dir() 70//US void *init_kabc_dir()
72 void *init_microkabc_dir() 71 void *init_microkabc_dir()
73 { 72 {
74 return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>(); 73 return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
75 } 74 }
76#ifndef _WIN32_ 75#ifndef _WIN32_
77} 76}
78#endif 77#endif
79 78
80ResourceDir::ResourceDir( const KConfig *config ) 79ResourceDir::ResourceDir( const KConfig *config )
81 : Resource( config ) 80 : Resource( config )
82{ 81{
83 QString path; 82 QString path;
84 83
85 KConfig *cfg = (KConfig *)config; 84 KConfig *cfg = (KConfig *)config;
86 if ( cfg ) { 85 if ( cfg ) {
87//US path = config->readEntry( "FilePath" ); 86//US path = config->readEntry( "FilePath" );
88 path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() ); 87 path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );
89//US mFormatName = config->readEntry( "FileFormat" ); 88//US mFormatName = config->readEntry( "FileFormat" );
90 mFormatName = cfg->readEntry( "FileFormat", "vcard" ); 89 mFormatName = cfg->readEntry( "FileFormat", "vcard" );
91 } else { 90 } else {
92 path = StdAddressBook::directoryName(); 91 path = StdAddressBook::directoryName();
93 mFormatName = "vcard"; 92 mFormatName = "vcard";
94 } 93 }
95 94
96 95
97 FormatFactory *factory = FormatFactory::self(); 96 FormatFactory *factory = FormatFactory::self();
98 mFormat = factory->format( mFormatName ); 97 mFormat = factory->format( mFormatName );
99 98
100 if ( !mFormat ) { 99 if ( !mFormat ) {
101 mFormatName = "vcard"; 100 mFormatName = "vcard";
102 mFormat = factory->format( mFormatName ); 101 mFormat = factory->format( mFormatName );
103 } 102 }
104 103
105/*US 104/*US
106//US qDebug("ResourceDir::ResourceDir initialized with format %s ", mFormatName.latin1()); 105//US qDebug("ResourceDir::ResourceDir initialized with format %s ", mFormatName.latin1());
107 if (mFormatName == "vcard") 106 if (mFormatName == "vcard")
108 mFormat = new VCardFormatPlugin2(); 107 mFormat = new VCardFormatPlugin2();
109 else if (mFormatName == "binary") 108 else if (mFormatName == "binary")
110 mFormat = new BinaryFormat(); 109 mFormat = new BinaryFormat();
111 else 110 else
112 qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1()); 111 qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1());
113*/ 112*/
114 113
115 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) ); 114 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
116 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) ); 115 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
117 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) ); 116 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
118 117
119 setPath( path ); 118 setPath( path );
120} 119}
121 120
122ResourceDir::~ResourceDir() 121ResourceDir::~ResourceDir()
123{ 122{
124 delete mFormat; 123 delete mFormat;
125 mFormat = 0; 124 mFormat = 0;
126} 125}
127 126
128void ResourceDir::writeConfig( KConfig *config ) 127void ResourceDir::writeConfig( KConfig *config )
129{ 128{
130 config->setGroup( "Resource_" + identifier() ); 129 config->setGroup( "Resource_" + identifier() );
131 Resource::writeConfig( config ); 130 Resource::writeConfig( config );
132 131
133 config->writeEntry( "FilePath", mPath ); 132 config->writeEntry( "FilePath", mPath );
134 config->writeEntry( "FileFormat", mFormatName ); 133 config->writeEntry( "FileFormat", mFormatName );
135} 134}
136 135
137Ticket *ResourceDir::requestSaveTicket() 136Ticket *ResourceDir::requestSaveTicket()
138{ 137{
139 kdDebug(5700) << "ResourceDir::requestSaveTicket()" << endl; 138 kdDebug(5700) << "ResourceDir::requestSaveTicket()" << endl;
140 139
141 if ( !addressBook() ) return 0; 140 if ( !addressBook() ) return 0;
142 141
143 if ( !lock( mPath ) ) { 142 if ( !lock( mPath ) ) {
144 kdDebug(5700) << "ResourceDir::requestSaveTicket(): Unable to lock path '" 143 kdDebug(5700) << "ResourceDir::requestSaveTicket(): Unable to lock path '"
145 << mPath << "'" << endl; 144 << mPath << "'" << endl;
146 return 0; 145 return 0;
147 } 146 }
148 return createTicket( this ); 147 return createTicket( this );
149} 148}
150 149
151 150
152bool ResourceDir::doOpen() 151bool ResourceDir::doOpen()
153{ 152{
154 QDir dir( mPath ); 153 QDir dir( mPath );
@@ -252,111 +251,114 @@ bool ResourceDir::lock( const QString &path )
252 251
253 QString lockUniqueName; 252 QString lockUniqueName;
254 lockUniqueName = p + KApplication::randomString( 8 ); 253 lockUniqueName = p + KApplication::randomString( 8 );
255 254
256 url = lockUniqueName; 255 url = lockUniqueName;
257//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); 256//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
258 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); 257 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
259 258
260 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; 259 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
261 260
262 // Create unique file 261 // Create unique file
263 QFile file( mLockUniqueName ); 262 QFile file( mLockUniqueName );
264 file.open( IO_WriteOnly ); 263 file.open( IO_WriteOnly );
265 file.close(); 264 file.close();
266 265
267 // Create lock file 266 // Create lock file
268 int result = 0; 267 int result = 0;
269#ifndef _WIN32_ 268#ifndef _WIN32_
270 result = ::link( QFile::encodeName( mLockUniqueName ), 269 result = ::link( QFile::encodeName( mLockUniqueName ),
271 QFile::encodeName( lockName ) ); 270 QFile::encodeName( lockName ) );
272#endif 271#endif
273 if ( result == 0 ) { 272 if ( result == 0 ) {
274 addressBook()->emitAddressBookLocked(); 273 addressBook()->emitAddressBookLocked();
275 return true; 274 return true;
276 } 275 }
277 276
278 // TODO: check stat 277 // TODO: check stat
279 278
280 return false; 279 return false;
281} 280}
282 281
283void ResourceDir::unlock( const QString &path ) 282void ResourceDir::unlock( const QString &path )
284{ 283{
285 QString p = path; 284 QString p = path;
286//US change the implementation how the lockfilename is getting created 285//US change the implementation how the lockfilename is getting created
287//US p.replace( QRegExp( "/" ), "_" ); 286//US p.replace( QRegExp( "/" ), "_" );
288//US QString lockName = locate( "data", "kabc/lock/" + p + ".lock" ); 287//US QString lockName = locate( "data", "kabc/lock/" + p + ".lock" );
289 KURL url(p); 288 KURL url(p);
290 QString lockName = locate( "data", "kabc/lock/" + url.fileName() + ".lock" ); 289 QString lockName = locate( "data", "kabc/lock/" + url.fileName() + ".lock" );
291 290
292 ::unlink( QFile::encodeName( lockName ) ); 291 ::unlink( QFile::encodeName( lockName ) );
293 QFile::remove( mLockUniqueName ); 292 QFile::remove( mLockUniqueName );
294 addressBook()->emitAddressBookUnlocked(); 293 addressBook()->emitAddressBookUnlocked();
295} 294}
296 295
297void ResourceDir::setPath( const QString &path ) 296void ResourceDir::setPath( const QString &path )
298{ 297{
299 mDirWatch.stopScan(); 298 mDirWatch.stopScan();
300 mDirWatch.removeDir( mPath ); 299 mDirWatch.removeDir( mPath );
301 300
302 mPath = path; 301 mPath = path;
303 302
304 mDirWatch.addDir( mPath, true ); 303 mDirWatch.addDir( mPath, true );
305 mDirWatch.startScan(); 304 mDirWatch.startScan();
306 305
307//US simulate KDirWatch event 306//US simulate KDirWatch event
308//US pathChanged(); 307//US pathChanged();
309 308
310} 309}
311 310
312QString ResourceDir::path() const 311QString ResourceDir::path() const
313{ 312{
314 return mPath; 313 return mPath;
315} 314}
316 315
317void ResourceDir::setFormat( const QString &format ) 316void ResourceDir::setFormat( const QString &format )
318{ 317{
319 mFormatName = format; 318 mFormatName = format;
320 319
321 if ( mFormat ) 320 if ( mFormat )
322 delete mFormat; 321 delete mFormat;
323 322
324 FormatFactory *factory = FormatFactory::self(); 323 FormatFactory *factory = FormatFactory::self();
325 mFormat = factory->format( mFormatName ); 324 mFormat = factory->format( mFormatName );
326/*US 325/*US
327qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1()); 326qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1());
328 if (mFormatName == "vcard") 327 if (mFormatName == "vcard")
329 mFormat = new VCardFormatPlugin2(); 328 mFormat = new VCardFormatPlugin2();
330 else if (mFormatName == "binary") 329 else if (mFormatName == "binary")
331 mFormat = new BinaryFormat(); 330 mFormat = new BinaryFormat();
332 else 331 else
333 qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1()); 332 qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1());
334*/ 333*/
335 334
336} 335}
337 336
338QString ResourceDir::format() const 337QString ResourceDir::format() const
339{ 338{
340 return mFormatName; 339 return mFormatName;
341} 340}
342 341
343void ResourceDir::pathChanged() 342void ResourceDir::pathChanged()
344{ 343{
345 if ( !addressBook() ) 344 if ( !addressBook() )
346 return; 345 return;
347 346
348 load(); 347 QString text( i18n( "Dir resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mPath ) );
349 addressBook()->emitAddressBookChanged(); 348 if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
349 load();
350 addressBook()->emitAddressBookChanged();
351 }
350} 352}
351 353
352void ResourceDir::removeAddressee( const Addressee& addr ) 354void ResourceDir::removeAddressee( const Addressee& addr )
353{ 355{
354 QFile::remove( mPath + "/" + addr.uid() ); 356 QFile::remove( mPath + "/" + addr.uid() );
355} 357}
356 358
357void ResourceDir::cleanUp() 359void ResourceDir::cleanUp()
358{ 360{
359 unlock( mPath ); 361 unlock( mPath );
360} 362}
361 363
362//US #include "resourcedir.moc" 364//US #include "resourcedir.moc"
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 9f9b00f..1d3acec 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -1,140 +1,141 @@
1/* 1/*
2 This file is part of libkabc. 2 This file is part of libkabc.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21/* 21/*
22Enhanced Version of the file for platform independent KDE tools. 22Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30#ifndef _WIN32_ 30#ifndef _WIN32_
31#include <unistd.h> 31#include <unistd.h>
32#endif 32#endif
33 33
34#include <qfile.h> 34#include <qfile.h>
35#include <qfileinfo.h> 35#include <qfileinfo.h>
36#include <qregexp.h> 36#include <qregexp.h>
37#include <qtimer.h> 37#include <qtimer.h>
38 38
39#include <kapplication.h> 39#include <kapplication.h>
40#include <kconfig.h> 40#include <kconfig.h>
41#include <kdebug.h> 41#include <kdebug.h>
42#include <klocale.h> 42#include <klocale.h>
43//US #include <ksavefile.h> 43//US #include <ksavefile.h>
44#include <kstandarddirs.h> 44#include <kstandarddirs.h>
45#include <kmessagebox.h>
45 46
46#include "formatfactory.h" 47#include "formatfactory.h"
47 48
48#include "resource.h" 49#include "resource.h"
49#include "resourcefileconfig.h" 50#include "resourcefileconfig.h"
50#include "stdaddressbook.h" 51#include "stdaddressbook.h"
51 52
52#include "resourcefile.h" 53#include "resourcefile.h"
53 54
54using namespace KABC; 55using namespace KABC;
55 56
56extern "C" 57extern "C"
57#ifdef _WIN32_ 58#ifdef _WIN32_
58__declspec(dllexport) 59__declspec(dllexport)
59#else 60#else
60{ 61{
61#endif 62#endif
62 63
63//US void *init_kabc_file() 64//US void *init_kabc_file()
64 void *init_microkabc_file() 65 void *init_microkabc_file()
65 { 66 {
66 return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>(); 67 return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
67 } 68 }
68#ifndef _WIN32_ 69#ifndef _WIN32_
69} 70}
70#endif 71#endif
71 72
72ResourceFile::ResourceFile( const KConfig *config ) 73ResourceFile::ResourceFile( const KConfig *config )
73 : Resource( config ) , mFormat( 0 ) 74 : Resource( config ) , mFormat( 0 )
74{ 75{
75 QString fileName, formatName; 76 QString fileName, formatName;
76 77
77 KConfig *cfg = (KConfig *)config; 78 KConfig *cfg = (KConfig *)config;
78 if ( cfg ) { 79 if ( cfg ) {
79 fileName = cfg->readEntry( "FileName", StdAddressBook::fileName() ); 80 fileName = cfg->readEntry( "FileName", StdAddressBook::fileName() );
80 formatName = cfg->readEntry( "FileFormat", "vcard" ); 81 formatName = cfg->readEntry( "FileFormat", "vcard" );
81// qDebug("ResourceFile::ResourceFile : 1 %s, %s", fileName.latin1(), formatName.latin1() ); 82// qDebug("ResourceFile::ResourceFile : 1 %s, %s", fileName.latin1(), formatName.latin1() );
82 } else { 83 } else {
83 fileName = StdAddressBook::fileName(); 84 fileName = StdAddressBook::fileName();
84 formatName = "vcard"; 85 formatName = "vcard";
85// qDebug("ResourceFile::ResourceFile : 2 %s, %s", fileName.latin1(), formatName.latin1() ); 86// qDebug("ResourceFile::ResourceFile : 2 %s, %s", fileName.latin1(), formatName.latin1() );
86 } 87 }
87 88
88 init( fileName, formatName ); 89 init( fileName, formatName );
89} 90}
90 91
91ResourceFile::ResourceFile( const QString &fileName, 92ResourceFile::ResourceFile( const QString &fileName,
92 const QString &formatName ) 93 const QString &formatName )
93 : Resource( 0 ) 94 : Resource( 0 )
94{ 95{
95// qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); 96// qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
96 init( fileName, formatName ); 97 init( fileName, formatName );
97} 98}
98 99
99void ResourceFile::init( const QString &fileName, const QString &formatName ) 100void ResourceFile::init( const QString &fileName, const QString &formatName )
100{ 101{
101 mFormatName = formatName; 102 mFormatName = formatName;
102 103
103 FormatFactory *factory = FormatFactory::self(); 104 FormatFactory *factory = FormatFactory::self();
104 mFormat = factory->format( mFormatName ); 105 mFormat = factory->format( mFormatName );
105 106
106 if ( !mFormat ) { 107 if ( !mFormat ) {
107 mFormatName = "vcard"; 108 mFormatName = "vcard";
108 mFormat = factory->format( mFormatName ); 109 mFormat = factory->format( mFormatName );
109 } 110 }
110 111
111/*US 112/*US
112//US qDebug("ResourceFile::init initialized with format %s ", formatName.latin1()); 113//US qDebug("ResourceFile::init initialized with format %s ", formatName.latin1());
113 if (mFormatName == "vcard") { 114 if (mFormatName == "vcard") {
114 mFormat = new VCardFormatPlugin2(); 115 mFormat = new VCardFormatPlugin2();
115// qDebug("ResourceFile::init format VCardFormatPlugin2"); 116// qDebug("ResourceFile::init format VCardFormatPlugin2");
116 } 117 }
117 else if (mFormatName == "binary") { 118 else if (mFormatName == "binary") {
118 mFormat = new BinaryFormat(); 119 mFormat = new BinaryFormat();
119// qDebug("ResourceFile::init format BinaryFormat"); 120// qDebug("ResourceFile::init format BinaryFormat");
120 } 121 }
121 else 122 else
122 qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1()); 123 qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1());
123*/ 124*/
124 125
125 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); 126 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
126 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); 127 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
127 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); 128 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
128 129
129 setFileName( fileName ); 130 setFileName( fileName );
130} 131}
131 132
132ResourceFile::~ResourceFile() 133ResourceFile::~ResourceFile()
133{ 134{
134 delete mFormat; 135 delete mFormat;
135 mFormat = 0; 136 mFormat = 0;
136} 137}
137 138
138void ResourceFile::writeConfig( KConfig *config ) 139void ResourceFile::writeConfig( KConfig *config )
139{ 140{
140 141
@@ -279,113 +280,118 @@ bool ResourceFile::lock( const QString &fileName )
279 280
280 url = lockUniqueName; 281 url = lockUniqueName;
281//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); 282//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
282 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); 283 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
283 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; 284 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
284 285
285 // Create unique file 286 // Create unique file
286 QFile file( mLockUniqueName ); 287 QFile file( mLockUniqueName );
287 file.open( IO_WriteOnly ); 288 file.open( IO_WriteOnly );
288 file.close(); 289 file.close();
289 290
290 // Create lock file 291 // Create lock file
291 int result = 0; 292 int result = 0;
292#ifndef _WIN32_ 293#ifndef _WIN32_
293 result = ::link( QFile::encodeName( mLockUniqueName ), 294 result = ::link( QFile::encodeName( mLockUniqueName ),
294 QFile::encodeName( lockName ) ); 295 QFile::encodeName( lockName ) );
295#endif 296#endif
296 if ( result == 0 ) { 297 if ( result == 0 ) {
297 addressBook()->emitAddressBookLocked(); 298 addressBook()->emitAddressBookLocked();
298 return true; 299 return true;
299 } 300 }
300 301
301 // TODO: check stat 302 // TODO: check stat
302 303
303 return false; 304 return false;
304} 305}
305 306
306void ResourceFile::unlock( const QString &fileName ) 307void ResourceFile::unlock( const QString &fileName )
307{ 308{
308 QString fn = fileName; 309 QString fn = fileName;
309//US change the implementation how the lockfilename is getting created 310//US change the implementation how the lockfilename is getting created
310//US fn.replace( QRegExp( "/" ), "_" ); 311//US fn.replace( QRegExp( "/" ), "_" );
311//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); 312//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
312//US QString lockName = fn + ".lock"; 313//US QString lockName = fn + ".lock";
313 KURL url(fn); 314 KURL url(fn);
314 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); 315 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
315 316
316 QFile::remove( lockName ); 317 QFile::remove( lockName );
317 QFile::remove( mLockUniqueName ); 318 QFile::remove( mLockUniqueName );
318 addressBook()->emitAddressBookUnlocked(); 319 addressBook()->emitAddressBookUnlocked();
319} 320}
320 321
321void ResourceFile::setFileName( const QString &fileName ) 322void ResourceFile::setFileName( const QString &fileName )
322{ 323{
323 mDirWatch.stopScan(); 324 mDirWatch.stopScan();
324 mDirWatch.removeFile( mFileName ); 325 mDirWatch.removeFile( mFileName );
325 326
326 mFileName = fileName; 327 mFileName = fileName;
327 328
328 329
329 mDirWatch.addFile( mFileName ); 330 mDirWatch.addFile( mFileName );
330 mDirWatch.startScan(); 331 mDirWatch.startScan();
331 332
332//US simulate KDirWatch event 333//US simulate KDirWatch event
333//US fileChanged(); 334//US fileChanged();
334} 335}
335 336
336QString ResourceFile::fileName() const 337QString ResourceFile::fileName() const
337{ 338{
338 return mFileName; 339 return mFileName;
339} 340}
340 341
341void ResourceFile::setFormat( const QString &format ) 342void ResourceFile::setFormat( const QString &format )
342{ 343{
343 mFormatName = format; 344 mFormatName = format;
344 delete mFormat; 345 delete mFormat;
345 346
346 FormatFactory *factory = FormatFactory::self(); 347 FormatFactory *factory = FormatFactory::self();
347 mFormat = factory->format( mFormatName ); 348 mFormat = factory->format( mFormatName );
348/*US 349/*US
349//qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1()); 350//qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1());
350 if (mFormatName == "vcard") { 351 if (mFormatName == "vcard") {
351 mFormat = new VCardFormatPlugin2(); 352 mFormat = new VCardFormatPlugin2();
352// qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); 353// qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
353 } 354 }
354 else if (mFormatName == "binary") { 355 else if (mFormatName == "binary") {
355 mFormat = new BinaryFormat(); 356 mFormat = new BinaryFormat();
356// qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); 357// qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
357 } 358 }
358 else 359 else
359 qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1()); 360 qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
360*/ 361*/
361 362
362} 363}
363 364
364QString ResourceFile::format() const 365QString ResourceFile::format() const
365{ 366{
366 return mFormatName; 367 return mFormatName;
367} 368}
368 369
369void ResourceFile::fileChanged() 370void ResourceFile::fileChanged()
370{ 371{
371 // There is a small theoretical chance that KDirWatch calls us before 372 // There is a small theoretical chance that KDirWatch calls us before
372 // we are fully constructed 373 // we are fully constructed
373 if (!addressBook()) 374 if (!addressBook())
374 return; 375 return;
375 load(); 376
376 addressBook()->emitAddressBookChanged(); 377
378 QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
379 if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
380 load();
381 addressBook()->emitAddressBookChanged();
382 }
377} 383}
378 384
379void ResourceFile::removeAddressee( const Addressee &addr ) 385void ResourceFile::removeAddressee( const Addressee &addr )
380{ 386{
381 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) ); 387 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
382 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) ); 388 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
383 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) ); 389 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
384} 390}
385 391
386void ResourceFile::cleanUp() 392void ResourceFile::cleanUp()
387{ 393{
388 unlock( mFileName ); 394 unlock( mFileName );
389} 395}
390 396
391//US #include "resourcefile.moc" 397//US #include "resourcefile.moc"
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index 1436508..aaee801 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -1,193 +1,192 @@
1/* 1/*
2 This file is part of libkabc. 2 This file is part of libkabc.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21/* 21/*
22Enhanced Version of the file for platform independent KDE tools. 22Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30#include <unistd.h> 30#include <unistd.h>
31 31
32#include <qdir.h> 32#include <qdir.h>
33#include <qfile.h> 33#include <qfile.h>
34#include <qfileinfo.h> 34#include <qfileinfo.h>
35#include <qregexp.h> 35#include <qregexp.h>
36 36
37#include <kapplication.h> 37#include <kapplication.h>
38#include <kconfig.h> 38#include <kconfig.h>
39#include <kdebug.h> 39#include <kdebug.h>
40#include <klocale.h> 40#include <klocale.h>
41//US #include <ksavefile.h> 41//US #include <ksavefile.h>
42#include <kstandarddirs.h> 42#include <kstandarddirs.h>
43#include <kmessagebox.h>
43 44
44//US #include "formatfactory.h" 45//US #include "formatfactory.h"
45//US #include <qpe/qpeapplication.h> 46//US #include <qpe/qpeapplication.h>
46 47
47#include <opie/ocontactaccess.h> 48#include <opie/ocontactaccess.h>
48#include <opie/ocontactaccessbackend_xml.h> 49#include <opie/ocontactaccessbackend_xml.h>
49 50
50#include "resourceopieconfig.h" 51#include "resourceopieconfig.h"
51#include "stdaddressbook.h" 52#include "stdaddressbook.h"
52 53
53#include "opieconverter.h" 54#include "opieconverter.h"
54 55
55#include "resourceopie.h" 56#include "resourceopie.h"
56 57
57using namespace KABC; 58using namespace KABC;
58extern "C" 59extern "C"
59{ 60{
60 void *init_microkabc_opie() 61 void *init_microkabc_opie()
61 { 62 {
62 return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig>(); 63 return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig>();
63 } 64 }
64} 65}
65 66
66ResourceOpie::ResourceOpie( const KConfig *config ) 67ResourceOpie::ResourceOpie( const KConfig *config )
67 : Resource( config ), mConverter (0) 68 : Resource( config ), mConverter (0)
68{ 69{
69 QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; 70 QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
70 71
71 KConfig *cfg = (KConfig *)config; 72 KConfig *cfg = (KConfig *)config;
72 if ( cfg ) { 73 if ( cfg ) {
73 fileName = cfg->readEntry( "FileName", fileName ); 74 fileName = cfg->readEntry( "FileName", fileName );
74 75
75 } 76 }
76 77
77// qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() ); 78// qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() );
78 79
79 init( fileName ); 80 init( fileName );
80} 81}
81 82
82ResourceOpie::ResourceOpie( const QString &fileName ) 83ResourceOpie::ResourceOpie( const QString &fileName )
83 : Resource( 0 ) 84 : Resource( 0 )
84{ 85{
85// qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1()); 86// qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1());
86 init( fileName ); 87 init( fileName );
87} 88}
88 89
89void ResourceOpie::init( const QString &fileName ) 90void ResourceOpie::init( const QString &fileName )
90{ 91{
91 92
92 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); 93 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
93 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); 94 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
94 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); 95 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
95 96
96 //US opie addressbook is always readonly
97//US setReadOnly( true );
98 97
99 setFileName( fileName ); 98 setFileName( fileName );
100 99
101} 100}
102 101
103ResourceOpie::~ResourceOpie() 102ResourceOpie::~ResourceOpie()
104{ 103{
105 if (mConverter != 0) 104 if (mConverter != 0)
106 delete mConverter; 105 delete mConverter;
107} 106}
108 107
109void ResourceOpie::writeConfig( KConfig *config ) 108void ResourceOpie::writeConfig( KConfig *config )
110{ 109{
111 Resource::writeConfig( config ); 110 Resource::writeConfig( config );
112 111
113 config->writeEntry( "FileName", mFileName ); 112 config->writeEntry( "FileName", mFileName );
114 113
115// qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); 114// qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
116 115
117} 116}
118 117
119Ticket *ResourceOpie::requestSaveTicket() 118Ticket *ResourceOpie::requestSaveTicket()
120{ 119{
121 kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl; 120 kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl;
122 121
123 if ( !addressBook() ) return 0; 122 if ( !addressBook() ) return 0;
124 123
125 if ( !lock( mFileName ) ) { 124 if ( !lock( mFileName ) ) {
126 kdDebug(5700) << "ResourceOpie::requestSaveTicket(): Unable to lock file '" 125 kdDebug(5700) << "ResourceOpie::requestSaveTicket(): Unable to lock file '"
127 << mFileName << "'" << endl; 126 << mFileName << "'" << endl;
128 return 0; 127 return 0;
129 } 128 }
130 return createTicket( this ); 129 return createTicket( this );
131} 130}
132 131
133 132
134bool ResourceOpie::doOpen() 133bool ResourceOpie::doOpen()
135{ 134{
136// qDebug("ResourceOpie::doOpen() %s", mFileName.latin1()); 135// qDebug("ResourceOpie::doOpen() %s", mFileName.latin1());
137/*US 136/*US
138 QFile file( mFileName ); 137 QFile file( mFileName );
139 138
140 if ( !file.exists() ) { 139 if ( !file.exists() ) {
141 // try to create the file 140 // try to create the file
142 bool ok = file.open( IO_WriteOnly ); 141 bool ok = file.open( IO_WriteOnly );
143 if ( ok ) 142 if ( ok )
144 file.close(); 143 file.close();
145 144
146 return ok; 145 return ok;
147 } else { 146 } else {
148 if ( !file.open( IO_ReadWrite ) ) 147 if ( !file.open( IO_ReadWrite ) )
149 return false; 148 return false;
150 149
151 if ( file.size() == 0 ) { 150 if ( file.size() == 0 ) {
152 file.close(); 151 file.close();
153 return true; 152 return true;
154 } 153 }
155 154
156//US bool ok = mFormat->checkFormat( &file ); 155//US bool ok = mFormat->checkFormat( &file );
157 bool ok = true; 156 bool ok = true;
158 157
159 file.close(); 158 file.close();
160 159
161 return ok; 160 return ok;
162 } 161 }
163*/ 162*/
164 qDebug("ResourceOpie::doOpen() has to be fixed - %s", mFileName.latin1()); 163 qDebug("ResourceOpie::doOpen() has to be fixed - %s", mFileName.latin1());
165 return true; 164 return true;
166} 165}
167 166
168void ResourceOpie::doClose() 167void ResourceOpie::doClose()
169{ 168{
170// qDebug("ResourceOpie::doClose() %s", mFileName.latin1()); 169// qDebug("ResourceOpie::doClose() %s", mFileName.latin1());
171} 170}
172 171
173bool ResourceOpie::load() 172bool ResourceOpie::load()
174{ 173{
175// qDebug("ResourceOpie::load() %s", mFileName.latin1()); 174// qDebug("ResourceOpie::load() %s", mFileName.latin1());
176 kdDebug(5700) << "ResourceOpie::load(): '" << mFileName << "'" << endl; 175 kdDebug(5700) << "ResourceOpie::load(): '" << mFileName << "'" << endl;
177 176
178 qDebug("ResourceOpie::load: Try to load file() %s", mFileName.latin1()); 177 qDebug("ResourceOpie::load: Try to load file() %s", mFileName.latin1());
179 178
180 OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", mFileName ); 179 OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", mFileName );
181 OContactAccess* access = new OContactAccess("KDEPim/Pi", 0l, backend, false); 180 OContactAccess* access = new OContactAccess("KDEPim/Pi", 0l, backend, false);
182 181
183 if ( !access ) { 182 if ( !access ) {
184 qDebug("Unable to load file() %s", mFileName.latin1()); 183 qDebug("Unable to load file() %s", mFileName.latin1());
185 addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) ); 184 addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
186 return false; 185 return false;
187 } 186 }
188 187
189 access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available 188 access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
190 189
191 bool res = false; 190 bool res = false;
192 if (mConverter == 0) 191 if (mConverter == 0)
193 { 192 {
@@ -278,112 +277,119 @@ bool ResourceOpie::save( Ticket *ticket )
278 277
279 qDebug("ResourceOpie::save has to be changed"); 278 qDebug("ResourceOpie::save has to be changed");
280*/ 279*/
281 return true; 280 return true;
282 281
283} 282}
284 283
285bool ResourceOpie::lock( const QString &fileName ) 284bool ResourceOpie::lock( const QString &fileName )
286{ 285{
287// qDebug("ResourceOpie::lock() %s", fileName.latin1()); 286// qDebug("ResourceOpie::lock() %s", fileName.latin1());
288 kdDebug(5700) << "ResourceOpie::lock()" << endl; 287 kdDebug(5700) << "ResourceOpie::lock()" << endl;
289 288
290 QString fn = fileName; 289 QString fn = fileName;
291 290
292//US change the implementation how the lockfilename is getting created 291//US change the implementation how the lockfilename is getting created
293//US fn.replace( QRegExp("/"), "_" ); 292//US fn.replace( QRegExp("/"), "_" );
294//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); 293//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
295 294
296 KURL url(fn); 295 KURL url(fn);
297 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); 296 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
298 297
299 kdDebug(5700) << "-- lock name: " << lockName << endl; 298 kdDebug(5700) << "-- lock name: " << lockName << endl;
300 299
301 if (QFile::exists( lockName )) return false; 300 if (QFile::exists( lockName )) return false;
302 301
303 QString lockUniqueName; 302 QString lockUniqueName;
304 lockUniqueName = fn + KApplication::randomString( 8 ); 303 lockUniqueName = fn + KApplication::randomString( 8 );
305 304
306 url = lockUniqueName; 305 url = lockUniqueName;
307//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); 306//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
308 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); 307 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
309 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; 308 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
310 309
311 // Create unique file 310 // Create unique file
312 QFile file( mLockUniqueName ); 311 QFile file( mLockUniqueName );
313 file.open( IO_WriteOnly ); 312 file.open( IO_WriteOnly );
314 file.close(); 313 file.close();
315 314
316 // Create lock file 315 // Create lock file
317 int result = 0; 316 int result = 0;
318#ifndef _WIN32_ 317#ifndef _WIN32_
319 result = ::link( QFile::encodeName( mLockUniqueName ), 318 result = ::link( QFile::encodeName( mLockUniqueName ),
320 QFile::encodeName( lockName ) ); 319 QFile::encodeName( lockName ) );
321#endif 320#endif
322 if ( result == 0 ) { 321 if ( result == 0 ) {
323 addressBook()->emitAddressBookLocked(); 322 addressBook()->emitAddressBookLocked();
324 return true; 323 return true;
325 } 324 }
326 325
327 // TODO: check stat 326 // TODO: check stat
328 327
329 return false; 328 return false;
330} 329}
331 330
332void ResourceOpie::unlock( const QString &fileName ) 331void ResourceOpie::unlock( const QString &fileName )
333{ 332{
334// qDebug("ResourceOpie::unlock() %s", fileName.latin1()); 333// qDebug("ResourceOpie::unlock() %s", fileName.latin1());
335 334
336 QString fn = fileName; 335 QString fn = fileName;
337//US change the implementation how the lockfilename is getting created 336//US change the implementation how the lockfilename is getting created
338//US fn.replace( QRegExp( "/" ), "_" ); 337//US fn.replace( QRegExp( "/" ), "_" );
339//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); 338//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
340//US QString lockName = fn + ".lock"; 339//US QString lockName = fn + ".lock";
341 KURL url(fn); 340 KURL url(fn);
342 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); 341 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
343 342
344 QFile::remove( lockName ); 343 QFile::remove( lockName );
345 QFile::remove( mLockUniqueName ); 344 QFile::remove( mLockUniqueName );
346 addressBook()->emitAddressBookUnlocked(); 345 addressBook()->emitAddressBookUnlocked();
347} 346}
348 347
349void ResourceOpie::setFileName( const QString &fileName ) 348void ResourceOpie::setFileName( const QString &fileName )
350{ 349{
351 mDirWatch.stopScan(); 350 mDirWatch.stopScan();
352 mDirWatch.removeFile( mFileName ); 351 mDirWatch.removeFile( mFileName );
353 352
354 mFileName = fileName; 353 mFileName = fileName;
355 354
356 mDirWatch.addFile( mFileName ); 355 mDirWatch.addFile( mFileName );
357 mDirWatch.startScan(); 356 mDirWatch.startScan();
358 357
359//US simulate KDirWatch event 358//US simulate KDirWatch event
360//US fileChanged(); 359//US fileChanged();
361} 360}
362 361
363QString ResourceOpie::fileName() const 362QString ResourceOpie::fileName() const
364{ 363{
365 return mFileName; 364 return mFileName;
366} 365}
367 366
368void ResourceOpie::fileChanged() 367void ResourceOpie::fileChanged()
369{ 368{
370 // There is a small theoretical chance that KDirWatch calls us before 369 // There is a small theoretical chance that KDirWatch calls us before
371 // we are fully constructed 370 // we are fully constructed
372 if (!addressBook()) 371 if (!addressBook())
373 return; 372 return;
373
374 QString text( i18n( "Opie resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
375 if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
376 load();
377 addressBook()->emitAddressBookChanged();
378 }
379
374 load(); 380 load();
375 addressBook()->emitAddressBookChanged(); 381 addressBook()->emitAddressBookChanged();
376} 382}
377 383
378void ResourceOpie::removeAddressee( const Addressee &addr ) 384void ResourceOpie::removeAddressee( const Addressee &addr )
379{ 385{
380} 386}
381 387
382void ResourceOpie::cleanUp() 388void ResourceOpie::cleanUp()
383{ 389{
384// qDebug("ResourceOpie::cleanup() %s", mFileName.latin1()); 390// qDebug("ResourceOpie::cleanup() %s", mFileName.latin1());
385 391
386 unlock( mFileName ); 392 unlock( mFileName );
387} 393}
388 394
389//US #include "resourceopie.moc" 395//US #include "resourceopie.moc"
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 4854197..7475685 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -1,138 +1,139 @@
1/* 1/*
2 This file is part of libkabc. 2 This file is part of libkabc.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21/* 21/*
22Enhanced Version of the file for platform independent KDE tools. 22Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27#include <sys/types.h> 27#include <sys/types.h>
28#include <sys/stat.h> 28#include <sys/stat.h>
29#include <unistd.h> 29#include <unistd.h>
30 30
31#include <qdir.h> 31#include <qdir.h>
32#include <qfile.h> 32#include <qfile.h>
33#include <qfileinfo.h> 33#include <qfileinfo.h>
34#include <qregexp.h> 34#include <qregexp.h>
35//US #include <qtimer.h> 35//US #include <qtimer.h>
36 36
37#include <kapplication.h> 37#include <kapplication.h>
38#include <kconfig.h> 38#include <kconfig.h>
39#include <kdebug.h> 39#include <kdebug.h>
40#include <klocale.h> 40#include <klocale.h>
41//US #include <ksavefile.h> 41//US #include <ksavefile.h>
42#include <kstandarddirs.h> 42#include <kstandarddirs.h>
43#include <kmessagebox.h>
43 44
44#include <qpe/pim/addressbookaccess.h> 45#include <qpe/pim/addressbookaccess.h>
45 46
46 47
47#include "resourceqtopiaconfig.h" 48#include "resourceqtopiaconfig.h"
48#include "stdaddressbook.h" 49#include "stdaddressbook.h"
49 50
50#include "qtopiaconverter.h" 51#include "qtopiaconverter.h"
51 52
52#include "resourceqtopia.h" 53#include "resourceqtopia.h"
53 54
54using namespace KABC; 55using namespace KABC;
55extern "C" 56extern "C"
56{ 57{
57 void *init_microkabc_qtopia() 58 void *init_microkabc_qtopia()
58 { 59 {
59 return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>(); 60 return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
60 } 61 }
61} 62}
62 63
63ResourceQtopia::ResourceQtopia( const KConfig *config ) 64ResourceQtopia::ResourceQtopia( const KConfig *config )
64 : Resource( config ), mConverter (0) 65 : Resource( config ), mConverter (0)
65{ 66{
66 // we can not choose the filename. Therefore use the default to display 67 // we can not choose the filename. Therefore use the default to display
67 QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; 68 QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
68 69
69 init( fileName ); 70 init( fileName );
70} 71}
71 72
72ResourceQtopia::ResourceQtopia( const QString &fileName ) 73ResourceQtopia::ResourceQtopia( const QString &fileName )
73 : Resource( 0 ) 74 : Resource( 0 )
74{ 75{
75// qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); 76// qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
76 init( fileName ); 77 init( fileName );
77} 78}
78 79
79void ResourceQtopia::init( const QString &fileName ) 80void ResourceQtopia::init( const QString &fileName )
80{ 81{
81 82
82 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); 83 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
83 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); 84 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
84 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); 85 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
85 86
86 setFileName( fileName ); 87 setFileName( fileName );
87} 88}
88 89
89ResourceQtopia::~ResourceQtopia() 90ResourceQtopia::~ResourceQtopia()
90{ 91{
91 if (mConverter != 0) 92 if (mConverter != 0)
92 delete mConverter; 93 delete mConverter;
93 94
94} 95}
95 96
96void ResourceQtopia::writeConfig( KConfig *config ) 97void ResourceQtopia::writeConfig( KConfig *config )
97{ 98{
98 Resource::writeConfig( config ); 99 Resource::writeConfig( config );
99} 100}
100 101
101Ticket *ResourceQtopia::requestSaveTicket() 102Ticket *ResourceQtopia::requestSaveTicket()
102{ 103{
103 kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl; 104 kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
104 105
105 if ( !addressBook() ) return 0; 106 if ( !addressBook() ) return 0;
106 107
107 if ( !lock( mFileName ) ) { 108 if ( !lock( mFileName ) ) {
108 kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '" 109 kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
109 << mFileName << "'" << endl; 110 << mFileName << "'" << endl;
110 return 0; 111 return 0;
111 } 112 }
112 return createTicket( this ); 113 return createTicket( this );
113} 114}
114 115
115 116
116bool ResourceQtopia::doOpen() 117bool ResourceQtopia::doOpen()
117{ 118{
118/*US 119/*US
119 QFile file( mFileName ); 120 QFile file( mFileName );
120 121
121 if ( !file.exists() ) { 122 if ( !file.exists() ) {
122 // try to create the file 123 // try to create the file
123 bool ok = file.open( IO_WriteOnly ); 124 bool ok = file.open( IO_WriteOnly );
124 if ( ok ) 125 if ( ok )
125 file.close(); 126 file.close();
126 127
127 return ok; 128 return ok;
128 } else { 129 } else {
129 if ( !file.open( IO_ReadWrite ) ) 130 if ( !file.open( IO_ReadWrite ) )
130 return false; 131 return false;
131 132
132 if ( file.size() == 0 ) { 133 if ( file.size() == 0 ) {
133 file.close(); 134 file.close();
134 return true; 135 return true;
135 } 136 }
136 137
137//US bool ok = mFormat->checkFormat( &file ); 138//US bool ok = mFormat->checkFormat( &file );
138 bool ok = true; 139 bool ok = true;
@@ -242,110 +243,114 @@ bool ResourceQtopia::save( Ticket *ticket )
242 addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); 243 addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
243 244
244 delete ticket; 245 delete ticket;
245 unlock( mFileName ); 246 unlock( mFileName );
246 247
247 return ok; 248 return ok;
248 249
249 qDebug("ResourceQtopia::save has to be changed"); 250 qDebug("ResourceQtopia::save has to be changed");
250*/ 251*/
251 return true; 252 return true;
252} 253}
253 254
254bool ResourceQtopia::lock( const QString &fileName ) 255bool ResourceQtopia::lock( const QString &fileName )
255{ 256{
256 kdDebug(5700) << "ResourceQtopia::lock()" << endl; 257 kdDebug(5700) << "ResourceQtopia::lock()" << endl;
257 258
258 QString fn = fileName; 259 QString fn = fileName;
259 260
260//US change the implementation how the lockfilename is getting created 261//US change the implementation how the lockfilename is getting created
261//US fn.replace( QRegExp("/"), "_" ); 262//US fn.replace( QRegExp("/"), "_" );
262//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); 263//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
263 264
264 KURL url(fn); 265 KURL url(fn);
265 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); 266 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
266 267
267 kdDebug(5700) << "-- lock name: " << lockName << endl; 268 kdDebug(5700) << "-- lock name: " << lockName << endl;
268 269
269 if (QFile::exists( lockName )) return false; 270 if (QFile::exists( lockName )) return false;
270 271
271 QString lockUniqueName; 272 QString lockUniqueName;
272 lockUniqueName = fn + KApplication::randomString( 8 ); 273 lockUniqueName = fn + KApplication::randomString( 8 );
273 274
274 url = lockUniqueName; 275 url = lockUniqueName;
275//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); 276//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
276 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); 277 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
277 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; 278 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
278 279
279 // Create unique file 280 // Create unique file
280 QFile file( mLockUniqueName ); 281 QFile file( mLockUniqueName );
281 file.open( IO_WriteOnly ); 282 file.open( IO_WriteOnly );
282 file.close(); 283 file.close();
283 284
284 // Create lock file 285 // Create lock file
285 int result = ::link( QFile::encodeName( mLockUniqueName ), 286 int result = ::link( QFile::encodeName( mLockUniqueName ),
286 QFile::encodeName( lockName ) ); 287 QFile::encodeName( lockName ) );
287 288
288 if ( result == 0 ) { 289 if ( result == 0 ) {
289 addressBook()->emitAddressBookLocked(); 290 addressBook()->emitAddressBookLocked();
290 return true; 291 return true;
291 } 292 }
292 293
293 // TODO: check stat 294 // TODO: check stat
294 295
295 return false; 296 return false;
296} 297}
297 298
298void ResourceQtopia::unlock( const QString &fileName ) 299void ResourceQtopia::unlock( const QString &fileName )
299{ 300{
300 QString fn = fileName; 301 QString fn = fileName;
301//US change the implementation how the lockfilename is getting created 302//US change the implementation how the lockfilename is getting created
302//US fn.replace( QRegExp( "/" ), "_" ); 303//US fn.replace( QRegExp( "/" ), "_" );
303//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); 304//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
304//US QString lockName = fn + ".lock"; 305//US QString lockName = fn + ".lock";
305 KURL url(fn); 306 KURL url(fn);
306 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); 307 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
307 308
308 QFile::remove( lockName ); 309 QFile::remove( lockName );
309 QFile::remove( mLockUniqueName ); 310 QFile::remove( mLockUniqueName );
310 addressBook()->emitAddressBookUnlocked(); 311 addressBook()->emitAddressBookUnlocked();
311} 312}
312 313
313void ResourceQtopia::setFileName( const QString &fileName ) 314void ResourceQtopia::setFileName( const QString &fileName )
314{ 315{
315 mDirWatch.stopScan(); 316 mDirWatch.stopScan();
316 mDirWatch.removeFile( mFileName ); 317 mDirWatch.removeFile( mFileName );
317 318
318 mFileName = fileName; 319 mFileName = fileName;
319 320
320 mDirWatch.addFile( mFileName ); 321 mDirWatch.addFile( mFileName );
321 mDirWatch.startScan(); 322 mDirWatch.startScan();
322 323
323//US simulate KDirWatch event 324//US simulate KDirWatch event
324//US fileChanged(); 325//US fileChanged();
325} 326}
326 327
327QString ResourceQtopia::fileName() const 328QString ResourceQtopia::fileName() const
328{ 329{
329 return mFileName; 330 return mFileName;
330} 331}
331 332
332void ResourceQtopia::fileChanged() 333void ResourceQtopia::fileChanged()
333{ 334{
334 // There is a small theoretical chance that KDirWatch calls us before 335 // There is a small theoretical chance that KDirWatch calls us before
335 // we are fully constructed 336 // we are fully constructed
336 if (!addressBook()) 337 if (!addressBook())
337 return; 338 return;
338 load(); 339
339 addressBook()->emitAddressBookChanged(); 340 QString text( i18n( "Qtopia resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
341 if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
342 load();
343 addressBook()->emitAddressBookChanged();
344 }
340} 345}
341 346
342void ResourceQtopia::removeAddressee( const Addressee &addr ) 347void ResourceQtopia::removeAddressee( const Addressee &addr )
343{ 348{
344} 349}
345 350
346void ResourceQtopia::cleanUp() 351void ResourceQtopia::cleanUp()
347{ 352{
348 unlock( mFileName ); 353 unlock( mFileName );
349} 354}
350 355
351//US #include "resourceqtopia.moc" 356//US #include "resourceqtopia.moc"
diff --git a/kaddressbook/details/detailsviewcontainer.cpp b/kaddressbook/details/detailsviewcontainer.cpp
index 8f566cf..a42499f 100644
--- a/kaddressbook/details/detailsviewcontainer.cpp
+++ b/kaddressbook/details/detailsviewcontainer.cpp
@@ -41,131 +41,132 @@
41 41
42 42
43#include "detailsviewcontainer.h" 43#include "detailsviewcontainer.h"
44 44
45ViewContainer::ViewContainer( QWidget *parent, const char* name ) 45ViewContainer::ViewContainer( QWidget *parent, const char* name )
46 : QWidget( parent, name ), mCurrentLook( 0 ) 46 : QWidget( parent, name ), mCurrentLook( 0 )
47{ 47{
48 QBoxLayout *topLayout = new QVBoxLayout( this ); 48 QBoxLayout *topLayout = new QVBoxLayout( this );
49 //topLayout->setMargin( KDialog::marginHint() ); 49 //topLayout->setMargin( KDialog::marginHint() );
50 //topLayout->setSpacing( KDialog::spacingHint() ); 50 //topLayout->setSpacing( KDialog::spacingHint() );
51 topLayout->setMargin( 0 ); 51 topLayout->setMargin( 0 );
52 topLayout->setSpacing( 0 ); 52 topLayout->setSpacing( 0 );
53 53
54 QBoxLayout *styleLayout = new QHBoxLayout( topLayout ); 54 QBoxLayout *styleLayout = new QHBoxLayout( topLayout );
55 55
56 QLabel *label = new QLabel( i18n("Style:"), this ); 56 QLabel *label = new QLabel( i18n("Style:"), this );
57 styleLayout->addWidget( label ); 57 styleLayout->addWidget( label );
58 58
59 mStyleCombo = new QComboBox( this ); 59 mStyleCombo = new QComboBox( this );
60 styleLayout->addWidget( mStyleCombo ); 60 styleLayout->addWidget( mStyleCombo );
61 61
62 QFrame *frameRuler = new QFrame( this ); 62 QFrame *frameRuler = new QFrame( this );
63//US frameRuler->setFrameShape( QFrame::HLine ); 63//US frameRuler->setFrameShape( QFrame::HLine );
64//US frameRuler->setFrameShadow( QFrame::Sunken ); 64//US frameRuler->setFrameShadow( QFrame::Sunken );
65//US topLayout->addWidget( frameRuler ); 65//US topLayout->addWidget( frameRuler );
66 66
67 mDetailsStack = new QWidgetStack( this ); 67 mDetailsStack = new QWidgetStack( this );
68 topLayout->addWidget( mDetailsStack, 1 ); 68 topLayout->addWidget( mDetailsStack, 1 );
69 69
70 registerLooks(); 70 registerLooks();
71 71
72#if 1 72#if 1
73 // Hide detailed view selection combo box, because we currently have 73 // Hide detailed view selection combo box, because we currently have
74 // only one. Reenable it when there are more detailed views. 74 // only one. Reenable it when there are more detailed views.
75 label->hide(); 75 label->hide();
76 mStyleCombo->hide(); 76 mStyleCombo->hide();
77 frameRuler->hide(); 77 frameRuler->hide();
78#endif 78#endif
79} 79}
80 80
81KABBasicLook *ViewContainer::currentLook() 81KABBasicLook *ViewContainer::currentLook()
82{ 82{
83 return mCurrentLook; 83 return mCurrentLook;
84} 84}
85 85
86void ViewContainer::registerLooks() 86void ViewContainer::registerLooks()
87{ 87{
88 mLookFactories.append( new KABHtmlViewFactory( mDetailsStack ) ); 88 mLookFactories.append( new KABHtmlViewFactory( mDetailsStack ) );
89// mLookFactories.append( new KABDetailedViewFactory( mDetailsStack ) ); 89// mLookFactories.append( new KABDetailedViewFactory( mDetailsStack ) );
90 mStyleCombo->clear(); 90 mStyleCombo->clear();
91 91
92 for ( uint i = 0; i < mLookFactories.count(); ++i ) 92 for ( uint i = 0; i < mLookFactories.count(); ++i )
93 mStyleCombo->insertItem( mLookFactories.at( i )->description() ); 93 mStyleCombo->insertItem( mLookFactories.at( i )->description() );
94 94
95 if ( !mLookFactories.isEmpty() ) 95 if ( !mLookFactories.isEmpty() )
96 slotStyleSelected( 0 ); 96 slotStyleSelected( 0 );
97} 97}
98 98
99void ViewContainer::slotStyleSelected( int index ) 99void ViewContainer::slotStyleSelected( int index )
100{ 100{
101#ifndef KAB_EMBEDDED 101#ifndef KAB_EMBEDDED
102 KConfig *config = kapp->config(); 102 KConfig *config = kapp->config();
103#else //KAB_EMBEDDED 103#else //KAB_EMBEDDED
104 //US I hope I got the same config object as above expected. 104 //US I hope I got the same config object as above expected.
105 KConfig *config = KABPrefs::instance()->getConfig(); 105 KConfig *config = KABPrefs::instance()->getConfig();
106#endif //KAB_EMBEDDED 106#endif //KAB_EMBEDDED
107 KABC::Addressee addr; 107 KABC::Addressee addr;
108 108
109 if ( index >= 0 && index < mStyleCombo->count() ) { 109 if ( index >= 0 && index < mStyleCombo->count() ) {
110 if ( mCurrentLook != 0 ) { 110 if ( mCurrentLook != 0 ) {
111 mCurrentLook->saveSettings( config ); 111 mCurrentLook->saveSettings( config );
112 addr = mCurrentLook->addressee(); 112 addr = mCurrentLook->addressee();
113 113
114 delete mCurrentLook; 114 delete mCurrentLook;
115 mCurrentLook = 0; 115 mCurrentLook = 0;
116 } 116 }
117 117
118 KABLookFactory *factory = mLookFactories.at( index ); 118 KABLookFactory *factory = mLookFactories.at( index );
119 kdDebug(5720) << "ViewContainer::slotStyleSelected: " 119 kdDebug(5720) << "ViewContainer::slotStyleSelected: "
120 << "creating look " 120 << "creating look "
121 << factory->description() << endl; 121 << factory->description() << endl;
122 122
123 mCurrentLook = factory->create(); 123 mCurrentLook = factory->create();
124 mDetailsStack->raiseWidget( mCurrentLook ); 124 mDetailsStack->raiseWidget( mCurrentLook );
125 125
126 connect( mCurrentLook, SIGNAL( sendEmail( const QString& ) ), this, 126 connect( mCurrentLook, SIGNAL( sendEmail( const QString& ) ), this,
127 SIGNAL( sendEmail( const QString& ) ) ); 127 SIGNAL( sendEmail( const QString& ) ) );
128 connect( mCurrentLook, SIGNAL( browse( const QString& ) ), this, 128 connect( mCurrentLook, SIGNAL( browse( const QString& ) ), this,
129 SIGNAL( browse( const QString& ) ) ); 129 SIGNAL( browse( const QString& ) ) );
130 } 130 }
131 131
132 mCurrentLook->restoreSettings( config ); 132 mCurrentLook->restoreSettings( config );
133 mCurrentLook->setAddressee( addr ); 133 mCurrentLook->setAddressee( addr );
134} 134}
135void ViewContainer::refreshView() 135void ViewContainer::refreshView()
136{ 136{
137 if ( mCurrentLook ) 137 if ( mCurrentLook ) {
138 mCurrentLook->setAddressee( mCurrentAddressee ); 138 mCurrentLook->setAddressee( mCurrentAddressee );
139 }
139} 140}
140 141
141void ViewContainer::setAddressee( const KABC::Addressee& addressee ) 142void ViewContainer::setAddressee( const KABC::Addressee& addressee )
142{ 143{
143 if ( mCurrentLook != 0 ) { 144 if ( mCurrentLook != 0 ) {
144 if ( addressee == mCurrentAddressee ) 145 if ( addressee == mCurrentAddressee )
145 return; 146 return;
146 else { 147 else {
147 mCurrentAddressee = addressee; 148 mCurrentAddressee = addressee;
148 mCurrentLook->setAddressee( mCurrentAddressee ); 149 mCurrentLook->setAddressee( mCurrentAddressee );
149 } 150 }
150 } 151 }
151} 152}
152 153
153KABC::Addressee ViewContainer::addressee() 154KABC::Addressee ViewContainer::addressee()
154{ 155{
155 static KABC::Addressee empty; // do not use! 156 static KABC::Addressee empty; // do not use!
156 157
157 if ( !mCurrentLook ) 158 if ( !mCurrentLook )
158 return empty; 159 return empty;
159 else 160 else
160 return mCurrentLook->addressee(); 161 return mCurrentLook->addressee();
161} 162}
162 163
163void ViewContainer::setReadOnly( bool state ) 164void ViewContainer::setReadOnly( bool state )
164{ 165{
165 if ( mCurrentLook ) 166 if ( mCurrentLook )
166 mCurrentLook->setReadOnly( state ); 167 mCurrentLook->setReadOnly( state );
167} 168}
168 169
169#ifndef KAB_EMBEDDED 170#ifndef KAB_EMBEDDED
170#include "detailsviewcontainer.moc" 171#include "detailsviewcontainer.moc"
171#endif //KAB_EMBEDDED 172#endif //KAB_EMBEDDED
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2b07541..a7ca0ce 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1031,192 +1031,193 @@ QString KABCore::getNameByPhone( const QString &phone )
1031 1031
1032} 1032}
1033 1033
1034void KABCore::openConfigDialog() 1034void KABCore::openConfigDialog()
1035{ 1035{
1036 KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true ); 1036 KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true );
1037 KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); 1037 KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" );
1038 ConfigureDialog->addModule(kabcfg ); 1038 ConfigureDialog->addModule(kabcfg );
1039 connect( ConfigureDialog, SIGNAL( applyClicked() ), 1039 connect( ConfigureDialog, SIGNAL( applyClicked() ),
1040 this, SLOT( configurationChanged() ) ); 1040 this, SLOT( configurationChanged() ) );
1041 connect( ConfigureDialog, SIGNAL( okClicked() ), 1041 connect( ConfigureDialog, SIGNAL( okClicked() ),
1042 this, SLOT( configurationChanged() ) ); 1042 this, SLOT( configurationChanged() ) );
1043 saveSettings(); 1043 saveSettings();
1044 ConfigureDialog->showMaximized(); 1044 ConfigureDialog->showMaximized();
1045 if ( ConfigureDialog->exec() ) 1045 if ( ConfigureDialog->exec() )
1046 KMessageBox::information( this, i18n("If you configured \nExtensions,\nplease restart!\n") ); 1046 KMessageBox::information( this, i18n("If you configured \nExtensions,\nplease restart!\n") );
1047 delete ConfigureDialog; 1047 delete ConfigureDialog;
1048} 1048}
1049 1049
1050void KABCore::openLDAPDialog() 1050void KABCore::openLDAPDialog()
1051{ 1051{
1052#ifndef KAB_EMBEDDED 1052#ifndef KAB_EMBEDDED
1053 if ( !mLdapSearchDialog ) { 1053 if ( !mLdapSearchDialog ) {
1054 mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); 1054 mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this );
1055 connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, 1055 connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager,
1056 SLOT( refreshView() ) ); 1056 SLOT( refreshView() ) );
1057 connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, 1057 connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this,
1058 SLOT( setModified() ) ); 1058 SLOT( setModified() ) );
1059 } else 1059 } else
1060 mLdapSearchDialog->restoreSettings(); 1060 mLdapSearchDialog->restoreSettings();
1061 1061
1062 if ( mLdapSearchDialog->isOK() ) 1062 if ( mLdapSearchDialog->isOK() )
1063 mLdapSearchDialog->exec(); 1063 mLdapSearchDialog->exec();
1064#else //KAB_EMBEDDED 1064#else //KAB_EMBEDDED
1065 qDebug("KABCore::openLDAPDialog() finsih method"); 1065 qDebug("KABCore::openLDAPDialog() finsih method");
1066#endif //KAB_EMBEDDED 1066#endif //KAB_EMBEDDED
1067} 1067}
1068 1068
1069void KABCore::print() 1069void KABCore::print()
1070{ 1070{
1071#ifndef KAB_EMBEDDED 1071#ifndef KAB_EMBEDDED
1072 KPrinter printer; 1072 KPrinter printer;
1073 if ( !printer.setup( this ) ) 1073 if ( !printer.setup( this ) )
1074 return; 1074 return;
1075 1075
1076 KABPrinting::PrintingWizard wizard( &printer, mAddressBook, 1076 KABPrinting::PrintingWizard wizard( &printer, mAddressBook,
1077 mViewManager->selectedUids(), this ); 1077 mViewManager->selectedUids(), this );
1078 1078
1079 wizard.exec(); 1079 wizard.exec();
1080#else //KAB_EMBEDDED 1080#else //KAB_EMBEDDED
1081 qDebug("KABCore::print() finsih method"); 1081 qDebug("KABCore::print() finsih method");
1082#endif //KAB_EMBEDDED 1082#endif //KAB_EMBEDDED
1083 1083
1084} 1084}
1085 1085
1086 1086
1087void KABCore::addGUIClient( KXMLGUIClient *client ) 1087void KABCore::addGUIClient( KXMLGUIClient *client )
1088{ 1088{
1089 if ( mGUIClient ) 1089 if ( mGUIClient )
1090 mGUIClient->insertChildClient( client ); 1090 mGUIClient->insertChildClient( client );
1091 else 1091 else
1092 KMessageBox::error( this, "no KXMLGUICLient"); 1092 KMessageBox::error( this, "no KXMLGUICLient");
1093} 1093}
1094 1094
1095 1095
1096void KABCore::configurationChanged() 1096void KABCore::configurationChanged()
1097{ 1097{
1098 mExtensionManager->reconfigure(); 1098 mExtensionManager->reconfigure();
1099} 1099}
1100 1100
1101void KABCore::addressBookChanged() 1101void KABCore::addressBookChanged()
1102{ 1102{
1103/*US 1103/*US
1104 QDictIterator<AddresseeEditorDialog> it( mEditorDict ); 1104 QDictIterator<AddresseeEditorDialog> it( mEditorDict );
1105 while ( it.current() ) { 1105 while ( it.current() ) {
1106 if ( it.current()->dirty() ) { 1106 if ( it.current()->dirty() ) {
1107 QString text = i18n( "Data has been changed externally. Unsaved " 1107 QString text = i18n( "Data has been changed externally. Unsaved "
1108 "changes will be lost." ); 1108 "changes will be lost." );
1109 KMessageBox::information( this, text ); 1109 KMessageBox::information( this, text );
1110 } 1110 }
1111 it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) ); 1111 it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) );
1112 ++it; 1112 ++it;
1113 } 1113 }
1114*/ 1114*/
1115 if (mEditorDialog) 1115 if (mEditorDialog)
1116 { 1116 {
1117 if (mEditorDialog->dirty()) 1117 if (mEditorDialog->dirty())
1118 { 1118 {
1119 QString text = i18n( "Data has been changed externally. Unsaved " 1119 QString text = i18n( "Data has been changed externally. Unsaved "
1120 "changes will be lost." ); 1120 "changes will be lost." );
1121 KMessageBox::information( this, text ); 1121 KMessageBox::information( this, text );
1122 } 1122 }
1123 QString currentuid = mEditorDialog->addressee().uid(); 1123 QString currentuid = mEditorDialog->addressee().uid();
1124 mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) ); 1124 mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) );
1125 } 1125 }
1126 mViewManager->refreshView(); 1126 mViewManager->refreshView();
1127// mDetails->refreshView();
1127 1128
1128 1129
1129} 1130}
1130 1131
1131AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent, 1132AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
1132 const char *name ) 1133 const char *name )
1133{ 1134{
1134 1135
1135 if ( mEditorDialog == 0 ) { 1136 if ( mEditorDialog == 0 ) {
1136 mEditorDialog = new AddresseeEditorDialog( this, parent, 1137 mEditorDialog = new AddresseeEditorDialog( this, parent,
1137 name ? name : "editorDialog" ); 1138 name ? name : "editorDialog" );
1138 1139
1139 1140
1140 connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ), 1141 connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
1141 SLOT( contactModified( const KABC::Addressee& ) ) ); 1142 SLOT( contactModified( const KABC::Addressee& ) ) );
1142 //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ), 1143 //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
1143 // SLOT( slotEditorDestroyed( const QString& ) ) ); 1144 // SLOT( slotEditorDestroyed( const QString& ) ) );
1144 } 1145 }
1145 1146
1146 return mEditorDialog; 1147 return mEditorDialog;
1147} 1148}
1148 1149
1149void KABCore::slotEditorDestroyed( const QString &uid ) 1150void KABCore::slotEditorDestroyed( const QString &uid )
1150{ 1151{
1151 //mEditorDict.remove( uid ); 1152 //mEditorDict.remove( uid );
1152} 1153}
1153 1154
1154void KABCore::initGUI() 1155void KABCore::initGUI()
1155{ 1156{
1156#ifndef KAB_EMBEDDED 1157#ifndef KAB_EMBEDDED
1157 QHBoxLayout *topLayout = new QHBoxLayout( this ); 1158 QHBoxLayout *topLayout = new QHBoxLayout( this );
1158 topLayout->setSpacing( KDialogBase::spacingHint() ); 1159 topLayout->setSpacing( KDialogBase::spacingHint() );
1159 1160
1160 mExtensionBarSplitter = new QSplitter( this ); 1161 mExtensionBarSplitter = new QSplitter( this );
1161 mExtensionBarSplitter->setOrientation( Qt::Vertical ); 1162 mExtensionBarSplitter->setOrientation( Qt::Vertical );
1162 1163
1163 mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); 1164 mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
1164 1165
1165 QVBox *viewSpace = new QVBox( mDetailsSplitter ); 1166 QVBox *viewSpace = new QVBox( mDetailsSplitter );
1166 mIncSearchWidget = new IncSearchWidget( viewSpace ); 1167 mIncSearchWidget = new IncSearchWidget( viewSpace );
1167 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), 1168 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
1168 SLOT( incrementalSearch( const QString& ) ) ); 1169 SLOT( incrementalSearch( const QString& ) ) );
1169 1170
1170 mViewManager = new ViewManager( this, viewSpace ); 1171 mViewManager = new ViewManager( this, viewSpace );
1171 viewSpace->setStretchFactor( mViewManager, 1 ); 1172 viewSpace->setStretchFactor( mViewManager, 1 );
1172 1173
1173 mDetails = new ViewContainer( mDetailsSplitter ); 1174 mDetails = new ViewContainer( mDetailsSplitter );
1174 1175
1175 mJumpButtonBar = new JumpButtonBar( this, this ); 1176 mJumpButtonBar = new JumpButtonBar( this, this );
1176 1177
1177 mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); 1178 mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
1178 1179
1179 topLayout->addWidget( mExtensionBarSplitter ); 1180 topLayout->addWidget( mExtensionBarSplitter );
1180 topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); 1181 topLayout->setStretchFactor( mExtensionBarSplitter, 100 );
1181 topLayout->addWidget( mJumpButtonBar ); 1182 topLayout->addWidget( mJumpButtonBar );
1182 topLayout->setStretchFactor( mJumpButtonBar, 1 ); 1183 topLayout->setStretchFactor( mJumpButtonBar, 1 );
1183 1184
1184 mXXPortManager = new XXPortManager( this, this ); 1185 mXXPortManager = new XXPortManager( this, this );
1185 1186
1186#else //KAB_EMBEDDED 1187#else //KAB_EMBEDDED
1187 //US initialize viewMenu before settingup viewmanager. 1188 //US initialize viewMenu before settingup viewmanager.
1188 // Viewmanager needs this menu to plugin submenues. 1189 // Viewmanager needs this menu to plugin submenues.
1189 viewMenu = new QPopupMenu( this ); 1190 viewMenu = new QPopupMenu( this );
1190 settingsMenu = new QPopupMenu( this ); 1191 settingsMenu = new QPopupMenu( this );
1191 //filterMenu = new QPopupMenu( this ); 1192 //filterMenu = new QPopupMenu( this );
1192 ImportMenu = new QPopupMenu( this ); 1193 ImportMenu = new QPopupMenu( this );
1193 ExportMenu = new QPopupMenu( this ); 1194 ExportMenu = new QPopupMenu( this );
1194 1195
1195 changeMenu= new QPopupMenu( this ); 1196 changeMenu= new QPopupMenu( this );
1196 1197
1197//US since we have no splitter for the embedded system, setup 1198//US since we have no splitter for the embedded system, setup
1198// a layout with two frames. One left and one right. 1199// a layout with two frames. One left and one right.
1199 1200
1200 QBoxLayout *topLayout; 1201 QBoxLayout *topLayout;
1201 1202
1202 // = new QHBoxLayout( this ); 1203 // = new QHBoxLayout( this );
1203// QBoxLayout *topLayout = (QBoxLayout*)layout(); 1204// QBoxLayout *topLayout = (QBoxLayout*)layout();
1204 1205
1205// QWidget *mainBox = new QWidget( this ); 1206// QWidget *mainBox = new QWidget( this );
1206// QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); 1207// QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox);
1207 1208
1208#ifdef DESKTOP_VERSION 1209#ifdef DESKTOP_VERSION
1209 topLayout = new QHBoxLayout( this ); 1210 topLayout = new QHBoxLayout( this );
1210 1211
1211 1212
1212 mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); 1213 mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
1213 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); 1214 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
1214 1215
1215 topLayout->addWidget(mMiniSplitter ); 1216 topLayout->addWidget(mMiniSplitter );
1216 1217
1217 mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); 1218 mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
1218 mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); 1219 mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
1219 mViewManager = new ViewManager( this, mExtensionBarSplitter ); 1220 mViewManager = new ViewManager( this, mExtensionBarSplitter );
1220 mDetails = new ViewContainer( mMiniSplitter ); 1221 mDetails = new ViewContainer( mMiniSplitter );
1221 mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); 1222 mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
1222#else 1223#else