fixes for desktop version

5 files changed, 35 insertions, 22 deletions

diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 7d96cb7..e58e4f7 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -56,6 +56,7 @@ $Id$
 //US
 #include <qdir.h>
 
+#define NO_DIRWATCH
 #include "resourcedir.h"
 #include "syncprefwidget.h"
 
@@ -113,11 +114,11 @@ ResourceDir::ResourceDir( const KConfig *config, bool syncable  )
   else
     qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1());
 */
-
+#ifndef NO_DIRWATCH
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
-
+#endif
   setPath( path );
 }
 
@@ -208,9 +209,9 @@ bool ResourceDir::save( Ticket *ticket )
 {
   AddressBook::Iterator it;
   bool ok = true;
-
+#ifndef NO_DIRWATCH
   mDirWatch.stopScan();
-
+#endif
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
     if ( (*it).resource() != this || !(*it).changed() )
       continue;
@@ -228,8 +229,9 @@ bool ResourceDir::save( Ticket *ticket )
 
     file.close();
   }
+#ifndef NO_DIRWATCH
   mDirWatch.startScan();
-
+#endif
   delete ticket;
 #ifdef ALLOW_LOCKING
   unlock( mPath );
@@ -301,6 +303,7 @@ void ResourceDir::unlock( const QString &path )
 
 void ResourceDir::setPath( const QString &path )
 {
+#ifndef NO_DIRWATCH
   mDirWatch.stopScan();
   mDirWatch.removeDir( mPath );
 
@@ -308,7 +311,9 @@ void ResourceDir::setPath( const QString &path )
 
   mDirWatch.addDir( mPath, true );
   mDirWatch.startScan();
-
+#else
+  mPath = path;
+#endif
 //US simulate KDirWatch event
 //US  pathChanged();
 
diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h
index c2aedad..77cd18c 100644
--- a/kabc/plugins/dir/resourcedir.h
+++ b/kabc/plugins/dir/resourcedir.h
@@ -104,8 +104,9 @@ protected:
 private:
   FormatPlugin *mFormat;
 
+#ifndef  NO_DIRWATCH
   KDirWatch mDirWatch;
-
+#endif
   QString mPath;
   QString mFormatName;
   QString mLockUniqueName;
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 17263ae..b8c32d5 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -49,12 +49,14 @@ $Id$
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
-
+#define NO_DIRWATCH
 #include "resourcefile.h"
 #include "syncprefwidget.h"
 
 //#define ALLOW_LOCKING
 
+
+
 using namespace KABC;
 
 extern "C"
@@ -115,11 +117,11 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
     mFormat = factory->format( mFormatName );
   }
 
-
+#ifndef NO_DIRWATCH
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
-
+#endif
   setFileName( fileName );
 }
 
@@ -227,8 +229,9 @@ bool ResourceFile::save( Ticket *ticket )
 */
 
 //US ToDo: write backupfile
+#ifndef NO_DIRWATCH
   mDirWatch.stopScan();
-
+#endif
   QFile info;
   info.setName( mFileName );
   bool ok = info.open( IO_WriteOnly );
@@ -244,9 +247,9 @@ bool ResourceFile::save( Ticket *ticket )
 
   if ( !ok )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
-
+#ifndef NO_DIRWATCH
   mDirWatch.startScan();
-
+#endif
   delete ticket;
 #ifdef ALLOW_LOCKING
   unlock( mFileName );
@@ -326,14 +329,17 @@ void ResourceFile::unlock( const QString &fileName )
 
 void ResourceFile::setFileName( const QString &fileName )
 {
+#ifndef NO_DIRWATCH
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
-
   mFileName = fileName;
 
 
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
+#else
+  mFileName = fileName;
+#endif
 
 //US simulate KDirWatch event
 //US  fileChanged();
diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h
index 0a3027c..8339340 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/kabc/plugins/file/resourcefile.h
@@ -153,8 +153,9 @@ private:
   FormatPlugin *mFormat;
 
   QString mLockUniqueName;
-
+#ifndef  NO_DIRWATCH
   KDirWatch mDirWatch;
+#endif
 };
 
 }
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp
index 1a3a22c..02c5fb1 100644
--- a/microkde/kresources/configpage.cpp
+++ b/microkde/kresources/configpage.cpp
@@ -100,8 +100,8 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
 
   QGroupBox *groupBox = new QGroupBox( i18n( "Resources" ), this );
   groupBox->setColumnLayout(0, Qt::Vertical );
-  groupBox->layout()->setSpacing( 6 );
-  groupBox->layout()->setMargin( 11 );
+  groupBox->layout()->setSpacing( 3 );
+  groupBox->layout()->setMargin( 5 );
   QGridLayout *groupBoxLayout = new QGridLayout( groupBox->layout(), 4, 2 );
 
 //US  mFamilyCombo = new KComboBox( false, groupBox );
@@ -112,19 +112,19 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
   mListView->setAllColumnsShowFocus( true );
   mListView->addColumn( i18n( "Name" ) );
   mListView->addColumn( i18n( "Type" ) );
-  mListView->addColumn( i18n( "Standard" ) );
+  mListView->addColumn( i18n( "Standard" ) ); 
 
 //US  groupBoxLayout->addWidget( mListView, 1, 0 );
   groupBoxLayout->addMultiCellWidget( mListView, 1, 1, 0, 1 );
 
 
-  mAddButton = new QPushButton( i18n( "&Add..." ), this );
+  mAddButton = new QPushButton( i18n( "&Add..." ), groupBox );
   groupBoxLayout->addWidget( mAddButton, 2, 0 );
-  mRemoveButton = new QPushButton( i18n( "&Remove" ), this );
+  mRemoveButton = new QPushButton( i18n( "&Remove" ), groupBox );
   groupBoxLayout->addWidget( mRemoveButton, 2, 1 );
-  mEditButton = new QPushButton( i18n( "&Edit..." ), this );
+  mEditButton = new QPushButton( i18n( "&Edit..." ), groupBox );
   groupBoxLayout->addWidget( mEditButton, 3, 0 );
-  mStandardButton = new QPushButton( i18n( "&Use as Standard" ), this );
+  mStandardButton = new QPushButton( i18n( "&Use as Standard" ), groupBox );
   groupBoxLayout->addWidget( mStandardButton, 3, 1 );
 
   mRemoveButton->setEnabled( false );