fixxxuuu

5 files changed, 27 insertions, 5 deletions

diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 9532759..e874b85 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -809,2 +809,3 @@
 { "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" },

+{ "Save using LOCAL storage","Speichere nutze LOCAL Pfad" },

 { "","" },

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index e699fe9..f3f5333 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1532,3 +1532,3 @@
 { "Show times on two lines","Zeige Zeiten auf zwei Zeilen" },
-{ "","" },
+{ "Save using LOCAL storage","Speichere nutze LOCAL Pfad" },
 { "","" },
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
@@ -200,3 +200,3 @@ void KDEPIMConfigWidget::setupStoreTab()
                
-#endif
+#endif 
     new QLabel( i18n("New dirs are created automatically"), storePage  );
@@ -216,4 +216,10 @@ void KDEPIMConfigWidget::setupStoreTab()
     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
 }
@@ -233,2 +239,13 @@ 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() ) {
@@ -246,2 +263,3 @@ void KDEPIMConfigWidget::saveStoreSettings()
         cfg.sync();
+        mDataStoragePath->setText( i18n("Settings are stored in\n%1").arg( path+"/.microkdehome" ));
     } else {
@@ -843,4 +861,6 @@ void KDEPIMConfigWidget::usrReadConfig()
       mBackupUrl->setURL( KGlobalSettings::backupDataDir() );
-  else
+  else {
       mBackupUrl->setURL(prefs->mBackupDatadir);
+
+  }
   mBackupNumbersSpin->setValue( prefs->mBackupNumbers );
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
@@ -154,3 +154,3 @@ class KDEPIMConfigWidget : public KPrefsWidget
 
-
+    QLabel* mDataStoragePath;
     KURLRequester* mBackupUrl;
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index 7f352d6..25b4e81 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -479,2 +479,3 @@ void  KDatePicker::keyPressEvent ( QKeyEvent * e )
     case Qt::Key_Enter:  
+    case Qt::Key_Space:  
         tableClickedSlot();