missing config

author: zautrix <zautrix> 2005-01-28 03:22:17 (UTC)
committer: zautrix <zautrix> 2005-01-28 03:22:17 (UTC)
commit: 94f0e8140c07696174dc3774dc2c11efad2ffa68 (patch) (unidiff)
tree: d95cc80e5c5221e8d9ce1cbf4b01cbf78fdf843a
parent: 6fb044008531ec883fc25a3ef2b43904930cfff6 (diff)
download: kdepimpi-94f0e8140c07696174dc3774dc2c11efad2ffa68.zip
kdepimpi-94f0e8140c07696174dc3774dc2c11efad2ffa68.tar.gz
kdepimpi-94f0e8140c07696174dc3774dc2c11efad2ffa68.tar.bz2
11 files changed, 101 insertions, 33 deletions
diff --git a/Makefile b/Makefile
index 68619b9..9656532 100644
--- a/Makefile
+++ b/Makefile
@@ -150,215 +150,216 @@ build_pwmanager: build_microkde
 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 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 -f ../new_$(KDEPIM_VERSION)/*
        rm -f *~
-        cd ..;mkdir -p new_$(KDEPIM_VERSION)
+        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 ../new_$(KDEPIM_VERSION)/
+        mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
-        mv *for_SharpRom.ipk.zip ../new_$(KDEPIM_VERSION)/
+        mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
-        mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../new_$(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) \
       kmicromail/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)
 kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
        cd kmicromail/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)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 68619b9..9656532 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -150,215 +150,216 @@ build_pwmanager: build_microkde
 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 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 -f ../new_$(KDEPIM_VERSION)/*
        rm -f *~
-        cd ..;mkdir -p new_$(KDEPIM_VERSION)
+        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 ../new_$(KDEPIM_VERSION)/
+        mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
-        mv *for_SharpRom.ipk.zip ../new_$(KDEPIM_VERSION)/
+        mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
-        mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../new_$(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) \
       kmicromail/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)
 kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
        cd kmicromail/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)
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 86819b7..68dc6db 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -165,100 +165,110 @@
 { "Mailbox has %1 mails","Mailbox hat %1 Mails" },
 { "Read this mail","Lies diese Mail" },
 { "Move/Copy this mail","Verschiebe/kopiere diese Mail" },
 { "Delete this mail","L�sche diese Mail" },
 { "Move/Copy all selected mail","Verschiebe/kopiere selektierte Mails" },
 { "Delete all selected mails","L�sche alle selektierten Mails" },
 { "Clear selection","Selektion aufheben" },
 { "Reply","Antworten" },
 { "Forward","Weiterleiten" },
 { "Attachments","Anhang" },
 { "Show Html","Zeige in html" },
 { "Description","Beschreibung" },
 { "Filename","Dateiname" },
 { "E-Mail by %1","E-Mail von %1" },
 { "Cc","Kopie" },
 { "To","An" },
 { "From","Von" },
 { "<p>Do you really want to delete this mail? <br><br>","<p>Wollen Sie diese Mail wirklich l�schen? <br><br>" },
 { "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" },
 { "Move/Copie all mails","Verschiebe/kopiere alle Mails" },
 { "Delete all mails","L�sche alle Mails" },
 { "Create new subfolder","Neues Unterverzeichnis" },
 { "Delete folder","L�sche Verzeichnis" },
 { "Refresh folder list","Aktualisiere Liste" },
 { "Create new folder","Neues Verzeichnis" },
 { "Disconnect","Diskonnect" },
 { "Set offline","Gehe offline" },
 { "Select target box","W�hle Ziel Box" },
 { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" },
 { "Folder:","Verzeichnis:" },
 { "Account:","Zugang:" },
 { "Prefix will prepend, do not enter","Pfad-Prefix wird vorangestellt" },
 { "Move mail(s)","Verschiebe Mail(s)" },
 { "only mails smaller","nur Mails kleiner" },
 { " kB"," kB" },
 { " message %1 of %2"," Nachricht %1 von %2" },
 { "Copying...","Am Kopieren..." },
 { "Copy message %1 of %2","Kopiere Nachricht %1 von %2" },
 { "Do you really want to delete\nall selected mails?","Wollen Sie wirklich alle\nselektierten Mails L�schen?" },
 { "Delete All Mails","L�sche alle Mails" },
 { "Deleting ...","Am L�schen..." },
 { "Delete message %1 of %2","L�sche Nachricht %1 von %2" },
 { "Compose Message","Verfasse Nachricht" },
 { "Reply-To","Antwort-An" },
 { "BCC","BCC" },
 { "Signature","Signatur" },
 { "CC","Kopie" },
 { "Options","Optionen" },
 { "Delete File","L�sche Datei" },
 { "Add File","F�ge Datei hinzu" },
 { "Attachment","Anhang" },
 { "send later","sende sp�ter" },
 { "use:","via:" },
 { "Save","Speichern" },
 { "Name","Name" },
 { "No Receiver spezified","Kein Empf�nger angegeben" },
 { "Sending mail","Sende Mail" },
 { "No","Nein" },
 { "Yes","Ja" },
 { "Store message into drafts?\n","Speichere Nachricht in Entw�rfe?\n" },
 { "Store message?","Nachricht speichern?" },
 { "Select Type","Selektiere Typ" },
 { "Select Account Type","W�hle Art des Zugangs" },
 { "IMAP","IMAP (online lesen)" },
 { "POP3","POP3 (holen)" },
 { "SMTP","SMTP (senden)" },
 { "<p>Do you really want to delete the selected Account?</p>","<p>M�chten Sie wirklich den ausgew�hlten Account l�schen?</p>" },
 { "Question","Eine Frage..." },
 { "Send this message?","Nachricht wirklich senden?" },
 { "Stop editing message","Stop editing message" },
 { "Sending mail %1 of %2","Sende Mail %1 von %2" },
 { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" },
 { "Refresh header list","Aktualisiere Titel Liste" },
 { "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" },
 { "Mail queue flushed","Gespeicherte Mails gesendet!" },
 { "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nf�r das Versenden von\nMails ben�tigt!" },
 { "Show next mail","Zeige n�chste Mail" },
 { "End of List","Ende der Liste" },
 { "Language","Sprache" },
 { "Time Format","Zeit Format" },
 { "%1 groups subscribed","%1 Guppen abboniert" },
 { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },
 { "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
 { "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },
 { "Save settings","Speichere Einstellungen" },
 { "Save standard","Speichere Standard" },
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
 { "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
 { "userdefined","benutzerdefiniert" },
 { "Reply to this mail","Beantworte diese Mail" },
 { "Su:","Be:" },
 { "Fr:","Vo:" },
 { "To:","An:" },
 { "Download Mail","Mail runterladen" },
 { "View Source","Zeige Source" },
+{ "Show "To" field in list view","Zeige "An" Feld in Listenansicht" },
+{ "Show info fields at startup","Zeige Info Felder beim Start" },
+{ "Show "Subject" info field","Zeige "Betreff" Info Feld" },
+{ "Show "From" info field","Zeige "Von" Info Feld" },
+{ "Show "To" info field","Zeige "An" Info Feld" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index 2bae5f6..7b1e169 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -1,126 +1,129 @@
 /*
    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.
    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 <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 #include "koprefs.h"
 #include "mainwindow.h"
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 KOPrefs::KOPrefs() :
  KPimPrefs("kopiemailrc")
 {
    mAppFont = QFont("helvetica",12);
    mComposeFont = QFont("helvetica",12);
    mReadFont = QFont("helvetica",12);
    KPrefs::setCurrentGroup("General");
    addItemString("SendCodec",&mSendCodec,i18n ("userdefined") );
    addItemString("SenderName",&mName,i18n ("Please set at") );
    addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") );
    addItemBool("ViewMailAsHtml",&mViewAsHtml,false);
    addItemBool("SendMailLater",&mSendLater,true);
    addItemBool("ShowToField",&mShowToField,false);
    addItemBool("UseKapi",&mUseKapi,false);
    addItemInt("CurrentCodec",&mCurrentCodec,0);
-    
+    addItemBool("ShowInfoSub",&mShowInfoSub,true);
+    addItemBool("ShowInfoFrom",&mShowInfoFrom,true);
+    addItemBool("ShowInfoTo",&mShowInfoTo,true);
+    addItemBool("ShowInfoStart",&mShowInfoStart,true);
    KPrefs::setCurrentGroup("Fonts");
    addItemFont("Application Font",&mAppFont);
    addItemFont("Compose Font",&mComposeFont);
    addItemFont("Read Font",&mReadFont);
    fillMailDefaults();
    isDirty = false;
 }
 KOPrefs::~KOPrefs()
 {
    if ( isDirty )
        writeConfig();
  if (mInstance == this)
      mInstance = insd.setObject(0); 
 }
 KOPrefs *KOPrefs::instance()
 {
  if (!mInstance) {
      mInstance = insd.setObject(new KOPrefs());
      mInstance->readConfig();
  }
  return mInstance;
 }
 void KOPrefs::usrSetDefaults()
 {
   
 }
 void KOPrefs::fillMailDefaults()
 {
  if (mName.isEmpty()) mName = i18n ("Please set at");
  if (mEmail.isEmpty()) mEmail = i18n ("Settings@General TAB");
 }
 void KOPrefs::usrReadConfig()
 {
  KPimPrefs::usrReadConfig();
 }
 void KOPrefs::usrWriteConfig()
 {
  KPimPrefs::usrWriteConfig();
 }
 KConfig* KOPrefs::getConfig()
 {
    return config();
 }
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h
index f2c4fbb..f2501e3 100644
--- a/kmicromail/koprefs.h
+++ b/kmicromail/koprefs.h
@@ -1,80 +1,81 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2000,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.
    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.
 */
 #ifndef KOPREFS_H
 #define KOPREFS_H
 #include <libkdepim/kpimprefs.h>
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 class KOPrefs : public KPimPrefs
 {
  public:
    virtual ~KOPrefs();
    /** Get instance of KOPrefs. It is made sure that there is only one
    instance. */
    static KOPrefs *instance();
    /** Set preferences to default values */
    void usrSetDefaults();
    /** Read preferences from config file */
    void usrReadConfig();
    /** Write preferences to config file */
    void usrWriteConfig();
    void setCategoryDefaults(){;};
  protected:
    /** Fill empty mail fields with default values. */
    void fillMailDefaults();
  private:
    /** Constructor disabled for public. Use instance() to create a KOPrefs
    object. */
    KOPrefs();
    static KOPrefs *mInstance;
  public:
    // preferences data
    KConfig* getConfig();
    QFont mAppFont;
    QFont mComposeFont;
    QFont mReadFont;
    QString mName;
    QString mSendCodec;
    QString mEmail;
    QString mCurrentCodeName;
    int mCurrentCodec;
    bool mSendLater, mViewAsHtml, mUseKapi, isDirty, mShowToField;
+    bool mShowInfoSub, mShowInfoFrom, mShowInfoTo, mShowInfoStart; 
  private:
 };
 #endif
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 5c8a5a9..4af4a8c 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -57,192 +57,211 @@
 #include <klineedit.h>
 #include "koprefs.h"
 #include "koprefsdialog.h"
 //#include <kprefswidget.h>
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
  KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
  setCaption( i18n("Settings - some need a restart (nr)"));
  setupGlobalTab();
  setupMainTab();
  setupMailTab();;
  setupFontsTab();
  readConfig();
 #if 0
  setupMainTab();
  setupLocaleTab();
  setupTimeZoneTab();
  setupTimeTab();
  setupLocaleDateTab();
  setupFontsTab();
  setupColorsTab();
  setupViewsTab();
  //setupSyncTab();
  //setupSyncAlgTab();
  //setupPrinterTab();
  //setupGroupSchedulingTab();
  //setupGroupAutomationTab();
 #endif
 }
 #include "kpimglobalprefs.h"
 KOPrefsDialog::~KOPrefsDialog()
 {
 }
 void KOPrefsDialog::setupGlobalTab() 
 {
   QFrame *topFrame = addPage(i18n("Global"),0,0);
   kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
   QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
   topLayout->addWidget( kdelibcfg );
 } 
 void KOPrefsDialog::setupMainTab() 
 {
    QFrame *topFrame = addPage(i18n("General"),0,0);
  QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
  topLayout->setSpacing(spacingHint());
  topLayout->setMargin(marginHint());
  mNameEdit = new QLineEdit(topFrame);
  mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
  topLayout->addWidget(mNameLabel,0,0);
  topLayout->addWidget(mNameEdit,0,1);
  mEmailEdit = new QLineEdit(topFrame);
  mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
  topLayout->addWidget(mEmailLabel,1,0);
  topLayout->addWidget(mEmailEdit,1,1); 
  QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame);
  topLayout->addMultiCellWidget(lab,2,2,0,1);
  KPrefsDialogWidBool*  ttt =  addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"),
                                    &(KOPrefs::instance()->mUseKapi),topFrame);
  topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1);
 }
 void KOPrefsDialog::setupMailTab()
 {
 QFrame *topFrame = addPage(i18n("Mail"),0,0);
  QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
  topLayout->setSpacing(spacingHint());
  topLayout->setMargin(marginHint());
  KPrefsDialogWidBool*  ttt =  addWidBool(i18n("View mail as html"),
                 &(KOPrefs::instance()->mViewAsHtml),topFrame);
  topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1);
  
  
  ttt =  addWidBool(i18n("Send mails later"),
                    &(KOPrefs::instance()->mSendLater),topFrame);
  topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1);
  ttt =  addWidBool(i18n("Show \"To\" field in list view"),
                    &(KOPrefs::instance()->mShowToField),topFrame);
  topLayout->addMultiCellWidget(ttt->checkBox(),2,2,0,1);
+  int iii =3;
+  ttt =  addWidBool(i18n("Show info fields at startup"),
+                    &(KOPrefs::instance()->mShowInfoStart),topFrame);
+  topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+  ++iii;
+  ttt =  addWidBool(i18n("Show \"Subject\" info field"),
+                    &(KOPrefs::instance()->mShowInfoSub),topFrame);
+  topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+  ++iii;
+  ttt =  addWidBool(i18n("Show \"From\" info field"),
+                    &(KOPrefs::instance()->mShowInfoFrom),topFrame);
+  topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+  ++iii;
+  ttt =  addWidBool(i18n("Show \"To\" info field"),
+                    &(KOPrefs::instance()->mShowInfoTo),topFrame);
+  topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+  ++iii;
  /*
  mCodecEdit = new QLineEdit(topFrame);
  topLayout->addMultiCellWidget( new QLabel(mCodecEdit, i18n("User defined codec for new mails:"), topFrame),2,2,0,1);
  topLayout->addMultiCellWidget(mCodecEdit,3,3,0,1);
  topLayout->addMultiCellWidget( new QLabel(0, i18n("Example: iso-8859-15"), topFrame),4,4,0,1);
  */
 }
 void KOPrefsDialog::setupFontsTab()
 {
    QFrame *topFrame = addPage(i18n("Fonts"),0,0);
    //  DesktopIcon("fonts",KIcon::SizeMedium));
  QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
  topLayout->setSpacing(1);
  topLayout->setMargin(3);
  KPrefsDialogWidFont * tVFont;
  int i = 0;
  KPrefsDialogWidFont *timeLabelsFont =
      addWidFont(i18n("OK"),i18n("Application(nr)"),
                 &(KOPrefs::instance()->mAppFont),topFrame);
  topLayout->addWidget(timeLabelsFont->label(),i,0);
  topLayout->addWidget(timeLabelsFont->preview(),i,1);
  topLayout->addWidget(timeLabelsFont->button(),i,2);
  ++i;
  timeLabelsFont =
      addWidFont(i18n("Dear Mr."),i18n("Compose mail:"),
                 &(KOPrefs::instance()->mComposeFont),topFrame);
  topLayout->addWidget(timeLabelsFont->label(),i,0);
  topLayout->addWidget(timeLabelsFont->preview(),i,1);
  topLayout->addWidget(timeLabelsFont->button(),i,2);
  ++i;
  KPrefsDialogWidFont *timeBarFont =
      addWidFont(i18n("Hello"),i18n("Read mail:"),
                 &(KOPrefs::instance()->mReadFont),topFrame);
  topLayout->addWidget(timeBarFont->label(),i,0);
  topLayout->addWidget(timeBarFont->preview(),i,1);
  topLayout->addWidget(timeBarFont->button(),i,2);
  ++i;
  topLayout->setColStretch(1,1);
  topLayout->setRowStretch(4,1);
 }
 void KOPrefsDialog::usrReadConfig()
 {
 
  mNameEdit->setText(KOPrefs::instance()->mName);
  mEmailEdit->setText(KOPrefs::instance()->mEmail);
  //mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
  kdelibcfg->readConfig();
 }
 void KOPrefsDialog::usrWriteConfig()
 {
    KOPrefs::instance()->mName = mNameEdit->text();
    KOPrefs::instance()->mEmail = mEmailEdit->text();
    //KOPrefs::instance()->mSendCodec = mCodecEdit->text();
    kdelibcfg->writeConfig();
 
    
 }
 #if 0
 void KOPrefsDialog::setupLocaleDateTab()
 {
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
   QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());  
   int iii = 0;
   
   KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Date Format:"),&(KOPrefs::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"));
   topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
   ++iii;   
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 250d114..0794e00 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -1,337 +1,357 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
 //#include <kdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #include <qstatusbar.h> 
 #include <kabc/stdaddressbook.h>
 extern QStatusBar* globalSstatusBarMainWindow;
 #else
 #include <qpe/qpeapplication.h>
 #include <klocale.h>
 #endif
 #include "defines.h"
+#include "koprefs.h"
 #include "mainwindow.h"
 #include "mailistviewitem.h"
 #include <KDGanttMinimizeSplitter.h>
 #include "koprefs.h"
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
    : QMainWindow( parent, name ) //, flags )
 {
 #ifdef DESKTOP_VERSION
    globalSstatusBarMainWindow = statusBar();
 #endif
    setCaption( i18n( "KOpieMail/Pi" ) );
    setToolBarsMovable( false ); 
    //KABC::StdAddressBook::self();
    toolBar = new QToolBar( this );
    menuBar = new QPEMenuBar( toolBar );
    mailMenu = new QPopupMenu( menuBar );
    menuBar->insertItem( i18n( "Mail" ), mailMenu );
    settingsMenu = new QPopupMenu( menuBar );
    menuBar->insertItem( i18n( "Settings" ), settingsMenu );
    addToolBar( toolBar );
    toolBar->setHorizontalStretchable( true );
    QAction* getMail = new QAction( i18n( "Get all new mails" ), SmallIcon("enter"),
                               0, 0, this );
    connect(getMail, SIGNAL( activated() ),
            SLOT( slotGetAllMail() ) );
    getMail->addTo( mailMenu );
    getMail = new QAction( i18n( "Get new messages" ), SmallIcon("add"),
                               0, 0, this );
    getMail->addTo( toolBar );
    getMail->addTo( mailMenu );
    connect(getMail, SIGNAL( activated() ),
            SLOT( slotGetMail() ) );
    composeMail = new QAction( i18n( "Compose new mail" ), SmallIcon("composemail"),
                               0, 0, this );
    composeMail->addTo( toolBar );
    composeMail->addTo( mailMenu );
    sendQueued = new QAction( i18n( "Send queued mails" ), SmallIcon("sendqueued") ,
                              0, 0, this );
    sendQueued->addTo( toolBar );
    sendQueued->addTo( mailMenu );
    /*
    syncFolders = new QAction( i18n( "Sync mailfolders" ), ICON_SYNC,
                               0, 0, this );
    syncFolders->addTo( toolBar );
    syncFolders->addTo( mailMenu );
    */
    showFolders = new QAction( i18n( "Show/Hide folders" ), SmallIcon("showfolders") ,
                               0, 0, this, 0, true );
    showFolders->addTo( toolBar );
    showFolders->addTo( mailMenu );
    showFolders->setOn( true );
    connect(showFolders, SIGNAL( toggled(bool) ),
            SLOT( slotShowFolders(bool) ) );
    /*
      searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ),
                               0, 0, this );
-    searchMails->addTo( toolBar );
+    searchMails->kopddTo( toolBar );
    searchMails->addTo( mailMenu );
    */
    deleteMails = new QAction(i18n("Delete Mail"),  SmallIcon("trash"), 0, 0, this);
    deleteMails->addTo( toolBar );
    deleteMails->addTo( mailMenu );
    connect( deleteMails, SIGNAL( activated() ),
             SLOT( slotDeleteAllMail() ) );
    editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon")  ,
                                0, 0, this );
    editSettings->addTo( settingsMenu );
    connect( editSettings, SIGNAL( activated() ),
             SLOT( slotEditSettings() ) );
    editAccounts = new QAction( i18n( "Configure accounts" ),  SmallIcon("editaccounts")  ,
                                0, 0, this );
    editAccounts->addTo( settingsMenu );
    codecMenu = new QPopupMenu( menuBar );
    codecMenu->insertItem( "Western (iso-8859-1)",0,0);
    codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1);
    codecMenu->insertItem( "Western (iso-8859-15)",2,2);
    codecMenu->insertItem( "Chinese (big-5)",3,3);
    codecMenu->insertItem( "Unicode (utf-8)",4,4);
    codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5);
    //disabled
    //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
    //setCentralWidget( view );
    QVBox* wrapperBox = new QVBox( this );
    setCentralWidget( wrapperBox );
    // QWidget *view = new QWidget( wrapperBox );
    KDGanttMinimizeSplitter* splithor = new KDGanttMinimizeSplitter( Qt::Vertical, wrapperBox);
    splithor->setMinimizeDirection( KDGanttMinimizeSplitter::Down);
    KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, splithor);
    split->setMinimizeDirection( KDGanttMinimizeSplitter::Left);
    //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight );
-    QWidget* infoBox = new QWidget( splithor );
+    subLE = 0;
-    QGridLayout *griLay = new QGridLayout( infoBox, 2,2);
+    fromLE = 0;
-    griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 );
+    toLE = 0;
-    griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 );
+    if ( KOPrefs::instance()->mShowInfoSub ||  KOPrefs::instance()->mShowInfoFrom ||  KOPrefs::instance()->mShowInfoTo ) {
-    griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 );
+        QWidget* infoBox = new QWidget( splithor );
-    griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ;
+        QGridLayout *griLay = new QGridLayout( infoBox, 2,2);
-    griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ;
+        if ( KOPrefs::instance()->mShowInfoSub ) {
-    griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ;
+            griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 );
-    infoBox->setMaximumHeight( infoBox->sizeHint().height() );
+            griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ;
+        }
+        if (  KOPrefs::instance()->mShowInfoFrom ) {
+            griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 );
+            griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ;
+        } 
+        if ( KOPrefs::instance()->mShowInfoTo ) {
+            griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 );
+            griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ;
+        } 
+        infoBox->setMaximumHeight( infoBox->sizeHint().height() );
+        if ( !KOPrefs::instance()->mShowInfoStart ) {
+            QTimer::singleShot( 1,splithor, SLOT  ( toggle() ) );
+        }
+    }
    folderView = new AccountView( split );
    folderView->header()->hide();
    folderView->setRootIsDecorated( false );
    folderView->addColumn( i18n( "Mailbox" ) );
    //layout->addWidget( folderView );
    mailView = new QListView( split );
    mailView->addColumn( i18n( " " ) );
    mailView->addColumn( i18n( "Subject" ),QListView::Manual );
    mailView->addColumn( i18n( "Sender" ),QListView::Manual );
    mailView->addColumn( i18n( "Size" ),QListView::Manual);
    mailView->addColumn( i18n( "Date" ),QListView::Manual);
    if ( KOPrefs::instance()->mShowToField )
        mailView->addColumn( i18n( "To" ),QListView::Manual);
    mailView->setAllColumnsShowFocus(true);
    //mailView->setSorting(-1);
    mailView->setRootIsDecorated( false );
    statusWidget = new StatusWidget( wrapperBox );
    statusWidget->hide();
    //layout->addWidget( mailView );
    //layout->setStretchFactor( folderView, 1 );
    //layout->setStretchFactor( mailView, 2 );
    slotAdjustLayout();
 #ifndef DESKTOP_VERSION
    QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
    QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
-    QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold);
+    if ( subLE ) 
-    QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold);
+        QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold);
-    QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold);
+    if ( fromLE ) 
+        QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold);
+    if ( toLE ) 
+        QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold);
 #endif
    connect( mailView, SIGNAL(  doubleClicked (QListViewItem* )),this,
             SLOT( mailLeftClicked(QListViewItem*) ) );
    connect( mailView, SIGNAL(  returnPressed (QListViewItem* )),this,
             SLOT( mailLeftClicked(QListViewItem*) ) );
    connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
             SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) );
    connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)),
            this,SLOT(refreshMailView(const QValueList<RecMailP>&)));
    connect( mailView, SIGNAL(  currentChanged  (QListViewItem* )),this,
             SLOT( setInfoFields(QListViewItem*) ) );
    connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
    connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
    connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
    //mailView->setMultiSelection ( true );
    mailView->setSelectionMode( QListView::Extended );
    QValueList<int> list;
    int fw = 100;
    if ( QApplication::desktop()->width() > 320 )
        fw = 50;
    list.append( fw );
    list.append( 100 );
    split->setSizes( list );
    QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
    mailView->setShowSortIndicator ( true ); 
    QLabel *spacer = new QLabel( toolBar );
    spacer->setBackgroundMode( QWidget::PaletteButton );
    toolBar->setStretchableWidget( spacer );
    QAction* closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); 
    connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
    if ( QApplication::desktop()->width() > 320 )
        closeMail->addTo(toolBar);
        closeMail->addTo(mailMenu);
   QPopupMenu* helpMenu = new QPopupMenu( menuBar );
   menuBar->insertItem( i18n( "Help" ), helpMenu ); 
   QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this); 
   connect( li, SIGNAL( activated() ), SLOT( showAbout()) );
   li->addTo(helpMenu);
   li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this); 
   connect( li, SIGNAL( activated() ), SLOT( showLicence()) );
   li->addTo(helpMenu); 
   li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this); 
   connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) );
   li->addTo(helpMenu);
   connect( codecMenu, SIGNAL( activated(int) ), this, SLOT( slotSetCodec( int )) );
   slotSetCodec( KOPrefs::instance()->mCurrentCodec );
 #ifdef DESKTOP_VERSION
   resize ( 640, 480 );
 #endif
 }
 MainWindow::~MainWindow()
 {
 }
 void MainWindow::setInfoFields(QListViewItem* item )
 {
    if ( item == 0) {
-        subLE->setText("");
+    if ( subLE ) subLE->setText("");
-        fromLE->setText("");
+    if ( fromLE ) fromLE->setText("");
-        toLE->setText("");
+    if ( toLE ) toLE->setText("");
        return;
    }
    RecMailP mail = ((MailListViewItem*)item)->data();
-    subLE->setText(mail->getSubject());
+    if ( subLE ) subLE->setText(mail->getSubject());
-    fromLE->setText(mail->getFrom());
+    if ( fromLE ) fromLE->setText(mail->getFrom());
-    toLE->setText(mail->To().join(";" ));
+    if ( toLE ) toLE->setText(mail->To().join(";" ));
-    subLE->setCursorPosition(0);
+    if ( subLE ) subLE->setCursorPosition(0);
-    fromLE->setCursorPosition(0);
+    if ( fromLE ) fromLE->setCursorPosition(0);
-    toLE->setCursorPosition(0);
+    if ( toLE ) toLE->setCursorPosition(0);
 }
 void MainWindow::slotSetCodec( int codec )
 { 
    codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, false  );
    //qDebug("codec %d ", codec);
    KOPrefs::instance()->mCurrentCodec = codec;
    KOPrefs::instance()->isDirty = true;
    QString name;
    switch ( codec ) {
    case 0:
        name = "iso-8859-1";
        break;
    case 1:
        name = "iso-8859-5";
        break;
    case 2:
        name = "iso-8859-15";
        break;
    case 3:
        name = "big-5";
        break;
    case 4:
        name = "utf-8";
        break;
    case 5:
        name = KOPrefs::instance()->mSendCodec.lower();
        break;
    }
    KOPrefs::instance()->mCurrentCodeName = name ;
    codecMenu->changeItem ( 5, "Userdefined ("+KOPrefs::instance()->mSendCodec+")");
    codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, true );
 }
 void  MainWindow::showLicence()
 {
    KApplication::showLicence();
 }
 void  MainWindow::showAbout()
 {
    QString version;
 #include <../version>
    QString cap = "About KOpieMail/Pi";
                QString text =i18n("KOpieMail/Platform-independent\n") +
                        "(OM/Pi) " + version + " - "
                      
 #ifdef DESKTOP_VERSION
                        "Desktop Edition\n"
 #else
                       "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n"
 #endif
                "www.pi-sync.net\n\n"
 "Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n"
                "KOpieMail/Pi is based on Opie Mail\n"
                "Copyright (c) Rajko Albrecht and the Opie team\n"
                "KOpieMail/Pi is licensed under the GPL\n"
                "\n"
                "KOpieMail/Pi uses LibEtPan - a mail stuff library\n"
        "Copyright (C) 2001, 2002 - DINH Viet Hoa\n"
                "libEtPan has its own licence - see LibEtPan licence\n";
    KApplication::showText( cap, text );
 }
 void  MainWindow::showEtpanLicence()
 {
    KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
 } 
 void MainWindow::appMessage(const QCString &, const QByteArray &)
 {
    qDebug("appMessage implemented by subclass");
 }
 void MainWindow::slotAdjustLayout() {
    /*
  QWidget *d = QApplication::desktop();
  if ( d->width() < d->height() ) {
    layout->setDirection( QBoxLayout::TopToBottom );
    } else {
    layout->setDirection( QBoxLayout::LeftToRight );
  }
    */
 }
 void MainWindow::slotAdjustColumns()
 {
    bool hidden = folderView->isHidden();
    if ( hidden ) folderView->show();
    folderView->setColumnWidth( 0, folderView->visibleWidth() );
    if ( hidden ) folderView->hide();
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 68f0eb3..f56711d 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -402,199 +402,200 @@ void OpieMail::displayMail()
    readMail.showMaximized();
 #else
    readMail.resize( 640, 480);
 #endif
    connect(  &readMail,SIGNAL( showNextMail(ViewMail *)  ), this, SLOT( displayNextMail(ViewMail *) ) );
    connect(  &readMail,SIGNAL( deleteAndDisplayNextMail(ViewMail *) ), this, SLOT(deleteAndDisplayNextMail(ViewMail *) ) );
    connect(  &readMail,SIGNAL( signalDownloadMail()  ), this, SLOT( slotDownloadMail() ) );
    readMail.exec();
    if (  readMail.deleted )
    {
        folderView->refreshCurrent();
    }
    else
    {
        QListViewItem*item = mailView->currentItem();
        if (item)
            ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
    }
 }
 void OpieMail::slotGetAllMail()
 {
    QListViewItem * item = folderView->firstChild();
    while ( item ){
        ((AccountViewItem *)item)->contextMenuSelected( 101 );
        item = item->nextSibling ();
    }
 }
 void OpieMail::slotGetMail()
 {
    QListViewItem * item = folderView->currentItem();
    if ( ! item ) return;
    ((AccountViewItem *)item)->contextMenuSelected( 101 );
 }
 void OpieMail::slotDeleteMail()
 {
    if (!mailView->currentItem()) return;
    RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
    if ( QMessageBox::warning(this, i18n("Delete Mail"), QString( i18n("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
    {
        mail->Wrapper()->deleteMail( mail );
        folderView->refreshCurrent();
    }
 }
 void OpieMail::slotDeleteAllMail()
 {
    QValueList<RecMailP> t;
    if ( QMessageBox::warning(this, i18n("Delete All Mails"), i18n("Do you really want to delete\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
        {
            MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
            while ( item ) {
                if ( item->isSelected() ) {
                    t.append( item->data() );
                }
                item = (MailListViewItem*)item->nextSibling();
            }
        }
    else
        return;
    if ( t.count() == 0 )
        return;
    RecMailP mail = t.first();
    mail->Wrapper()->deleteMailList(t);
    folderView->refreshCurrent();
 }
 void OpieMail::clearSelection()
 {
    mailView->clearSelection();
  
 }
 void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
 {
    if (!mailView->currentItem()) return;
    MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType();
    /* just the RIGHT button - or hold on pda */
    if (button!=2) {return;}
    if (!item) return;
    QPopupMenu *m = new QPopupMenu(0);
    if (m)
    {
        if (mailtype==MAILLIB::A_NNTP) {
            m->insertItem(i18n("Read this posting"),this,SLOT(displayMail()));
            m->insertItem(i18n("Copy this posting"),this,SLOT(slotMoveCopyMail()));
            m->insertSeparator();
            m->insertItem(i18n("Copy all selected postings"),this,SLOT(slotMoveCopyAllMail()));
            m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
        } else {
            if (folderView->currentisDraft()) {
                m->insertItem(i18n("Edit this mail"),this,SLOT(reEditMail()));
            }
            m->insertItem(i18n("Reply to this mail"),this,SLOT(replyMail()));
-            m->insertSeparator();
            m->insertItem(i18n("Read this mail"),this,SLOT(displayMail()));
+            m->insertSeparator();
            m->insertItem(i18n("Move/Copy this mail"),this,SLOT(slotMoveCopyMail()));
            m->insertItem(i18n("Delete this mail"),this,SLOT(slotDeleteMail()));
            m->insertSeparator();
            m->insertItem(i18n("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail()));
            m->insertItem(i18n("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
+            m->insertSeparator();
            m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
        }
        m->setFocus();
        m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
        delete m;
    }
 }
 void OpieMail::slotShowFolders( bool show )
 {
    if ( show && folderView->isHidden() )
    {
        folderView->show();
    }
    else if ( !show && !folderView->isHidden() )
    {
        folderView->hide();
    }
 }
 void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
 {
    MailListViewItem*item = 0;
    mailView->clear();
    QValueList<RecMailP>::ConstIterator it;
    for (it = list.begin(); it != list.end();++it)
    {
        item = new MailListViewItem(mailView,item);
        item->storeData((*it));
        item->showEntry();
    }
    mailView->setSorting ( 4, false );
 }
 void OpieMail::mailLeftClicked( QListViewItem *item )
 {
    mailView->clearSelection();
    /* just LEFT button - or tap with stylus on pda */
    //if (button!=1) return;
    if (!item) return;
    if (folderView->currentisDraft()) {
        reEditMail();
    } else {
        displayMail();
    }
 }
 void OpieMail::slotMoveCopyMail()
 {
    if (!mailView->currentItem()) return;
    RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
    AbstractMail*targetMail = 0;
    QString targetFolder = "";
    Selectstore sels;
    folderView->setupFolderselect(&sels);
    if (!sels.exec()) return;
    targetMail = sels.currentMail();
    targetFolder = sels.currentFolder();
    if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) ||
            targetFolder.isEmpty())
    {
        return;
    }
    if (sels.newFolder() && !targetMail->createMbox(targetFolder))
    {
        QMessageBox::critical(0,i18n("Error creating new Folder"),
                              i18n("<center>Error while creating<br>new folder - breaking.</center>"));
        return;
    }
    sels.hide();
    qApp->processEvents();
    // qDebug("hiding sels ");
    mail->Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails());
    folderView->refreshCurrent();
 }
 void OpieMail::slotMoveCopyAllMail()
 {
    if (!mailView->currentItem()) return;
    QValueList<RecMailP> t;
    // if ( QMessageBox::warning(this, i18n("Move/Copy all selected mails"), i18n("Do you really want to copy/move\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
    {
        MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
        while ( item ) {
            if ( item->isSelected() ) {
                t.append( item->data() );
            }
            item = (MailListViewItem*)item->nextSibling();
        }
    }
    // else
    //  return;
    if ( t.count() == 0 )
        return;
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 57623e6..d7ff9f2 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -519,193 +519,193 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
                    dateText += event->dtEndTimeStr();
                if ( notRed ) 
                    tempText += dateText;
                else {
                    if ( end < cdt  ) {
                        if ( !KOPrefs::instance()->mWNViewShowsPast )
                            return false;
                        tempText += "<font color=\"#F00000\">" + dateText + "</font>";
                    }
                    else if ( st < cdt )
                        tempText += "<font color=\"#008000\">" + dateText + "</font>";
                    else
                        tempText += dateText;
                
                }
    
            } else {
                if ( bDay ) {
                    
                    if ( ev->categories().contains( i18n("Birthday") ))
                        tempText += "<font color=\"#F00000\">" + i18n("Birthday") +":</font>";
                    else
                        tempText += "<font color=\"#F00000\">" + i18n("Anniversary")+":</font>";
                } else {
                    tempText += i18n("Allday:");
                }
            }
        }
    } else {
        mTodos.append( ev );
        tempText += i18n("ToDo:"); 
        if (reply)  {
            tempText += " "; 
            if ( noc != cdt ) {
                tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
            }
        } else {
            if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) {
                // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
                QString dfs = KGlobal::locale()->dateFormatShort();
                KGlobal::locale()->setDateFormatShort("%d.%b");
                tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>";
                KGlobal::locale()->setDateFormatShort(dfs);
            } else {
                if (!ev->doesFloat() )
                    if( ( (Todo*)ev)->dtDue()  < cdt  ) {
                        tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>";
                    } else 
                        tempText +=((Todo*)ev)->dtDueTimeStr();
                mTodos.append( ev );
            }
        }
    }
    tempText += "</b></td><td>";
    bool needClose = false;
    if ( ev->cancelled() ) {
        tempText += "<font color=\"#F00000\">[c";
        needClose =true;
    }
    if ( ev->isAlarmEnabled() ) { 
        if ( !needClose)
            tempText +="[";
        tempText += "a";
        needClose =true;
    }
    if ( ev->description().length() > 0 ) {
        if ( !needClose)
            tempText +="[";
        tempText += "i";
        needClose =true;
    }
    if ( ev->recurrence()->doesRecur() ) {
        if ( !needClose)
            tempText +="[";
        tempText += "r";
        needClose =true;
    }
    if ( needClose ) {
        tempText += "] ";
    }
    if ( ev->cancelled() ) 
        tempText += "</font>";
    tempText += "<a ";
    if (ev->type()=="Event") tempText += "href=\"event:";
    if (ev->type()=="Todo") tempText += "href=\"todo:";
    tempText += ev->uid() + "\">";
    if ( ev->summary().length() > 0 )
        tempText += ev->summary();
    else
        tempText += i18n("-no summary-"); 
    if ( bDay  ) {
-        noc = ev->getNextOccurence( cdt, &ok );
+        noc = ev->getNextOccurence( cdt.addDays(-1), &ok );
        if ( ok ) {
            int years = noc.date().year() - ev->dtStart().date().year();
            tempText += i18n(" (%1 y.)"). arg( years );
        }
    } 
    
    tempText += "</a>";
    if ( KOPrefs::instance()->mWNViewShowLocation )
        if ( !ev->location().isEmpty() )
            tempText += " ("+ev->location() +")";
    if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents)
            tempText += " ["+ev->relatedTo()->summary() +"]";
    tempText += "</td></tr>\n";
    mText += tempText;
    return true;
 }
 bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
 {
    if ( mTodos.find( ev ) != mTodos.end() ) return false;
    mTodos.append( ev );
    if ( !isSub )
        mText += "<p>";
    else
        mText += "<li>";
    mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] ";
    mText += ind;
    bool needClose = false;
    if ( ev->cancelled() ) {
        mText += "<font color=\"#F00000\">[c";
        needClose =true;
    }
    if ( ev->isAlarmEnabled() ) { 
        if ( !needClose)
            mText +="[";
        mText += "a";
        needClose =true;
    }
   
    if ( ev->description().length() > 0 ) {
        if ( !needClose)
            mText +="[";
        mText += "i";
        needClose =true;
    }
    //  if ( ev->recurrence()->doesRecur() ) {
    //       if ( !needClose)
    //           mText +="(";
    //       mText += "r";
    //       needClose =true;
    //   }
    if ( needClose )
        mText += "] ";
    if ( ev->cancelled() ) 
        mText += "</font>";
    mText += "<a href=\"todo:" + ev->uid() + "\">";
    if ( ev->summary().length() > 0 )
        mText += ev->summary();
    else
        mText += i18n("-no summary-"); 
    mText += "</a>"; 
    if ( ((Todo*)ev)->hasDueDate () ) {
        QString year = "";
        int ye = ((Todo*)ev)->dtDue().date().year();
        if ( QDateTime::currentDateTime().date().year() != ye )
            year = QString::number( ye );
        QString dfs = KGlobal::locale()->dateFormatShort();
        KGlobal::locale()->setDateFormatShort("%d.%b");
        mText +="<font color=\"#00A000\"> [" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "."+ year +"]</font>";
        KGlobal::locale()->setDateFormatShort(dfs);
    }
    if ( KOPrefs::instance()->mWNViewShowLocation )
        if ( !ev->location().isEmpty() )
            mText += " ("+ev->location() +")";
    if ( !isSub ) {
        if ( ((Todo*)ev)->relatedTo()&& KOPrefs::instance()->mWNViewShowsParents)
            mText += " ["+ev->relatedTo()->summary() +"]";
        mText += "</p>\n";
    }
    else {
        ind += "-";
        mText += "</li>\n";
    }
    QPtrList<Incidence> Relations = ev->relations();
    Incidence *to;
    for (to=Relations.first();to;to=Relations.next()) {
        if (!((Todo*)to)->isCompleted())
            appendTodo( to, ind , true );
    } 
    
    return true;
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 567ae54..84edc0d 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -73,192 +73,193 @@ KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
    if ( QApplication::desktop()->width() > 320 &&  QApplication::desktop()->width() < 650 ) {
        mSizeHint = QSize(7,7);
        mUseOffset = true;
    } else {
        mSizeHint = QSize(6,6);
        mUseOffset = false;
    }
    s = parent;
    setOrientation(o);
    setMouseTracking( true );
    //setMaximumHeight( 5 ); // test only
 }
 QSize KDGanttSplitterHandle::sizeHint() const
 {
    return  mSizeHint;
 }
 void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
 {
    orient = o;
 #ifndef QT_NO_CURSOR
    if ( o == KDGanttMinimizeSplitter::Horizontal )
        setCursor( splitHCursor );
    else
        setCursor( splitVCursor );
 #endif
 }
 void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
 {
    updateCursor( e->pos() );
    if ( !(e->state()&LeftButton) )
        return;
    if ( _activeButton != 0)
        return;
    QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
    if ( true /*opaque()*/ ) {
        s->moveSplitter( pos, id() );
    } else {
        int min = pos; int max = pos;
        s->getRange( id(), &min, &max );
        s->setRubberband( QMAX( min, QMIN(max, pos )));
    }
    _collapsed = false;
 }
 void KDGanttSplitterHandle::mousePressEvent( QMouseEvent *e )
 {
    if ( e->button() == LeftButton ) {
        _activeButton = onButton( e->pos() );
        mouseOffset = s->pick(e->pos());
        if ( _activeButton != 0)
            repaint();
        updateCursor( e->pos() );
    }
 }
 void KDGanttSplitterHandle::updateCursor( const QPoint& p)
 {
    if ( onButton( p ) != 0 ) {
        setCursor( arrowCursor );
    }
    else {
        if ( orient == KDGanttMinimizeSplitter::Horizontal )
            setCursor( splitHCursor );
        else
            setCursor( splitVCursor );
    }
 }
 void KDGanttSplitterHandle::toggle()
 {
    int pos;
    int min, max;
    if ( !_collapsed ) {
        s->expandPos( id(), &min, &max );
        if ( s->minimizeDirection() == KDGanttMinimizeSplitter::Left
             || s->minimizeDirection() == KDGanttMinimizeSplitter::Up ) {
            pos = min;
        }
        else {
            pos = max;
        }
        _origPos = s->pick(mapToParent( QPoint( 0,0 ) ));
        s->moveSplitter( pos, id() );
        _collapsed = true;
    }
    else {
        s->moveSplitter( _origPos, id() );
        _collapsed = false;
    }
+    repaint();
 }
 void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
 {
    if ( _activeButton != 0 ) {
        if ( onButton( e->pos() ) == _activeButton )
        {
            toggle();
        }
        _activeButton = 0;
        updateCursor( e->pos() );
    }
    else {
        if ( !opaque() && e->button() == LeftButton ) {
            QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                - mouseOffset;
            s->setRubberband( -1 );
            s->moveSplitter( pos, id() );
        }
    }
    repaint();
 }
 int KDGanttSplitterHandle::onButton( const QPoint& p )
 {
    QValueList<QPointArray> list = buttonRegions();
    int index = 1;
    int add = 12;
    for( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
        QRect rect = (*it).boundingRect();
        rect.setLeft( rect.left()- add );
        rect.setRight( rect.right() + add);
        rect.setTop( rect.top()- add );
        rect.setBottom( rect.bottom() + add);
        if ( rect.contains( p ) ) {
            return index;
        }
        index++;
    }
    return 0;
 }
 QValueList<QPointArray> KDGanttSplitterHandle::buttonRegions()
 {
    QValueList<QPointArray> list;
    int sw = 8;
    int yyy = 1;
    int xxx = 1;
    int voffset[] = { (int) -sw*3, (int) sw*3 };
    for ( int i = 0; i < 2; i++ ) {
        QPointArray arr;
        if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Right ||
             _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Left) {
            int mid = height()/2 + voffset[i];
            arr.setPoints( 3,
                           1-xxx, mid - sw + 4,
                           sw-3-xxx, mid,
                           1-xxx, mid + sw -4);
        }
        else if ( !_collapsed &&  s->minimizeDirection() == KDGanttMinimizeSplitter::Left ||
                  _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Right ) {
            int mid = height()/2 + voffset[i];
            arr.setPoints( 3,
                           sw-4, mid - sw + 4,
                           0, mid,
                           sw-4, mid + sw - 4);
        }
        else if ( !_collapsed &&  s->minimizeDirection() == KDGanttMinimizeSplitter::Up ||
                  _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Down) {
            int mid = width()/2 + voffset[i];
            arr.setPoints( 3,
                           mid - sw + 4, sw-4,
                           mid, 0,
                           mid + sw - 4, sw-4 );
        }
        else if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Down ||
                  _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Up ) {
            int mid = width()/2 + voffset[i];
            arr.setPoints( 3,
                           mid - sw + 4, 1-yyy,
                           mid, sw-3-yyy,
                           mid + sw -4, 1-yyy);
        }
        list.append( arr );
    }
    return list;
 }
 void KDGanttSplitterHandle::paintEvent( QPaintEvent * )
 {
    QPixmap buffer( size() );
    QPainter p( &buffer );
    //LR
@@ -387,192 +388,201 @@ void kdganttGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int
  but you can use setOrientation( QSplitter::Vertical ) to set it to
  vertical.
  Use setResizeMode() to specify
  that a widget should keep its size when the splitter is resized.
  Although KDGanttMinimizeSplitter normally resizes the children only
  at the end of a resize operation, if you call setOpaqueResize( TRUE
  ) the widgets are resized as often as possible.
  The initial distribution of size between the widgets is determined
  by the initial size of each widget. You can also use setSizes() to
  set the sizes of all the widgets. The function sizes() returns the
  sizes set by the user.
  If you hide() a child, its space will be distributed among the other
  children. It will be reinstated when you show() it again. It is also
  possible to reorder the widgets within the splitter using
  moveToFirst() and moveToLast().
 */
 static QSize minSize( const QWidget* /*w*/ )
 {
    return QSize(0,0);
 }
 // This is the original version of minSize
 static QSize minSizeHint( const QWidget* w )
 {
    QSize min = w->minimumSize();
    QSize s;
    if ( min.height() <= 0 || min.width() <= 0 )
        s = w->minimumSizeHint();
    if ( min.height() > 0 )
        s.setHeight( min.height() );
    if ( min.width() > 0 )
        s.setWidth( min.width() );
    return s.expandedTo(QSize(0,0));
 }
 /*!
  Constructs a horizontal splitter with the \a parent and \a
  name arguments being passed on to the QFrame constructor.
 */
 KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( QWidget *parent, const char *name )
    :QFrame(parent,name,WPaintUnclipped)
 {
    mFirstHandle = 0;
 #if QT_VERSION >= 232
     orient = Horizontal;
     init();
 #endif
 }
 /*!
  Constructs a splitter with orientation \a o with the \a parent
  and \a name arguments being passed on to the QFrame constructor.
 */
 KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Orientation o, QWidget *parent, const char *name )
    :QFrame(parent,name,WPaintUnclipped)
 { 
    mFirstHandle = 0;
 #if QT_VERSION >= 232
     orient = o;
     init();
 #endif
 }
 /*!
  Destroys the splitter and any children.
 */
 KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
 {
 #if QT_VERSION >= 232
    data->list.setAutoDelete( TRUE );
    delete data;
 #endif
 }
 #if QT_VERSION >= 232
 void KDGanttMinimizeSplitter::init()
 {
    data = new QSplitterData;
    if ( orient == Horizontal )
        setSizePolicy( QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum) );
    else
        setSizePolicy( QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Expanding) );
 }
 #endif
+void KDGanttMinimizeSplitter::toggle()
+{
+    if ( mFirstHandle  )
+        mFirstHandle->toggle();
+    else
+        qDebug("KDGanttMinimizeSplitter::toggle::sorry, handle not available ");
+        
+}
 /*!
  \brief the orientation of the splitter
  By default the orientation is horizontal (the widgets are side by side).
  The possible orientations are Qt:Vertical and Qt::Horizontal (the default).
 */
 void KDGanttMinimizeSplitter::setOrientation( Orientation o )
 {
 #if QT_VERSION >= 232
    if ( orient == o )
        return;
    orient = o;
    if ( orient == Horizontal )
        setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
    else
        setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) );
    QSplitterLayoutStruct *s = data->list.first();
    while ( s ) {
        if ( s->isSplitter )
            ((KDGanttSplitterHandle*)s->wid)->setOrientation( o );
        s = data->list.next();  // ### next at end of loop, no iterator
    }
    recalc( isVisible() );
 #endif
 }
 #if QT_VERSION >= 232
 /*!
  \reimp
 */
 void KDGanttMinimizeSplitter::resizeEvent( QResizeEvent * )
 {
    doResize();
 }
 /*
  Inserts the widget \a w at the end (or at the beginning if \a first
  is TRUE) of the splitter's list of widgets.
  It is the responsibility of the caller of this function to make sure
  that \a w is not already in the splitter and to call recalcId if
  needed.  (If \a first is TRUE, then recalcId is very probably
  needed.)
 */
 QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool first )
 {
    QSplitterLayoutStruct *s;
    KDGanttSplitterHandle *newHandle = 0;
    if ( data->list.count() > 0 ) {
        s = new QSplitterLayoutStruct;
        s->mode = KeepSize;
        QString tmp = "qt_splithandle_";
        tmp += w->name();
        newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() );
    if ( ! mFirstHandle )
        mFirstHandle = newHandle;
        s->wid = newHandle;
        newHandle->setId(data->list.count());
        s->isSplitter = TRUE;
        s->sizer = pick( newHandle->sizeHint() );
        if ( first )
            data->list.insert( 0, s );
        else
            data->list.append( s );
    }
    s = new QSplitterLayoutStruct;
    s->mode = Stretch;
    s->wid = w;
    if ( !testWState( WState_Resized ) && w->sizeHint().isValid() )
        s->sizer = pick( w->sizeHint() );
    else
        s->sizer = pick( w->size() );
    s->isSplitter = FALSE;
    if ( first )
        data->list.insert( 0, s );
    else
        data->list.append( s );
    if ( newHandle && isVisible() )
        newHandle->show(); //will trigger sending of post events
    return s;
 }
 /*!
  Tells the splitter that a child widget has been inserted or removed.
  The event is passed in \a c.
 */
 void KDGanttMinimizeSplitter::childEvent( QChildEvent *c )
 {
    if ( c->type() == QEvent::ChildInserted ) {
        if ( !c->child()->isWidgetType() )
diff --git a/microkde/KDGanttMinimizeSplitter.h b/microkde/KDGanttMinimizeSplitter.h
index 75e0443..8120d14 100644
--- a/microkde/KDGanttMinimizeSplitter.h
+++ b/microkde/KDGanttMinimizeSplitter.h
@@ -1,178 +1,180 @@
 /* -*- Mode: C++ -*-
   $Id$
 */
 /****************************************************************************
 ** Copyright (C)  2001-2004 Klar�lvdalens Datakonsult AB.  All rights reserved.
 **
 ** This file is part of the KDGantt library.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** Licensees holding valid commercial KDGantt licenses may use this file in
 ** accordance with the KDGantt Commercial License Agreement provided with
 ** the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.klaralvdalens-datakonsult.se/Public/products/ for
 **   information about KDGantt Commercial License Agreements.
 **
 ** Contact info@klaralvdalens-datakonsult.se if any conditions of this
 ** licensing are not clear to you.
 **
 ** 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.
 **
 **********************************************************************/
 #ifndef KDGANTTMINIMIZESPLITTER_H
 #define KDGANTTMINIMIZESPLITTER_H
 #ifndef QT_H
 #include "qframe.h"
 #include "qvaluelist.h"
 #endif // QT_H
 #ifndef QT_NO_SPLITTER___
 class QSplitterData;
 class QSplitterLayoutStruct;
 class KDGanttSplitterHandle;
 class KDGanttMinimizeSplitter : public QFrame
 {
    Q_OBJECT
    //  Q_ENUMS( Direction )
    // Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
    // Q_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
 public:
    enum ResizeMode { Stretch, KeepSize, FollowSizeHint };
    enum Direction { Left, Right, Up, Down };
    KDGanttMinimizeSplitter( QWidget* parent=0, const char* name=0 );
    KDGanttMinimizeSplitter( Orientation, QWidget* parent=0, const char* name=0 );
    ~KDGanttMinimizeSplitter();
    virtual void setOrientation( Orientation );
    Orientation orientation() const { return orient; }
    void setMinimizeDirection( Direction );
    Direction minimizeDirection() const;
 #if QT_VERSION >= 232
    virtual void setResizeMode( QWidget *w, ResizeMode );
    virtual void setOpaqueResize( bool = TRUE );
    bool opaqueResize() const;
    void moveToFirst( QWidget * );
    void moveToLast( QWidget * );
    void refresh() { recalc( TRUE ); }
    QSize sizeHint() const;
    QSize minimumSizeHint() const;
    QValueList<int> sizes() const;
    void setSizes( QValueList<int> );
    KDGanttSplitterHandle* firstHandle(){ return mFirstHandle;}
    void expandPos( int id, int* min, int* max );
+public slots:
+     void toggle();
 protected:
    void childEvent( QChildEvent * );
    bool event( QEvent * );
    void resizeEvent( QResizeEvent * );
    int idAfter( QWidget* ) const;
    void moveSplitter( QCOORD pos, int id );
    virtual void drawSplitter( QPainter*, QCOORD x, QCOORD y,
                               QCOORD w, QCOORD h );
    void styleChange( QStyle& );
    int adjustPos( int , int );
    virtual void setRubberband( int );
    void getRange( int id, int*, int* );
 private:
    void init();
    void recalc( bool update = FALSE );
    void doResize();
    void storeSizes();
    void processChildEvents();
    QSplitterLayoutStruct *addWidget( QWidget*, bool first = FALSE );
    void recalcId();
    void moveBefore( int pos, int id, bool upLeft );
    void moveAfter( int pos, int id, bool upLeft );
    void setG( QWidget *w, int p, int s, bool isSplitter = FALSE );
    QCOORD pick( const QPoint &p ) const
    { return orient == Horizontal ? p.x() : p.y(); }
    QCOORD pick( const QSize &s ) const
    { return orient == Horizontal ? s.width() : s.height(); }
    QCOORD trans( const QPoint &p ) const
    { return orient == Vertical ? p.x() : p.y(); }
    QCOORD trans( const QSize &s ) const
    { return orient == Vertical ? s.width() : s.height(); }
    KDGanttSplitterHandle* mFirstHandle;
    QSplitterData *data;
 #endif
 private:
    Orientation orient;
    Direction _direction;
 #ifndef DOXYGEN_SKIP_INTERNAL
    friend class KDGanttSplitterHandle;
 #endif
        private:// Disabled copy constructor and operator=
 #if defined(Q_DISABLE_COPY)
    KDGanttMinimizeSplitter( const KDGanttMinimizeSplitter & );
    KDGanttMinimizeSplitter& operator=( const KDGanttMinimizeSplitter & );
 #endif
 };
 #ifndef DOXYGEN_SKIP_INTERNAL
 // This class was continued from a verbatim copy of the
 // QSplitterHandle pertaining to the Qt Enterprise License and the
 // GPL. It has only been renamed to KDGanttSplitterHandler in order to
 // avoid a symbol clash on some platforms.
 class KDGanttSplitterHandle : public QWidget
 {
    Q_OBJECT
 #if QT_VERSION >= 232
 public:
    KDGanttSplitterHandle( Qt::Orientation o,
                       KDGanttMinimizeSplitter *parent, const char* name=0 );
    void setOrientation( Qt::Orientation o );
    Qt::Orientation orientation() const { return orient; }
    bool opaque() const { return s->opaqueResize(); }
    QSize sizeHint() const;
    void toggle();
    int id() const { return myId; } // data->list.at(id())->wid == this
    void setId( int i ) { myId = i; }
 protected:
    QValueList<QPointArray> buttonRegions();
    void paintEvent( QPaintEvent * );
    void mouseMoveEvent( QMouseEvent * );
    void mousePressEvent( QMouseEvent * );
    void mouseReleaseEvent( QMouseEvent * );
    int onButton( const QPoint& p );
    void updateCursor( const QPoint& p );
 private:
    QSize mSizeHint;
    bool mUseOffset;
    Qt::Orientation orient;
    bool opaq;
    int myId;
    KDGanttMinimizeSplitter *s;
    int _activeButton;
    bool _collapsed;
author	zautrix <zautrix>	2005-01-28 03:22:17 (UTC)
committer	zautrix <zautrix>	2005-01-28 03:22:17 (UTC)
commit	94f0e8140c07696174dc3774dc2c11efad2ffa68 (patch) (unidiff)
tree	d95cc80e5c5221e8d9ce1cbf4b01cbf78fdf843a
parent	6fb044008531ec883fc25a3ef2b43904930cfff6 (diff)
download	kdepimpi-94f0e8140c07696174dc3774dc2c11efad2ffa68.zip kdepimpi-94f0e8140c07696174dc3774dc2c11efad2ffa68.tar.gz kdepimpi-94f0e8140c07696174dc3774dc2c11efad2ffa68.tar.bz2