6 files changed, 442 insertions, 306 deletions
diff --git a/Makefile b/Makefile
index df71188..594d47d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,279 +1,385 @@
-#############################################################################
+export KDEPIMDIR = $(shell pwd)
-# Makefile for building: kdepim-desktop
-# Generated by qmake (1.07a) (Qt 3.3.4) on: Wed Mar 30 01:16:42 2005
+export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
-# Project:  kdepim-desktop.pro
-# Template: subdirs
+ifeq ($(PLATFORM) , zaurus)
-# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
+  BUILD_NO_LDAP_PLUGIN=1
-#############################################################################
+endif
-        MAKEFILE =Makefile
+ifneq ($(PLATFORM) , zaurus)
-        QMAKE    =qmake
+  BUILD_NO_SHARP_PLUGIN=1
-DEL_FILE =    rm -f
+endif
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
+#opie plugin is deprecated. The qtopia plugin handles the task from now on.
-INSTALL_FILE= 
+BUILD_NO_OPIE_PLUGIN=1
-INSTALL_DIR = 
-        SUBTARGETS = \
+SUBDIRS_MICROKDE = \
-                sub-libical \
+   libical/src/libical \
-                sub-libkcal \
+   libical/src/libicalss \
-                sub-kabc \
+   qtcompat \
-                sub-libkdepim \
+   microkde \
-                sub-microkde \
+   libkcal \
-                sub-korganizer \
+   libkdepim \
-                sub-kaddressbook \
+   kabc \
-                sub-kabc-plugins-file \
+   kabc/formats/binary \
-                sub-kabc-plugins-dir \
+   kabc/plugins/file \
-                sub-kabc-plugins-qtopia \
+   kabc/plugins/dir \
-                sub-gammu-emb-common \
+   korganizer \
-                sub-gammu-emb-gammu \
+   kalarmd \
-                sub-libetpan \
+   kaddressbook
-                sub-kmicromail-libmailwrapper \
-                sub-kmicromail \
+SUBDIRS_QTOPIA_PLUGIN = \
-                sub-pwmanager-libcrypt-cipher \
+   kabc/plugins/qtopia
-                sub-pwmanager-libcrypt-error \
-                sub-pwmanager-libcrypt-mpi \
+SUBDIRS_OPIE_PLUGIN = \
-                sub-pwmanager-libcrypt-zlib \
+   kabc/plugins/opie
-                sub-pwmanager-pwmanager
+SUBDIRS_SHARP_PLUGIN = \
-first: all
+   kabc/plugins/sharpdtm
-all: Makefile $(SUBTARGETS)
+SUBDIRS_LDAP_PLUGIN = \
+   kabc/plugins/ldap
-libical/$(MAKEFILE): 
-        @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
+SUBDIRS_MICROMAIL = \
-        cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
+   libetpan \
-sub-libical: libical/$(MAKEFILE) FORCE
+   kmicromail/libmailwrapper \
-        cd libical && $(MAKE) -f $(MAKEFILE)
+   kmicromail
-libkcal/$(MAKEFILE): 
+SUBDIRS_GAMMU = \
-        @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
+   gammu/emb/common \
-        cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
+   gammu/emb/gammu
-sub-libkcal: libkcal/$(MAKEFILE) FORCE
-        cd libkcal && $(MAKE) -f $(MAKEFILE)
+SUBDIRS_PWMANAGER = \
+   pwmanager/libcrypt/mpi  \
-kabc/$(MAKEFILE): 
+   pwmanager/libcrypt/error  \
-        @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
+   pwmanager/libcrypt/cipher  \
-        cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
+   pwmanager/libcrypt/zlib \
-sub-kabc: kabc/$(MAKEFILE) FORCE
+   pwmanager/pwmanager
-        cd kabc && $(MAKE) -f $(MAKEFILE)
+SUBDIRS = \
-libkdepim/$(MAKEFILE): 
+   $(SUBDIRS_MICROKDE) \
-        @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
+   $(SUBDIRS_QTOPIA_PLUGIN) \
-        cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
+   $(SUBDIRS_OPIE_PLUGIN) \
-sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
+   $(SUBDIRS_SHARP_PLUGIN) \
-        cd libkdepim && $(MAKE) -f $(MAKEFILE)
+   $(SUBDIRS_LDAP_PLUGIN) \
+   $(SUBDIRS_MICROMAIL) \
-microkde/$(MAKEFILE): 
+   $(SUBDIRS_GAMMU) \
-        @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
+   $(SUBDIRS_PWMANAGER) 
-        cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
-sub-microkde: microkde/$(MAKEFILE) FORCE
-        cd microkde && $(MAKE) -f $(MAKEFILE)
+all: build_microkde \
+     build_qtopia_plugin \
-korganizer/$(MAKEFILE): 
+     build_opie_plugin \
-        @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
+     build_sharp_plugin \
-        cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
+     build_ldap_plugin \
-sub-korganizer: korganizer/$(MAKEFILE) FORCE
+     build_micromail \
-        cd korganizer && $(MAKE) -f $(MAKEFILE)
+     build_gammu \
+     build_pwmanager
-kaddressbook/$(MAKEFILE): 
-        @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
-        cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
+build_microkde: variable_test tmake
-sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
+        for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
-        cd kaddressbook && $(MAKE) -f $(MAKEFILE)
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
-kabc/plugins/file/$(MAKEFILE): 
-        @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
+build_qtopia_plugin: build_microkde
-        cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
+  ifdef BUILD_NO_QTOPIA_PLUGIN
-sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
+        @echo == qtopia plugin not build.
-        cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
+  else
+        for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
-kabc/plugins/dir/$(MAKEFILE): 
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
-        @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
+          done
-        cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
+  endif
-sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
-        cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
+build_opie_plugin: build_microkde
+  ifdef BUILD_NO_OPIE_PLUGIN
-kabc/plugins/qtopia/$(MAKEFILE): 
+        @echo == opie plugin not build.
-        @$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia"
+  else
-        cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE)
+        for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
-sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
-        cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE)
+          done
+  endif
-gammu/emb/common/$(MAKEFILE): 
-        @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
+build_sharp_plugin: build_microkde
-        cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
+  ifdef BUILD_NO_SHARP_PLUGIN
-sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
+        @echo == ldap plugin not build.
-        cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
+  else
+        for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
-gammu/emb/gammu/$(MAKEFILE): 
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
-        @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
+          done
-        cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
+  endif
-sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
+  
-        cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
+build_ldap_plugin: build_microkde
+  ifdef BUILD_NO_LDAP_PLUGIN
-libetpan/$(MAKEFILE): 
+        @echo == ldap plugin not build.
-        @$(CHK_DIR_EXISTS) "libetpan" || $(MKDIR) "libetpan"
+  else
-        cd libetpan && $(QMAKE) libetpan.pro -o $(MAKEFILE)
+          for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
-sub-libetpan: libetpan/$(MAKEFILE) FORCE
+            make -f Makefile$(PLATFORM) || exit 1; popd; \
-        cd libetpan && $(MAKE) -f $(MAKEFILE)
+          done
+  endif
-kmicromail/libmailwrapper/$(MAKEFILE): 
-        @$(CHK_DIR_EXISTS) "kmicromail/libmailwrapper" || $(MKDIR) "kmicromail/libmailwrapper"
-        cd kmicromail/libmailwrapper && $(QMAKE) libmailwrapper.pro -o $(MAKEFILE)
+build_micromail: build_microkde
-sub-kmicromail-libmailwrapper: kmicromail/libmailwrapper/$(MAKEFILE) FORCE
+  ifdef BUILD_NO_MICROMAIL
-        cd kmicromail/libmailwrapper && $(MAKE) -f $(MAKEFILE)
+        @echo == kmicromail not build.
+  else
-kmicromail/$(MAKEFILE): 
+        for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
-        @$(CHK_DIR_EXISTS) "kmicromail" || $(MKDIR) "kmicromail"
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
-        cd kmicromail && $(QMAKE) kmicromail.pro -o $(MAKEFILE)
+          done
-sub-kmicromail: kmicromail/$(MAKEFILE) FORCE
+  endif
-        cd kmicromail && $(MAKE) -f $(MAKEFILE)
+build_gammu: variable_test tmake
-pwmanager/libcrypt/cipher/$(MAKEFILE): 
+  ifdef BUILD_NO_GAMMU
-        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher"
+        @echo == gammu not build.
-        cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE)
+  else
-sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE
+        for i in $(SUBDIRS_GAMMU); do pushd $$i; \
-        cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE)
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
-pwmanager/libcrypt/error/$(MAKEFILE): 
+  endif
-        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error"
-        cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE)
+build_pwmanager: build_microkde
-sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE
+  ifdef BUILD_NO_PWMANAGER
-        cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE)
+        @echo == pwmanager not build.
+  else
-pwmanager/libcrypt/mpi/$(MAKEFILE): 
+        for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
-        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi"
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
-        cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE)
+          done
-sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE
+  endif
-        cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE)
-pwmanager/libcrypt/zlib/$(MAKEFILE): 
+variable_info:
-        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib"
+        @echo --------------------------------------
-        cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE)
+        @echo KDEPIM buildsystem, variableinfo...
-sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE
+        @echo KDEPIMDIR=$(KDEPIMDIR)
-        cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE)
+        @echo QTDIR=$(QTDIR)
+        @echo QPEDIR=$(QPEDIR)
-pwmanager/pwmanager/$(MAKEFILE): 
+        @echo OPIEDIR=$(OPIEDIR)
-        @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager"
+        @echo PLATFORM=$(PLATFORM)
-        cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE)
+        @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
-sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE
+        @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
-        cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE)
+        @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
+        @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
-Makefile: kdepim-desktop.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
+        @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
-        $(QMAKE) -o Makefile kdepim-desktop.pro
+        @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
-qmake: qmake_all
+        ifndef BUILD_NO_SHARP_PLUGIN
-        @$(QMAKE) -o Makefile kdepim-desktop.pro
+        @echo SHARPDTMSDK=$(SHARPDTMSDK)
+        endif
-all: $(SUBTARGETS)
+        @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
-qmake_all: libical/$(MAKEFILE) libkcal/$(MAKEFILE) kabc/$(MAKEFILE) libkdepim/$(MAKEFILE) microkde/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libetpan/$(MAKEFILE) kmicromail/libmailwrapper/$(MAKEFILE) kmicromail/$(MAKEFILE) pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE)
+        @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
-         ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        @echo --------------------------------------
-         ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-         ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+variable_test: variable_info
-         ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        @echo KDEPIM buildsystem, variablecheck...
-         ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+  ifndef KDEPIMDIR
-         ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        @echo KDEPIMDIR is not defined.
-         ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        $(error KDEPIMDIR is not defined)
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+  endif
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+  ifndef PLATFORM
-         ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        @echo PLATFORM is not defined.
-         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        $(error PLATFORM is not defined)
-         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+  endif
-         ( [ -d libetpan ] && cd libetpan ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+  ifdef BUILD_NO_LDAP_PLUGIN
-         ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
-         ( [ -d kmicromail ] && cd kmicromail ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+  endif
-         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+  ifdef BUILD_NO_OPIE_PLUGIN
-         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
-         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+  endif
-         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+  ifdef BUILD_NO_QTOPIA_PLUGIN
-         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
-clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
+  endif
-         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  ifdef BUILD_NO_MICROMAIL
-         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
-         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  endif
-         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  ifdef BUILD_NO_SHARP_PLUGIN
-         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
-         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  else
-         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  ifndef SHARPDTMSDK
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        $(error SHARPDTMSDK is not defined)
-         ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  endif
-         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  endif
-         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  ifdef BUILD_NO_GAMMU
-         ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
-         ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  endif
-         ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  ifdef BUILD_NO_PWMANAGER
-         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
-         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+  endif
-         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        @echo --------------------------------------
-         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-uninstall_subdirs: qmake_all FORCE
+objects:
-         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
-         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
-         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        mkdir -p libical/lib/$(PLATFORM)
-         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        mkdir -p dest
-         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        mkdir -p dest$(LIBICAL_PATH)
-         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        mkdir -p pwmanager/libcrypt/$(PLATFORM)
-         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+clean:
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        rm -rf libical/lib/$(PLATFORM)/*;
-         ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
-         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
-         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
-         ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+          done 
-         ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-         ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+pac:
-         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        rm -f $(QPEDIR)/lib/libmicro*
-         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        rm -f $(QPEDIR)/plugins/applets/libkopi*
-         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        make
-         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        make install
-         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        make dist
-install_subdirs: qmake_all FORCE
+install:
-         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
-         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cd bin/kdepim; make install
-         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cp -r Pim $(QPEDIR)/apps
-         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cp db2file/db2file $(QPEDIR)/bin/db2file
-         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        chmod ugo+x $(QPEDIR)/bin/db2file
-         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
-         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
-         ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true
+    
-         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
+dist: 
-         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        @echo Dont forget to do "make install" before "make dist"
-         ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        rm -f *arm.ipk
-         ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        rm -f *ipk.zip
-         ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
-         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        rm -f *~
-         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
-         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
-         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
-         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true
+        mkipks kmicrokdelibs.control
-distclean: qmake_all FORCE
+        mkipks korganizer.control
-         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mkipks kaddressbook.control
-         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+  ifndef BUILD_NO_MICROMAIL
-         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mkipks kopiemail.control
-         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+  endif
-         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+  ifndef BUILD_NO_SHARP_PLUGIN
-         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mkipks ksharpPIM-DTMaccess.control
-         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+  endif
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mkipks korganizer-alarm.control
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+  ifndef BUILD_NO_GAMMU
-         ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mkipks kmobilephoneaccess.control
-         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+  endif
-         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+  ifndef BUILD_NO_PWMANAGER
-         ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mkipks pwmanager.control
-         ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+  endif
-         ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mkipks pimTABicon.control
-         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
-         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
-         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
-         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+        mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
-         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+tmake: objects \
-install:  install_subdirs
+       qtcompat/Makefile$(PLATFORM) \
+       microkde/Makefile$(PLATFORM) \
-uninstall:  uninstall_subdirs
+       libkcal/Makefile$(PLATFORM) \
+       libkdepim/Makefile$(PLATFORM) \
-FORCE:
+       korganizer/Makefile$(PLATFORM) \
+       kalarmd/Makefile$(PLATFORM) \
+       libical/src/libical/Makefile$(PLATFORM) \
+       libical/src/libicalss/Makefile$(PLATFORM) \
+       kabc/Makefile$(PLATFORM) \
+       kabc/formats/binary/Makefile$(PLATFORM) \
+       kabc/plugins/file/Makefile$(PLATFORM) \
+       kabc/plugins/dir/Makefile$(PLATFORM) \
+       kabc/plugins/ldap/Makefile$(PLATFORM) \
+       kabc/plugins/opie/Makefile$(PLATFORM) \
+       kabc/plugins/qtopia/Makefile$(PLATFORM) \
+       kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
+       kaddressbook/Makefile$(PLATFORM) \
+       kmicromail/Makefile$(PLATFORM) \
+       libetpan/Makefile$(PLATFORM) \
+       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
+       gammu/emb/common/Makefile$(PLATFORM) \
+       gammu/emb/gammu/Makefile$(PLATFORM) \
+       pwmanager/pwmanager/Makefile$(PLATFORM) \
+       pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
+       pwmanager/libcrypt/error/Makefile$(PLATFORM) \
+       pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
+       pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
+qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
+        cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
+microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
+        cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
+libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
+        cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
+libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
+        cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
+kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
+        cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
+korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
+        cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
+libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
+        cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
+libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
+        cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
+kabc/Makefile$(PLATFORM): kabc/kabcE.pro
+        cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
+kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
+        cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
+kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
+        cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
+kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
+        cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
+kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
+        cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
+kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
+        cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
+kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
+        cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
+kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
+        cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
+kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
+        cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
+kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
+        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
+libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
+        cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
+kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
+        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
+gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
+        cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
+gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
+        cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
+pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
+        cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
+pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
+        cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
+pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
+        cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
+pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
+        cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
+pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
+        cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 4ab7f02..0e6c2a3 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -1,421 +1,427 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qtimer.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include "formatfactory.h"
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 #define NO_DIRWATCH
 #include "resourcefile.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport)
 #else
 {
 #endif
 //US  void *init_kabc_file()
  void *init_microkabc_file()
  {
    return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
  }
 #ifndef _WIN32_
 }
 #endif
 ResourceFile::ResourceFile( const KConfig *config )
  : Resource( config ) , mFormat( 0 )
 {
  QString fileName, formatName, default_fileName;
  default_fileName = StdAddressBook::fileName();
  KConfig *cfg = (KConfig *)config;
  if ( cfg ) {
    fileName = cfg->readEntry( "FileName", default_fileName );
    formatName = cfg->readEntry( "FileFormat", "vcard" );
  } else {
    fileName = default_fileName;
    formatName = "vcard";
  }
  init( fileName, formatName );
 }
 ResourceFile::ResourceFile( const QString &fileName ,
                            const QString &formatName )
  : Resource( 0 )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   
  init( fileName, formatName );
 }
 void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
  mFormatName = formatName;
  FormatFactory *factory = FormatFactory::self();
  mFormat = factory->format( mFormatName );
  if ( !mFormat ) {
    mFormatName = "vcard";
    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
 QString localKdeDir;
    localKdeDir = readEnvPath("LOCALMICROKDEHOME");
    if ( ! localKdeDir.isEmpty() ) {
        qDebug("LOCALMICROKDEHOME is set to: %s",localKdeDir.latin1() );
+        QFileInfo fi ( fileName );
+        QString localname = localKdeDir + "/apps/kabc/" + fi.fileName ();
+        QFileInfo fi2 ( localname );
+        if ( ! fi2.exists() ) {
+            KMessageBox::error(0,i18n("Addressbook resource file not found:\n '%1'.\nIn LOCAL mode only resource files in\n'%2'\nare supported.\n(i.e. in the dir ./apps/kabc/ relative to the kapi(.exe) binary.)\n\nIf you are starting KA/Pi for the very first time\nyou will get this error message as well.\nIt will create the missing file automatically for you.").arg(localname).arg(localKdeDir+"/apps/kabc/") );
+            setFileName( localname );
+            return;
+        } else {
+            qDebug("Local resource file found. Changing filename to: %s",localname.latin1() );
+            setFileName( localname );
+            return;
+        }
    }
-    qDebug("RESOURCE: %s ", fileName.latin1());
+    setFileName( fileName );
-  setFileName( fileName );
 }
 ResourceFile::~ResourceFile()
 {
  delete mFormat;
  mFormat = 0;
 }
 void ResourceFile::writeConfig( KConfig *config )
 {
    config->setGroup( "Resource_" + identifier() );
  Resource::writeConfig( config );
  config->writeEntry( "FileName", fileName() );
  config->writeEntry( "FileFormat", mFormatName );
 //    qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
 }
 Ticket *ResourceFile::requestSaveTicket()
 {
  kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl;
  if ( !addressBook() ) return 0;
 #ifdef ALLOW_LOCKING
  if ( !lock( mFileName ) ) {
      qDebug("unablt to lock file ");
    return 0;
  }
 #endif
  return createTicket( this );
 }
 bool ResourceFile::doOpen()
 {
  QFile file( fileName() );
  qDebug("ResourceFile::openfile %s ", fileName().latin1());
  if ( !file.exists() ) {
    // try to create the file
    bool ok = file.open( IO_WriteOnly );
    if ( ok )
      file.close();
    return ok;
  } else {
    if ( !file.open( IO_ReadWrite ) )
      return false;
    if ( file.size() == 0 ) {
      file.close();
      return true;
    }
    bool ok = mFormat->checkFormat( &file );
    file.close();
    return ok;
  }
 }
 void ResourceFile::doClose()
 {
 }
 bool ResourceFile::load()
 {
  QFile file( fileName() );
  if ( !file.open( IO_ReadOnly ) ) {
    addressBook()->error( i18n( "Unable to open file '%1'." ).arg( fileName() ) );
    return false;
  }
 //    qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1());
  return mFormat->loadAll( addressBook(), this, &file );
 }
 bool ResourceFile::save( Ticket *ticket )
 {
 //  qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
  // create backup file
  QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
 /*US we use a simpler method to create a backupfile
  (void) KSaveFile::backupFile( mFileName, QString::null
  ,extension );
  KSaveFile saveFile( mFileName );
  bool ok = false;
  if ( saveFile.status() == 0 && saveFile.file() )
  {
    mFormat->saveAll( addressBook(), this, saveFile.file() );
    ok = saveFile.close();
  }
 */
 //US ToDo: write backupfile
 #ifndef NO_DIRWATCH
  mDirWatch.stopScan();
 #endif
  QFile info;
  info.setName( fileName() );
  bool ok = info.open( IO_WriteOnly );
  if ( ok ) {
    mFormat->saveAll( addressBook(), this, &info );
    info.close();
    ok = true;
  }
  else {
  }
  if ( !ok )
    addressBook()->error( i18n( "Unable to save file '%1'." ).arg( fileName() ) );
 #ifndef NO_DIRWATCH
  mDirWatch.startScan();
 #endif
  delete ticket;
 #ifdef ALLOW_LOCKING
  unlock( mFileName );
 #endif
  return ok;
 }
 bool ResourceFile::lock( const QString &fileName )
 {
 #ifdef ALLOW_LOCKING
  QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
  KURL url(fn);
  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
  if (QFile::exists( lockName )) return false;
  QString lockUniqueName;
  lockUniqueName = fn + KApplication::randomString( 8 );
  url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
  mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
  kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
  // Create unique file
  QFile file( mLockUniqueName );
  file.open( IO_WriteOnly );
  file.close();
  // Create lock file
  int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                       QFile::encodeName( lockName ) );
 #endif
  if ( result == 0 ) {
    addressBook()->emitAddressBookLocked();
    return true;
  }
  // TODO: check stat
  return false;
 #else
  return true;
 #endif
 }
 void ResourceFile::unlock( const QString &fileName )
 {
 #ifdef ALLOW_LOCKING
  QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 //US  QString lockName = fn + ".lock";
  KURL url(fn);
  QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
  QFile::remove( lockName );
  QFile::remove( mLockUniqueName );
  addressBook()->emitAddressBookUnlocked();
 #else
  return;
 #endif
 }
 void ResourceFile::setFileName( const QString &fileName )
 {
 #ifndef NO_DIRWATCH
  mDirWatch.stopScan();
  mDirWatch.removeFile( mFileName );
  mFileName = fileName;
  mDirWatch.addFile( mFileName );
  mDirWatch.startScan();
 #else
  mFileName2 = fileName;
 #endif
 //US simulate KDirWatch event
 //US  fileChanged();
 }
 QString ResourceFile::fileName() const
 {
  return mFileName2;
 }
 void ResourceFile::setFormat( const QString &format )
 {
  mFormatName = format;
  delete mFormat;
  FormatFactory *factory = FormatFactory::self();
  mFormat = factory->format( mFormatName );
 /*US
 //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1());
  if (mFormatName == "vcard") {
    mFormat = new VCardFormatPlugin2();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
  }
  else if (mFormatName == "binary") {
    mFormat = new BinaryFormat();
 //    qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
  }
  else
    qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
 */
 }
 QString ResourceFile::format() const
 {
  return mFormatName;
 }
 void ResourceFile::fileChanged()
 {
  // There is a small theoretical chance that KDirWatch calls us before
  // we are fully constructed
  if (!addressBook())
    return;
  QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
    load();
    addressBook()->emitAddressBookChanged();
  }
 }
 void ResourceFile::removeAddressee( const Addressee &addr )
 {
  QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
  QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
  QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
 }
 void ResourceFile::cleanUp()
 {
  unlock( fileName() );
 }
 //US #include "resourcefile.moc"
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 27ba9e0..f6f62a4 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -1,431 +1,429 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2001,2002,2003 Cornelius Schumacher <schumacher@kde.org>
    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <kdebug.h>
 #include <klocale.h>
 //#include "koglobals.h"
 #include "navigatorbar.h"
 #include "kdatenavigator.h"
 #include <kcalendarsystem.h>
 #include "datenavigatorcontainer.h"
 #include "koprefs.h"
 DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
                                                const char *name )
  : QWidget( parent, name ), mCalendar( 0 ),
    mHorizontalCount( 1 ), mVerticalCount( 1 )
 {
    mResizeEnabled = false;
  mExtraViews.setAutoDelete( true );
  mNavigatorView = new KDateNavigator( this, name );
  mNavigatorView->hide();
  connectNavigatorView( mNavigatorView );
  //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
  mLastDisplayedDN = 0;
  mUpdateTimer; 
  mUpdateTimer = new QTimer( this );
  connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() ));
  mFirstSelectedDate = QDate::currentDate();
  mSelectedDateCount = 1;
 }
 DateNavigatorContainer::~DateNavigatorContainer()
 {
 }
 void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
 {
  connect( v, SIGNAL( datesSelected( const KCal::DateList & ) ),
           SIGNAL( datesSelected( const KCal::DateList & ) ) );
 #if 0
  connect( v, SIGNAL( incidenceDropped( Incidence *, const QDate & ) ),
           SIGNAL( incidenceDropped( Incidence *, const QDate & ) ) );
  connect( v, SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ),
           SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ) );
 #endif
  connect( v, SIGNAL( weekClicked( const QDate & ) ),
           SIGNAL( weekClicked( const QDate & ) ) );
  connect( v, SIGNAL( showMonth( const QDate & ) ),
           SIGNAL( showMonth( const QDate & ) ) );
  connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) );
  connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) );
  connect( v, SIGNAL( goNextMonth() ), SLOT( slotgoNextMonth() ) );
  connect( v, SIGNAL( goPrevMonth() ), SLOT( slotgoPrevMonth() ) );
  connect( v, SIGNAL( goNextYear() ), SLOT( slotgoNextYear() ) );
  connect( v, SIGNAL( goPrevYear() ), SLOT( slotgoPrevYear() ) );
  connect( v, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) );
 }
 void DateNavigatorContainer::slotgoNextYear()
 {
    jumpMonth( 12 );
    emit goNextYear();
 }
 void DateNavigatorContainer::slotgoPrevYear()
 {
    jumpMonth( -12 );
    emit goPrevYear();
 }
 void DateNavigatorContainer::slotgoPrevMonth()
 {
    jumpMonth( -1 );
    emit goPrevMonth();
 }
 void DateNavigatorContainer::slotgoNextMonth()
 { 
    jumpMonth( 1 );
    emit goNextMonth();
 }
 void DateNavigatorContainer::jumpMonth( int month )
 {
    QDate baseDate = mNavigatorView->baseDate();
    computeMonthSelected( baseDate.month() + month, false );
 }
 void DateNavigatorContainer::slotMonthSelected( int month )
 {
    computeMonthSelected( month, true );
 }
 void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
 {
 //qDebug("slotMonthSelected %d ", month);
    QDate baseDate = mNavigatorView->baseDate();
    if ( baseDate.month() == month )
        return;
    //qDebug("month %d %d  ",baseDate.month(),month);
    QDate date = QDate (  baseDate.year(), baseDate.month() , 15 );
    date = date.addDays( -(baseDate.month()-month ) *30 );
    QDate newBase = QDate (  date.year(), date.month() ,1 ); 
    
    //qDebug("NEW BASE %s", newBase.toString().latin1());
    mNavigatorView->setBaseDate( newBase );
    QDate last = lastAvailableDate();
    QDate first = firstAvailableDate();
    QDate selFirst = mFirstSelectedDate;
    QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
    if (  selFirst >= first && selLast <= last ) {
        setBaseDates();
        if ( forceEmit ) 
            updateDayMatrixDates();
    }
    else {
        setBaseDates();
        if ( forceEmit ) 
            updateDayMatrixDates();
        if ( forceEmit ) 
            emit monthSelected( month );
    }
 }
 void DateNavigatorContainer::setCalendar( Calendar *cal )
 {
  mCalendar = cal;
  mNavigatorView->setCalendar( cal );
  for( uint i = 0; i < mLastDisplayedDN; ++i ) {
      KDateNavigator *n = mExtraViews.at( i );
      n->setCalendar( cal );
  }
 }
 void DateNavigatorContainer::checkUpdateDayMatrixDates()
 { 
    //qDebug("KODNC: wid %d  hei %d ", width(), height());
    mUpdateTimer->stop();
    //return;
    if ( width() < 3 || height() < 3 )
        return;
    static int lastWid = 0;
    static int lastHei = 0;
    if ( lastWid == width() && height() == lastHei ) {
        qDebug("KODNC: No layout computing needed. ");
    } else {
        lastWid = width();
        lastHei = height();
        QSize minSize = mNavigatorView->yourSizeHint();
        int verticalCount = size().height() / minSize.height();
        int horizontalCount = size().width() / minSize.width();
        //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() );  
        //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount );
        bool fontchange = false;  
        if ( horizontalCount == 1)
            horizontalCount = size().width() / mNavigatorView->yourFullSizeHint().width();  
        QFont fo;
        if ( horizontalCount != mHorizontalCount ||
             verticalCount != mVerticalCount ) {
            uint count = horizontalCount * verticalCount;
            if ( count == 0 ) {
                bool ok;
                fo = mNavigatorView->yourFontHint( size() , &ok );
                //mNavigatorView->resize( size() );
                //if ( ! ok )
                //  return;
                int butt = 2;
                horizontalCount =  size().width() / mNavigatorView->sizeHintTwoButtons( ).width();
                if (  horizontalCount <= 1 )
                    minSize = mNavigatorView->sizeHintTwoButtons( 4 ); 
                else 
                    minSize = mNavigatorView->sizeHintTwoButtons(); 
                verticalCount = size().height() / minSize.height();
                horizontalCount = size().width() / minSize.width();
                if ( horizontalCount == 0 )
                    horizontalCount = 1;
                if ( verticalCount == 0 )
                    verticalCount = 1;
                fontchange = true;
                count = horizontalCount * verticalCount;
-            } else {
+            } 
-                if ( mNavigatorView->fontChanged() ) {
+            
-                    fontchange = true;
-                    fo = KOPrefs::instance()->mDateNavigatorFont;
-                    mNavigatorView->changeFont( fo );
-                    mNavigatorView->unsetFontChanged();
-                }
-            }
            mLastDisplayedDN =  horizontalCount*verticalCount-1;
            while ( count > ( mExtraViews.count() + 1 ) ) {
                KDateNavigator *n = new KDateNavigator( this );
                n->setMonthSignalOffset ( mExtraViews.count()+1 );
                mExtraViews.append( n );
                n->setCalendar( mCalendar );
                connectNavigatorView( n );
                // n->show();
            }
            
-    
            setBaseDates();
-            if ( fontchange ) {
-                //mNavigatorView->changeFont( fo );
-                uint i;
-                for( i = 0; i < mExtraViews.count(); ++i ) {
-                    KDateNavigator *view = mExtraViews.at( i );
-                    view->changeFont( fo );
-                }
-            }
            mHorizontalCount = horizontalCount;
            mVerticalCount = verticalCount;
    
        }
+        if ( !fontchange ) {
+            if ( mNavigatorView->fontChanged() ) {
+                fontchange = true;
+                fo = KOPrefs::instance()->mDateNavigatorFont;
+                mNavigatorView->changeFont( fo );
+                mNavigatorView->unsetFontChanged();
+            }
+        }
+        if ( fontchange ) {
+            uint i;
+            for( i = 0; i < mLastDisplayedDN; ++i ) {
+                KDateNavigator *view = mExtraViews.at( i );
+                view->changeFont( fo );
+            }
+        }
        int theight = height() / mVerticalCount;
        int twidth = width() / mHorizontalCount;
        NavigatorBar *bar = mNavigatorView->navigatorBar();
        if ( mHorizontalCount > 1 ) bar->showButtons( true, false );
        else bar->showButtons( true, true );
        mNavigatorView->setGeometry(0,
                                    0, twidth, theight );
        for( uint i = 0; i < mLastDisplayedDN; ++i ) {
            int x = ( i + 1 ) % mHorizontalCount;
            int y = ( i + 1 ) / mHorizontalCount;
            KDateNavigator *view = mExtraViews.at( i );
            bar = view->navigatorBar();
            if ( y > 0 ) bar->showButtons( false, false );
            else {
                if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true );
                else bar->showButtons( false, false );
            }
            view->setGeometry( x * twidth,
                               y * theight, twidth, theight );
        }
        int iii = 0;
        int ccc = mHorizontalCount * mVerticalCount;
        mNavigatorView->show();
        while ( iii < ( mExtraViews.count()  ) ) {
            if ( iii < ccc-1 )
                mExtraViews.at( iii )->show();
            else
                mExtraViews.at( iii )->hide();
            ++iii;
        }
    }
    QDate last = lastAvailableDate();
    QDate first = firstAvailableDate();
    QDate selFirst = mFirstSelectedDate;
    QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
    if ( selFirst >= first && selLast <= last ) {
        updateDayMatrixDates();
    }
    else {
        updateDayMatrixDates();
        emit monthSelected( mFirstSelectedDate.month() );
    }
 }
 void DateNavigatorContainer::updateDayMatrixDates()
 { 
    QDate fDate =  mFirstSelectedDate;
    QDate lDate =  fDate.addDays( mSelectedDateCount - 1 );
    mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
    mNavigatorView->dayMatrix()->repaint( false );
    for( uint i = 0; i < mLastDisplayedDN; ++i ) {
        KDateNavigator *n = mExtraViews.at( i );
        if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
            n->dayMatrix()->repaint( false );
        }
    }
 }
 void DateNavigatorContainer::updateDayMatrix()
 {
  mNavigatorView->updateDayMatrix();
  for( uint i = 0; i < mLastDisplayedDN; ++i ) {
      KDateNavigator *n = mExtraViews.at( i );
      n->updateDayMatrix();
  }
 }
 void DateNavigatorContainer::updateToday()
 {
    qDebug("DateNavigatorContainer::updateToday() NOT IMPL ");
 #if 0
  mNavigatorView->updateToday();
  KDateNavigator *n;
  for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
    n->updateToday();
  }
 #endif 
 }
 void DateNavigatorContainer::updateView()
 {
  mNavigatorView->updateView();
  for( uint i = 0; i < mLastDisplayedDN; ++i ) {
      KDateNavigator *n = mExtraViews.at( i );
      n->updateView();
  }
 }
 void DateNavigatorContainer::updateConfig()
 {
  mNavigatorView->updateConfig();
  for( uint i = 0; i < mLastDisplayedDN; ++i ) {
      KDateNavigator *n = mExtraViews.at( i );
      n->updateConfig();
  }
 }
 QDate DateNavigatorContainer::lastAvailableDate() const 
 {
    QDate date = mNavigatorView->baseDate();
    QDate last = QDate ( date.year(), date.month(), date.daysInMonth() );
    int iii = mLastDisplayedDN;
    if ( mLastDisplayedDN )
        last = last.addDays( 1);
    while ( iii ) {
        last = last.addDays( last.daysInMonth ());
        //qDebug("DATE %s   ", last.toString().latin1() );
        --iii;
    }
    if ( mLastDisplayedDN )
        last = last.addDays( -1);
    return last;
 }
 QDate DateNavigatorContainer::firstAvailableDate() const 
 {
    return QDate ( mNavigatorView->baseDate().year(), mNavigatorView->baseDate().month(), 1 );
 }
 void DateNavigatorContainer::selectDates( const DateList &dateList )
 {
    mFirstSelectedDate = dateList.first() ;
    mSelectedDateCount = dateList.count() ;
    if ( !mLastDisplayedDN ) {
        mNavigatorView->selectDates( dateList );
        return;
    } 
    QDate fDate =  dateList.first();
    QDate lDate =  dateList.last();
    //qDebug("%s %s  ", lastAvailableDate().toString().latin1(), firstAvailableDate().toString().latin1()  );
    //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1()  );
    if ( lDate <= lastAvailableDate() && firstAvailableDate() <=  fDate) {
        updateDayMatrixDates();
        return;
    }
    mNavigatorView->selectDates( dateList );
    setBaseDates();
  if ( mLastDisplayedDN ) {
      KDateNavigator *view = mExtraViews.at( 0 );
      view->dayMatrix()->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
      view->dayMatrix()->repaint( false ); 
      if ( mLastDisplayedDN > 1 ) {
          KDateNavigator *view = mExtraViews.at( 1 );
          view->dayMatrix()->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
          view->dayMatrix()->repaint( false );
      }
  }
 }
 void DateNavigatorContainer::setBaseDates()
 {
  QDate baseDate = mNavigatorView->baseDate();
  bool doRepaint = true;
  for( uint i = 0; i < mLastDisplayedDN; ++i ) {
      KDateNavigator *n = mExtraViews.at( i );
      baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 );
      n->setBaseDate( baseDate, doRepaint );
  }
 }
 void DateNavigatorContainer::setResizeEnabled()
 {
    mResizeEnabled = true;
    //qDebug("DateNavigatorContainer::setResizeEnabled ");
    checkUpdateDayMatrixDates();
 }
 void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
 {
    //qDebug("DateNavigatorContainer::resizeEvent %d %d ", width(), height());
  //qDebug("COUNT %d ", mExtraViews.count());
    if ( ! mResizeEnabled  ) {
        //qDebug("NOT ResizeEnabled");
        return;
    }
    else
        mUpdateTimer->start( 250 );
        
  //updateDayMatrixDates();
 }
 QSize DateNavigatorContainer::minimumSizeHint() const
 {
  return mNavigatorView->minimumSizeHint();
 }
 QSize DateNavigatorContainer::sizeHint() const
 {
    return mNavigatorView->yourSizeHint();
 }
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 2fca49e..1d09f40 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -1,468 +1,467 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2001,2002 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qstring.h>
 #include <qkeycode.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include "koglobals.h"
 #include "koprefs.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include <kcalendarsystem.h>
 #include "navigatorbar.h"
 #include "kdatenavigator.h"
 KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
  : QFrame(parent, name),
    updateTimer(0L)
 {
    setFrameStyle(QFrame::NoFrame);
    QDate startDate = QDate::currentDate();
  QGridLayout *topLayout = new QGridLayout(this,8,8);
  if (! startDate.isValid()) {
      qDebug("KDateNavigator::invalid startdate ");
    startDate = QDate::currentDate();
  }
  mMonthSignalOffset = 0;
  mSelectedDates.append(startDate);
  m_MthYr = startDate;
  m_bShowWeekNums = true;
-  
  setFont( KOPrefs::instance()->mDateNavigatorFont );
  mNavigatorBar = new NavigatorBar( startDate, this );
  topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 );
  //mNavigatorBar->resize( 1,1);
  connect( mNavigatorBar, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) );
  connect( mNavigatorBar, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) );
  connect( mNavigatorBar, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) );
  connect( mNavigatorBar, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) );
  connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) );
  
  // get the day of the week on the first day
  QDate dayone(m_MthYr.year(), m_MthYr.month(), 1);
  m_fstDayOfWk = dayone.dayOfWeek();
  int i;
  // Set up the heading fields.
  for( i = 0; i < 7; i++ ) {
    headings[i] = new QLabel("",this);
    //headings[i]->setFont(QFont("Arial", 10, QFont::Bold));
    headings[i]->setAlignment(AlignCenter);
    headings[i]->installEventFilter(this);
    topLayout->addWidget(headings[i],1,i+1);
  }
  // Create the weeknumber labels
  for( i = 0; i < 6; i++ ) {
    weeknos[i] = new QLabel(this);
    weeknos[i]->setAlignment(AlignCenter);
    //weeknos[i]->setFont(QFont("Arial", 10));
    if(!m_bShowWeekNums) {
      weeknos[i]->hide();
    }
    weeknos[i]->installEventFilter(this);
    topLayout->addWidget(weeknos[i],i+2,0);
  }
  daymatrix = new KODayMatrix( this, "KDateNavigator::DayMatrix");
  daymatrix->setFrameStyle(QFrame::Panel|QFrame::Sunken);
  daymatrix->setLineWidth(1);
  connect( daymatrix, SIGNAL( selected( const KCal::DateList & ) ),
           SIGNAL( datesSelected( const KCal::DateList & ) ) );
  connect( daymatrix, SIGNAL( eventDropped( Event * ) ),
           SIGNAL( eventDropped( Event * ) ) );
  topLayout->addMultiCellWidget(daymatrix,2,7,1,7);
  // read settings from configuration file.
  updateConfig();
  enableRollover(FollowMonth);
  mySizeHint = sizeHintTwoButtons();
  myFullSizeHint = sizeHintTwoButtons( 4 );
  mFontChanged = false;
  //resize ( 3,3 );
  
 }
 void KDateNavigator::changeFont ( QFont fo ) 
 {
        setFont( fo );
        mNavigatorBar->resetFont( fo );
 }
 QFont KDateNavigator::yourFontHint( QSize si , bool *b)
 {
    QFont fo =  KOPrefs::instance()->mDateNavigatorFont;
    *b = false;
    int fontPoint = fo.pointSize();
    while ( fontPoint > 5 ) {
        --fontPoint;
        fo.setPointSize( fontPoint );
        setFont( fo );
        mFontChanged = true;
        mNavigatorBar->resetFont( fo );
        QSize sh = sizeHintTwoButtons( 2 );
        //qDebug("fp %d %d %d %d %d", fontPoint,   si.width() , sh.width() ,   si.height() , sh.height()                 );
        if ( si.width()  > sh.width() &&   si.height()  > sh.height()) {
            if (  si.width()  / sh.width() == 1 ) {
                if (  si.width() < sizeHintTwoButtons( 4 ).width())
                    continue;
            }
            *b = true;
            //qDebug("fooooooooooooooooooooooouuuuund ");
            break;
        }
    }
    //qDebug("returnnnnnnnnnnnnnnnnnnn %d", fo.pointSize() );
    return fo;
 }
 QSize KDateNavigator::sizeHint() const
 {
    QFontMetrics fm ( font() );
    QSize day =  daymatrix->sizeHint();
    QSize nav =  mNavigatorBar->sizeHint();
    int wid = fm.width( "30") + day.width()+3;
    int hei = fm.height() +day.height()+nav.height()+2;
    if ( wid <  nav.width() )
        wid = nav.width() ;
    //qDebug("KDateNavigator+++++++++++++ %d %d", wid , hei);
  return   QSize ( wid, hei );
 }
 QSize KDateNavigator::sizeHintTwoButtons( int butnum ) const
 {
    QFontMetrics fm ( font() );
    QSize day =  daymatrix->sizeHint();
    QSize nav =  mNavigatorBar->sizeHintTwoButtons( butnum );
    int wid = fm.width( "30") + day.width()+3;
    int hei = fm.height() +day.height()+nav.height()+2;
    if ( wid <  nav.width() )
        wid = nav.width() ;
    //qDebug("KDateNavigator+++++++++++++ %d %d", wid , hei);
  return   QSize ( wid, hei );
 }
 void KDateNavigator::slotMonthSelected( int m )
 {
    if ( m_MthYr.month() <= mMonthSignalOffset)
      m += 12;
    //qDebug("%d mMonthSignalOffset %d emit %d", m, mMonthSignalOffset, m - mMonthSignalOffset);
    emit monthSelected( m - mMonthSignalOffset );
 }
 void KDateNavigator::setCalendar( Calendar *cal )
 {
  daymatrix->setCalendar( cal );
 }
 void KDateNavigator::setBaseDate( const QDate &date , bool doRepaint ) // = true
 {
  m_MthYr  = date;
  //qDebug("KDateNavigator::setBaseDate %s ", date.toString().latin1());
  
  updateDates();
  updateView();
  KCal::DateList dates;
  dates.append( date );
  mNavigatorBar->selectDates( dates );
  daymatrix->clearSelection();
  if ( doRepaint )
      daymatrix->repaint( false );
 }
 void KDateNavigator::enableRollover(RolloverType r)
 {
  switch(r)
  {
  case None :
    if (updateTimer)
    {
      updateTimer->stop();
      delete updateTimer;
      updateTimer=0L;
    }
    break;
  case FollowDay :
  case FollowMonth :
    if (!updateTimer)
    {
      updateTimer = new QTimer(this);
      QObject::connect(updateTimer,SIGNAL(timeout()),
        this,SLOT(possiblyPastMidnight()));
    }
    updateTimer->start(0,true);
    lastDayChecked = QDate::currentDate();
  }
  updateRollover=r;
 }
 KDateNavigator::~KDateNavigator()
 {
 }
 void KDateNavigator::passedMidnight()
 {
    QDate today = QDate::currentDate();
    bool emitMonth = false;
    if (today.month() != lastDayChecked.month())
    {
       if (updateRollover==FollowMonth &&
           daymatrix->isEndOfMonth()) {
         goNextMonth();
         emitMonth=true;
       }
    }
    daymatrix->recalculateToday();
    daymatrix->repaint( false );
    emit dayPassed(today);
    if (emitMonth) { emit monthPassed(today); }
 }
 /* slot */ void KDateNavigator::possiblyPastMidnight()
 {
  if (lastDayChecked!=QDate::currentDate())
  {
    passedMidnight();
    lastDayChecked=QDate::currentDate();
  }
  // Set the timer to go off 1 second after midnight
  // or after 8 minutes, whichever comes first.
  if (updateTimer)
  {
    QTime now = QTime::currentTime();
    QTime midnight = QTime(23,59,59);
    int msecsWait = QMIN(480000,now.msecsTo(midnight)+2000);
    // qDebug(QString("Waiting %1 msec from %2 to %3.").arg(msecsWait))
            //.arg(now.toString()).arg(midnight.toString()));
    updateTimer->stop();
    updateTimer->start(msecsWait,true);
  }
 }
 void KDateNavigator::updateDates()
 {
  // Find the first day of the week of the current month.
  //int d1 = KOGlobals::self()->calendarSystem()->day( m_MthYr );
  QDate dayone( m_MthYr.year(), m_MthYr.month(), m_MthYr.day() );
  int d2 = KOGlobals::self()->calendarSystem()->day( dayone );
  //int di = d1 - d2 + 1;
  dayone = dayone.addDays( -d2 + 1 );
  int m_fstDayOfWkCalsys = KOGlobals::self()->calendarSystem()->dayOfWeek( dayone );
  // If month begins on Monday and Monday is first day of week,
  // month should begin on second line. Sunday doesn't have this problem.
  int nextLine = ( ( m_fstDayOfWkCalsys == 1) &&
                   ( KGlobal::locale()->weekStartsMonday() == 1 ) ) ? 7 : 0;
  // update the matrix dates
  int index = (KGlobal::locale()->weekStartsMonday() ? 1 : 0) - m_fstDayOfWkCalsys - nextLine;
  daymatrix->updateView(dayone.addDays(index));
 //each updateDates is followed by an updateView -> repaint is issued there !
 //  daymatrix->repaint();
 }
 void KDateNavigator::updateDayMatrix()
 {
  daymatrix->updateView();
  //daymatrix->repaint();
 }
 void KDateNavigator::updateView()
 {
   
  setUpdatesEnabled( false );
  int i;
 //  kdDebug() << "updateView() -> daymatrix->updateView()" << endl;
  daymatrix->updateView();
  int sub = 4; 
  if ( !  KGlobal::locale()->weekStartsMonday() )
      --sub;
  // set the week numbers.
  for(i = 0; i < 6; i++) {
    // remember, according to ISO 8601, the first week of the year is the
    // first week that contains a thursday.  Thus we must subtract off 4,
    // not just 1.
    //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear();
    int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-sub)));
    int weekNo;
    if (dayOfYear % 7 != 0)
      weekNo = (dayOfYear / 7 + 1);
    else
      weekNo = (dayOfYear / 7);
    weeknos[i]->setText(QString::number( weekNo ));
  }
  setUpdatesEnabled( true );
 //  kdDebug() << "updateView() -> repaint()" << endl;
  repaint();
  // daymatrix->repaint();
 }
 void KDateNavigator::updateConfig()
 {
  int day;
  for(int i=0; i<7; i++) {
    // take the first letter of the day name to be the abbreviation
    if (KGlobal::locale()->weekStartsMonday()) {
      day = i+1;
    } else {
      if (i==0) day = 7;
      else day = i;
    }
    QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day,
                                                                        true );
    if ( KOPrefs::instance()->mCompactDialogs ) dayName = dayName.left( 1 );
    headings[i]->setText( dayName );
  }
  updateDates();
  updateView();
 }
 void KDateNavigator::setShowWeekNums(bool enabled)
 {
    qDebug("KDateNavigator::setShowWeekNums***************************** ");
  m_bShowWeekNums = enabled;
  for(int i=0; i<6; i++) {
    if(enabled)
      weeknos[i]->show();
    else
      weeknos[i]->hide();
  }
  resize(size());
 }
 void KDateNavigator::selectDates(const DateList& dateList)
 {
    
  if (dateList.count() > 0) {
    mNavigatorBar->selectDates( dateList );
    mSelectedDates = dateList;
    // set our record of the month and year that this datetbl is
    // displaying.
    m_MthYr = mSelectedDates.first();
    // set our record of the first day of the week of the current
    // month. This needs to be done before calling dayToIndex, since it
    // relies on this information being up to date.
    QDate dayone(m_MthYr.year(), m_MthYr.month(), 1);
    m_fstDayOfWk = dayone.dayOfWeek();
    updateDates();
    daymatrix->setSelectedDaysFrom(*(dateList.begin()), *(--dateList.end()));
    updateView();
  }
 }
 int KDateNavigator::dayNum(int row, int col)
 {
  return 7 * (row - 1) + (col + 1) - m_fstDayOfWk;
 }
 int KDateNavigator::dayToIndex(int dayNum)
 {
  int row, col;
  row = (dayNum+m_fstDayOfWk-1-(KGlobal::locale()->weekStartsMonday() ? 1 : 0)) / 7;
  if (KGlobal::locale()->weekStartsMonday() && (m_fstDayOfWk == 1))
    row++;
  col = (dayNum+m_fstDayOfWk-1-(KGlobal::locale()->weekStartsMonday() ? 1 : 0)) % 7;
  return row * 7 + col;
 }
 void KDateNavigator::wheelEvent (QWheelEvent *e)
 {
  if(e->delta()>0) emit goPrevious();
  else emit goNext();
  e->accept();
 }
 bool KDateNavigator::eventFilter (QObject *o,QEvent *e)
 {
  if (e->type() == QEvent::MouseButtonPress) {
    int i;
    for(i=0;i<6;++i) {
      if (o == weeknos[i]) {
        QDate weekstart = daymatrix->getDate(i*7);
        emit weekClicked(weekstart);
        break;
      }
    }
    for(i=0;i<7;++i) {
      if (o == headings[i]) {
          KCal::DateList selDays;
          QDate date = daymatrix->getDate(14);
          emit showMonth(date );
 #if 0
          int dio = date.daysInMonth();
          int j;
          int ye =  date.year();
          int mo = date.month();
          for ( j = 1; j <= dio; ++j ) {
              selDays.append( QDate( ye, mo, j ) );
          }
          emit datesSelected( selDays );
 #endif
        break;
      }
    }
    return true;
  } else {
    return false;
  }
 }
 //#include "kdatenavigator.moc"
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 5cd845e..4fe1e66 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -1,649 +1,675 @@
 /*
    This file is part of KdePim/Pi.
    Copyright (c) 2004 Ulf Schenk
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <qlayout.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #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 <kprefsdialog.h>
 #include <klocale.h>
 #include <kdateedit.h>
 #include <kglobal.h>
 #include <stdlib.h>
 /*US
 #include <qcheckbox.h>
 #include <qframe.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else // KAB_EMBEDDED
 #include <mergewidget.h>
 #include <distributionlistwidget.h>
 #endif // KAB_EMBEDDED
 #include "addresseewidget.h"
 #include "extensionconfigdialog.h"
 #include "extensionwidget.h"
 */
 #include "qapplication.h"
 #include "kpimglobalprefs.h"
 #include "kdepimconfigwidget.h"
 #include <kprefs.h>
+#include <kmessagebox.h>
 KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name )
  : KPrefsWidget(prefs, parent, name )
 {
  mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
  mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
  mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
  mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
  mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
  mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
  QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
                                            KDialog::spacingHint() );
  tabWidget = new QTabWidget( this );
  topLayout->addWidget( tabWidget );
  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>New data storage dir:</b>"), storePage );
    mStoreUrl = new KURLRequester( storePage );
    mStoreUrl->setURL( KGlobal::dirs()->localkdedir() );
+#ifdef DESKTOP_VERSION     
+    QString confFile = qApp->applicationDirPath ()+ "/.microkdehome" ;
+    QFileInfo fi ( confFile );
+    if ( fi.exists() ) {
+        KConfig cfg (   confFile );
+        cfg.setGroup("Global");
+        QString localKdeDir = cfg.readEntry( "MICROKDEHOME", "x_x_x" );
+        if ( localKdeDir != "x_x_x" ) {
+            mStoreUrl->setURL( localKdeDir );
+            qDebug("Reading config from %s ", confFile.latin1());
+        }
+    }
+               
+#endif
    new QLabel( i18n("New dirs are created automatically"), storePage  );
    QHBox *bb = new QHBox( storePage );
    QPushButton * pb;
    if ( QApplication::desktop()->width() < 640 )
        pb = new QPushButton ( i18n("Save"), bb  );
    else
        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() ) );
+#ifdef DESKTOP_VERSION
+    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  );
    tabWidget->addTab( storePage, i18n( "Data storage path" ) );
 }
+void KDEPIMConfigWidget::setLocalStore()
+{
+    mStoreUrl->setURL(  "LOCAL:kdepimpi"  );
+    saveStoreSettings();
+    QString message = i18n("'LOCAL' mode makes is possible to run\nKA/Pi and KO/Pi from a USB memory stick.\nIn LOCAL mode the data is stored\nin a path relative to the executable.\nNote, that in LOCAL mode only addressbook\nresource files in\n <path of the executable>/<dirname after LOCAL:>/apps/kabc/*.vcf\n are supported.\nIf you use the standard addressbook settings\nyou do not have to reconfigure any path,\njust restart the application and import\nyour addressbook and calendar data.");
+    KMessageBox::information( this, message);
+}
 void KDEPIMConfigWidget::setStandardStore()
 {
    mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
    saveStoreSettings();
 }
 void KDEPIMConfigWidget::saveStoreSettings()
 {
    if ( !mStoreUrl->url().isEmpty() ) {
        QString path = QDir::homeDirPath();
        QString url = mStoreUrl->url();
 #ifdef DESKTOP_VERSION
        if ( url.startsWith( "LOCAL:" ) ) {
            path = qApp->applicationDirPath () ;
        }
 #endif
        KConfig cfg (   path + "/.microkdehome" );
        cfg.setGroup("Global");
        cfg.writeEntry( "MICROKDEHOME", url ); 
        qDebug("cfg.writeEntry( MICROKDEHOME, %s  ", url.latin1());
        cfg.sync();
    } else {
        mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
        saveStoreSettings();
    }
 }
 void KDEPIMConfigWidget::setupExternalAppTab()
 {
  QWidget *externalAppsPage = new QWidget( this );
  QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
                                            KDialog::spacingHintSmall() );
  mExternalApps = new QComboBox( externalAppsPage );
  QMap<ExternalAppHandler::Types, QString>::Iterator it;
  for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
    mExternalApps->insertItem( it.data(), it.key() );
  layout->addWidget( mExternalApps );
  connect( mExternalApps, SIGNAL( activated( int ) ),
           this, SLOT (externalapp_changed( int ) ) );
  mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
  QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
  mExternalAppGroupBox->layout()->setMargin(5);
  mClient = new QComboBox( mExternalAppGroupBox );
  boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
  connect( mClient, SIGNAL( activated( int ) ),
           this, SLOT (client_changed( int ) ) );
  QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
  boxLayout->addWidget( lab, 1, 0 );
  mChannel = new QLineEdit(mExternalAppGroupBox);
  mChannel->setReadOnly(true);
  boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 );
  lab = new QLabel( i18n("Message:"), mExternalAppGroupBox);
  boxLayout->addWidget( lab, 3, 0 );
  mMessage = new QLineEdit(mExternalAppGroupBox);
  mMessage->setReadOnly(true);
  boxLayout->addWidget( mMessage , 4, 0);
  lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox);
  boxLayout->addWidget( lab, 3, 1 );
  mParameters = new QLineEdit(mExternalAppGroupBox);
  mParameters->setReadOnly(true);
  boxLayout->addWidget( mParameters, 4, 1 );
  lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
  boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
  lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
  boxLayout->addWidget( lab, 6, 0 );
  mMessage2 = new QLineEdit(mExternalAppGroupBox);
  mMessage2->setReadOnly(true);
  boxLayout->addWidget( mMessage2 , 7, 0);
  lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
  boxLayout->addWidget( lab, 6, 1 );
  mParameters2 = new QLineEdit(mExternalAppGroupBox);
  mParameters2->setReadOnly(true);
  boxLayout->addWidget( mParameters2, 7, 1 );
  lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
  boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
  connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
  connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
  connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
  connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
  connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
  layout->addWidget( mExternalAppGroupBox );
  tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) );
 }
  
 void KDEPIMConfigWidget::setupLocaleDateTab()
 {
  QWidget *topFrame = new QWidget( this );
  QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2);
   topLayout->setSpacing(KDialog::spacingHintSmall());
   topLayout->setMargin(KDialog::marginHintSmall());  
   int iii = 0;
   
   KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame);
   QString format;
   if ( QApplication::desktop()->width() < 480 )
       format = "(%d.%m.%Y)";
   else 
       format = "(%d.%m.%Y|%A %d %B %Y)";
   syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
   if ( QApplication::desktop()->width() < 480 )
       format = "(%m.%d.%Y)";
   else 
       format = "(%m.%d.%Y|%A %B %d %Y)";
   syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
   if ( QApplication::desktop()->width() < 480 )
       format = "(%Y-%m-%d)";
   else 
       format = "(%Y-%m-%d|%A %Y %B %d)";
   syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
   syncPrefsGroup->addRadio(i18n("User defined"));
   if ( QApplication::desktop()->width() < 480 ) {
       syncPrefsGroup->groupBox()->layout()->setMargin( 5 );
       syncPrefsGroup->groupBox()->layout()->setSpacing( 0 );
   }  
   topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
   ++iii;   
   ++iii;
   QLabel * lab;
   mUserDateFormatLong = new QLineEdit(topFrame);
   lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
   topLayout->addWidget(lab ,iii,0);
   topLayout->addWidget(mUserDateFormatLong,iii,1);
   ++iii;
   mUserDateFormatShort = new QLineEdit(topFrame);
   lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
   topLayout->addWidget(lab ,iii,0);
   topLayout->addWidget(mUserDateFormatShort,iii,1);
   ++iii;
   lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
   topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
   ++iii;
   lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
   topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
   ++iii;  
   lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
   topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
   ++iii;
  connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
  connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   tabWidget->addTab( topFrame, i18n( "Date Format" ) );
 }
 void KDEPIMConfigWidget::setupLocaleTab()
 {
  QWidget *topFrame = new QWidget( this );
   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
   topLayout->setSpacing(KDialog::spacingHint());
   topLayout->setMargin(KDialog::marginHint());  
   int iii = 0;
 KPrefsWidRadios *syncPrefsGroup =
      addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame);
   syncPrefsGroup->addRadio(i18n("English"));
   syncPrefsGroup->addRadio(i18n("German")); 
   syncPrefsGroup->addRadio(i18n("French")); 
   syncPrefsGroup->addRadio(i18n("Italian")); 
   syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
   if (  QApplication::desktop()->width() <  300   ) {
       syncPrefsGroup->groupBox()->layout()->setMargin( 5 );
       syncPrefsGroup->groupBox()->layout()->setSpacing( 0 );
   }
   topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
   ++iii;   
 
   tabWidget->addTab( topFrame, i18n( "Language" ) );
   topFrame = new QWidget( this );
   topLayout = new QGridLayout(topFrame,4,2);
   
   topLayout->setSpacing(KDialog::spacingHint());
   topLayout->setMargin(KDialog::marginHint());  
   iii = 0;
   syncPrefsGroup =
       addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame);
   if (  QApplication::desktop()->width() >  300   )
       syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
   syncPrefsGroup->addRadio(i18n("24:00"));
   syncPrefsGroup->addRadio(i18n("12:00am"));
   syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
   topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
   ++iii;   
   KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"),
                      &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame);
   topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
   ++iii;   
   tabWidget->addTab( topFrame, i18n( "Time Format" ) );
 }
 void KDEPIMConfigWidget::setupTimeZoneTab()
 {
    QWidget *topFrame;
    QGridLayout *topLayout ;
 
  topFrame = new QWidget( this );
  topLayout = new QGridLayout( topFrame, 5, 2);
  topLayout->setSpacing(KDialog::spacingHintSmall());
  topLayout->setMargin(KDialog::marginHintSmall());
  QHBox *timeZoneBox = new QHBox( topFrame );
  topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
  new QLabel( i18n("Timezone:"), timeZoneBox );
  mTimeZoneCombo = new QComboBox( timeZoneBox ); 
  if ( QApplication::desktop()->width() <  300 ) {
       mTimeZoneCombo->setMaximumWidth(150);
    }
  QStringList list;
  list = KGlobal::locale()->timeZoneList();
  mTimeZoneCombo->insertStringList(list);
    // find the currently set time zone and select it
  QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId;
  int nCurrentlySet = 11;
  for (int i = 0; i < mTimeZoneCombo->count(); i++)
    {
      if (mTimeZoneCombo->text(i) == sCurrentlySet)
        {
         nCurrentlySet = i;
         break;
        }
    }
  mTimeZoneCombo->setCurrentItem(nCurrentlySet);
  int iii = 1;
  KPrefsWidBool *sb =
      addWidBool(i18n("Add 30 min to selected Timezone"),
                 &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame);
  topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
  ++iii;  
  sb =
      addWidBool(i18n("Timezone has daylight saving"),
                 &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame);
  topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
  ++iii; 
  QLabel* lab; 
  lab = new QLabel(  i18n("Actual start and end is the\nsunday before this date."), topFrame );
  topLayout->addMultiCellWidget(lab, iii,iii,0,1);
  ++iii;
 
  lab = new QLabel(  i18n("The year in the date is ignored."), topFrame );
  topLayout->addMultiCellWidget(lab, iii,iii,0,1);
  ++iii; 
  lab = new QLabel(  i18n("Daylight start:"), topFrame );
  topLayout->addWidget(lab, iii,0);
  mStartDateSavingEdit = new KDateEdit(topFrame);
  topLayout->addWidget(mStartDateSavingEdit, iii,1);
  ++iii;
  lab = new QLabel(  i18n("Daylight end:"), topFrame );
  topLayout->addWidget(lab, iii,0);
  mEndDateSavingEdit = new KDateEdit(topFrame);
  topLayout->addWidget(mEndDateSavingEdit, iii,1);
  ++iii;
  QDate current ( 2001, 1,1);
  mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1));
  mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1));
  connect( mStartDateSavingEdit, SIGNAL(  dateChanged(QDate)), this, SLOT( modified())  );
  connect( mEndDateSavingEdit, SIGNAL(  dateChanged(QDate)), this, SLOT( modified())  );
  connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) );
  tabWidget->addTab( topFrame, i18n( "Time Zone" ) );
 
  topFrame = new QWidget( this );
  topLayout = new QGridLayout( topFrame, 3, 2);
  topLayout->setSpacing(KDialog::spacingHintSmall());
  topLayout->setMargin(KDialog::marginHintSmall());
  tabWidget->addTab( topFrame, i18n( "Fonts" ) );
  QLabel* labb = new QLabel( i18n("Global application font for all apps:"),  topFrame );
  topLayout->addMultiCellWidget(labb,0,0,0,2);
  int i = 1;
  KPrefsWidFont *timeLabelsFont =
      addWidFont(i18n("Kx/Pi"),i18n("Application Font"),
                 &(KPimGlobalPrefs::instance()->mApplicationFont),topFrame);
  topLayout->addWidget(timeLabelsFont->label(),i,0);
  topLayout->addWidget(timeLabelsFont->preview(),i,1);
  topLayout->addWidget(timeLabelsFont->button(),i,2);
 }
 void KDEPIMConfigWidget::externalapp_changed( int newApp )
 {
  // first store the current data
  saveEditFieldSettings();
  // set mCurrentApp
  mCurrentApp = (ExternalAppHandler::Types)newApp;
  // set mCurrentClient
  switch(mCurrentApp)
  {
    case(ExternalAppHandler::EMAIL):
      mCurrentClient = mEmailClient;
      break;
    case(ExternalAppHandler::PHONE):
      mCurrentClient = mPhoneClient;
      break;
    case(ExternalAppHandler::SMS):
      mCurrentClient = mSMSClient;
      break;
    case(ExternalAppHandler::FAX):
      mCurrentClient = mFaxClient;
      break;
    case(ExternalAppHandler::PAGER):
      mCurrentClient = mPagerClient;
      break;
    case(ExternalAppHandler::SIP):
      mCurrentClient = mSipClient;
      break;
    default:
      return;
  }
  // and at last update the widgets
  updateClientWidgets();
 }
 void KDEPIMConfigWidget::client_changed( int newClient )
 {
  if (newClient == mCurrentClient)
    return;
  // first store the current data
  saveEditFieldSettings();
  //then reset the clientvariable
  mCurrentClient = newClient;
  // and at last update the widgets
  updateClientWidgets();
  KPrefsWidget::modified();
 }
 void KDEPIMConfigWidget::saveEditFieldSettings()
 {
  switch(mCurrentApp)
  {
    case(ExternalAppHandler::EMAIL):
      mEmailClient = mClient->currentItem();
      break;
    case(ExternalAppHandler::PHONE):
      mPhoneClient= mClient->currentItem();
      break;
    case(ExternalAppHandler::SMS):
      mSMSClient = mClient->currentItem();
      break;
    case(ExternalAppHandler::FAX):
      mFaxClient = mClient->currentItem();
      break;
    case(ExternalAppHandler::PAGER):
      mPagerClient = mClient->currentItem();
      break;
    case(ExternalAppHandler::SIP):
      mSipClient = mClient->currentItem();
      break;
    default:
      return;
  }
  //store the current data back to the apropriate membervariables if we had set it to "other"
  if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
  {
    mEmailOtherChannel = mChannel->text();
    mEmailOtherMessage = mMessage->text();
    mEmailOtherMessageParameters = mParameters->text();
    mEmailOtherMessage2 = mMessage2->text();
    mEmailOtherMessageParameters2 = mParameters2->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
  {
    mPhoneOtherChannel = mChannel->text();
    mPhoneOtherMessage = mMessage->text();
    mPhoneOtherMessageParameters = mParameters->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
  {
    mSMSOtherChannel = mChannel->text();
    mSMSOtherMessage = mMessage->text();
    mSMSOtherMessageParameters = mParameters->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
  {
    mFaxOtherChannel = mChannel->text();
    mFaxOtherMessage = mMessage->text();
    mFaxOtherMessageParameters = mParameters->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
  {
    mPagerOtherChannel = mChannel->text();
    mPagerOtherMessage = mMessage->text();
    mPagerOtherMessageParameters = mParameters->text();
  }
  else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
  {
    mSipOtherChannel = mChannel->text();
    mSipOtherMessage = mMessage->text();
    mSipOtherMessageParameters = mParameters->text();
  }
 }
 void KDEPIMConfigWidget::updateClientWidgets()
 {
  bool blocked = signalsBlocked();
  blockSignals( true );
  // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display
  QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp );
  if (it == mExternalAppsMap.end())
    return;
  // update group box
  mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data()));
  //update the entries in the client combobox
  mClient->clear();
  QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp);
  DefaultAppItem* dai;
  for ( dai=items.first(); dai != 0; dai=items.next() )
  {
    mClient->insertItem( i18n(dai->_label), dai->_id );
    if (dai->_id == mCurrentClient)
    {
      //restore the edit fields with the data of the local membervariables if we had set it to "other".
      //Otherwise take the default data from externalapphandler.
      mChannel->setText(dai->_channel);
      mMessage->setText(dai->_message);
      mParameters->setText(dai->_parameters);
      mMessage2->setText(dai->_message2);
      mParameters2->setText(dai->_parameters2);
      if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
      {
        mChannel->setText(mEmailOtherChannel);
        mMessage->setText(mEmailOtherMessage);
        mParameters->setText(mEmailOtherMessageParameters);
        mMessage2->setText(mEmailOtherMessage2);
        mParameters2->setText(mEmailOtherMessageParameters2);
      }
      else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
      {
        mChannel->setText(mPhoneOtherChannel);
        mMessage->setText(mPhoneOtherMessage);
        mParameters->setText(mPhoneOtherMessageParameters);
      }
      else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
      {
        mChannel->setText(mSMSOtherChannel);
        mMessage->setText(mSMSOtherMessage);
        mParameters->setText(mSMSOtherMessageParameters);
      }
      else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
      {
        mChannel->setText(mFaxOtherChannel);
        mMessage->setText(mFaxOtherMessage);
        mParameters->setText(mFaxOtherMessageParameters);
      }
      else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
      {
        mChannel->setText(mPagerOtherChannel);
        mMessage->setText(mPagerOtherMessage);
        mParameters->setText(mPagerOtherMessageParameters);
      }
      else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
      {
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index c545207..984e4e0 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -1,160 +1,161 @@
 /*
    This file is part of KDEPim/Pi.
    Copyright (c) 2004 Ulf Schenk
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KDEPIMCONFIGWIDGET_H
 #define KDEPIMCONFIGWIDGET_H
 #include <kprefswidget.h>
 #include <kio/kfile/kurlrequester.h>
 #include <qmap.h>
 #include "externalapphandler.h"
 class QComboBox;
 class QLineEdit;
 class KPimGlobalPrefs;
 class QGroupBox;
 class QTabWidget;
 class KDateEdit;
 class KDEPIMConfigWidget : public KPrefsWidget
 {
  Q_OBJECT
  public:
    KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 );
  public slots:
    void textChanged( const QString& text );
    void showTimeZoneTab();
  protected:
    /** Implement this to read custom configuration widgets. */
  virtual void usrReadConfig();
    /** Implement this to write custom configuration widgets. */
  virtual void usrWriteConfig();
  private slots:
 //    void configureExtension();
 //    void selectionChanged( QListViewItem* );
 //    void itemClicked( QListViewItem* );
    void client_changed( int newClient );
    void externalapp_changed( int newApp );
    void saveStoreSettings();
    void setStandardStore();
+    void setLocalStore(); 
  private:
    void setupExternalAppTab();
    void setupLocaleDateTab();
    void setupLocaleTab();
    void setupTimeZoneTab();
    void setupStoreTab();
    KURLRequester* mStoreUrl;
    void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
    void saveEditFieldSettings();
    void updateClientWidgets();
    QTabWidget *tabWidget;
    QLineEdit* mUserDateFormatShort;
    QLineEdit* mUserDateFormatLong;
    QComboBox* mTimeZoneCombo;
    KDateEdit* mStartDateSavingEdit;
    KDateEdit* mEndDateSavingEdit; 
 //    void restoreExtensionSettings();
 //    void saveExtensionSettings();
 //    KListView *mExtensionView;
 //    QCheckBox *mNameParsing;
 //    QCheckBox *mViewsSingleClickBox;
 //    QPushButton *mConfigureButton;
        QComboBox* mExternalApps;
        QGroupBox* mExternalAppGroupBox;
    QComboBox* mClient;
    QLineEdit* mChannel;
    QLineEdit* mMessage;
    QLineEdit* mParameters;
    QLineEdit* mMessage2;
    QLineEdit* mParameters2;
    ExternalAppHandler::Types mCurrentApp;
    int mCurrentClient;
    int mEmailClient;
    QString mEmailOtherChannel;
    QString mEmailOtherMessage;
    QString mEmailOtherMessageParameters;
    QString mEmailOtherMessage2;
    QString mEmailOtherMessageParameters2;
    int mPhoneClient;
    QString mPhoneOtherChannel;
    QString mPhoneOtherMessage;
    QString mPhoneOtherMessageParameters;
    int mFaxClient;
    QString mFaxOtherChannel;
    QString mFaxOtherMessage;
    QString mFaxOtherMessageParameters;
    int mSMSClient;
    QString mSMSOtherChannel;
    QString mSMSOtherMessage;
    QString mSMSOtherMessageParameters;
    int mPagerClient;
    QString mPagerOtherChannel;
    QString mPagerOtherMessage;
    QString mPagerOtherMessageParameters;
    int mSipClient;
    QString mSipOtherChannel;
    QString mSipOtherMessage;
    QString mSipOtherMessageParameters;
    QMap<ExternalAppHandler::Types, QString> mExternalAppsMap;
 //    AddresseeWidget *mAddresseeWidget;
 };
 #endif