7 files changed, 78 insertions, 63 deletions

diff --git a/kalarmd/simplealarmdaemonapplet.cpp b/kalarmd/simplealarmdaemonapplet.cpp
index 7e8125d..94d8428 100644
--- a/kalarmd/simplealarmdaemonapplet.cpp
+++ b/kalarmd/simplealarmdaemonapplet.cpp
@@ -1,57 +1,58 @@
 #include "simplealarmdaemonapplet.h"
 
 #include "simplealarmdaemonimpl.h"
 
 #include <qcopchannel_qws.h> 
 #include <qlabel.h>
 #include <qapp.h>
 #include <qpe/resource.h>
 SimpleAlarmDaemonApplet::SimpleAlarmDaemonApplet()
   : mApplet( 0 ), ref( 0 )
 {
   
 }
 
 SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet()
 {
   delete mApplet;
+  mApplet = 0;
 }
 
 
 QWidget *SimpleAlarmDaemonApplet::applet( QWidget *parent )
 {
   if ( !mApplet ) {
       mApplet = new SimpleAlarmDaemonImpl( parent );
           if ( QApplication::desktop()->width() < 480 ) 
               mApplet->setPixmap( Resource::loadPixmap( "ko16" ) );
           else
               mApplet->setPixmap( Resource::loadPixmap( "ko24" ) );
       QCopChannel* c = new QCopChannel("koalarm",mApplet , "channel" ) ;
       QObject::connect( c, SIGNAL (received ( const QCString &, const QByteArray & )),mApplet, SLOT(recieve(  const QCString&, const QByteArray& )));
       mApplet->show();
   }
   return mApplet;
 }
 
 int SimpleAlarmDaemonApplet::position() const
 {
   return 7;
 }
 
 QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
   *iface = 0;
   if ( uuid == IID_QUnknown )
       *iface = this;
   else if ( uuid == IID_TaskbarApplet )
       *iface = this;
 
   if ( *iface )
       (*iface)->addRef();
   return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( SimpleAlarmDaemonApplet )
 }
diff --git a/kalarmd/simplealarmdaemonapplet.h b/kalarmd/simplealarmdaemonapplet.h
index a4cbee4..1787bf3 100644
--- a/kalarmd/simplealarmdaemonapplet.h
+++ b/kalarmd/simplealarmdaemonapplet.h
@@ -1,26 +1,25 @@
 #ifndef SIMPLEALARMDAEMONAPPLET_H
 #define SIMPLEALARMDAEMONAPPLET_H
 
 #include <qpe/taskbarappletinterface.h>
 
 class SimpleAlarmDaemonImpl;
-class ScreenshotApplet;
 
 class SimpleAlarmDaemonApplet : public TaskbarAppletInterface
 {
   public:
     SimpleAlarmDaemonApplet();
     virtual ~SimpleAlarmDaemonApplet();
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual QWidget *applet( QWidget *parent );
     virtual int position() const;
 
   private:
     SimpleAlarmDaemonImpl *mApplet;
     ulong ref;
 };
 
 #endif
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 4ff6861..50c4605 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -3,191 +3,191 @@
     Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include "simplealarmdaemonimpl.h"
 
 #include "alarmdialog.h"
 #include <qpopupmenu.h>
 #include <qapp.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qhbox.h>
 #include <qtimer.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qdialog.h>
 #include <qspinbox.h>
 #include <qtextstream.h> 
 #include <qtopia/qcopenvelope_qws.h> 
 #include <qtopia/alarmserver.h> 
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 
 
 SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     : QLabel( parent )
 {
     mAlarmDialog = new AlarmDialog( 0 );
-    mPopUp = new QPopupMenu( 0 );
+    mPopUp = new QPopupMenu( this );
     mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) );
     mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "What's Todo?", this, SLOT ( showTodo() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) );
     mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) );
     mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) );
     mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
-    mTimerPopUp = new QPopupMenu( mPopUp );
+    mTimerPopUp = new QPopupMenu( this );
 
-    mBeepPopUp = new QPopupMenu( mPopUp );   
-    mSoundPopUp = new QPopupMenu( mBeepPopUp );   
-    mPausePopUp = new QPopupMenu( mBeepPopUp );    
-    QPopupMenu* savePopUp = new QPopupMenu( mBeepPopUp ); 
+    mBeepPopUp = new QPopupMenu( this );   
+    mSoundPopUp = new QPopupMenu( this );   
+    mPausePopUp = new QPopupMenu( this );    
+    QPopupMenu* savePopUp = new QPopupMenu( this ); 
     savePopUp->insertItem( "Save", 0 );   
     savePopUp->insertItem( "Load", 1 );   
     mSoundPopUp->insertItem( "Buzzer", 0 );   
     mSoundPopUp->insertItem( "Wav file", 1 ); 
     mPausePopUp->insertItem( " 1 sec", 1 );
     mPausePopUp->insertItem( " 2 sec", 2 );
     mPausePopUp->insertItem( " 3 sec", 3 );
     mPausePopUp->insertItem( " 5 sec", 5 );
     mPausePopUp->insertItem( "10 sec", 10 );
     mPausePopUp->insertItem( "30 sec", 30 );
     mPausePopUp->insertItem( " 1 min", 60 );
     mPausePopUp->insertItem( " 5 min", 300 );
     mPausePopUp->insertItem( "10 min", 600 );
-    mSuspendPopUp = new QPopupMenu( mBeepPopUp );
+    mSuspendPopUp = new QPopupMenu( this );
     mSuspendPopUp->insertItem( "Off", 0 ); 
     mSuspendPopUp->insertItem( " 1x", 1 );   
     mSuspendPopUp->insertItem( " 2x", 2 );   
     mSuspendPopUp->insertItem( " 3x", 3 );  
     mSuspendPopUp->insertItem( " 5x", 5 );  
     mSuspendPopUp->insertItem( "10x", 10 );  
     mSuspendPopUp->insertItem( "20x", 20 );  
     mSuspendPopUp->insertItem( "30x", 30 );    
     mBeepPopUp->insertItem( "Auto  suspend",mSuspendPopUp  );
     mBeepPopUp->insertItem( "Beep interval",mPausePopUp  );
     mBeepPopUp->insertItem( "Replay",mSoundPopUp  );      
     mBeepPopUp->insertItem( "Config",savePopUp  );        
     mBeepPopUp->insertItem( "300", 300 );      
     mBeepPopUp->insertItem( "180", 180 );         
     mBeepPopUp->insertItem( "60", 60 );       
     mBeepPopUp->insertItem( "30", 30 );    
     mBeepPopUp->insertItem( "10", 10 ); 
     mBeepPopUp->insertItem( "3", 3 );   
     mBeepPopUp->insertItem( "1", 1 );   
     mBeepPopUp->insertItem( "Off", 0 ); 
     mBeepPopUp->setCheckable( true );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Play beeps", mBeepPopUp );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Timer", mTimerPopUp );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Simulate", this, SLOT ( simulate() ) );
  
     mPopUp->resize( mPopUp->sizeHint()  );
     mPlayBeeps = 60;
     mBeepPopUp->setItemChecked ( mPlayBeeps, true );
     connect ( mBeepPopUp, SIGNAL( activated ( int )  ), this, SLOT (slotPlayBeep( int ) ) );
     connect ( mTimerPopUp, SIGNAL( activated ( int )  ), this, SLOT (confTimer( int ) ) );
     connect ( mTimerPopUp, SIGNAL(aboutToShow()  ), this, SLOT ( showTimer( ) ) ); 
     connect ( mSoundPopUp, SIGNAL( activated ( int )  ), this, SLOT (confSound( int ) ) );
     connect ( mPausePopUp, SIGNAL( activated ( int )  ), this, SLOT (confPause( int ) ) );
     connect ( mSuspendPopUp, SIGNAL( activated ( int )  ), this, SLOT (confSuspend( int ) ) );  
     connect ( savePopUp, SIGNAL( activated ( int )  ), this, SLOT (saveSlot( int ) ) );
     mTimerTime = 0;
     mCustomText = "Custom Text";
     mCustomMinutes = 7;
     mTimerPopupConf = 1;
     fillTimerPopUp();
     mPausePlay = 0;
     confPause( 1 );
     mSuspend = 0;
     confSuspend( 0 );
     if ( QApplication::desktop()->width() < 480 ) {
         wavAlarm = false;
         mSoundPopUp->setItemChecked ( 0, true );
     }
     else {
         wavAlarm = true;
         mSoundPopUp->setItemChecked ( 1, true );
     }
     saveSlot( 1 );
 }
 
 SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl()
 {
-    delete mPopUp;
+    //delete mPopUp;
     delete mAlarmDialog;
 }
 void SimpleAlarmDaemonImpl::saveSlot( int load )
 {
     QString fileName = QDir::homeDirPath() +"/.kopialarmrc";
     //qDebug("save %d ", load );
     QFile file( fileName );
     if ( load ) {
         if( !QFile::exists(  fileName) )
             return;
          if (!file.open( IO_ReadOnly ) ) {
             return ;
         } 
          QString line;
          bool ok;
          int val;
          int len;
          while ( file.readLine( line, 1024 ) > 0 ) {
              //qDebug("read %s  ", line.latin1());
              len = line.length();
              if ( line.left(4 ) == "PPAU" ) {
                  val = line.mid( 4,len-5).toInt( &ok );
                  if ( ok ) {
                      confPause( val );
                  }
              }
              if ( line.left(4 ) == "SUCO" )  {
                  val = line.mid( 4,len-5).toInt( &ok );
                  if ( ok )
                      confSuspend ( val );
              }
              if ( line.left(4 ) == "WAAL" )  {
                  val = line.mid( 4,len-5).toInt( &ok );
                  if ( ok )
                      confSound( val );
 
              }
              if ( line.left(4 ) == "PLBE" )  {
                  val = line.mid( 4,len-5).toInt( &ok );
                  if ( ok )
                      slotPlayBeep( val );
 
              }
              if ( line.left(4 ) == "CUTE" ) {
                  mCustomText = line.mid( 5,len-6);
                  // qDebug("text ***%s*** ",mCustomText.latin1() );
 
              } 
@@ -519,89 +519,89 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
             spinm.setValue( mCustomMinutes%60 );
             lay.addWidget( &hbox);
             dia.resize( dia.sizeHint().width(), dia.sizeHint().height() );
             if ( !dia.exec() )
                 return;
             mCustomText = lEdit.text();
             mCustomMinutes = spinh.value()*60+spinm.value();
             if ( mCustomMinutes == 0 )
                 mCustomMinutes = 1;
             if ( mCustomMinutes > 1440 )
                 mCustomMinutes = 1440;
             mess += mCustomText;
             minutes = mCustomMinutes;
         }
         else
             mess+= QString::number ( minutes ) + ( " minutes are past!");
     }
     //minutes = 1;
     mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );
     timerMesssage = mess;
     AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.latin1());
     mTimerTime = 1;
 }
 
 void SimpleAlarmDaemonImpl::writeFile()
 {
     QCopEnvelope e("QPE/Application/kopi", "-writeFile");
 }
 void SimpleAlarmDaemonImpl::showWN()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showWN");
 }
 void SimpleAlarmDaemonImpl::newTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newTodo");
 }
 
 void SimpleAlarmDaemonImpl::newEvent()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newEvent");
 
 }
 void SimpleAlarmDaemonImpl::newMail()
 {
  QCopEnvelope e("QPE/Application/ompi", "newMail()");
 }
 void SimpleAlarmDaemonImpl::showAdd()
 {
- QCopEnvelope e("QPE/Application/kapi", " ");
+ QCopEnvelope e("QPE/Application/kapi", "raise()");
 }
 void SimpleAlarmDaemonImpl::ringSync()
 {
     QCopEnvelope e("QPE/Application/kopi", "-ringSync");
 
 }
 void SimpleAlarmDaemonImpl::newCountdown()
 {
     //recieve("cal_alarm", 10 );
 }
 void SimpleAlarmDaemonImpl::simulate()
 {
     writeFile();
     QString filename =  getenv("QPEDIR") ;
     filename += "/pics/kdepim/korganizer/koalarm.wav";
     startAlarm("Alarm simulation", filename );
 }
 void SimpleAlarmDaemonImpl::showKO()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showKO");
 
 }
 void SimpleAlarmDaemonImpl::showTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showTodo");
 
 }
 void SimpleAlarmDaemonImpl::writeJournal()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showJournal");
 
 }
 
 void SimpleAlarmDaemonImpl::mousePressEvent( QMouseEvent * )
 {
 
     mPopUp->popup(mapToGlobal(QPoint (0, -mPopUp->height() )));
 
 }
 
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 8dca3ae..1cdb2fb 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -184,97 +184,98 @@ KOPrefs::KOPrefs() :
   addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
   addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
   addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
   addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
  
 
   KPrefs::setCurrentGroup("Locale");
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
 
 
   KPrefs::setCurrentGroup("Colors");
   addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
   addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
   addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
   addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
   addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
   addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
   addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
   addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
   addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
   addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
   addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
   addItemBool("UseAppColors",&mUseAppColors,false); 
 
   
 
   KPrefs::setCurrentGroup("Views");
   addItemInt("Hour Size",&mHourSize,8);
   addItemBool("Show Daily Recurrences",&mDailyRecur,true);
   addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
   addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
   addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
   addItemBool("ShowShortMonthName",&mMonthShowShort,false);
   addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
   addItemBool("Enable ToolTips",&mEnableToolTips,false);
   addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
   addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
   addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
   addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
   addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false);
   addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
   addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
   addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
   addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
-  addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);
+  addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
+  addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
   addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
   addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
   addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
   addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
   addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
   addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false);
   addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
   addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
   addItemInt("Day Begins",&mDayBegins,7);
   addItemInt("Working Hours Start",&mWorkingHoursStart,8);
   addItemInt("Working Hours End",&mWorkingHoursEnd,17);
   addItemBool("Exclude Holidays",&mExcludeHolidays,true);
   addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
 
   addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
   addItemBool("Full View Month",&mFullViewMonth,true);
   addItemBool("Full View Todo",&mFullViewTodo,true);
   addItemBool("Quick Todo",&mEnableQuickTodo,false);
 
   addItemInt("Next X Days",&mNextXDays,3);
 
   KPrefs::setCurrentGroup("Printer");
 
   KPrefs::setCurrentGroup("Layout");
 
   addItemBool("CompactDialogs",&mCompactDialogs,false);
   addItemBool("VerticalScreen",&mVerticalScreen,true);
 
   KPrefs::setCurrentGroup("KOrganizer Plugins");
 
   addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
 
   KPrefs::setCurrentGroup("Group Scheduling");
 
   addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
   addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
   addItemStringList("AdditionalMails",&mAdditionalMails,"");
   addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
   addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
   addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
   addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
   addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
 
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 0656644..f2fe77a 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -187,87 +187,88 @@ class KOPrefs : public KPimPrefs
     bool mToolBarMiniIcons;
 
     bool mAskForQuit;
     bool mUsePassWd;
     bool mShowSyncEvents;
     bool mShowTodoInAgenda;
 
     int mLastSyncTime;
     void setCategoryColor(QString cat,const QColor & color);
     QColor *categoryColor(QString cat);
 
     QString mArchiveFile;
     QString mHtmlExportFile;
     bool    mHtmlWithSave;
 
     QStringList mSelectedPlugins;
   
     QString mLastImportFile;
     QString mLastVcalFile;
     QString mLastSaveFile;
     QString mLastLoadFile;
 
 
     QString mDefaultAlarmFile;
     int mIMIPScheduler;
     int mIMIPSend;
     QStringList mAdditionalMails;
     int mIMIPAutoRefresh;
     int mIMIPAutoInsertReply;
     int mIMIPAutoInsertRequest;
     int mIMIPAutoFreeBusy;
     int mIMIPAutoFreeBusyReply;
 
     QStringList mTodoTemplates;
     QStringList mEventTemplates;
 
     int mDestination;
 
 
     bool mEditOnDoubleClick;
     bool mViewChangeHoldFullscreen;
     bool mViewChangeHoldNonFullscreen;
     bool mCenterOnCurrentTime;
     bool mSetTimeToDayStartAt;
     bool mHighlightCurrentDay;
     bool mUseHighlightLightColor;
     bool mListViewMonthTimespan;
     bool mWNViewShowsParents;
+    bool mWNViewShowsPast;
     bool mWNViewShowLocation;
     bool mTodoViewShowsPercentage;
     bool mTodoViewUsesCatColors;
     bool mTodoViewUsesSmallFont;
     bool mTodoViewUsesForegroundColor;
     bool mMonthViewUsesForegroundColor;
 
     bool mHightlightDateTimeEdit;
     bool mShortDateInViewer;
 
     QStringList mLocationDefaults;
     QStringList mEventSummaryUser;
     QStringList mTodoSummaryUser;
 
     bool mUseInternalAlarmNotification;
     int mAlarmPlayBeeps;
     int mAlarmSuspendTime;
     int mAlarmSuspendCount;
     int mAlarmBeepInterval;
     int mOldLanguage;
     int mOldLoadedLanguage;
 
   
     QString mActiveSyncPort;
     QString mActiveSyncIP;
 
   private:
     QDict<QColor> mCategoryColors;
     QColor mDefaultCategoryColor;
 
     QFont mDefaultTimeBarFont;
     QFont mDefaultViewFont;
     QFont mDefaultMonthViewFont;
 
     QString mName;
     QString mEmail;
 };
 
 #endif
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 393e6e6..578c0e9 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -739,128 +739,136 @@ void KOPrefsDialog::setupViewsTab()
   weeklyRecur = 
     addWidBool(i18n("short month"),
                &(KOPrefs::instance()->mMonthShowShort),habo);
  weeklyRecur =
     addWidBool(i18n("icons"),
                &(KOPrefs::instance()->mMonthShowIcons),habo);
 
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 #ifdef DESKTOP_VERSION
  KPrefsDialogWidBool *enableMonthScroll =
       addWidBool(i18n("Enable scrollbars in month view cells"),
                  &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
   topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
 #endif
 
   dummy =
     addWidBool(i18n("Show Sat/Sun together"),
                &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  KPrefsDialogWidBool *coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses category colors"),
                   &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 
 
   dummy =
     addWidBool(i18n("Categorie colors are applied to text"),
                &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
  coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses day colors"),
                   &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
 
  KPrefsDialogWidColor *holidayColor =
       addWidColor(i18n("Day color odd months"),
                   &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  holidayColor =
       addWidColor(i18n("Day color even months"),
                   &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  
- holidayColor =
+  holidayColor =
       addWidColor(i18n("Color for Sundays + category \"Holiday\""),
                   &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
   // *********************** What'sNext View
   topFrame = addPage(i18n("What's Next View"),0,0);
   //  DesktopIcon("viewmag",KIcon::SizeMedium));
   
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   ii = 0;
-   KPrefsDialogWidBool *passwdk =
-    addWidBool(i18n("Show parent To-Do's in What's Next view"),
-               &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
-   topLayout->addWidget(passwdk->checkBox(), ii++,0);
+  KPrefsDialogWidBool *passwdk =
+
+      addWidBool(i18n("Show events, that are done in \nWhat's Next view"),
+                 &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
+  topLayout->addWidget(passwdk->checkBox(), ii++,0);
+  passwdk =
+      addWidBool(i18n("Show parent To-Do's in What's Next view"),
+                 &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
+  topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
   passwdk =
-    addWidBool(i18n("Show location in What's Next view"),
-               &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
-   topLayout->addWidget(passwdk->checkBox(), ii++,0);
+      addWidBool(i18n("Show location in What's Next view"),
+                 &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
+  topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
   passwdk =
-    addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"),
-               &(KOPrefs::instance()->mShowSyncEvents),topFrame);
-   topLayout->addWidget(passwdk->checkBox(), ii++,0);
-    passwdk =
-           addWidBool(i18n("Use short date in \nWhat's Next/Event view"),
-                      &(KOPrefs::instance()->mShortDateInViewer),topFrame);
-       topLayout->addMultiCellWidget(passwdk->checkBox(), ii,ii,0,1);
+      addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"),
+                 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
+  topLayout->addWidget(passwdk->checkBox(), ii++,0);
+  passwdk =
+      addWidBool(i18n("Use short date in \nWhat's Next/Event view"),
+                 &(KOPrefs::instance()->mShortDateInViewer),topFrame);
+  topLayout->addWidget(passwdk->checkBox(), ii++,0);
    
+
+ 
+
   // *********************** Todo View
 
    topFrame = addPage(i18n("Todo View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   ii = 0;
 
  KPrefsDialogWidBool *showCompletedTodo =
       addWidBool(i18n("To-do view shows completed Todos"),
                  &(KOPrefs::instance()->mShowCompletedTodo),topFrame);
   topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0);
  dummy =
     addWidBool(i18n("To-do view shows complete as 'xx %'"),
                &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Small To-do view uses smaller font"),
                &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
  dummy =
     addWidBool(i18n("Todo view uses category colors"),
                &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
   QWidget* wid = new QWidget( topFrame );
   // Todo due today color
   KPrefsDialogWidColor *todoDueTodayColor =
       addWidColor(i18n("Todo due today color:"),
                   &(KOPrefs::instance()->mTodoDueTodayColor),wid);
   QHBoxLayout *widLayout = new QHBoxLayout(wid);
   widLayout->addWidget( todoDueTodayColor->label() );
   widLayout->addWidget( todoDueTodayColor->button() );
   topLayout->addWidget(wid,ii++,0);
   //topLayout->addWidget(todoDueTodayColor->button(),ii++,1);
 
   // Todo overdue color
   wid = new QWidget( topFrame );
   widLayout = new QHBoxLayout(wid);
   KPrefsDialogWidColor *todoOverdueColor =
       addWidColor(i18n("Todo overdue color:"),
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 0f0bf11..aa33588 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -312,309 +312,314 @@ void KOWhatsNextView::updateView()
                         //mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n";  
                         mText +="<h2><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></h2>\n";
                         mText += "<table>\n";
                     }
                     replys++;
                     appendEvent(ev,true);
                 }
             }
             ev = events.next();
         }
     }
     todos = calendar()->todos();
     if (todos.count() > 0) {
         Todo *to = todos.first();
         while(to) {
             if ( !to->isCompleted() ){
                 Attendee *me = to->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
                 if (me!=0) {
                     if (me->status()==Attendee::NeedsAction && me->RSVP()) {
                         if (replys == 0) {
                             mText +="<h2><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></h2>\n";
                             mText += "<table>\n";
                         }
                         replys++;
                         appendEvent(to, true);
                     }
                 }
             }
             to = todos.next();
         }
     }
     if (replys > 0 ) mText += "</table>\n";
 
 
     mText += "</td></tr>\n</table></qt>\n";
 
     mView->setText(mText);
     mView->setFocus();
 
     //  QPixmap bPix = SmallIcon( "back" );
     //   qDebug("xxxxxxxxxxxxxxxxxxxxx ");
     //   QWidget* test = new QWidget();
     //  test->setBackgroundMode(FixedPixmap  );
     //  test->setBackgroundPixmap ( bPix );
     //  test->resize( 300, 400 );
     //  test->show();
     //   mView->setBackgroundMode(FixedPixmap  );
     //   mView->setBackgroundPixmap ( bPix );
-    qDebug("%s ",mText.latin1());
+    // qDebug("%s ",mText.latin1());
 }
 
 void  KOWhatsNextView::appendDay( int i, QDate eventDate )
 {
     QString date;
     QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer); 
     if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) {
         if ( i == 0 ) {
             mText += "<table>\n";
             return;//date = "<em><font color=\"#008000\"><em>" +  day+"</font></em>";
         }
         else if ( i == 1 )
             date = "<em><font color=\"#000080\">" + day + "</font></em>" ;
         else date = "<em><font color=\"#000080\">" + day + "</font></em>";
         mText += "<h2>" + date + "</h2>\n";
         //mText += "<big><big><strong>" + date + "</strong></big></big>\n";
         mText += "<table>\n";
 
 
 
     } else { 
         if ( i == 0 ) {
             mText += "<table>\n";
             return;// date = "<font color=\"#008000\"><em>" +i18n("Today: ") +"</em>" + day+"</font>";
         }
 
 #ifdef DESKTOP_VERSION
         else if ( i == 1 ) {
             date = "<h2><em><font color=\"#000080\">" + i18n("Tomorrow: ") + day +"</font></em></h2>" ;
         }
         else date = "<h2><em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em></h2>";
 #else
         else if ( i == 1 ) {
             date = "<em><font color=\"#000080\">" + i18n("Tomorrow: ") + day +"</font></em>" ;
         }
         else date = "<em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em>";
 
 #endif
         mText += "<h2>" + date + "</h2>\n";
         //mText += "<big><big><strong>" + date + "</strong></big></big>\n";
         mText += "<table>\n";
     }
 }
 
 
 void KOWhatsNextView::showDates(const QDate &, const QDate &)
 {
     updateView();
 }
 
 void KOWhatsNextView::showEvents(QPtrList<Event>)
 {
 }
 
 void KOWhatsNextView::changeEventDisplay(Event *, int action)
 {
     switch(action) {
     case KOGlobals::EVENTADDED:
         updateView();
         break;
     case KOGlobals::EVENTEDITED:
         updateView();
         break;
     case KOGlobals::EVENTDELETED:
         updateView();
         break;
     default:
         updateView();
         kdDebug() << "KOWhatsNextView::changeEventDisplay(): Illegal action " << action << endl;
     }
 }
 
 void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
 {
     if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") )
         return;
     QDateTime cdt =  QDateTime::currentDateTime();
     QDateTime noc;
+    QString tempText;
     bool ok = true; 
     if ( reply ) {
         noc = ev->getNextOccurence( cdt, &ok );
         if (! ok && ev->type() == "Event")
             return;
     }
-    mText += "<tr><td><b>";
+    tempText += "<tr><td><b>";
     if (ev->type()=="Event") {
         if (reply)  {
             if (!ev->doesFloat())
-                mText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": ";
+                tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": ";
             else
-                mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
+                tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
                 
         } else {
             if (!ev->doesFloat()) {
                 Event *event = static_cast<Event *>(ev);
                 QDateTime st,end;
                 if ( event->recurrence()->doesRecur() ) {
                     QDate  recDate= mEventDate;
                     int days =  event->dtStart().date().daysTo (event->dtEnd().date()  );
                     while ( ! event->recursOn(  recDate ) ) {
                         recDate = recDate.addDays( -1 );
 
                     }
                     st =  QDateTime ( recDate,  event->dtStart().time() );
                     end = QDateTime ( recDate.addDays( days ),  event->dtEnd().time() );
                 }
                 else {
                     st = event->dtStart();
                     end = event->dtEnd();
                 }
       
            
                 QString dateText;
                 // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() );
                 if ( st.date() < mEventDate )
                     dateText = "++:++-";
                 else
                     dateText =  event->dtStartTimeStr() + "-";
                 if ( end.date() > mEventDate ) 
                     dateText += "++:++";
                 else
                     dateText += event->dtEndTimeStr();
                 if ( notRed ) 
-                    mText += dateText;
+                    tempText += dateText;
                 else {
-                    if ( end < cdt  )
-                        mText += "<font color=\"#F00000\">" + dateText + "</font>";
+                    if ( end < cdt  ) {
+                        if ( !KOPrefs::instance()->mWNViewShowsPast )
+                            return;
+                        tempText += "<font color=\"#F00000\">" + dateText + "</font>";
+                    }
                     else if ( st < cdt )
-                        mText += "<font color=\"#008000\">" + dateText + "</font>";
+                        tempText += "<font color=\"#008000\">" + dateText + "</font>";
                     else
-                        mText += dateText;
+                        tempText += dateText;
                 
                 }
     
             } else {
-                mText += i18n("Allday:");
+                tempText += i18n("Allday:");
 
             }
         }
     } else {
         mTodos.append( ev );
-        mText += i18n("ToDo:"); 
+        tempText += i18n("ToDo:"); 
         if (reply)  {
-            mText += " "; 
+            tempText += " "; 
             if ( noc != cdt ) {
-                mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
+                tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
             }
         } else {
             if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) {
-                // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
+                // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
                 QString dfs = KGlobal::locale()->dateFormatShort();
                 KGlobal::locale()->setDateFormatShort("%d.%b");
-                mText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>";
+                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  ) {
-                        mText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>";
+                        tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>";
 
 
                     } else 
-                        mText +=((Todo*)ev)->dtDueTimeStr();
+                        tempText +=((Todo*)ev)->dtDueTimeStr();
                 mTodos.append( ev );
             }
         }
     }
-    mText += "</b></td><td>";
+    tempText += "</b></td><td>";
     bool needClose = false;
     if ( ev->cancelled() ) {
-        mText += "<font color=\"#F00000\">[c";
+        tempText += "<font color=\"#F00000\">[c";
         needClose =true;
 
     }
     if ( ev->isAlarmEnabled() ) { 
         if ( !needClose)
-            mText +="[";
-        mText += "a";
+            tempText +="[";
+        tempText += "a";
         needClose =true;
 
     }
     if ( ev->description().length() > 0 ) {
         if ( !needClose)
-            mText +="[";
-        mText += "i";
+            tempText +="[";
+        tempText += "i";
         needClose =true;
     }
     if ( ev->recurrence()->doesRecur() ) {
         if ( !needClose)
-            mText +="[";
-        mText += "r";
+            tempText +="[";
+        tempText += "r";
         needClose =true;
     }
     if ( needClose ) {
-        mText += "] ";
+        tempText += "] ";
     }
     if ( ev->cancelled() ) 
-        mText += "</font>";
-    mText += "<a ";
-    if (ev->type()=="Event") mText += "href=\"event:";
-    if (ev->type()=="Todo") mText += "href=\"todo:";
-    mText += ev->uid() + "\">";
+        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 )
-        mText += ev->summary();
+        tempText += ev->summary();
     else
-        mText += i18n("-no summary-"); 
-    mText += "</a>";
+        tempText += i18n("-no summary-"); 
+    tempText += "</a>";
     if ( KOPrefs::instance()->mWNViewShowLocation )
         if ( !ev->location().isEmpty() )
-            mText += " ("+ev->location() +")";
+            tempText += " ("+ev->location() +")";
     if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents)
-            mText += " ["+ev->relatedTo()->summary() +"]";
-    mText += "</td></tr>\n";
+            tempText += " ["+ev->relatedTo()->summary() +"]";
+    tempText += "</td></tr>\n";
+    mText += tempText;
 }
 
 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() + "\">";
     mText += ev->summary();
     mText += "</a>";