1 files changed, 9 insertions, 7 deletions

diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index ba3bc05..4057ae0 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -1,270 +1,272 @@
 /*
   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 <qwidgetstack.h>
 
 #include <kconfig.h>
 #include <kglobal.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include <qdatetime.h>
 #include "calendarview.h"
 #include "datenavigator.h"
 #include "kotodoview.h"
 #include "koagendaview.h"
 #include "kodialogmanager.h"
 #include "komonthview.h"
 #include "kolistview.h"
 #include "kowhatsnextview.h"
 #include "kojournalview.h"
 #include "kotimespanview.h"
 #include "koprefs.h"
 #include "navigatorbar.h"
 #include "kdatenavigator.h"
 
 #include "koviewmanager.h"
 //extern bool externFlagMonthviewBlockPainting;
 
 //bool globalFlagBlockPainting = false;
 int globalFlagBlockAgenda = 0;
 int globalFlagBlockLabel = 0;
 int globalFlagBlockAgendaItemPaint = 1;
 int globalFlagBlockAgendaItemUpdate = 1;
 
 
 KOViewManager::KOViewManager( CalendarView *mainView ) :
     QObject(), mMainView( mainView )
 {
+
+    lastMode = 0;
+    lastCount = 0;
+    lastNDMode = false;
+    selecteddatescount = 0;
+    selecteddate = QDate ( 2000, 1, 1 );
+    baseCycleDate = QDate ( 2000, 1, 1 );
     mCurrentView = 0;
     flagResetViewChangeDate = 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") {
         if ( !KOPrefs::instance()->mMonthViewWeek )
             showMonthView();
         else
             showMonthViewWeek();
     }
     else if (view == "List") showListView();
     else if (view == "Journal") showJournalView();
     else if (view == "TimeSpan") showTimeSpanView();
     else if (view == "Todo") showTodoView();
     else {
         config->setGroup( "Views" );
         int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
         mCurrentAgendaView = dateCount;
         showAgendaView();
         mCurrentAgendaView = dateCount;
 #ifdef DESKTOP_VERSION
         QTimer::singleShot( 1000, mAgendaView, SLOT ( setInitStartHour() ) );
 #endif
     }
 }
 
 
 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->dateNavigator()->selectDate( date );
         lastMode = 1;
         mCurrentAgendaView = 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 ) {
         resetDateSilent( date,1);
         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() );
     } 
 }
 
    
 
 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::showNextView()
 { 
-    static int selecteddatescount = 0;
-    static QDate selecteddate = QDate ( 2000, 1, 1 );
-    static QDate baseCycleDate = QDate ( 2000, 1, 1 );
+
     int newCount = mMainView->dateNavigator()->selectedDates().count();
     if ( selecteddatescount != newCount && flagResetViewChangeDate == 0 ) {
         flagResetViewChangeDate = 1;
     }
     if ( selecteddate != mMainView->dateNavigator()->selectedDates().first() )
         flagResetViewChangeDate = 1;
     if ( flagResetViewChangeDate > 0 ) {
         baseCycleDate = mMainView->dateNavigator()->selectedDates().first();
         //qDebug("newCycle ");
     }
     if (mCurrentView == mWhatsNextView) goto NEXT_X;
     if (mCurrentView == mAgendaView && mFlagShowNextxDays)  goto JOURNAL;
     if  (mCurrentView == mJournalView )  goto DAY_1;
     if (mCurrentView == mAgendaView && mCurrentAgendaView == 1 )  goto DAY_5;
     if (mCurrentView == mAgendaView && mCurrentAgendaView == 5 )  goto DAY_7;
     if  (mCurrentView == mAgendaView )  goto DAY_6;
     if  (mCurrentView == mMonthView && KOPrefs::instance()->mMonthViewWeek)  goto MONTH;
     if  (mCurrentView == mMonthView )  goto LIST;
     if (mCurrentView == mListView ) goto TODO;
     // if  (mCurrentView == mTodoView )  goto NEXT;
  NEXT:
     if ( KOPrefs::instance()->mShowIconNext )  { showWhatsNextView();goto ENTE ;}
  NEXT_X:
     if ( KOPrefs::instance()->mShowIconNextDays )  { 
         showNextXView();
         goto ENTE ;
     } 
  JOURNAL:
     if ( KOPrefs::instance()->mShowIconJournal )  { 
         resetDateSilent( baseCycleDate , 1  );  
         showJournalView() ;goto ENTE ;}
  DAY_1:
     if ( KOPrefs::instance()->mShowIconDay1 )  { 
         resetDateSilent( baseCycleDate , 2  );    
         showDayView() ;goto ENTE ;}
  DAY_5:
     if ( KOPrefs::instance()->mShowIconDay5 )  {  
         resetDateSilent( baseCycleDate , 2  );   
         showWorkWeekView() ;goto ENTE ;}
  DAY_7:
     if ( KOPrefs::instance()->mShowIconDay7 )   {  
         resetDateSilent( baseCycleDate , 2  );   
         showWeekView();goto ENTE ;}
  DAY_6:
     if ( KOPrefs::instance()->mShowIconDay6 )   { 
         resetDateSilent( baseCycleDate , 2  );  
         showMonthViewWeek();goto ENTE ;}
  MONTH:
     if ( KOPrefs::instance()->mShowIconMonth )   { 
         resetDateSilent( baseCycleDate , 2  ); 
         showMonthView();goto ENTE ;}
  LIST:
     if ( KOPrefs::instance()->mShowIconList )  {  
         resetDateSilent( baseCycleDate , 2  );
         showListView() ;goto ENTE ;}
  TODO:
     if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;goto ENTE ;}
     if ( KOPrefs::instance()->mShowIconNext )  { goto NEXT ;}
     if ( KOPrefs::instance()->mShowIconNextDays )  { goto NEXT_X ;}
     if ( KOPrefs::instance()->mShowIconJournal )  { goto  JOURNAL;}
     if ( KOPrefs::instance()->mShowIconDay1 )  { goto DAY_1 ;}
     if ( KOPrefs::instance()->mShowIconDay5 )  { goto DAY_5 ;}
     if ( KOPrefs::instance()->mShowIconDay7 )   { goto DAY_7 ;}
     if ( KOPrefs::instance()->mShowIconDay6 )   { goto DAY_6 ;}