fihix

6 files changed, 22 insertions, 13 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 6945864..65bb075 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,50 +1,54 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.0.5 ************
+
+Bugfixes in KO/Pi.
+
 ********** VERSION 2.0.4 ************
 
 KO/Pi:
 Fixed problem loading translations for summary/location edit boxes in event/todo editor.
 
 Added a general "select week number" to the toolbar.
 
 Fixed some small problem of the new features introduced in version 2.0.3.
 
 Made it possible to specify one specific category as category color,
 if more than one categories are selected.
 
 Fixed a bug in saving colors for categories with non-ascii characters.
 (Like, e.g. German Umlauts).
 Propably you have to set your colors again for those categories. 
 
 
 ********** VERSION 2.0.3 ************
 
 KO/Pi:
 Added feature for changing alarm settings for many items at once:
 Open list view (or search dialog), select the desired items and choose in
 the popup menu: Set alarm for selected...
 
 Added to the event/todo viewer the option to send an email to 
 all attendees or all selected (with RSVP) attendees. 
 
 Made the week-month mode changing in month view faster.
 
 Made month view better useable with keyboard.
 Now TAB key jumps to next cell with an event/todo.
 Scroll in cell with coursor keys, scroll in time (next week) with
 Shift/Control + coursorkeys.
 
 Fixed bug that the todo view flat mode was reset after first view update.
 
 If a todo is displayed closed in the todo view, 
 it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties.
 
 Added info about the numbers of years to the caption (title) information about a birthday event.
 
 Made completion date in todo editor editable.
 
 Added possibility to save/load templates for journals.
 (Which is just a simple "save text to file" or "insert text from file".
 
 ********** VERSION 2.0.2 ************
 
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 04c6aa1..4c53aac 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,51 +1,51 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.0.4
+Version: 2.0.5
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 
 %description
 This package contains the platform-independent PIM programs from
 www.pi-sync.net, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data 
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 
 After installation, you should have a 
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9b9e164..6ae4c6f 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -745,98 +745,100 @@ void MonthViewCell::newEvent()
     emit newEventSignal( dt );
 }
 void MonthViewCell::cellClicked( QListBoxItem *item )
 {
     static  QListBoxItem * lastClicked = 0;
     if ( item == 0 ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
     /*
       if ( lastClicked )
       if ( ! item ) {
       if ( lastClicked->listBox() != item->listBox() )
       lastClicked->listBox()->clearSelection();
       }
     */
  
     mMonthView->setSelectedCell( this );
     if( KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) enableScrollBars( true );
     select();
 }
 
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
     if ( !item ) return;
   
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->showContextMenu( incidence );
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) return;
 
     mMonthView->setSelectedCell( this );
 }
 
 
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
 
 
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     : KOEventView( calendar, parent, name ),
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
-      mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
+      mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
+    mShortDayLabelsM = false;
+    mShortDayLabelsW = false;
     skipResize = false;
     clPending = true;
     mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" );
     mWidStack = new QWidgetStack( this );
     QVBoxLayout* hb = new QVBoxLayout( this );
     mMonthView = new QWidget( mWidStack );
     mWeekView = new QWidget( mWidStack );
 #if QT_VERSION >= 0x030000
     mWidStack->addWidget(mMonthView );
     mWidStack->addWidget(mWeekView  );
 #else
     mWidStack->addWidget( mMonthView, 1 );
     mWidStack->addWidget( mWeekView , 1 );
 #endif
     hb->addWidget( mNavigatorBar );
     hb->addWidget( mWidStack );
     mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
     mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
     if ( mShowWeekView )
         mWeekStartsMonday = true;
     updatePossible = false;
     //updatePossible = true;
     mCells.setAutoDelete( true );
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     mDayLabels.resize( mDaysPerWeek );
     mDayLabelsW.resize( mDaysPerWeek );
     QFont bfont = font();
     if ( QApplication::desktop()->width() < 650 ) {
         bfont.setPointSize( bfont.pointSize() - 2 );
     }
     bfont.setBold( true );
     int i;
   
     for( i = 0; i < mDaysPerWeek; i++ ) {
         QLabel *label = new QLabel( mMonthView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabels.insert( i, label );
         label = new QLabel( mWeekView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabelsW.insert( i, label );
     }
 
@@ -1005,116 +1007,116 @@ void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
 }
 
 void KOMonthView::updateConfig()
 {
  
     mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView ) {
         mWeekStartsMonday = true;
     } 
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
 
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
     bool temp = mShowSatSunComp ;
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     if ( !  mShowWeekView ) {
         if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
             computeLayout();
     }
     updateDayLabels();
     //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
     //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
     //resizeEvent( 0 );
     for (uint i = 0; i < mCells.count(); ++i) {
         mCells[i]->updateConfig();
     }
 
     for (uint i = 0; i < mCellsW.count(); ++i) {
         mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
     }
 #ifdef DESKTOP_VERSION
     MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
 #endif
     updateView();
 }
 
 void KOMonthView::updateDayLabels()
 {
   
     QPtrVector<QLabel> *mDayLabelsT;
 
     mDayLabelsT = &mDayLabelsW;
     for (int i = 0; i < 7; i++) {
         if (mWeekStartsMonday) {
-            bool show = mShortDayLabels;
+            bool show = mShortDayLabelsW;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         } else {
-            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels));
-            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
+            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW));
+            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW));
 
         }
     }
     mDayLabelsT = &mDayLabels;
     for (int i = 0; i < 7; i++) {
         if (mWeekStartsMonday) {
-            bool show = mShortDayLabels;
+            bool show = mShortDayLabelsM;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         } else {
-            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels));
-            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
+            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM));
+            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM));
 
         }
     }
 
 }
 
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
     //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
 
     QPtrVector<MonthViewCell> *cells;
     QPtrVector<QLabel> *dayLabels;
     QPtrVector<KOWeekButton> *weekLabels;
     int weekNum = 6;
     if ( mShowWeekView ) {
         weekNum = 1;
         cells = &mCellsW;
         dayLabels = &mDayLabelsW;
         weekLabels = &mWeekLabelsW;
     } else {
         cells = &mCells;
         dayLabels = &mDayLabels;
         weekLabels = &mWeekLabels;
     }
 
     mStartDate = start;
 
     int startWeekDay = mWeekStartsMonday ? 1 : 7;
 
     while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) {
         mStartDate = mStartDate.addDays( -1 );
     }
 
     bool primary = false;
     uint i;
     for( i = 0; i < (*cells).size(); ++i ) {
         QDate date = mStartDate.addDays( i );
         (*cells)[i]->setDate( date );
 
 #ifndef KORG_NOPLUGINS
         // add holiday, if present
         QString hstring(KOCore::self()->holiday(date));
         (*cells)[i]->setHoliday( hstring );
 #endif
 
     }
     QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
     for( i = 0; i < weekNum; ++i ) {
@@ -1341,97 +1343,97 @@ void KOMonthView::computeLayoutWeek()
         else
             mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei;
     for ( i = 0; i < mCellsW.count(); ++i) {
         if ( i > 6 ) {
             mCellsW[i]->hide();
             continue;
         }
         
         w = colWid;
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
         if ( i  == (daysToShow-1-rowModulo)*7)
             ++h; 
       
         if ( i >= 5 ) {
             if ( i ==5 ) {
                 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 
                 x -= w ;y += h/2;
             } else {
                 if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
                     ++w;
                 }
                 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 
                 y -= h/2;
             }
         } else
             mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
                 
        
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h+dayLabelHei ;
         }
     }
     y= dayLabelHei;
     h = cellHei ;
     mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
     mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
     // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
     //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
-    mShortDayLabels = mDayLabelsW[0]->width() < mWidthLongDayLabel ;
+    mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ;
     updateDayLabels();
     //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("M"));
     //if ( forceUpdate )
     //  updateView();
 }
 void KOMonthView::computeLayout()
 {
   
 
     static int lastWid = 0;
     static int lastHei = 0;
 
     if ( mShowWeekView ){
             computeLayoutWeek();
             return;
     }
     int daysToShow = 7;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) {
         return;  
     }
     if ( lastWid == width() && lastHei == height() ){
         return;
     }
 
     lastWid = width();
     lastHei =  height();
     //qDebug("KOMonthView::computeLayout() MMM ------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabels[0]->sizeHint().height();
     int cellHei = (hei - dayLabelHei) /6; 
@@ -1457,97 +1459,97 @@ void KOMonthView::computeLayout()
         } else
             mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei ;
     for ( i = 0; i < mCells.count(); ++i) {
         //qDebug("iii %d ", i);
         w = colWid;
         if ( ((i) % 7) >= 7-colModulo ) {
             ++w;
         }
         if ( i  == (6-rowModulo)*7)
             ++h; 
         if ( combinedSatSun ) {
             if ( (i)%7 >=  daysToShow-1 ) {
                 if ( (i)%7 ==  daysToShow-1 ) {
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 
                     x -= w ;y += h/2;
                 } else {
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 
                     y -= h/2;
                 }
             } else
                 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
                 
         }
         else
             mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h;
         }
     }
     y= dayLabelHei;
     h = cellHei ;
     for ( i = 0; i < 6; i++) {
         if ( i  == (6-rowModulo))
             ++h;
         mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
         y += h;                            
     }
     mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
     // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
     //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
-    mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ;
+    mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ;
     updateDayLabels();
     //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 }
 
 void KOMonthView::showContextMenu( Incidence *incidence )
 {
     mContextMenu->showIncidencePopup(incidence);
     /*
       if( incidence && incidence->type() == "Event" ) {
       Event *event = static_cast<Event *>(incidence);
       mContextMenu->showEventPopup(event);
       } else {
       kdDebug() << "MonthView::showContextMenu(): cast failed." << endl;
       }
     */
 }
 MonthViewCell * KOMonthView::selectedCell( )
 {
     return mSelectedCell;
 }
 void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
     // qDebug("KOMonthView::setSelectedCell ");
     if ( mSelectedCell && mSelectedCell != cell ) {
         MonthViewCell * mvc = mSelectedCell;
         mSelectedCell = cell;
         mvc->deselect();
     } else 
         mSelectedCell = cell;
     //  if ( mSelectedCell )
     //         mSelectedCell->select();
     if ( !mSelectedCell )
         emit incidenceSelected( 0 );
     else 
         emit incidenceSelected( mSelectedCell->selectedIncidence() );
 }
 
 void KOMonthView::processSelectionChange()
 {
     QPtrList<Incidence> incidences = selectedIncidences();
     if (incidences.count() > 0) {
         emit incidenceSelected( incidences.first() );
     } else {
         emit incidenceSelected( 0 );
     }
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index bf861ef..03f9dc6 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -237,61 +237,62 @@ class KOMonthView: public KOEventView
     virtual void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
     void clearSelection();
 
     void showContextMenu( Incidence * );
 
     void setSelectedCell( MonthViewCell * );
 
   protected slots:
     void selectInternalWeekNum ( int );
     void switchView();
     void processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
     void selectWeekNum ( int );
     void showDaySignal( QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
     NavigatorBar* mNavigatorBar;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
     int mNumCells;
     bool mWeekStartsMonday;
     bool mShowSatSunComp;
     void computeLayout();
     void computeLayoutWeek();
 
     QPtrVector<MonthViewCell> mCells;
     QPtrVector<QLabel> mDayLabels;
     QPtrVector<KOWeekButton> mWeekLabels;
     QPtrVector<MonthViewCell> mCellsW;
     QPtrVector<QLabel> mDayLabelsW;
     QPtrVector<KOWeekButton> mWeekLabelsW;
 
-    bool mShortDayLabels;
+    bool mShortDayLabelsM;
+    bool mShortDayLabelsW;
     int mWidthLongDayLabel;
 
     QDate mStartDate;
 
     MonthViewCell *mSelectedCell;
 
     KOEventPopupMenu *mContextMenu;
     void keyPressEvent ( QKeyEvent * ) ;
 
 };
 
 #endif
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 90be237..b0f26d1 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -61,141 +61,143 @@ KOViewManager::KOViewManager( CalendarView *mainView ) :
     QObject(), mMainView( mainView )
 {
     mCurrentView = 0;
 
     mWhatsNextView = 0;
     mTodoView = 0;
     mAgendaView = 0;
     mMonthView = 0;
     mListView = 0;
     mJournalView = 0;
     mTimeSpanView = 0; 
     mCurrentAgendaView = 0 ;
     mFlagShowNextxDays = false;
 }
 
 KOViewManager::~KOViewManager()
 {
 }
 
 
 KOrg::BaseView *KOViewManager::currentView()
 {
     return mCurrentView;
 }
 
 void KOViewManager::readSettings(KConfig *config)
 {
     config->setGroup("General");
     QString view = config->readEntry("Current View");
     if (view == "WhatsNext") showWhatsNextView();
     else if (view == "Month") showMonthView();
     else if (view == "List") showListView();
     else if (view == "Journal") showJournalView();
     else if (view == "TimeSpan") showTimeSpanView();
     else if (view == "Todo") showTodoView();
     else {
         showAgendaView();
     }
 }
 
 void KOViewManager::showDateView( int view, QDate date)
 {
     static int lastMode = 0;
     static int lastCount = 0;
     static bool lastNDMode = false;
     static QDate lastDate;
     //qDebug("date %d %s", view, date.toString().latin1());
 
+    if (view != 9)
+        lastMode = 0;
     //qDebug("%d %d  ", lastNDMode, mFlagShowNextxDays );
     bool savemFlagShowNextxDays = mFlagShowNextxDays;
     mFlagShowNextxDays = false;
     if ( view == 3 ) {
         //mCurrentAgendaView = 1 ;
         lastDate = mMainView->dateNavigator()->selectedDates().first();
         lastCount = mMainView->dateNavigator()->selectedDates().count();
         lastNDMode = savemFlagShowNextxDays;
         mMainView->showDay( date );
+        lastMode = 1;
     } else if (view == 4 ) {
         mCurrentAgendaView = 7 ;
         mMainView->dateNavigator()->selectDates( date, 7 );
     } else if (view == 5 ) {
         mCurrentAgendaView = 14 ;
         mMainView->dateNavigator()->selectDates( date, 14);
     } else if (view == 6 ) {
         //mMainView->dateNavigator()->selectDates( date, 7 );
         showMonthView();
     } else if (view == 7 ) {
         mMainView->dateNavigator()->selectDate( date );
         showJournalView();
     } else if (view == 8 ) {
         globalFlagBlockAgenda = 1;
         if ( mCurrentAgendaView != 3 )
             mCurrentAgendaView = -1;
         showAgendaView(KOPrefs::instance()->mFullViewMonth);
         globalFlagBlockAgenda = 2;
         mMainView->dateNavigator()->selectDates( date ,
                                                  KOPrefs::instance()->mNextXDays );
         mFlagShowNextxDays = true;
         mCurrentAgendaView = 3 ;
     } if (view == 9) { // return behaviour, for getting back from mode == 3 (single day mode )
         if ( lastMode ) {
             mCurrentAgendaView = lastCount ;
             mMainView->dateNavigator()->selectDates( lastDate, lastCount);
             mFlagShowNextxDays = lastNDMode;
             if ( mFlagShowNextxDays  ) {
                 mCurrentAgendaView = 3 ;
             }
         } else
             showWeekView();
     } else if (view == 10) {
         mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() );
     } 
-    lastMode = view;
 }
 
    
 
 void KOViewManager::writeSettings(KConfig *config)
 {
      config->setGroup("General");
 
     QString view;
     if (mCurrentView == mWhatsNextView) view = "WhatsNext";
     else if (mCurrentView == mMonthView) view = "Month";
     else if (mCurrentView == mListView) view = "List";
     else if (mCurrentView == mJournalView) view = "Journal";
     else if (mCurrentView == mTimeSpanView) view = "TimeSpan";
     else if (mCurrentView == mTodoView) view = "Todo";
     else view = "Agenda";
 
     config->writeEntry("Current View",view);
 
     if (mAgendaView) {
         mAgendaView->writeSettings(config);
     }
     if (mTimeSpanView) {
         mTimeSpanView->writeSettings(config);
     }
     if (mListView) {
         mListView->writeSettings(config);
     }
     if (mTodoView) {
         mTodoView->saveLayout(config,"Todo View");
     }
 }
 
 void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
 {
  
     //mFlagShowNextxDays = false;
     //if(view == mCurrentView) return;  
     if ( view == 0 ) {
         view = mCurrentView;
         if ( view == 0 )
             return;
     }
     bool full = fullScreen;
     if(view == mCurrentView && view != mWhatsNextView ) {
         if ( mCurrentAgendaView < 0 )
             return;
         full = mMainView->leftFrame()->isVisible();
diff --git a/version b/version
index 0584395..2976531 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.4";
+version = "2.0.5";