print fixes

4 files changed, 395 insertions, 284 deletions

diff --git a/Makefile b/Makefile
index f93af01..594d47d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,279 +1,385 @@
-#############################################################################
-# Makefile for building: kdepim-desktop
-# Generated by qmake (1.07a) (Qt 3.3.4) on: Mon Mar 28 20:19:36 2005
-# Project:  kdepim-desktop.pro
-# Template: subdirs
-# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
-#############################################################################
-
-MAKEFILE =	Makefile
-QMAKE    =	qmake
-DEL_FILE =    rm -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-INSTALL_FILE= 
-INSTALL_DIR = 
-SUBTARGETS =	 \
-		sub-libical \
-		sub-libkcal \
-		sub-kabc \
-		sub-libkdepim \
-		sub-microkde \
-		sub-korganizer \
-		sub-kaddressbook \
-		sub-kabc-plugins-file \
-		sub-kabc-plugins-dir \
-		sub-kabc-plugins-qtopia \
-		sub-gammu-emb-common \
-		sub-gammu-emb-gammu \
-		sub-libetpan \
-		sub-kmicromail-libmailwrapper \
-		sub-kmicromail \
-		sub-pwmanager-libcrypt-cipher \
-		sub-pwmanager-libcrypt-error \
-		sub-pwmanager-libcrypt-mpi \
-		sub-pwmanager-libcrypt-zlib \
-		sub-pwmanager-pwmanager
-
-first: all
-
-all: Makefile $(SUBTARGETS)
-
-libical/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
-	cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
-sub-libical: libical/$(MAKEFILE) FORCE
-	cd libical && $(MAKE) -f $(MAKEFILE)
-
-libkcal/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
-	cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
-sub-libkcal: libkcal/$(MAKEFILE) FORCE
-	cd libkcal && $(MAKE) -f $(MAKEFILE)
-
-kabc/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
-	cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
-sub-kabc: kabc/$(MAKEFILE) FORCE
-	cd kabc && $(MAKE) -f $(MAKEFILE)
-
-libkdepim/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
-	cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
-sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
-	cd libkdepim && $(MAKE) -f $(MAKEFILE)
-
-microkde/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
-	cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
-sub-microkde: microkde/$(MAKEFILE) FORCE
-	cd microkde && $(MAKE) -f $(MAKEFILE)
-
-korganizer/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
-	cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
-sub-korganizer: korganizer/$(MAKEFILE) FORCE
-	cd korganizer && $(MAKE) -f $(MAKEFILE)
-
-kaddressbook/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
-	cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
-sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
-	cd kaddressbook && $(MAKE) -f $(MAKEFILE)
-
-kabc/plugins/file/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
-	cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
-sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
-	cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
-
-kabc/plugins/dir/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
-	cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
-sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
-	cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
-
-kabc/plugins/qtopia/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia"
-	cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE)
-sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE
-	cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE)
-
-gammu/emb/common/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
-	cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
-sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
-	cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
-
-gammu/emb/gammu/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
-	cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
-sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
-	cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
-
-libetpan/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "libetpan" || $(MKDIR) "libetpan"
-	cd libetpan && $(QMAKE) libetpan.pro -o $(MAKEFILE)
-sub-libetpan: libetpan/$(MAKEFILE) FORCE
-	cd libetpan && $(MAKE) -f $(MAKEFILE)
-
-kmicromail/libmailwrapper/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kmicromail/libmailwrapper" || $(MKDIR) "kmicromail/libmailwrapper"
-	cd kmicromail/libmailwrapper && $(QMAKE) libmailwrapper.pro -o $(MAKEFILE)
-sub-kmicromail-libmailwrapper: kmicromail/libmailwrapper/$(MAKEFILE) FORCE
-	cd kmicromail/libmailwrapper && $(MAKE) -f $(MAKEFILE)
-
-kmicromail/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kmicromail" || $(MKDIR) "kmicromail"
-	cd kmicromail && $(QMAKE) kmicromail.pro -o $(MAKEFILE)
-sub-kmicromail: kmicromail/$(MAKEFILE) FORCE
-	cd kmicromail && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/libcrypt/cipher/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher"
-	cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE)
-sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE
-	cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/libcrypt/error/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error"
-	cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE)
-sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE
-	cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/libcrypt/mpi/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi"
-	cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE)
-sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE
-	cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/libcrypt/zlib/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib"
-	cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE)
-sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE
-	cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/pwmanager/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager"
-	cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE)
-sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE
-	cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE)
-
-Makefile: kdepim-desktop.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o Makefile kdepim-desktop.pro
-qmake: qmake_all
-	@$(QMAKE) -o Makefile kdepim-desktop.pro
-
-all: $(SUBTARGETS)
-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)
-	 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -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
-	 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d libetpan ] && cd libetpan ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
-	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -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
-	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-install_subdirs: qmake_all FORCE
-	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -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
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true
-distclean: qmake_all FORCE
-	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-
-install:  install_subdirs
-
-uninstall:  uninstall_subdirs
-
-FORCE:
+export KDEPIMDIR = $(shell pwd)
+
+export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
+
+ifeq ($(PLATFORM) , zaurus)
+  BUILD_NO_LDAP_PLUGIN=1
+endif
+
+ifneq ($(PLATFORM) , zaurus)
+  BUILD_NO_SHARP_PLUGIN=1
+endif
+
+#opie plugin is deprecated. The qtopia plugin handles the task from now on.
+BUILD_NO_OPIE_PLUGIN=1
+
+SUBDIRS_MICROKDE = \
+   libical/src/libical \
+   libical/src/libicalss \
+   qtcompat \
+   microkde \
+   libkcal \
+   libkdepim \
+   kabc \
+   kabc/formats/binary \
+   kabc/plugins/file \
+   kabc/plugins/dir \
+   korganizer \
+   kalarmd \
+   kaddressbook
+
+SUBDIRS_QTOPIA_PLUGIN = \
+   kabc/plugins/qtopia
+
+SUBDIRS_OPIE_PLUGIN = \
+   kabc/plugins/opie
+
+SUBDIRS_SHARP_PLUGIN = \
+   kabc/plugins/sharpdtm
+
+SUBDIRS_LDAP_PLUGIN = \
+   kabc/plugins/ldap
+
+SUBDIRS_MICROMAIL = \
+   libetpan \
+   kmicromail/libmailwrapper \
+   kmicromail
+
+SUBDIRS_GAMMU = \
+   gammu/emb/common \
+   gammu/emb/gammu
+
+SUBDIRS_PWMANAGER = \
+   pwmanager/libcrypt/mpi  \
+   pwmanager/libcrypt/error  \
+   pwmanager/libcrypt/cipher  \
+   pwmanager/libcrypt/zlib \
+   pwmanager/pwmanager
+
+SUBDIRS = \
+   $(SUBDIRS_MICROKDE) \
+   $(SUBDIRS_QTOPIA_PLUGIN) \
+   $(SUBDIRS_OPIE_PLUGIN) \
+   $(SUBDIRS_SHARP_PLUGIN) \
+   $(SUBDIRS_LDAP_PLUGIN) \
+   $(SUBDIRS_MICROMAIL) \
+   $(SUBDIRS_GAMMU) \
+   $(SUBDIRS_PWMANAGER) 
+
+
+all: build_microkde \
+     build_qtopia_plugin \
+     build_opie_plugin \
+     build_sharp_plugin \
+     build_ldap_plugin \
+     build_micromail \
+     build_gammu \
+     build_pwmanager
+
+
+build_microkde: variable_test tmake
+	for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+
+build_qtopia_plugin: build_microkde
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+	@echo == qtopia plugin not build.
+  else
+	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+build_opie_plugin: build_microkde
+  ifdef BUILD_NO_OPIE_PLUGIN
+	@echo == opie plugin not build.
+  else
+	for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+build_sharp_plugin: build_microkde
+  ifdef BUILD_NO_SHARP_PLUGIN
+	@echo == ldap plugin not build.
+  else
+	for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+  
+build_ldap_plugin: build_microkde
+  ifdef BUILD_NO_LDAP_PLUGIN
+	@echo == ldap plugin not build.
+  else
+	  for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
+            make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+
+build_micromail: build_microkde
+  ifdef BUILD_NO_MICROMAIL
+	@echo == kmicromail not build.
+  else
+	for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+build_gammu: variable_test tmake
+  ifdef BUILD_NO_GAMMU
+	@echo == gammu not build.
+  else
+	for i in $(SUBDIRS_GAMMU); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+build_pwmanager: build_microkde
+  ifdef BUILD_NO_PWMANAGER
+	@echo == pwmanager not build.
+  else
+	for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+
+variable_info:
+	@echo --------------------------------------
+	@echo KDEPIM buildsystem, variableinfo...
+	@echo KDEPIMDIR=$(KDEPIMDIR)
+	@echo QTDIR=$(QTDIR)
+	@echo QPEDIR=$(QPEDIR)
+	@echo OPIEDIR=$(OPIEDIR)
+	@echo PLATFORM=$(PLATFORM)
+	@echo RELEASE_DEBUG=$(RELEASE_DEBUG)
+	@echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
+	@echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
+	@echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+	@echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
+	@echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
+        ifndef BUILD_NO_SHARP_PLUGIN
+	@echo SHARPDTMSDK=$(SHARPDTMSDK)
+        endif
+	@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
+	@echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
+	@echo --------------------------------------
+
+variable_test: variable_info
+	@echo KDEPIM buildsystem, variablecheck...
+  ifndef KDEPIMDIR
+	@echo KDEPIMDIR is not defined.
+	$(error KDEPIMDIR is not defined)
+  endif
+  ifndef PLATFORM
+	@echo PLATFORM is not defined.
+	$(error PLATFORM is not defined)
+  endif
+  ifdef BUILD_NO_LDAP_PLUGIN
+	@echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
+  endif
+  ifdef BUILD_NO_OPIE_PLUGIN
+	@echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
+  endif
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+	@echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
+  endif
+  ifdef BUILD_NO_MICROMAIL
+	@echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
+  endif
+  ifdef BUILD_NO_SHARP_PLUGIN
+	@echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
+  else
+  ifndef SHARPDTMSDK
+	@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
+	$(error SHARPDTMSDK is not defined)
+  endif
+  endif
+  ifdef BUILD_NO_GAMMU
+	@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
+  endif
+  ifdef BUILD_NO_PWMANAGER
+	@echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
+  endif
+	@echo --------------------------------------
+
+
+objects:
+	for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
+	for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
+	mkdir -p libical/lib/$(PLATFORM)
+	mkdir -p dest
+	mkdir -p dest$(LIBICAL_PATH)
+	mkdir -p pwmanager/libcrypt/$(PLATFORM)
+
+clean:
+	rm -rf libical/lib/$(PLATFORM)/*;
+	rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
+	for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
+          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
+          done 
+
+pac:
+	rm -f $(QPEDIR)/lib/libmicro*
+	rm -f $(QPEDIR)/plugins/applets/libkopi*
+	make
+	make install
+	make dist
+install:
+
+	cd bin/kdepim; make install
+	cp -r Pim $(QPEDIR)/apps
+	cp db2file/db2file $(QPEDIR)/bin/db2file
+	chmod ugo+x $(QPEDIR)/bin/db2file
+	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
+	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
+	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
+	cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
+    
+dist: 
+	@echo Dont forget to do "make install" before "make dist"
+	rm -f *arm.ipk
+	rm -f *ipk.zip
+	rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
+	rm -f *~
+	cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
+	cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
+	cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
+	mkipks kmicrokdelibs.control
+	mkipks korganizer.control
+	mkipks kaddressbook.control
+  ifndef BUILD_NO_MICROMAIL
+	mkipks kopiemail.control
+  endif
+  ifndef BUILD_NO_SHARP_PLUGIN
+	mkipks ksharpPIM-DTMaccess.control
+  endif
+	mkipks korganizer-alarm.control
+  ifndef BUILD_NO_GAMMU
+	mkipks kmobilephoneaccess.control
+  endif
+  ifndef BUILD_NO_PWMANAGER
+	mkipks pwmanager.control
+  endif
+	mkipks pimTABicon.control
+	zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
+	mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
+	mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
+	mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
+
+tmake: objects \
+       qtcompat/Makefile$(PLATFORM) \
+       microkde/Makefile$(PLATFORM) \
+       libkcal/Makefile$(PLATFORM) \
+       libkdepim/Makefile$(PLATFORM) \
+       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/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index c6e6d9b..b3a406c 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1130,202 +1130,202 @@
 { "Date && Time Range","Datum && Zeitspanne" },
 { "&End date:","&Enddatum:" },
 { "&Start date:","&Startdatum:" },
 { "Start &time:","Startzeit:" },
 { "End ti&me:","Endzeit:" },
 { "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" },
 { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" },
 { "Alt+D","Alt+D" },
 { "&Use colors","Nutze Farben" },
 { "Alt+U","Alt+U" },
 { "Print week","Drucke Woche" },
 { "CalPrintWeek_Base","CalPrintWeek_Base" },
 { "Use &colors","Nutze Farben" },
 { "Type of View","Typ der Ansicht" },
 { "Print as &Filofax page","Drucke als &Filofax Seite" },
 { "Alt+F","Alt+F" },
 { "Print as &timetable view:","Drucke als Zeittabelle:" },
 { "Alt+T","Alt+T" },
 { "Print as split week view","Drucke als gesplittete Wochenansicht" },
 { "Print month","Drucke Monat" },
 { "CalPrintMonth_Base","CalPrintMonth_Base" },
 { "&Start month:","&Startmonat:" },
 { "&End month:","&Endmonat:" },
 { "Print week &numbers","Drucke Wochen Nummer(n)" },
 { "Print todos","Drucke Todos" },
 { "CalPrintTodoConfig_Base","CalPrintTodoConfig_Base" },
 { "Include &description of the item","Inclusive Itembeschreibung" },
 { "Include d&ue date of the item","Inclusive Fälligkeitsdatum des Items" },
 { "Include &priority of the item","Inclusive Priorität des Items" },
 { "Items to Print","Zu druckende Items" },
 { "&From:","Von:" },
 { "&To:","Bis:" },
 { "Print &all todo items","Drucke alle Todo Items" },
 { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" },
 { "Only items due in the &range:","Nur Items in dem Zeitraum:" },
 { "Todo List","Todo Liste" },
 { "&Title:","&Titel:" },
 { "Co&nnect subtodos with its parent","Verbinde Unter-Todos mit ihren Ober-Todos" },
 { "Todo list","Todo Liste" },
 { "&Print...","Drucke..." },
 { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" },
 { "[Unconfigured]","[Unkonfiguriert]" },
 { "OK","OK" },
 { "FilterEditor","FilterEditor" },
 { "Include","Inclusive" },
 { "Exclude","Exclusive" },
 { "Edit Selection...","Editiere Auswahl" },
 { "recurring events","wiederholende Termine" },
 { "recurr. events","wiederh.Termine" },
 { "completed to-dos","erledigte Todos" },
 { "events","Termine" },
 { "todos","Todos" },
 { "journals","Journale" },
 { "public","öffentl." },
 { "private","privat" },
 { "confidential","vertraul." },
 { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" },
 { "Yesterday","Gestern" },
 { "Day after tomorrow","Übermorgen" },
 { "Tomorrow","Morgen" },
 { "Day before yesterday","Vorgestern" },
 { "Size %1","Größe %1" },
 { "New Agendasize: %1","Neue Agendagröße: %1" },
 { " (%1 y.)"," (%1 J.)" },
 { "Allday:","Ganztägig:" },
 { "compl.todos","erled.Todos" },
 { "Day view","Tagesansicht" },
 { "Next days","Nächste Tage" },
 { "Next week","Nächste Woche" },
 { "Next two weeks","Nächste zwei Wochen" },
 { "Next month","Nächster Monat" },
 { "Journal view","Journal" },
 { "Display all opened","Zeige alle geöffnet" },
 { "Display all closed","Zeige alle geschlossen" },
 { "Display all flat","Zeige alle flach" },
 { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" },
 { "Default todo done color:","Standard Todo erledigt Farbe" },
 { "Select week %1-%2","Wähle Woche %1-%2" },
 { "Select Week","Wähle Woche" },
 { "Set alarm for selected...","Setze Alarm für Selekt..." },
 { "Set Alarm!","Setze Alarm!" },
 { "Canged alarm for %1 items","Alarm für %1 Items geändert" },
 { " and "," und " },
 { "<IMG src="%1"> only )","nur <IMG src="%1"> )" },
 { "Mail to selected","Mail an Ausgewählte" },
 { "Mail to all","Mail an Alle" },
 { "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" },
 { "Set reminder ON with offset to:","Alarm AN mit Offset auf:" },
 { " on"," am" },
 { " completed on "," erledigt am " },
 { "Save as Event template","Speichere als Vorlage" },
 { "Load Event template","Lade Termin Vorlage" },
 { "Save as Journal template","Speichere als Journal Vorlage" },
 { "Insert Journal template","Füge Journal Vorlage ein" },
 { "Sub todos:<br>","Unter Todos:<br>" },
 { "Parent todo:<br>","Über Todo:<br>" },
 { "Set current as color category","Setze Gewählte als Farbkategorie" },
 { " completed"," erledigt" },
 { "(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!","(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi basiert auf KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) und das KDE Team.\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.pi-sync.info --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" },
 { "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." },
 { "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." },
 { "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." },
 { "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" },
 { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." },
 { "Error","Fehler" },
 { ""You entered an invalid date!\n Date changed  to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." },
 { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." },
 { "Warning","Warnung" },
 { "Select week number","Wähle Wochen Nummer" },
 { "Februar","Februar" },
 { "Click on the week number to\nshow week zoomed","Klicke auf die Wochennummer\num die Woche groß zu zeigen" },
 { "W","W" },
 { "Click on this to\nselect week number","Klicke hierauf um\ndie Woche auszuwählen" },
 { "T: %1","T: %1" },
 { "Start: ","Start: " },
 { "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " },
 { "Password for remote access:","Passwort für fernen Zugriff:" },
 { "Remote IP address:","Ferne IP Adresse:" },
 { "Remote port number:","Ferne Port Nummer:" },
 { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." },
 { "Remote from: ","Fern von: " },
 { "Local from: ","Lokal von: " },
 { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" },
 { "Local calendar changed!\n","Lokaler Kalender geändert!\n" },
 { "Write back","Schreibe zurück" },
 { "KO/Pi  Synchronization","KO/Pi  Synchronisation" },
 { "Pi-Sync succesful!","Pi-Sync erfolgreich!" },
 { "Received sync request","Sync Anfrage erhalten" },
 { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." },
 { "Saving Data to temp file ...","Speichere Daten in temp Datei..." },
 { "Data saved to temp file!","Daten in temp Datei gespeichert!" },
 { "Sending file...","Sende Datei..." },
 { "Waiting for synced file...","Warte auf gesyncte Daten..." },
 { "Receiving synced file...","Gesyncte Daten erhalten..." },
 { "Received %1 bytes","%1 Bytes erhalten" },
 { "Writing file to disk...","Speichere Datei..." },
 { "Pi-Sync successful!","Pi-Sync erfolgreich!" },
 { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" },
 { "Synchronize!","Synchronisiere!" },
 { "High clock skew!","Großer Uhrzeitunterschied!" },
 { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" },
 { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" },
 { "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." },
 { "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" },
 { "List week view","Listenwochenansicht" },
 { "List week","Listenwochenansicht" },
 { "Next Week","Nächste Woche" },
 { "Previous Week","Vorherige Woche" },
 { "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." },
 { "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" },
 { "Details","Details" },
 { "Created time","Erstellt Zeit" },
 { "Last modified time","Geändert Zeit" },
 { "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" },
 { "View Options","Anzeige Optionen" },
 { "<b>Created: ","<b>Erstellt am: " },
 { "<b>Last modified: ","<b>Zuletzt geändert am: " },
 { "Journal: ","Journal: " },
 { "yearly","jährlich" },
 { "(%1) ","%1-" },
 { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" },
 { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" },
 { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" },
 { "Summary/Loc.","Titel/Ort" },
 { "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." },
 { "Week Number","Wochennummer" },
 { "Import","Importiere" },
 { "Export","Exportiere" },
 { "Beam","Beame" },
 { "Export selected","Exportiere Selektierte" },
 { "As iCal (ics) file...","Als iCal (ics) Datei..." },
 { "As vCal (vcs) file...","Als vCal (vcs) Datei..." },
 { "Journal/Details...","Journale/Details..." },
 { "Agenda View","Agenda Ansicht" },
 { "Show current time","Zeige aktuelle Zeit" },
 { "Edit new item","Bearbeite neuen Eintrag" },
 { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" },
 { "There is no next alarm.","Es gibt keinen nächsten Alarm." },
 { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" },
 { "The next alarm is in:\n","Der nächste Alarm ist in:\n" },
 { "%1 days\n","%1 Tagen\n" },
 { "1 day\n","1 Tag\n" },
 { "%1 hours\n","%1 Stunden\n" },
 { "1 hour\n","1 Stunde\n" },
 { "%1 minutes\n","%1 Minuten\n" },
 { "1 minute\n","1 Minute\n" },
 { "Only one toolbar","Nur eine Toolbar" },
 { "Print","Drucke" },
 { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." },
 { "There is nothing selected!","Es ist nichts ausgewählt!" },
 { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " },
 { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" },
-{ "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden." },
+{ "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" },
 { "KO/Pi Printout","KO/Pi Ausdruck" },
 { "Print unscaled","Drucke unskaliert" },
 { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." },
 { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." },
-{ "","" },
+{ "Printout Mode","Druck Modus" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
\ No newline at end of file
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index f452db0..b9909d6 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -881,571 +881,576 @@ DateList KOAgendaView::selectedDates()
     return selected;
 }
 
 
 void KOAgendaView::updateView()
 {
     if ( mBlockUpdating )
         return;
     //  kdDebug() << "KOAgendaView::updateView()" << endl;
     fillAgenda();
  
 }
 
 
 /*
   Update configuration settings for the agenda view. This method is not
   complete.
 */
 void KOAgendaView::updateConfig()
 {
     if ( mBlockUpdating )
         return;
     if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) {
         int old = KOPrefs::instance()->mHourSize;
         KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1;
         qDebug("KOPrefs::instance()->mHourSize adjusted %d to  %d ", old,KOPrefs::instance()->mHourSize );
     }
 
 
     // update config for children
     mTimeLabels->updateConfig();
     mAgenda->storePosition();
     mAgenda->updateConfig();
     mAllDayAgenda->updateConfig();
     // widget synchronization
     //TODO: find a better way, maybe signal/slot
     mTimeLabels->positionChanged();
 
     // for some reason, this needs to be called explicitly
     mTimeLabels->repaint();
 
     mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
 
     // ToolTips displaying summary of events
     KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance()
                                              ->mEnableToolTips);
   
     //setHolidayMasks();
 
     //createDayLabels(); called by via updateView();
     mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); 
     updateView();
     mAgenda->restorePosition();
 }
 
 
 void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
 {
     //  kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl;
     //qDebug("KOAgendaView::updateEventDates ");
     QDateTime startDt,endDt;
     QDate startDate;
     int lenInSecs;
     //  if ( type == KOAgenda::RESIZETOP )
     //       qDebug("RESIZETOP ");
     //   if ( type ==  KOAgenda::RESIZEBOTTOM )
     //       qDebug("RESIZEBOTTOM ");
     //   if ( type ==  KOAgenda::MOVE )
     //       qDebug("MOVE ");
     if ( item->incidence()->type() == "Event" ) {
         startDt =item->incidence()->dtStart();
         endDt = item->incidence()->dtEnd();
         lenInSecs = startDt.secsTo( endDt );
     }
 
     // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED );
 
     if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) {
         startDate = mSelectedDates[item->mLastMoveXPos];
     } else {
         if (item->cellX() < 0) {
             startDate = (mSelectedDates.first()).addDays(item->cellX());
         } else {
             startDate = mSelectedDates[item->cellX()];
         }
     }
     startDt.setDate(startDate);
 
     if (item->incidence()->doesFloat()) {
         endDt.setDate(startDate.addDays(item->cellWidth() - 1));
     } else {
         if ( type == KOAgenda::RESIZETOP ||  type ==  KOAgenda::MOVE )
             startDt.setTime(mAgenda->gyToTime(item->cellYTop()));
         if ( item->incidence()->type() == "Event" ) {
             if ( type ==  KOAgenda::MOVE ) {
                 endDt = startDt.addSecs(lenInSecs);
 
             } else if ( type ==  KOAgenda::RESIZEBOTTOM  ) {
                 if (item->lastMultiItem()) {
                     endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
                     endDt.setDate(startDate.
                                   addDays(item->lastMultiItem()->cellX() - item->cellX()));
                 } else {
                     endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
                     endDt.setDate(startDate);
                 }
             }
         } else {
             // todo
             if (item->lastMultiItem()) {
                 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
                 endDt.setDate(startDate.
                               addDays(item->lastMultiItem()->cellX() - item->cellX()));
             } else {
                 //qDebug("tem->cellYBottom() %d",item->cellYBottom() );
                 if ( item->cellYBottom() > 0 )
                     endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
                 else
                     endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time());
                 endDt.setDate(startDate);
             }
         }
     }
     if ( item->incidence()->type() == "Event" ) {
         item->incidence()->setDtStart(startDt);
         (static_cast<Event*>(item->incidence()))->setDtEnd(endDt);
     } else if ( item->incidence()->type() == "Todo" ) {
         Todo* to = static_cast<Todo*>(item->incidence());
 
         to->setDtDue(endDt);
         if ( to->hasStartDate() ) {
             if (to->dtStart() >= to->dtDue() )
                 to->setDtStart(to->dtDue().addDays( -2 ));
         }
         
     }
     //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() );
     item->incidence()->setRevision(item->incidence()->revision()+1);
     item->setItemDate(startDt.date());
     //item->updateItem();
     if ( item->incidence()->type() == "Todo" ) {
          emit  todoMoved((Todo*)item->incidence(),  KOGlobals::EVENTEDITED );
 
     }
      else
          emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED);
      item->updateItem();
 }
 
 void KOAgendaView::showDates( const QDate &start, const QDate &end )
 {
     //  kdDebug() << "KOAgendaView::selectDates" << endl;
 
     mSelectedDates.clear();
     // qDebug("KOAgendaView::showDates ");
     QDate d = start;
     while (d <= end) {
         mSelectedDates.append(d);
         d = d.addDays( 1 );
     }
 
     // and update the view
     fillAgenda();
 }
 
 
 void KOAgendaView::showEvents(QPtrList<Event>)
 {
     kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl;
 }
 
 void KOAgendaView::changeEventDisplay(Event *, int)
 {
     //  qDebug("KOAgendaView::changeEventDisplay ");
     //  kdDebug() << "KOAgendaView::changeEventDisplay" << endl;
     // this should be re-written to be MUCH smarter.  Right now we
     // are just playing dumb.
     fillAgenda();
 }
 
 void KOAgendaView::fillAgenda(const QDate &)
 {
     // qDebug("KOAgendaView::fillAgenda ");
     fillAgenda();
 }
 
 void KOAgendaView::fillAgenda()
 {
     if ( globalFlagBlockStartup )
         return;
     if ( globalFlagBlockAgenda == 1 )
         return;
+    static bool onlyOne = false;
+    if ( onlyOne )
+        return;
+    onlyOne = true;
     //if ( globalFlagBlockAgenda == 2 )
     //globalFlagBlockAgenda = 0;
     // globalFlagBlockPainting = false;
     if ( globalFlagBlockAgenda == 0 )
         globalFlagBlockAgenda = 1;
     //  clearView();
     //qDebug("fillAgenda()++++ ");
     globalFlagBlockAgendaItemPaint = 1;
 
     mAllDayAgenda->changeColumns(mSelectedDates.count());
     mAgenda->changeColumns(mSelectedDates.count());
     qApp->processEvents(); 
     mEventIndicatorTop->changeColumns(mSelectedDates.count());
     mEventIndicatorBottom->changeColumns(mSelectedDates.count());
     setHolidayMasks();
 
     //mAgenda->hideUnused();
     //mAllDayAgenda->hideUnused();
  
     //   mAgenda->blockNextRepaint( false );
     //   mAgenda->viewport()->repaint();
     //   mAgenda->blockNextRepaint( true );
     mMinY.resize(mSelectedDates.count());
     mMaxY.resize(mSelectedDates.count());
 
     QPtrList<Event> dayEvents;
 
     // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
     // Therefore, gtodoset all of them.
     QPtrList<Todo> todos  = calendar()->todos();
 
     mAgenda->setDateList(mSelectedDates);
 
     QDate today = QDate::currentDate();
 
     DateList::ConstIterator dit;
     int curCol = 0;
     for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
         QDate currentDate = *dit;
         //    kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString()
         //              << endl;
 
         dayEvents = calendar()->events(currentDate,true);
 
         // Default values, which can never be reached
         mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1;
         mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1;
 
         unsigned int numEvent;
         for(numEvent=0;numEvent<dayEvents.count();++numEvent) {
             Event *event = dayEvents.at(numEvent);
             if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
                 if ( event->uid().left(15) == QString("last-syncEvent-")  )
                     continue;
             //      kdDebug() << " Event: " << event->summary() << endl;
 
             int beginX = currentDate.daysTo(event->dtStart().date()) + curCol;
             int endX = currentDate.daysTo(event->dtEnd().date()) + curCol;
 
             //      kdDebug() << "  beginX: " << beginX << "  endX: " << endX << endl;
 
             if (event->doesFloat()) {
                 if (event->recurrence()->doesRecur()) {
                     mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
                 } else {
                     if (beginX <= 0 && curCol == 0) {
                         mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
                     } else if (beginX == curCol) {
                         mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
                     }
                 }
             } else if (event->isMultiDay()) {
                 if ( event->doesRecur () ) {
                     QDate dateit = currentDate;
                     int count = 0;
                     int max = event->dtStart().daysTo( event->dtEnd() ) +2;
                     while (! event->recursOn( dateit ) && count <= max ) {
                         ++count; 
                         dateit = dateit.addDays( -1 );
                     }
                     bool ok;
                     QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok );
                     if ( ok )
                          {
                                 int secs = event->dtStart().secsTo( event->dtEnd() );
                                 QDateTime nextOcend =nextOcstart.addSecs( secs ); ;
                                 beginX = currentDate.daysTo(nextOcstart.date()) + curCol;
                                 endX = currentDate.daysTo(nextOcend.date()) + curCol;
                             
                         }
                 }
                 int startY = mAgenda->timeToY(event->dtStart().time());
                 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
                 //qDebug("insert %d %d %d %d   %d ",beginX,endX,startY,endY , curCol );
                 if ((beginX <= 0 && curCol == 0) || beginX == curCol) {
                     //qDebug("insert!!! ");
                     mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY);
                 }
                 if (beginX == curCol) {
                     mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
                     if (startY < mMinY[curCol]) mMinY[curCol] = startY;
                 } else if (endX == curCol) {
                     mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
                     if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
                 } else {
                     mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
                     mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
                 }
             } else {
                 int startY = mAgenda->timeToY(event->dtStart().time());
                 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
                 if (endY < startY) endY = startY;
                 mAgenda->insertItem(event,currentDate,curCol,startY,endY);
                 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
                 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
             }
         }
         // ---------- [display Todos --------------
         unsigned int numTodo;
         for (numTodo = 0; numTodo < todos.count(); ++numTodo) {
             Todo *todo = todos.at(numTodo);
 
             if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue;  // todo shall not be displayed if it has no date
            
             // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
             // Already completed items can be displayed on their original due date
             //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
             bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda;
             bool fillIn = false;
             if ( todo->hasCompletedDate() && todo->completed().date() == currentDate )
                 fillIn = true;
             if ( ! fillIn && !todo->hasCompletedDate() ) 
                 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue);
             if ( fillIn ) {
                 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) {  // Todo has no due-time set or is already overdue
                     if ( KOPrefs::instance()->mShowTodoInAgenda )
                         mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol);
                 }
                 else {
                     QDateTime dt;
                     if ( todo->hasCompletedDate() )
                         dt = todo->completed();
                     else
                         dt = todo->dtDue();;
                         
 
                     int endY = mAgenda->timeToY(dt.time()) - 1;
                     int hi = (18/KOPrefs::instance()->mHourSize);
                     //qDebug("hei %d ",KOPrefs::instance()->mHourSize);
                     int startY = endY -hi;
 
                     mAgenda->insertItem(todo,currentDate,curCol,startY,endY);
 
                     if (startY < mMinY[curCol]) mMinY[curCol] = startY;
                     if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
                 }
             }
         }
         // ---------- display Todos] --------------
 
         ++curCol;
     }
     mAgenda->hideUnused();
     mAllDayAgenda->hideUnused();
     mAgenda->checkScrollBoundaries();
 
     deleteSelectedDateTime();
   
     createDayLabels();
     emit incidenceSelected( 0 );
 
     if ( globalFlagBlockAgenda == 2 ) {
         if ( KOPrefs::instance()->mSetTimeToDayStartAt )
             setStartHour( KOPrefs::instance()->mDayBegins  );
         else if ( KOPrefs::instance()->mCenterOnCurrentTime )
             setStartHour( QTime::currentTime ().hour() );
         //  qApp->processEvents();   
     }
     qApp->processEvents(); 
     //qDebug("qApp->processEvents(); END ");
     globalFlagBlockAgenda = 0; 
 
     // mAgenda->hideUnused();
     //mAllDayAgenda->hideUnused();
     mAllDayAgenda->drawContentsToPainter();
     mAgenda->drawContentsToPainter();
     repaintAgenda();
+    onlyOne = false;
     // mAgenda->finishUpdate();
     //mAllDayAgenda->finishUpdate();
 
     // repaintAgenda();
     //qApp->processEvents(); 
     // globalFlagBlockAgenda = 0;
 }
 void KOAgendaView::repaintAgenda()
 {
    //  mAllDayAgenda->drawContentsToPainter();
 //     mAllDayAgenda->viewport()->repaint( false ); 
 //     mAgenda->drawContentsToPainter();
 //     mAgenda->viewport()->repaint( false ); 
 //     qApp->processEvents(); 
 
     //qDebug("KOAgendaView::repaintAgenda() ");
     //qApp->processEvents(); 
     mAgenda->viewport()->repaint( false );
     mAllDayAgenda->viewport()->repaint( false );
     mAgenda->finishUpdate();
     mAllDayAgenda->finishUpdate();
 }
 
 
 void KOAgendaView::clearView()
 {
     //  kdDebug() << "ClearView" << endl;
     mAllDayAgenda->clear();
     mAgenda->clear();
 }
 
 void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                 const QDate &td)
 {
 #ifndef KORG_NOPRINTER
     if (fd == td)
         calPrinter->preview(CalPrinter::Day, fd, td);
     else
         calPrinter->preview(CalPrinter::Week, fd, td);
 #endif
 }
 
 // void KOAgendaView::updateMovedTodo()
 // {
 //     // updateConfig();
 //     // emit updateTodoViews();
 // }
 
 void KOAgendaView::newEvent(int gx, int gy)
 {
     if (!mSelectedDates.count()) return;
   
     QDate day = mSelectedDates[gx];
 
     QTime time = mAgenda->gyToTime(gy);
     QDateTime dt(day,time);
     // if ( dt <  QDateTime::currentDateTime () )
     //    dt = QDateTime::currentDateTime ().addSecs( 3600 );
     emit newEventSignal(dt);
 }
 
 void KOAgendaView::newEvent(int gxStart, int gyStart, int gxEnd, int gyEnd)
 {
     if (!mSelectedDates.count()) return;
   
     QDate dayStart = mSelectedDates[gxStart];
     QDate dayEnd = mSelectedDates[gxEnd];
 
     QTime timeStart = mAgenda->gyToTime(gyStart);
     QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 );
 
     QDateTime dtStart(dayStart,timeStart);
     QDateTime dtEnd(dayEnd,timeEnd);
 
     emit newEventSignal(dtStart,dtEnd);
 }
 
 void KOAgendaView::newEventAllDay(int gx, int )
 {
     if (!mSelectedDates.count()) return;
 
     QDate day = mSelectedDates[gx];
 
     emit newEventSignal(day);
 }
 void KOAgendaView::newTodoAllDay(int gx, int )
 {
     if (!mSelectedDates.count()) return;
 
     QDateTime day (mSelectedDates[gx] );
     emit newTodoSignal(day, true);
 }
 void KOAgendaView::newTodo(int gx, int gy )
 {
     if (!mSelectedDates.count()) return;
     QDate dayStart = mSelectedDates[gx];
     QTime timeStart = mAgenda->gyToTime(gy);
     QDateTime dt (dayStart,timeStart);
     emit newTodoSignal( dt, false );
 }
 
 void KOAgendaView::updateEventIndicatorTop(int newY)
 {
     uint i;
     for(i=0;i<mMinY.size();++i) {
         if (newY >= mMinY.at(i)) mEventIndicatorTop->enableColumn(i,true);
         else mEventIndicatorTop->enableColumn(i,false);
     }
 
     mEventIndicatorTop->update();
 }
 
 void KOAgendaView::updateEventIndicatorBottom(int newY)
 {
     uint i;
     for(i=0;i<mMaxY.size();++i) {
         if (newY <= mMaxY.at(i)) mEventIndicatorBottom->enableColumn(i,true);
         else mEventIndicatorBottom->enableColumn(i,false);
     }
 
     mEventIndicatorBottom->update();
 }
 
 void KOAgendaView::startDrag(Event *event)
 {
 #ifndef KORG_NODND
     DndFactory factory( calendar() );
     ICalDrag *vd = factory.createDrag(event,this);
     if (vd->drag()) {
         kdDebug() << "KOAgendaView::startDrag(): Delete drag source" << endl;
     }
 #endif
 }
 
 void KOAgendaView::readSettings()
 {
     readSettings(KOGlobals::config());
 }
 
 void KOAgendaView::readSettings(KConfig *config)
 {
     //  kdDebug() << "KOAgendaView::readSettings()" << endl;
 
     config->setGroup("Views");
 
     //#ifndef KORG_NOSPLITTER
     QValueList<int> sizes = config->readIntListEntry("Separator AgendaView");
     if (sizes.count() == 2) {
         if ( sizes[0] < 20 ) {
             sizes[1] = sizes[1] +20 - sizes[0];
             sizes[0] = 20;
         }
         mSplitterAgenda->setSizes(sizes);
         //  qDebug("read %d %d ",sizes[0],sizes[1]  );
     }
     //#endif
 
     // updateConfig();
 }
 
 void KOAgendaView::writeSettings(KConfig *config)
 {
     //  kdDebug() << "KOAgendaView::writeSettings()" << endl;
 
     config->setGroup("Views");
 
     //#ifndef KORG_NOSPLITTER
     QValueList<int> list = mSplitterAgenda->sizes();
     config->writeEntry("Separator AgendaView",list);
     //qDebug("write %d %d ", list[0],list[1] );
     //#endif
 }
 
 void KOAgendaView::setHolidayMasks()
 {
     mHolidayMask.resize(mSelectedDates.count());
 
     uint i;
     for(i=0;i<mSelectedDates.count();++i) {
         QDate date = mSelectedDates[i];
         bool showSaturday = KOPrefs::instance()->mExcludeSaturdays && (date.dayOfWeek() == 6);
         bool showSunday = KOPrefs::instance()->mExcludeHolidays && (date.dayOfWeek() == 7);
         bool showHoliday = false;
         if ( KOPrefs::instance()->mExcludeHolidays ) {
             QPtrList<Event> events = calendar()->events( date, true );
             Event *event;
             for( event = events.first(); event; event = events.next() ) {
                 if ( event->isHoliday()) {
                     showHoliday = true;
                     break;
                 }
             }
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 6ecc233..1eeb8d1 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -1,131 +1,131 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 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.
 */
 #ifndef KOEVENTVIEWER_H
 #define KOEVENTVIEWER_H
 //
 // Viewer widget for events.
 //
 
 #include <qtextbrowser.h>
 
 #include <libkcal/event.h>
 #include <libkcal/journal.h>
 
 
 using namespace KCal;
 
 #ifdef DESKTOP_VERSION
 
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qbuttongroup.h>
 #include <kglobal.h>
 
 class KOPrintPrefs : public QDialog
 {
   public:
     KOPrintPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("KO/Pi Printout") );
         QVBoxLayout* lay = new QVBoxLayout( this );
-        lay->setSpacing( 3 );
-        lay->setMargin( 3 );
-        QLabel * lab = new QLabel( i18n("This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog."), this );
+        lay->setSpacing( 9 );
+        lay->setMargin( 9 );
+        QLabel * lab = new QLabel( i18n("This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n"), this );
         lay->addWidget( lab ); 
+        lab->setAlignment( AlignCenter );
         QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("Printout Mode"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         pmNo = new QRadioButton(i18n("Print unscaled"), format );
         pmScaledDown = new QRadioButton(i18n("Print scaled down to fit one page"), format );
         new QRadioButton(i18n("Print scaled up/down to fit one page"), format );
         pmScaledDown->setChecked( true );
         QPushButton * ok = new QPushButton( i18n("OK"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
-        resize( 200, 200 );
     }
       
     int printMode() 
     {
         if ( pmNo->isChecked() )
             return 0;
         if ( pmScaledDown->isChecked() )
             return 1;
         return 2;
     }
 private:
     QRadioButton* pmNo;
     QRadioButton* pmScaledDown;
 };
 
 #endif
 
 class KOEventViewer : public QTextBrowser {
     Q_OBJECT
   public:
     KOEventViewer(QWidget *parent=0,const char *name=0);
     virtual ~KOEventViewer();
 
     void setSource(const QString &);
     void setEvent(Event *event);
     void addEvent(Event *event);
     void setTodo(Todo *event, bool clearV = true );
     void setJournal(Journal *jour, bool clearV = true );
 
     void appendEvent(Event *event, int mode = 0 );
     void appendTodo(Todo *event, int mode = 0 );
     void appendJournal(Journal *jour, int mode = 0 );
     
     void clearEvents(bool now=false);
     
     void addText(QString text);
     void setSyncMode( bool );
     void setColorMode( int );
     void mailToAttendees( bool all );
     void printMe();
 
   protected:
     int mColorMode;
     void addTag(const QString & tag,const QString & text);
 
     void formatCategories(Incidence *event);
     void formatAttendees(Incidence *event);
     void formatReadOnly(Incidence *event);
     void keyPressEvent ( QKeyEvent * e );
 
   private:
     QTextBrowser *mEventTextView;
     bool mSyncMode;
     QString deTag(QString text);
 
     QString mText;
     QString mMailSubject;
     Incidence* mCurrentIncidence;  
   signals:
     void launchaddressbook(QString uid); 
 };
 
 #endif