7 files changed, 106 insertions, 4 deletions

diff --git a/bin/kdepim/storagehowto.txt b/bin/kdepim/storagehowto.txt
new file mode 100644
index 0000000..4bb036b
--- a/dev/null
+++ b/bin/kdepim/storagehowto.txt
@@ -0,0 +1,80 @@
+
+KDE-Pim/Pi Storage HowTo
+
+As a default KDE-Pim/Pi is storing it's configuration and application (contacts and calendar) data in the directory <yourHome>/kdepim/.
+This Howto is about to change these settings.
+
+CONTENT:
+
+0) General problems
+1) Zaurus and desktop settings
+2) Additional settings for the desktop
+3) Technical background information
+
+********************************************
+0) General problems
+********************************************
+
+There is no problem if you start KDE-Pim/Pi, set the storage dir and restart KDE-Pim/Pi and import all your data.
+In general you can copy your data to another directory and set this a the new storage dir. The only problem are the absolute paths in the KA/Pi resource configuration.
+KA/Pi stores it's resource information in the file <storageDir>/config/kabcrc.
+Change the absolute paths there if you changed your storageDir or (that is recommended) change the path of the resources in the KA/Pi resource configuration directly.
+
+********************************************
+1) Zaurus and desktop settings
+********************************************
+
+You can access the global settings from KA/Pi and from KO/Pi.
+To change the storage dir go to configure dialog. Choose there the "Global" TAB and there the "Data storage path" TAB.
+Change the value of the current storage path to a new (absolute) path and press the button "Save settings".
+Restart the application.
+Import your data to the application or copy the old storage dir to the new dir. Solve the KA/Pi resource path problem as in 0).
+
+********************************************
+2) Additional settings for the desktop
+********************************************
+
+The LOCAL option:
+In the desktop versions (NOT on the Zaurus) you have the possibility to set the storage dir relative to the executable binary.
+That does mean: You can copy all the data (binaries, config data, application data) of the directory where the binaries are to another directory and it will find all files without needing to change anything. NO resource path change is needed.
+In this LOCAL mode only resource files are supported (no resource directories) and only in the <storageDir>/apps/kabc/ directory (the default directory).
+
+To set the LOCAL mode go to configure dialog. Choose there the "Global" TAB and there the "Data storage path" TAB.
+Press there the button "Save using LOCAL storage".
+Restart the application.
+
+This LOCAL mode makes it possible to run KO/Pi and KA/Pi from a USB stick:
+All data is read from and written to the stick.
+Just put KDE-Pim/Pi on a memory stick and you can access all your PIM data on every computer with Windows XP. It will work with the ME and Linux versions as well.
+
+********************************************
+3) Technical background information
+********************************************
+
+Directly after the start KDE-Pim/Pi looks for the evironment variable MICROKDEHOME.
+If the variable is set, the path in the MICROKDEHOME is used as the storage dir. End.
+
+If MICROKDEHOME is not set ( what is usually the case ), then
+
+###DESKTOP_VERSION ONLY###
+It looks for the file .microkdehome in the directory of the binary.
+(That file is written by pressing the "Save using LOCAL storage" button in the "Data storage path" TAB ).
+If this file is found, it sets the path in the this file  as the storage dir.End.
+If the path starts with a LOCAL:
+it sets the environment variable LOCALMICROKDEHOME to the path of the binary
+and takes that path as storage dir.End.
+
+If the file .microkdehome in the directory of the binary is not found: 
+###DESKTOP_VERSION ONLY END###
+
+It looks for the file .microkdehome in the home directory of the user.
+(That file is written by pressing the "Save settings" button in the "Data storage path" TAB ).
+If this file is found, it sets the path in this file as the storage dir.End.
+
+If the file .microkdehome in the home directory of the user is not found, it sets the
+<yourHome>/kdepim/ directory as the storage dir.
+End of setting the storage dir.
+
+If KA/Pi opens a resource it looks for the  environment variable LOCALMICROKDEHOME.
+If the variable is set, the file resource takes the path in LOCALMICROKDEHOME to find it's file.
+
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 088d3fe..5e7783b 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -2,3 +2,3 @@ Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.0.23
+Version: 2.0.24
 Release: SuSE_9.2
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index ce5c755..eba74a6 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2100,2 +2100,9 @@ void KABCore::initActions()
                  "wn" );
+
+
+  
+ mActionStorageHowto = new KAction( i18n( "Storage HowTo" ), 0,
+                 this, SLOT( storagehowto() ), actionCollection(),
+                 "storage" );
+  
  mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
@@ -2275,2 +2282,3 @@ void KABCore::addActionsManually()
   mActionWN->plug( helpMenu );
+  mActionStorageHowto->plug( helpMenu );
   mActionSyncHowto->plug( helpMenu );
@@ -2728,3 +2736,6 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
 }
-
+void KABCore::storagehowto()
+{
+    KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" );
+}
 void KABCore::whatsnew()
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 4cef73a..80dbf08 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -151,2 +151,3 @@ class KABCore : public QWidget, public KSyncInterface
     void synchowto() ;
+    void storagehowto() ;
     void multisynchowto() ;
@@ -474,2 +475,3 @@ class KABCore : public QWidget, public KSyncInterface
     KAction *mActionSyncHowto;
+    KAction *mActionStorageHowto;
     KAction *mActionKdeSyncHowto;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 357154e..7aa3b60 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1084,3 +1084,7 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ),
-             SLOT( keyBindings() ) );
+             SLOT( keyBindings() ) ); 
+    action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this );
+    action->addTo( helpMenu );
+    connect( action, SIGNAL( activated() ),
+             SLOT( storagehowto() ) );
     action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
@@ -1395,2 +1399,6 @@ void MainWindow::usertrans()
 
+void MainWindow::storagehowto()
+{
+    KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" );
+}
 void MainWindow::kdesynchowto()
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 4d1753f..3151f50 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -69,2 +69,3 @@ class MainWindow : public QMainWindow
     void synchowto();   
+    void storagehowto();   
     void kdesynchowto();   
diff --git a/version b/version
index 662668e..f601af0 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.23";
+version = "2.0.24";