7 files changed, 75 insertions, 15 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1e83236..beb19d9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1838,9 +1838,10 @@ void CalendarView::readSettings()
     if ( ! list.isEmpty() ) {
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
-        h = list[3].toInt();
+        h = list[3].toInt(); 
+        KApplication::testCoords( &x,&y,&w,&h );
         topLevelWidget()->setGeometry(x,y,w,h);
 
     } else {
         topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
@@ -1850,8 +1851,9 @@ void CalendarView::readSettings()
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
+        KApplication::testCoords( &x,&y,&w,&h );
         mEventEditor->setGeometry(x,y,w,h);
 
     }
     list = config->readListEntry("EditTodoLayout");
@@ -1859,8 +1861,9 @@ void CalendarView::readSettings()
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
+        KApplication::testCoords( &x,&y,&w,&h );
         mTodoEditor->setGeometry(x,y,w,h);
 
     }
     list = config->readListEntry("ViewerLayout");
@@ -1868,8 +1871,9 @@ void CalendarView::readSettings()
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
+        KApplication::testCoords( &x,&y,&w,&h );
         getEventViewerDialog()->setGeometry(x,y,w,h);
     }
 #endif
     config->setGroup( "Views" );
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index a8652ea..c927b37 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -39,8 +39,9 @@
 #endif
 
 #include "kconfig.h"
 #include "kodialogmanager.h"
+#include <kapplication.h>
 
 KODialogManager::KODialogManager( CalendarView *mainView ) :
   QObject(), mMainView( mainView )
 {
@@ -203,8 +204,9 @@ void KODialogManager::showSearchDialog()
             x = list[0].toInt();
             y = list[1].toInt();
             w = list[2].toInt();
             h = list[3].toInt();
+            KApplication::testCoords( &x,&y,&w,&h );
             mSearchDialog->setGeometry(x,y,w,h);
        
         }
 
@@ -216,9 +218,9 @@ void KODialogManager::showSearchDialog()
 #else 
     mSearchDialog->setMaximumSize( QApplication::desktop()->size());
     mSearchDialog->showMaximized();
 #endif
-    mSearchDialog->raise();
+    mSearchDialog->raiseAndSelect();
 }
 
 SearchDialog * KODialogManager::getSearchDialog()
 {
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 3a07348..cf8dae6 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -31,8 +31,17 @@ class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 
+#define VIEW_WN_VIEW 1
+#define VIEW_NX_VIEW 2
+#define VIEW_J_VIEW 3
+#define VIEW_A_VIEW 4
+#define VIEW_ML_VIEW 5
+#define VIEW_M_VIEW 6
+#define VIEW_L_VIEW 7
+#define VIEW_T_VIEW 8
+
 class KOPrefs : public KPimPrefs
 {
   public:
     enum { FormatVCalendar, FormatICalendar };
@@ -289,8 +298,10 @@ class KOPrefs : public KPimPrefs
     bool mWTshowDetails;
     bool mWTshowCreated;
     bool mWTshowChanged;
 
+    int mCurrentDisplayedView;
+
   private:
     QDict<QColor> mCategoryColors;
     QColor mDefaultCategoryColor;
 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index c442d0b..406e741 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -226,17 +226,9 @@ void KOViewManager::showNextView()
  NEXT:
     if ( KOPrefs::instance()->mShowIconNext )  { showWhatsNextView();goto ENTE ;}
  NEXT_X:
     if ( KOPrefs::instance()->mShowIconNextDays )  { 
-        globalFlagBlockAgenda = 1;
-        if ( mCurrentAgendaView != 3 )
-            mCurrentAgendaView = -1;
-        showAgendaView(KOPrefs::instance()->mFullViewMonth);
-        globalFlagBlockAgenda = 2;
-        mMainView->dateNavigator()->selectDates( baseCycleDate ,
-                                                 KOPrefs::instance()->mNextXDays );
-        mFlagShowNextxDays = true;
-        mCurrentAgendaView = 3 ;
+        showNextXView();
         goto ENTE ;
     } 
  JOURNAL:
     if ( KOPrefs::instance()->mShowIconJournal )  { 
@@ -406,9 +398,9 @@ void KOViewManager::showWhatsNextView()
     }
     globalFlagBlockAgenda = 1;
     showView(mWhatsNextView, true );
     //mWhatsNextView->updateView();
- 
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW;
 }
 
 void  KOViewManager::slotprintWNV()
 {
@@ -452,8 +444,9 @@ void KOViewManager::showListView()
         mMainView->setBlockShowDates( false );
     }
     showView(mListView, KOPrefs::instance()->mFullViewTodo);
     //mFlagShowNextxDays = temp;
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW;
 }
 
 void KOViewManager::showAgendaView( bool fullScreen )
 {
@@ -517,9 +510,9 @@ void KOViewManager::showAgendaView( bool fullScreen )
         mAgendaView->updateConfig(); 
     }
    
     showView( mAgendaView, full);
-  
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW;
 }
 
 void KOViewManager::showDayView()
 { 
@@ -591,8 +584,9 @@ void KOViewManager::showNextXView()
     mMainView->dateNavigator()->selectDates( QDate::currentDate(),
                                              KOPrefs::instance()->mNextXDays );
     mFlagShowNextxDays = true;
     mCurrentAgendaView = 3 ;
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW;
 }
 bool KOViewManager::showsNextDays() 
 {
     return mFlagShowNextxDays;
@@ -675,8 +669,9 @@ void KOViewManager::showMonthViewWeek()
     }
     mMainView->dateNavigator()->selectWeek();
     showView(mMonthView, full );
     mMonthView->setKeyBFocus();
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_ML_VIEW ;
 }
 
 void KOViewManager::showMonth( const QDate & date )
 {
@@ -705,8 +700,9 @@ void KOViewManager::showMonthView()
     mMainView->dateNavigator()->selectMonth();
 
     showView(mMonthView, full );
     mMonthView->setKeyBFocus();
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_M_VIEW ;
    
 }
 
 void KOViewManager::showTodoView()
@@ -760,8 +756,9 @@ void KOViewManager::showTodoView()
     }
 
     globalFlagBlockAgenda = 1;
     showView( mTodoView, true );
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_T_VIEW ;
 
 }
 
 void KOViewManager::showJournalView()
@@ -777,8 +774,9 @@ void KOViewManager::showJournalView()
     }
 
     showView(mJournalView);
     mMainView->dateNavigator()->selectDates( 1 );
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW  ;
 }
 
 void KOViewManager::showTimeSpanView()
 {
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index d98915b..357154e 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -144,8 +144,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     mFlagKeyPressed = false;
     setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
     KPimGlobalPrefs::instance()->setGlobalConfig();
+    p->mCurrentDisplayedView = 0;
     if ( p->mHourSize >  22 )
         p->mHourSize = 22;
     QMainWindow::ToolBarDock tbd;
     if ( p->mToolBarHor ) {
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 341a839..db60383 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -76,9 +76,9 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     QHBox *incidenceGroup = new QHBox( topFrame );
     layout->addWidget(incidenceGroup);
 
     mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
-    mSearchEvent->setChecked(true);
+    //mSearchEvent->setChecked(true);
     mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
     mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup);
 
     QHBox *subjectGroup = new QHBox( topFrame );
@@ -128,8 +128,51 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 SearchDialog::~SearchDialog()
 {
   
 }
+void SearchDialog::raiseAndSelect()
+{
+
+    static int currentState = 0;
+
+    if ( !mSearchJournal->isChecked() && !mSearchTodo->isChecked()  && !mSearchEvent->isChecked() )
+        currentState = 0;
+    int newState = 0;
+    if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
+        newState = VIEW_J_VIEW;
+    }
+    else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
+        newState = VIEW_T_VIEW;
+    }
+    else {
+        newState = VIEW_A_VIEW;
+    }
+    if ( newState != currentState ) {
+        if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
+            if ( ! mSearchJournal->isChecked() ) {
+                mSearchJournal->setChecked( true );
+                mSearchTodo->setChecked( false );
+                mSearchEvent->setChecked( false );
+            }
+        }
+        else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
+            if ( !  mSearchTodo->isChecked()    ) {
+                mSearchTodo->setChecked( true );
+                mSearchJournal->setChecked( false );
+                mSearchEvent->setChecked( false );
+            }
+        }
+        else {
+            if ( ! mSearchEvent->isChecked() ) {
+                mSearchEvent->setChecked( true );
+                mSearchJournal->setChecked( false );
+                mSearchTodo->setChecked( false );
+            }
+        }
+    }
+    currentState = newState;
+    raise();
+}
 void SearchDialog::setFocusToList()
 {
     listView->resetFocus();
 }
@@ -200,9 +243,9 @@ void SearchDialog::updateConfig()
     listView->updateConfig();
 }
 void SearchDialog::updateView()
 {
- 
+    //qDebug("SearchDialog::updateView() %d ", isVisible());
     QRegExp re;
     re.setWildcard(true); // most people understand these better.
     re.setCaseSensitive(false);
     re.setPattern(searchEdit->text());
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index b730ed5..4559d20 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -48,8 +48,9 @@ class SearchDialog : public  QVBox
     SearchDialog(Calendar *calendar,CalendarView *parent=0);
     virtual ~SearchDialog();
     KOListView *listview(){ return listView;}
     void updateView();
+    void raiseAndSelect();
 
   public slots:
     void changeEventDisplay(Event *, int) { updateView(); } 
   void updateConfig();