5 files changed, 55 insertions, 3 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 683de7c..c0078be 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -17,8 +17,14 @@ To sync only with particular parts of a shared calendar,
 the incoming filter settings can be used.
 An example can be found in the SyncHowTo.
 Same for shared addressbooks.
 
+Added a setting for the global kdepim data storage.
+Usually the data is stored in (yourhomedir/kdepim).
+Now you can set in the Global config dialog TAB, subTAB "Data storage path"
+a directory where all the kdepim data is stored.
+That makes it easy to save all kdepim data on a SD card on the Z, for example.
+
 KO/Pi:
 The timeedit input has a pulldown list for times.
 If opened, this pulldown list should now has the right time highlighted.
 Added the possibility to exclude events/todos/journals in a filter.
@@ -31,9 +37,10 @@ Added printing of card view and details view on desktop.
 Printing of list view is not working...
 Added button for removing pictures in contact editor.
 Parsing data fix of KA/Pi version 1.9.17.
 Fixed the "parse name automatically" problem of KA/Pi version 1.9.17.
- 
+Fixed some syncing merging problems.
+
 
 ********** VERSION 1.9.17 ************
 
 KO/Pi:
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 20594c6..d097078 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -35,8 +35,10 @@ $Id$
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qbuttongroup.h>
 #include <qfile.h>
+#include <qvbox.h>
+#include <qdir.h>
 #include <qregexp.h>
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -102,14 +104,50 @@ KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent,
   setupLocaleTab();
   setupLocaleDateTab();
   setupTimeZoneTab();
   setupExternalAppTab();
+  setupStoreTab();
 
 }
 void KDEPIMConfigWidget::showTimeZoneTab()
 {
     tabWidget->setCurrentPage ( 3 ) ;
 }
+void KDEPIMConfigWidget::setupStoreTab()
+{
+    QVBox *storePage = new QVBox( this );
+    new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage  );
+    new QLabel( i18n("<b>Set new data storage dir:</b>"), storePage );
+    mStoreUrl = new KURLRequester( storePage );
+    mStoreUrl->setURL( KGlobal::dirs()->localkdedir() );
+    new QLabel( i18n("Not existing dirs are created automatically"), storePage  );
+    QHBox *bb = new QHBox( storePage );
+    QPushButton * pb = new QPushButton ( i18n("Save settings"), bb  );
+    connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) );
+    pb = new QPushButton ( i18n("Save standard"), bb  );
+    connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) );
+    new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage );
+    new QLabel( i18n("The settings of the storage\ndir is saved in the file\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage  );
+    tabWidget->addTab( storePage, i18n( "Data storage path" ) );
+}
+void KDEPIMConfigWidget::setStandardStore()
+{
+    mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
+    saveStoreSettings();
+}
+void KDEPIMConfigWidget::saveStoreSettings()
+{
+    if ( !mStoreUrl->url().isEmpty() ) {
+        KConfig cfg (   QDir::homeDirPath() + "/.microkdehome" );
+        cfg.setGroup("Global");
+        cfg.writeEntry( "MICROKDEHOME", mStoreUrl->url() ); 
+        qDebug("cfg.writeEntry( MICROKDEHOME, mStoreUrl->url() );  ");
+        cfg.sync();
+    } else {
+        mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
+        saveStoreSettings();
+    }
+}
 void KDEPIMConfigWidget::setupExternalAppTab()
 {
   QWidget *externalAppsPage = new QWidget( this );
   QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index 619f3d7..c545207 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -31,8 +31,9 @@ $Id$
 #ifndef KDEPIMCONFIGWIDGET_H
 #define KDEPIMCONFIGWIDGET_H
 
 #include <kprefswidget.h>
+#include <kio/kfile/kurlrequester.h>
 #include <qmap.h>
 
 #include "externalapphandler.h"
 
@@ -67,14 +68,18 @@ class KDEPIMConfigWidget : public KPrefsWidget
 //    void selectionChanged( QListViewItem* );
 //    void itemClicked( QListViewItem* );
     void client_changed( int newClient );
     void externalapp_changed( int newApp );
+    void saveStoreSettings();
+    void setStandardStore();
 
   private:
     void setupExternalAppTab();
     void setupLocaleDateTab();
     void setupLocaleTab();
     void setupTimeZoneTab();
+    void setupStoreTab();
+    KURLRequester* mStoreUrl;
 
     void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
 
 
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 4c03c15..f3584d7 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -1282,9 +1282,11 @@ void KStandardDirs::addKDEDefaults()
           //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 );
        }
        else
        {
-          localKdeDir =  QDir::homeDirPath() + "/kdepim/";
+           KConfig cfg (   QDir::homeDirPath() + "/.microkdehome" );
+           cfg.setGroup("Global");
+           localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" );
        }
     }
     else
     {
diff --git a/microkde/kdecore/kstandarddirs.h b/microkde/kdecore/kstandarddirs.h
index c4e1108..bee864e 100644
--- a/microkde/kdecore/kstandarddirs.h
+++ b/microkde/kdecore/kstandarddirs.h
@@ -567,9 +567,9 @@ public:
         static QString realPath(const QString &dirname);
         
     static void setAppDir( const QString & );
     static QString appDir();
-        
+         
  private:
 
         QStringList prefixes;