3 files changed, 25 insertions, 4 deletions

diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index ff1e240..764c495 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -197,9 +197,9 @@ void KDEPIMConfigWidget::setupStoreTab()
             qDebug("Reading config from %s ", confFile.latin1());
         }
     }
                
-#endif
+#endif 
     new QLabel( i18n("New dirs are created automatically"), storePage  );
     QHBox *bb = new QHBox( storePage );
     QPushButton * pb;
     if ( QApplication::desktop()->width() < 640 )
@@ -213,10 +213,16 @@ void KDEPIMConfigWidget::setupStoreTab()
     pb = new QPushButton ( i18n("Save using LOCAL storage"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( setLocalStore() ) );
 #endif
     new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage );
-    new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage  );
+    mDataStoragePath = new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage  );
     tabWidget->addTab( storePage, i18n( "Data storage path" ) );
+
+#ifdef DESKTOP_VERSION  
+      if ( mStoreUrl->url().startsWith( "LOCAL:" ) ) {
+        mDataStoragePath->setText( i18n("Settings are stored in\n%1").arg( qApp->applicationDirPath ()+"/.microkdehome" ));
+      }
+#endif
 }
 void KDEPIMConfigWidget::setLocalStore()
 {
     mStoreUrl->setURL(  "LOCAL:kdepimpi"  );
@@ -230,8 +236,19 @@ void KDEPIMConfigWidget::setStandardStore()
     saveStoreSettings();
 }
 void KDEPIMConfigWidget::saveStoreSettings()
 {
+#ifdef DESKTOP_VERSION
+        if ( !mStoreUrl->url().startsWith( "LOCAL:" ) ) {
+            QString file = qApp->applicationDirPath ()+"/.microkdehome";
+            QFileInfo fi ( file );
+            if ( fi.exists() ) {
+                bool res = QFile::remove( file );
+                if ( ! res )
+                    KMessageBox::information( this, i18n("ERROR: Cannot remove file\n%1\nPlease remove it manually.").arg( file ));
+            }
+        }
+#endif
     if ( !mStoreUrl->url().isEmpty() ) {
         QString path = QDir::homeDirPath();
         QString url = mStoreUrl->url();
 #ifdef DESKTOP_VERSION
@@ -243,8 +260,9 @@ void KDEPIMConfigWidget::saveStoreSettings()
         cfg.setGroup("Global");
         cfg.writeEntry( "MICROKDEHOME", url ); 
         qDebug("cfg.writeEntry( MICROKDEHOME, %s  ", url.latin1());
         cfg.sync();
+        mDataStoragePath->setText( i18n("Settings are stored in\n%1").arg( path+"/.microkdehome" ));
     } else {
         mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
         saveStoreSettings();
     }
@@ -840,10 +858,12 @@ void KDEPIMConfigWidget::usrReadConfig()
   blockSignals( true );
 
   if (KPimGlobalPrefs::instance()->mBackupUseDefaultDir )
       mBackupUrl->setURL( KGlobalSettings::backupDataDir() );
-  else
+  else {
       mBackupUrl->setURL(prefs->mBackupDatadir);
+
+  }
   mBackupNumbersSpin->setValue( prefs->mBackupNumbers );
   mBackupDayCountSpin->setValue( prefs->mBackupDayCount);
 
   QString dummy = prefs->mUserDateFormatLong;
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index c0b92a9..824ef79 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -151,9 +151,9 @@ class KDEPIMConfigWidget : public KPrefsWidget
     QString mSipOtherChannel;
     QString mSipOtherMessage;
     QString mSipOtherMessageParameters;
 
-
+    QLabel* mDataStoragePath;
     KURLRequester* mBackupUrl;
     QSpinBox* mBackupDayCountSpin, *mBackupNumbersSpin   ;
     QMap<ExternalAppHandler::Types, QString> mExternalAppsMap;
 
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index 7f352d6..25b4e81 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -476,8 +476,9 @@ void  KDatePicker::keyPressEvent ( QKeyEvent * e )
         break;             
    
     case Qt::Key_Return:  
     case Qt::Key_Enter:  
+    case Qt::Key_Space:  
         tableClickedSlot();
         break;
      case Qt::Key_Escape:
          e->ignore();