11 files changed, 100 insertions, 19 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1e83236..beb19d9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1746,222 +1746,226 @@ bool CalendarView::checkFileVersion(QString fn)
    setSyncDevice("deleteaftersync" );
    mSyncManager->mAskForPreferences = true;
    mSyncManager->mSyncAlgoPrefs = 3;
    mSyncManager->mWriteBackFile = false;
    mSyncManager->mWriteBackExistingOnly = false;
    mSyncManager->mShowSyncSummary = false;
    syncCalendar( fn, 3 );
    Event * e = getLastSyncEvent();
    mCalendar->deleteEvent ( e );
    updateView();
    return true;
 }
 bool CalendarView::saveCalendar( QString filename )
 {
 
    // Store back all unsaved data into calendar object
    // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
    if ( mViewManager->currentView() )
        mViewManager->currentView()->flushView();
    
    QDateTime lfv = QDateTime::currentDateTime().addSecs( -2);
    mStorage->setSaveFormat( new ICalFormat() );
    mStorage->setFileName( filename );
    bool success;
    success = mStorage->save();
    if ( !success ) {
        return false;
    }
    if ( filename == MainWindow::defaultFileName() ) {
        setLoadedFileVersion( lfv );
        watchSavedFile();
    }
    return true;
 }
 void CalendarView::closeCalendar()
 {
 
    // child windows no longer valid
    emit closingDown();
    mCalendar->close();
    setModified(false);
    updateView();
 }
 void CalendarView::archiveCalendar()
 {
    mDialogManager->showArchiveDialog();
 }
 void CalendarView::readSettings()
 {
 
  
    // mViewManager->showAgendaView();
    QString str;
    //qDebug("CalendarView::readSettings() ");
    // read settings from the KConfig, supplying reasonable
    // defaults where none are to be found
    KConfig *config = KOGlobals::config();
 #ifndef KORG_NOSPLITTER
    config->setGroup("KOrganizer Geometry");
    QValueList<int> sizes = config->readIntListEntry("Separator1");
    if (sizes.count() != 2) {
        sizes << mDateNavigator->minimumSizeHint().width();
        sizes << 300;
    }
    mPanner->setSizes(sizes);
    sizes = config->readIntListEntry("Separator2");
    if ( ( mResourceView && sizes.count() == 4 ) ||
         ( !mResourceView && sizes.count() == 3 ) ) {
        mLeftSplitter->setSizes(sizes);
    }
 #endif
    globalFlagBlockAgenda = 1;
    mViewManager->showAgendaView();
    //mViewManager->readSettings( config );
    mTodoList->restoreLayout(config,QString("Todo Layout"));
    readFilterSettings(config);
   
 #ifdef DESKTOP_VERSION
    config->setGroup("WidgetLayout");
    QStringList list;
    list = config->readListEntry("MainLayout");
    int x,y,w,h;
    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);
    }
    list = config->readListEntry("EditEventLayout");
    if ( ! list.isEmpty() ) {
        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");
    if ( ! list.isEmpty() ) {
        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");
    if ( ! list.isEmpty() ) {
        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" );
    int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
    QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
   
    int resetval = 0;
    int maxVal = 0;
    if (sizes.count() != 3) { 
        if ( KOPrefs::instance()->mVerticalScreen ) {
            resetval = mDateNavigator->sizeHint().width()+2;
        } else {
            resetval = mDateNavigator->sizeHint().height()+2;
        }
    }
    if ( resetval ) {
        sizes.clear();
        if ( KOPrefs::instance()->mVerticalScreen ) {
            maxVal = QApplication::desktop()->width() -10;
        } else {
            maxVal = QApplication::desktop()->height()-10;
        }
        sizes << resetval;
        if ( maxVal < resetval + resetval)
            resetval = maxVal - resetval;
        sizes << resetval;
        sizes << 100;
    }
    mLeftFrame->setSizes(sizes);
    sizes = config->readIntListEntry("Main Splitter Frame");
    resetval = 0;
    maxVal = 0;
    if (sizes.count() != 2) { 
        if ( !KOPrefs::instance()->mVerticalScreen ) {
            resetval = mDateNavigator->sizeHint().width()+2;
        } else {
            resetval = mDateNavigator->sizeHint().height()+2;
        }
    }
    if ( resetval ) {
        sizes.clear();
        if ( !KOPrefs::instance()->mVerticalScreen ) {
            maxVal = QApplication::desktop()->width() -10;
        } else {
            maxVal = QApplication::desktop()->height()-10;
        }
        sizes << resetval;
        if ( maxVal < resetval + resetval)
            resetval = maxVal - resetval;
        sizes << resetval;
    }
    mMainFrame->setSizes(sizes);
    if ( dateCount == 5 ) mNavigator->selectWorkWeek();
    else if ( dateCount == 7 ) mNavigator->selectWeek();
    else mNavigator->selectDates( dateCount );
    // mViewManager->readSettings( config );
    updateConfig(); 
    globalFlagBlockAgenda = 2;
    mViewManager->readSettings( config );
    QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) );
 }
 void CalendarView::writeSettings()
 {
    //  kdDebug() << "CalendarView::writeSettings" << endl;
    KConfig *config = KOGlobals::config();
    mViewManager->writeSettings( config );
    mTodoList->saveLayout(config,QString("Todo Layout"));
    mDialogManager->writeSettings( config );
    //KOPrefs::instance()->usrWriteConfig();
    KOPrefs::instance()->writeConfig();
    writeFilterSettings(config);
    config->setGroup( "Views" );
    config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() );
    QValueList<int> listINT = mLeftFrame->sizes();
    config->writeEntry("Left Splitter Frame",listINT);
    QValueList<int> listINT2 = mMainFrame->sizes();
    config->writeEntry("Main Splitter Frame",listINT2);
 #ifdef DESKTOP_VERSION
    config->setGroup("WidgetLayout");
    QStringList list ;//= config->readListEntry("MainLayout");
    int x,y,w,h;
    QWidget* wid;
    wid = topLevelWidget();
    x = wid->geometry().x();
    y = wid->geometry().y();
    w = wid->width();
    h = wid->height();
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index a8652ea..c927b37 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -1,316 +1,318 @@
 /*
  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.
 */
 #include <libkdepim/categoryeditdialog.h>
 #include "calendarview.h"
 #include "incomingdialog.h"
 #include "outgoingdialog.h"
 #include "koprefsdialog.h"
 #include "koeventeditor.h"
 #include "koprefs.h"
 #include "datenavigator.h"
 #include "kotodoeditor.h"
 #include "searchdialog.h"
 #include "filtereditdialog.h"
 #ifndef KORG_NOPLUGINS
 #include "plugindialog.h"
 #endif
 #ifndef KORG_NOARCHIVE
 #include "archivedialog.h"
 #endif
 #include "kconfig.h"
 #include "kodialogmanager.h"
+#include <kapplication.h>
 KODialogManager::KODialogManager( CalendarView *mainView ) :
  QObject(), mMainView( mainView )
 {
  mOutgoingDialog = 0;
  mIncomingDialog = 0;
  mOptionsDialog = 0;
  mSearchDialog = 0;
  mArchiveDialog = 0;
  mFilterEditDialog = 0;
  mPluginDialog = 0;
  // mCategoryEditDialog = new KPIM::CategoryEditDialog(KOPrefs::instance(),mMainView);
  //KOGlobals::fitDialogToScreen( mCategoryEditDialog );
 }
 KODialogManager::~KODialogManager()
 {
  delete mOutgoingDialog;
  delete mIncomingDialog;
  delete mOptionsDialog;
  delete mSearchDialog;
 #ifndef KORG_NOARCHIVE
  delete mArchiveDialog;
 #endif
  delete mFilterEditDialog;
 #ifndef KORG_NOPLUGINS
  delete mPluginDialog;
 #endif
 }
 OutgoingDialog *KODialogManager::outgoingDialog()
 {
  createOutgoingDialog();
  return mOutgoingDialog;
 }
 void KODialogManager::createOutgoingDialog()
 {
  if (!mOutgoingDialog) {
    mOutgoingDialog = new OutgoingDialog(mMainView->calendar(),mMainView);
    if (mIncomingDialog) mIncomingDialog->setOutgoingDialog(mOutgoingDialog);
    connect(mOutgoingDialog,SIGNAL(numMessagesChanged(int)),
            mMainView,SIGNAL(numOutgoingChanged(int)));
  }
 }
 void KODialogManager::showOptionsDialog( bool showSync )
 {
   
  if (!mOptionsDialog) {
    mOptionsDialog = new KOPrefsDialog(mMainView);
    //mOptionsDialog->readConfig();
    connect(mOptionsDialog,SIGNAL(configChanged()),
            mMainView,SLOT(updateConfig()));
    //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
    //      mOptionsDialog,SLOT(updateCategories()));
    
  }
  mOptionsDialog->readConfig();
 #ifndef DESKTOP_VERSION  
  mOptionsDialog->showMaximized();
 #else
  mOptionsDialog->show();
 #endif
  if ( showSync )
      mOptionsDialog->showSyncPage();
  mOptionsDialog->exec();
  
 }
 void KODialogManager::showSyncOptions()
 {
    showOptionsDialog( true );
 }
 void KODialogManager::showOutgoingDialog()
 {
  createOutgoingDialog();
  mOutgoingDialog->show();
  mOutgoingDialog->raise();
 }
 IncomingDialog *KODialogManager::incomingDialog()
 {
  createOutgoingDialog();
  if (!mIncomingDialog) {
    mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
    connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
            mMainView,SIGNAL(numIncomingChanged(int)));
    connect(mIncomingDialog,SIGNAL(calendarUpdated()),
            mMainView,SLOT(updateView()));
  }
  return mIncomingDialog;
 }
 void KODialogManager::createIncomingDialog()
 {
  createOutgoingDialog();
  if (!mIncomingDialog) {
    mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView);
    connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)),
            mMainView,SIGNAL(numIncomingChanged(int)));
    connect(mIncomingDialog,SIGNAL(calendarUpdated()),
            mMainView,SLOT(updateView()));
  }
 }
 void KODialogManager::showIncomingDialog()
 {
  createIncomingDialog();
  mIncomingDialog->show();
  mIncomingDialog->raise();
 }
 /*
 void KODialogManager::showCategoryEditDialog()
 {
  mCategoryEditDialog->show();
 }
 */
 void KODialogManager::hideSearchDialog()
 {
  if (mSearchDialog) 
      mSearchDialog->hide();
 }
 void KODialogManager::showSearchDialog()
 {
    if (!mSearchDialog) {
        mSearchDialog = new SearchDialog(mMainView->calendar(),mMainView); 
        KOListView * lview = mSearchDialog->listview();
        connect(lview, SIGNAL(showIncidenceSignal(Incidence *)),
                mMainView, SLOT(showIncidence(Incidence *)));
        connect(lview, SIGNAL(editIncidenceSignal(Incidence *)),
                mMainView, SLOT(editIncidence(Incidence *)));
        connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)),
                mMainView, SLOT(deleteIncidence(Incidence *)));
        connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)),
                mMainView, SLOT(cloneIncidence(Incidence *)));
        connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)),
                mMainView, SLOT(beamIncidence(Incidence *)));
        connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)),
                mMainView, SLOT(moveIncidence(Incidence *)));
        connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )),
                mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> )));
        connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig()));
        connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList()));
        //  connect( lview, SIGNAL( incidenceSelected( Incidence * ) ),
        //       mMainView, SLOT( processMainViewSelection( Incidence * ) ) );  
 #ifndef DESKTOP_VERSION    
        mSearchDialog->setMaximumSize( QApplication::desktop()->size());
        mSearchDialog->showMaximized();
 #else
        KConfig *config = KOGlobals::config();
        config->setGroup("WidgetLayout");
        QStringList list;
        list = config->readListEntry("SearchLayout");
        int x,y,w,h;
        if ( ! list.isEmpty() ) {
            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);
       
        }
 #endif
    }
    // make sure the widget is on top again 
 #ifdef DESKTOP_VERSION    
    mSearchDialog->show();
 #else 
    mSearchDialog->setMaximumSize( QApplication::desktop()->size());
    mSearchDialog->showMaximized();
 #endif
-    mSearchDialog->raise();
+    mSearchDialog->raiseAndSelect();
 }
 SearchDialog * KODialogManager::getSearchDialog()
 {
    return mSearchDialog;
 }
 void KODialogManager::showArchiveDialog()
 {
 #ifndef KORG_NOARCHIVE
  if (!mArchiveDialog) {
    mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView);
    connect(mArchiveDialog,SIGNAL(eventsDeleted()),
            mMainView,SLOT(updateView()));
  }
  mArchiveDialog->show();
  mArchiveDialog->raise();
  // Workaround.
  QApplication::restoreOverrideCursor();
 #endif
 }
 void KODialogManager::showFilterEditDialog(QPtrList<CalFilter> *filters)
 {
  if (!mFilterEditDialog) {
    mFilterEditDialog = new FilterEditDialog(filters,mMainView);
    connect(mFilterEditDialog,SIGNAL(filterChanged()),
            mMainView,SLOT(filterEdited()));
    
  }
 #ifndef DESKTOP_VERSION  
  mFilterEditDialog->showMaximized();
 #else
  mFilterEditDialog->show();
 #endif
  mFilterEditDialog->raise();
 }
 void KODialogManager::showPluginDialog()
 {
 #ifndef KORG_NOPLUGINS
  if (!mPluginDialog) {
    mPluginDialog = new PluginDialog(mMainView);
    connect(mPluginDialog,SIGNAL(configChanged()),
            mMainView,SLOT(updateConfig()));
  }
  mPluginDialog->show();
  mPluginDialog->raise();
 #endif
 }
 KOEventEditor *KODialogManager::getEventEditor()
 {
  KOEventEditor *eventEditor = new KOEventEditor( mMainView->calendar(),
                                                  mMainView );
  connect(eventEditor,SIGNAL(eventAdded(Event *)),
          mMainView,SLOT(eventAdded(Event *)));
  connect(eventEditor,SIGNAL(eventChanged(Event *)),
          mMainView,SLOT(eventChanged(Event *)));
  connect(eventEditor,SIGNAL(eventDeleted()),
          mMainView,SLOT(eventDeleted()));
  connect(eventEditor,SIGNAL(deleteAttendee(Incidence *)),
          mMainView,SLOT(schedule_cancel(Incidence *)));
  connect( eventEditor, SIGNAL(jumpToTime( const QDate  &)), 
           mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) );
  connect( eventEditor, SIGNAL( showAgendaView( bool)), 
           mMainView->viewManager(), SLOT(  showAgendaView( bool) ) );
  //  connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
  //      eventEditor,SLOT(updateCategoryConfig()));
  // connect(eventEditor,SIGNAL(editCategories()),
  //      mCategoryEditDialog,SLOT(show()));
  connect(eventEditor,SIGNAL(dialogClose(Incidence*)),
          mMainView,SLOT(dialogClosing(Incidence*)));
  //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject()));
 #ifndef DESKTOP_VERSION
  eventEditor->resize( QApplication::desktop()->width() -20, 100 );
 #endif
  return eventEditor;
 }
 KOTodoEditor *KODialogManager::getTodoEditor()
 {
  KOTodoEditor *todoEditor = new KOTodoEditor( mMainView->calendar(),
                                               mMainView );
  // connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
  //      todoEditor,SLOT(updateCategoryConfig()));
  //  connect(todoEditor,SIGNAL(editCategories()),mCategoryEditDialog,SLOT(show()));
  connect(todoEditor,SIGNAL(todoAdded(Todo *)),
          mMainView,SLOT(todoAdded(Todo *)));
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 3a07348..cf8dae6 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -1,130 +1,139 @@
 /*
    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>
 #include <qdict.h>
 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 };
    enum { MailClientKMail, MailClientSendmail };
    enum { IMIPDummy, IMIPKMail };
    enum { IMIPOutbox, IMIPdirectsend };
    enum { neverAuto, addressbookAuto, selectedAuto };
    enum { standardDestination, askDestination };
    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();
    void setAllDefaults();
  protected:
    void setTimeZoneIdDefault();
    /** 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;
    QStringList getDefaultList();
    QStringList getLocationDefaultList();
  public:
    // preferences data
    KConfig* getConfig();
    void setFullName(const QString &);
    QString fullName();
    void setEmail(const QString &);
    QString email();
    QString mAdditional;
    bool    mEmailControlCenter;
    bool    mBcc;
    bool    mAutoSave;
    int     mAutoSaveInterval;
    bool    mConfirm;
    bool    mEnableGroupScheduling;
    bool    mEnableProjectView;
    int     mDefaultFormat;
    int     mMailClient;
    int     mStartTime;
    int     mDefaultDuration;
    int     mAlarmTime;
    int     mWorkingHoursStart;
    int     mWorkingHoursEnd;
    bool    mExcludeHolidays;
    bool    mExcludeSaturdays;
    bool    mMarcusBainsShowSeconds;
    QFont   mTimeBarFont;
    QFont   mMonthViewFont;
    QFont   mAgendaViewFont;
    QFont   mMarcusBainsFont;
    QFont   mTimeLabelsFont;
    QFont   mTodoViewFont;
    QFont   mListViewFont;
    QFont   mDateNavigatorFont;
    QFont   mEditBoxFont;
    QFont   mJornalViewFont;
    QFont   mWhatsNextFont;
    QFont   mEventViewFont;
    QColor  mHolidayColor;
    QColor  mHighlightColor;
    QColor  mEventColor;
    QColor  mTodoDoneColor;
    QColor  mAgendaBgColor;
    QColor  mWorkingHoursColor;
@@ -197,109 +206,111 @@ class KOPrefs : public KPimPrefs
    bool mToolBarHor;
    bool mToolBarUp;
    bool mToolBarHorV;
    bool mToolBarUpV;
    bool mToolBarHorN;
    bool mToolBarUpN;
    bool mToolBarHorF;
    bool mToolBarUpF;
    bool mToolBarMiniIcons;
    bool mAskForQuit;
    bool mUsePassWd;
    bool mShowSyncEvents;
    bool mShowTodoInAgenda;
    bool mShowTimeInAgenda;
    bool mHideNonStartedTodos;
    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 mMonthViewUsesBigFont;
    bool mTodoViewUsesSmallFont;
    bool mTodoViewUsesForegroundColor;
    bool mMonthViewUsesForegroundColor;
    bool mHightlightDateTimeEdit;
    bool mShortDateInViewer;
    bool mShowDateNavigator;
    QStringList mLocationDefaults;
    QStringList mEventSummaryUser;
    QStringList mTodoSummaryUser;
    bool mUseInternalAlarmNotification;
    int mAlarmPlayBeeps;
    int mAlarmSuspendTime;
    int mAlarmSuspendCount;
    int mAlarmBeepInterval;
    int mOldLanguage;
    int mOldLoadedLanguage;
  
    QString mActiveSyncPort;
    QString mActiveSyncIP;
    // settings for eventviewer
    bool mEVshowDetails;
    bool mEVshowCreated;
    bool mEVshowChanged;
    bool mWTshowDetails;
    bool mWTshowCreated;
    bool mWTshowChanged;
+    int mCurrentDisplayedView;
  private:
    QDict<QColor> mCategoryColors;
    QColor mDefaultCategoryColor;
    QFont mDefaultTimeBarFont;
    QFont mDefaultViewFont;
    QFont mDefaultMonthViewFont;
    QString mName;
    QString mEmail;
 };
 #endif
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index c442d0b..406e741 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -134,696 +134,694 @@ void KOViewManager::showDateView( int view, QDate date)
    } 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 )  { 
-        globalFlagBlockAgenda = 1;
+        showNextXView();
-        if ( mCurrentAgendaView != 3 )
-            mCurrentAgendaView = -1;
-        showAgendaView(KOPrefs::instance()->mFullViewMonth);
-        globalFlagBlockAgenda = 2;
-        mMainView->dateNavigator()->selectDates( baseCycleDate ,
-                                                 KOPrefs::instance()->mNextXDays );
-        mFlagShowNextxDays = true;
-        mCurrentAgendaView = 3 ;
        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 ;}
    if ( KOPrefs::instance()->mShowIconMonth )   {goto MONTH ;}
    if ( KOPrefs::instance()->mShowIconList )  {  goto LIST ;}
    //if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;goto ENTE ;}
 ENTE:
    flagResetViewChangeDate = 0;
    selecteddatescount =  mMainView->dateNavigator()->selectedDates().count();
    selecteddate = mMainView->dateNavigator()->selectedDates().first();
 }
 void KOViewManager::resetDateSilent( QDate date , int days )
 {
    mMainView->dateNavigator()->blockSignals( true );
    mMainView->dateNavigator()->selectDates( date , days ); 
    mMainView->dateNavigator()->blockSignals( false );
 }
 void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
 {
    if ( flagResetViewChangeDate < 10 )
        ++flagResetViewChangeDate;
    //mFlagShowNextxDays = false;
    //if(view == mCurrentView) return;  
    if ( view == 0 ) {
        view = mCurrentView;
        if ( view == 0 )
            return;
    }
    bool callupdate = !(view == mCurrentView);
    bool full = fullScreen;
    if(view == mCurrentView && view != mWhatsNextView ) {
        if ( mCurrentAgendaView < 0 )
            return;
        if ( view != mMonthView )
            full = mMainView->leftFrame()->isVisible();
    } else {
        if ( view == mMonthView && mMonthView)
            ;//mMonthView->skipResize = true ; 
        mCurrentView = view;
        // bool full = fullScreen;
        bool isFull = !mMainView->leftFrame()->isVisible();
        if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen )
            full = true;
        if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen )
            full = false;
    }
    if ( mAgendaView ) mAgendaView->deleteSelectedDateTime();
    //raiseCurrentView( full );
    mMainView->processIncidenceSelection( 0 );
    //mMainView->updateView();
    raiseCurrentView( full, callupdate );
    mMainView->adaptNavigationUnits();
 }
 void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
 {
    mCurrentAgendaView = 0;
    if ( fullScreen ) {
        mMainView->leftFrame()->hide();
    } else {
        mMainView->leftFrame()->show();
    }
    //if ( mCurrentView == mMonthView )  qApp->processEvents();
    emit signalFullScreen( !fullScreen );
    if ( callUpdateView )
        mMainView->updateView();
        
    if ( globalFlagBlockAgenda ==  5 ) {
        globalFlagBlockAgenda =  4;
        globalFlagBlockAgendaItemPaint = 1;
    }
    mMainView->viewStack()->raiseWidget(mCurrentView);
    if ( globalFlagBlockAgenda ==  4 ) {
        if ( mCurrentView == mAgendaView ) {
            //globalFlagBlockAgenda =1 ;
            if ( KOPrefs::instance()->mSetTimeToDayStartAt )
                mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins  );
            else if ( KOPrefs::instance()->mCenterOnCurrentTime )
                mAgendaView->setStartHour( QTime::currentTime ().hour() );
            qApp->processEvents();  
            //qDebug("qApp->processEvents() ");
            globalFlagBlockAgenda = 0;
            mAgendaView->repaintAgenda();
        } 
        globalFlagBlockAgenda = 0;
    }
    emit signalAgendaView( mCurrentView == mAgendaView );
    //qDebug("raiseCurrentView ende ");
 }
 void KOViewManager::updateView()
 {
    // qDebug("KOViewManager::updateView() ");
    // if we are updating mTodoView, we get endless recursion
    if ( mTodoView == mCurrentView )
        return;
    if ( mCurrentView ) mCurrentView->updateView();
 }
 void KOViewManager::updateView(const QDate &start, const QDate &end)
 {
    //  kdDebug() << "KOViewManager::updateView()" << endl;
    if (mCurrentView) mCurrentView->showDates(start, end);
    if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView();
 }
 void KOViewManager::updateWNview()
 {
    if ( mCurrentView == mWhatsNextView && mWhatsNextView )
        mWhatsNextView->updateView();
    if ( mCurrentView == mMonthView && mMonthView )
        mMonthView->updateView();
        
 }
 void KOViewManager::showWhatsNextView()
 {
    if (!mWhatsNextView) {
        mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(),
                                             "KOViewManager::WhatsNextView");
        mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog());
        connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig()));
        addView(mWhatsNextView);
         connect(this, SIGNAL( printWNV() ),
             mWhatsNextView, SLOT( printMe() ) );
    }
    globalFlagBlockAgenda = 1;
    showView(mWhatsNextView, true );
    //mWhatsNextView->updateView();
- 
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW;
 }
 void  KOViewManager::slotprintWNV()
 {
    if (!mWhatsNextView) 
        showWhatsNextView();
    emit  printWNV();
 }
 void KOViewManager::showListView()
 {
    if (!mListView) {
        mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView");
        addView(mListView);
        connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)),
                mMainView, SLOT(showIncidence(Incidence *)));
        connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)),
                mMainView, SLOT(editIncidence(Incidence *)));
        connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                mMainView, SLOT(deleteIncidence(Incidence *)));
        connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ),
                 mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); 
        connect( mListView, SIGNAL( signalNewEvent() ),
                 mMainView, SLOT( newEvent() ) );
        connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); 
        connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); 
        connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); 
        connect( mListView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( moveIncidence( Incidence * ) ) );
        connect( mListView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( beamIncidence( Incidence * ) ) );
    }
    // bool temp = mFlagShowNextxDays;
    //globalFlagBlockPainting = true;
    globalFlagBlockAgenda = 1;
    if ( KOPrefs::instance()->mListViewMonthTimespan ) {
        mMainView->setBlockShowDates( true );
        mMainView->dateNavigator()->selectMonth();
        mMainView->setBlockShowDates( false );
    }
    showView(mListView, KOPrefs::instance()->mFullViewTodo);
    //mFlagShowNextxDays = temp;
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW;
 }
 void KOViewManager::showAgendaView( bool fullScreen )
 {
    mMainView->dialogManager()->hideSearchDialog();
    // qDebug("KOViewManager::showAgendaView ");
    bool full;
    full = fullScreen;
    if (!mAgendaView) {
        full = false; 
        mAgendaView = new KOAgendaView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::AgendaView"); 
        addView(mAgendaView);
 #ifndef DESKTOP_VERSION
        QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold );
 #endif
        connect( mAgendaView, SIGNAL( incidenceChanged(Incidence  *, int )),
                 mMainView, SLOT( changeIncidenceDisplay( Incidence  *, int ) ));
        // SIGNALS/SLOTS FOR DAY/WEEK VIEW
        connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate )));
        connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)),
                mMainView, SLOT(newTodoDateTime(QDateTime,bool)));
        connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)),
                mMainView, SLOT(newEvent(QDateTime)));
        connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)),
             mMainView, SLOT(newEvent(QDateTime,QDateTime)));
        connect(mAgendaView,SIGNAL(newEventSignal(QDate)),
                mMainView, SLOT(newEvent(QDate)));
        connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)),
                mMainView, SLOT(editIncidence(Incidence *)));
        connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)),
                mMainView, SLOT(showIncidence(Incidence *)));
        connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                mMainView, SLOT(deleteIncidence(Incidence *)));
        connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ),
                 mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
        connect(mAgendaView, SIGNAL( toggleExpand() ),
                mMainView, SLOT( toggleExpand() ) );
      
        connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), 
                 mMainView, SLOT(cloneIncidence(Incidence *) ) ) ;
        connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), 
                 mMainView, SLOT(cancelIncidence(Incidence *) ) ) ;
        connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); 
        connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView,
                 SLOT( updateTodo( Todo *, int ) ) );  
        connect(  mAgendaView,SIGNAL( todoMoved( Todo *, int )),
                  mMainView, SIGNAL( todoModified( Todo *, int )));
        connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( moveIncidence( Incidence * ) ) );
        connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( beamIncidence( Incidence * ) ) );
        connect( mAgendaView, SIGNAL( selectWeekNum( int ) ),
                 mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) );
        mAgendaView->readSettings(); 
        mAgendaView->updateConfig(); 
    }
   
    showView( mAgendaView, full);
-  
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW;
 }
 void KOViewManager::showDayView()
 { 
    mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
    mFlagShowNextxDays =  false;
    globalFlagBlockLabel = 1;
    globalFlagBlockAgenda = 1;
    if ( mCurrentAgendaView != 1 )
        mCurrentAgendaView = -1;
    showAgendaView();
    qApp->processEvents();  
    globalFlagBlockAgenda = 2;
    globalFlagBlockLabel = 0;
    mMainView->dateNavigator()->selectDates( 1 );
    mCurrentAgendaView = 1 ;
    
 }
 void KOViewManager::showWorkWeekView()
 {
    mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
    mFlagShowNextxDays =  false;
    globalFlagBlockAgenda = 1;
    globalFlagBlockLabel = 1;
    if ( mCurrentAgendaView != 5 )
        mCurrentAgendaView = -1;
    showAgendaView();
    qApp->processEvents();  
    globalFlagBlockAgenda = 2;
    globalFlagBlockLabel = 0;
    mMainView->dateNavigator()->selectWorkWeek();
    mCurrentAgendaView = 5 ;
   
 }
 void KOViewManager::showWeekView()
 {
    /*
      globalFlagBlockAgenda = 2;
      qDebug("4globalFlagBlockAgenda = 2; ");
      //globalFlagBlockPainting = true;
      mMainView->dateNavigator()->selectWeek();
      showAgendaView();
    */
    mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
    mFlagShowNextxDays = false;
    globalFlagBlockAgenda = 1;
    globalFlagBlockLabel = 1;
    if ( mCurrentAgendaView != 7 )
        mCurrentAgendaView = -1;
    showAgendaView();
    qApp->processEvents();  
    globalFlagBlockAgenda = 2;
    globalFlagBlockLabel = 0;  
    mMainView->dateNavigator()->selectWeek();
    mCurrentAgendaView = 7 ;
 }
 void KOViewManager::showNextXView()
 {
      
    globalFlagBlockAgenda = 1;
    if ( mCurrentAgendaView != 3 )
        mCurrentAgendaView = -1;
    showAgendaView(KOPrefs::instance()->mFullViewMonth);
    globalFlagBlockAgenda = 2;
    mMainView->dateNavigator()->selectDates( QDate::currentDate(),
                                             KOPrefs::instance()->mNextXDays );
    mFlagShowNextxDays = true;
    mCurrentAgendaView = 3 ;
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW;
 }
 bool KOViewManager::showsNextDays() 
 {
    return mFlagShowNextxDays;
 }
 void KOViewManager::createMonthView()
 {
 if (!mMonthView) {
        mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView");
     
        addView(mMonthView);
        // mMonthView->show();
        // SIGNALS/SLOTS FOR MONTH VIEW
        connect(mMonthView, SIGNAL(newEventSignal(QDateTime)),
                mMainView, SLOT(newEvent(QDateTime)));
        connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)),
                mMainView, SLOT(showIncidence(Incidence *)));
        connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)),
                mMainView, SLOT(editIncidence(Incidence *)));
        connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                mMainView, SLOT(deleteIncidence(Incidence *)));
        connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ),
                 mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
        connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
        connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
        connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( moveIncidence( Incidence * ) ) );
        connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( beamIncidence( Incidence * ) ) );
        connect( mMonthView, SIGNAL( selectWeekNum( int ) ),
                 mMainView->dateNavigator(), SLOT ( selectWeekFromMonthView( int ) ) );
        connect( mMonthView, SIGNAL( selectMonth() ),
                 mMainView->dateNavigator(), SLOT ( selectMonthFromMonthview() ) );
        connect( mMonthView, SIGNAL( showDaySignal( QDate ) ),
                 mMainView, SLOT ( showDay( QDate ) ) );
        connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig()));
        connect( mMonthView, SIGNAL(nextMonth() ),
                 mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) );
        connect( mMonthView, SIGNAL(prevMonth() ),
                 mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ),
                 mMainView->dateNavigator(), SLOT( selectPreviousYear() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ),
                 mMainView->dateNavigator(), SLOT( selectNextYear() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ),
                 mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ),
                 mMainView->dateNavigator(), SLOT( selectNextMonth() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ),
                 mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ),
                 mMainView->dateNavigator(), SLOT( selectNextWeek() ) );
        
        connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
                 mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) );
        
        
        connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ),
                 mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) );
    }
 }
 void KOViewManager::showMonthViewWeek()
 {
    createMonthView();
    globalFlagBlockAgenda = 1;
    bool full = true;
    if ( mCurrentView == mMonthView)
        full = mMainView->leftFrame()->isVisible();
    if ( !KOPrefs::instance()->mMonthViewWeek ) {
        mMonthView->switchView();
        if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
            full = false;
        else
            full = true;
    }
    mMainView->dateNavigator()->selectWeek();
    showView(mMonthView, full );
    mMonthView->setKeyBFocus();
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_ML_VIEW ;
 }
 void KOViewManager::showMonth( const QDate & date )
 {
    mMainView->dateNavigator()->blockSignals( true );
    mMainView->dateNavigator()->selectDate( date );
    mMainView->dateNavigator()->blockSignals( false );
    showMonthView();
 }
 void KOViewManager::showMonthView()
 {
    
     createMonthView();
    globalFlagBlockAgenda = 1;
    //mFlagShowNextxDays = false;
    bool full = true;
    if ( mCurrentView == mMonthView)
        full = mMainView->leftFrame()->isVisible();
    // if(mMonthView == mCurrentView) return; 
    if ( KOPrefs::instance()->mMonthViewWeek ) {
        mMonthView->switchView();
        if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
            full = false;
        else
            full = true;
    }
    mMainView->dateNavigator()->selectMonth();
    showView(mMonthView, full );
    mMonthView->setKeyBFocus();
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_M_VIEW ;
   
 }
 void KOViewManager::showTodoView()
 {
    //mFlagShowNextxDays = false;
    if ( !mTodoView ) {
        mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(),
                                    "KOViewManager::TodoView" );
    
        addView( mTodoView ); 
        // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold );
  
        // SIGNALS/SLOTS FOR TODO VIEW
        connect( mTodoView, SIGNAL( newTodoSignal() ),
                 mMainView, SLOT( newTodo() ) );
        connect( mTodoView, SIGNAL( newSubTodoSignal( Todo * ) ),
                 mMainView, SLOT( newSubTodo( Todo *) ) );
        connect( mTodoView, SIGNAL( showTodoSignal( Todo *) ),
                 mMainView, SLOT( showTodo( Todo * ) ) );
        connect( mTodoView, SIGNAL( editTodoSignal( Todo * ) ),
                 mMainView, SLOT( editTodo( Todo * ) ) );
        connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ),
                 mMainView, SLOT( deleteTodo( Todo * ) ) );
        connect( mTodoView, SIGNAL( purgeCompletedSignal() ),
                 mMainView, SLOT( purgeCompleted() ) );
        connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ),
                 mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
        connect( mMainView, SIGNAL( configChanged() ), mTodoView,
                 SLOT( updateConfig() ) ); 
        connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView,
                 SLOT( updateTodo( Todo *, int ) ) );
        connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ),
                 mMainView, SIGNAL ( todoModified( Todo *, int ) ) );
        connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence *  ) ),
                 mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
        connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence *  ) ),
                 mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
        connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ),
                 mMainView, SLOT ( todo_unsub( Todo * ) ) );
        connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ),
                 mMainView, SLOT ( todo_resub( Todo *, Todo *) ) );
        connect( mTodoView, SIGNAL( moveTodoSignal( Incidence *  ) ),
                 mMainView, SLOT ( moveIncidence( Incidence * ) ) );
        connect( mTodoView, SIGNAL( beamTodoSignal( Incidence *  ) ),
                 mMainView, SLOT ( beamIncidence( Incidence * ) ) );
        KConfig *config = KOGlobals::config();
        mTodoView->restoreLayout(config,"Todo View");
        mTodoView->setNavigator( mMainView->dateNavigator() );
    }
    globalFlagBlockAgenda = 1;
    showView( mTodoView, true );
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_T_VIEW ;
 }
 void KOViewManager::showJournalView()
 {
    //mFlagShowNextxDays = false;
    if (!mJournalView) {
        mJournalView = new KOJournalView(mMainView->calendar(),mMainView->viewStack(),
                                         "KOViewManager::JournalView"); 
        connect( mMainView, SIGNAL( configChanged() ), mJournalView,
                 SLOT( updateConfig() ) );
        connect(mJournalView, SIGNAL(deleteJournal(Journal *) ), mMainView,SLOT(deleteJournal(Journal *)) );
        addView(mJournalView);
    }
    showView(mJournalView);
    mMainView->dateNavigator()->selectDates( 1 );
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW  ;
 }
 void KOViewManager::showTimeSpanView()
 {
    //mFlagShowNextxDays = false;
    if (!mTimeSpanView) {
        mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(),
                                           "KOViewManager::TimeSpanView");
        addView(mTimeSpanView);
        mTimeSpanView->readSettings();
    }
    showView(mTimeSpanView);
 }
 Incidence *KOViewManager::currentSelection()
 {
    if (!mCurrentView) return 0;
    if ( mCurrentView == mListView ) {
        if ( mListView->currentItem() )
            return mListView->currentItem();
    }
    return mCurrentView->selectedIncidences().first();
 }
 QDate KOViewManager::currentSelectionDate()
 {
    QDate qd;
    if (mCurrentView) {
        DateList qvl = mCurrentView->selectedDates();
        if (!qvl.isEmpty()) qd = qvl.first();
    }
    return qd;
 }
 void KOViewManager::addView(KOrg::BaseView *view)
 {
 #if QT_VERSION >= 0x030000
    mMainView->viewStack()->addWidget( view );
 #else
    mMainView->viewStack()->addWidget( view, 1 );
 #endif
 }
 void KOViewManager::setDocumentId( const QString &id )
 {
    if (mTodoView) mTodoView->setDocumentId( id );
 }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index d98915b..357154e 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -52,192 +52,193 @@
 #include "kdialogbase.h"
 #include "kapplication.h"
 #include "kofilterview.h"
 #include "kstandarddirs.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "ktoolbar.h"
 #include "klocale.h"
 #include "kconfig.h"
 #include "simplealarmclient.h"
 #include "externalapphandler.h"
 using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #ifdef _OL_IMPORT_
 #include "koimportoldialog.h"
 #endif
 #endif
 #include "mainwindow.h"
 class KOex2phonePrefs : public QDialog
 {
  public:
    KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
      QDialog( parent, name, true ) 
    {
        setCaption( i18n("Export to phone options") );
        QVBoxLayout* lay = new QVBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QLabel *lab;
        lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
        lab->setAlignment (AlignHCenter  ); 
        QHBox* temphb;
        temphb = new QHBox( this );
        new QLabel( i18n("I/O device: "), temphb ); 
        mPhoneDevice = new QLineEdit( temphb);
        lay->addWidget( temphb );
        temphb = new QHBox( this );
        new QLabel( i18n("Connection: "), temphb ); 
        mPhoneConnection = new QLineEdit( temphb);
        lay->addWidget( temphb );
        temphb = new QHBox( this );
        new QLabel( i18n("Model(opt.): "), temphb ); 
        mPhoneModel = new QLineEdit( temphb);
        lay->addWidget( temphb );
        mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this );
        mWriteBackFuture->setChecked( true );
        lay->addWidget( mWriteBackFuture );
        temphb = new QHBox( this );
        new QLabel( i18n("Max. weeks in future: ") , temphb );
        mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
        mWriteBackFutureWeeks->setValue( 8 );
        lay->addWidget( temphb );  
        lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );  
        lab->setAlignment (AlignHCenter  ); 
        QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
        lay->addWidget( ok );
        QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
        lay->addWidget( cancel );
        connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
        connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
        resize( 220, 240 );
        qApp->processEvents();
        int dw = QApplication::desktop()->width();
        int dh = QApplication::desktop()->height();
        move( (dw-width())/2, (dh - height() )/2 );
    }
   
 public:
    QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
    QCheckBox* mWriteBackFuture;
    QSpinBox* mWriteBackFutureWeeks;
 };
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
    QMainWindow( parent, name )
 {
    mClosed = false;
    //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
    QString confFile = locateLocal("config","korganizerrc");
    QFileInfo finf ( confFile );
    bool showWarning =  !finf.exists();
    setIcon(SmallIcon( "ko24" )  );
    mBlockAtStartup = true;
    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 ) {
        if ( p->mToolBarUp )
            tbd = Bottom;
        else
            tbd = Top;
    }
    else {
        if ( p->mToolBarUp )
            tbd = Right;
        else
            tbd = Left;
    }
    if ( KOPrefs::instance()->mUseAppColors )
        QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
    globalFlagBlockStartup = 1;
    iconToolBar = new QPEToolBar( this );
    addToolBar (iconToolBar , tbd );
 #ifdef DESKTOP_VERSION
    if ( KOPrefs::instance()->mShowIconFilter ) 
 #else
    if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) 
 #endif
 {
        if ( p->mToolBarHorF ) {
            if ( p->mToolBarUpF )
                tbd = Bottom;
            else
                tbd = Top;
        }
        else {
            if ( p->mToolBarUpF )
            tbd = Right;
            else
                tbd = Left;
        }
        filterToolBar = new QPEToolBar ( this );
        filterMenubar = new QPEMenuBar( filterToolBar );
        QFontMetrics fm ( filterMenubar->font() );
            
        filterPopupMenu = new QPopupMenu( this );
        filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
        QString addTest = "Ax";  
 #ifdef DESKTOP_VERSION
        addTest = "AAAx"; 
 #endif
        filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+addTest ) );
        addToolBar (filterToolBar , tbd );
        connect ( filterPopupMenu , SIGNAL( activated ( int )  ), this, SLOT (selectFilterPopup( int ) ) );
        connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
        if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
            filterToolBar->hide();
    } else {
        filterToolBar = 0;
        filterMenubar  = 0;
        filterPopupMenu = 0;
    }
    if ( p->mShowIconOnetoolbar ) {
        viewToolBar = iconToolBar ;
        navigatorToolBar = iconToolBar ;
    } else {
 #ifndef DESKTOP_VERSION
        setToolBarsMovable( false );
 #endif
        if ( p->mToolBarHorV ) {
            if ( p->mToolBarUpV )
                tbd = Bottom;
            else
                tbd = Top;
        }
        else {
            if ( p->mToolBarUpV )
                tbd = Right;
            else
                tbd = Left;
        }
        viewToolBar = new QPEToolBar( this );
        addToolBar (viewToolBar , tbd );
        if ( p->mToolBarHorN ) {
            if ( p->mToolBarUpN )
                tbd = Bottom;
            else
                tbd = Top;
        }
        else {
            if ( p->mToolBarUpN )
                tbd = Right;
            else
                tbd = Left;
        }
        navigatorToolBar = new QPEToolBar( this );
        addToolBar (navigatorToolBar , tbd );
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 341a839..db60383 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -1,300 +1,343 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 1998 Preston Brown
    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.
 */
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qwhatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <libkdepim/kdateedit.h>
 #include "koglobals.h"
 #include "koprefs.h"
 #include "klineedit.h"
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "searchdialog.h"
 SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
    : QVBox( 0  )
 {
    mCalendar = calendar;
    QFrame *topFrame = new QFrame( this ) ;//plainPage();
    QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
    // Search expression
    QHBoxLayout *subLayout = new QHBoxLayout();
    layout->addLayout(subLayout);
    searchLabel = new QLabel(topFrame);
    searchLabel->setText(i18n("Search for:"));
    subLayout->addWidget(searchLabel);
    searchEdit = new KLineEdit(topFrame);
    subLayout->addWidget(searchEdit);
    QPushButton *OkButton = new QPushButton(  i18n("&Find"), topFrame );
    //OkButton->setDefault( true );
    connect(OkButton,SIGNAL(clicked()),SLOT(doSearch()));
    subLayout->addWidget(OkButton);
    searchEdit->setText("*"); // Find all events by default
    searchEdit->setFocus();
    connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & )));
    connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
    // Subjects to search
    // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
    //                                        topFrame);
    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 );
    layout->addWidget(subjectGroup);
    mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
    mSummaryCheck->setChecked(true);
    mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
    mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
    QHBox *attendeeGroup = new QHBox( topFrame );
    layout->addWidget(attendeeGroup );
    new QLabel( i18n("Attendee:"),attendeeGroup );
    mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup  );
    mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup );
    // Date range
    // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"),
    //                                    topFrame);
    // layout->addWidget(rangeGroup);
    QWidget *rangeWidget = new QWidget(topFrame);
    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint());
    rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget));
    mStartDate = new KDateEdit(rangeWidget);
    rangeLayout->addWidget(mStartDate);
    rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget));
    mEndDate = new KDateEdit(rangeWidget);
    mEndDate->setDate(QDate::currentDate().addDays(365));
    rangeLayout->addWidget(mEndDate);
    QToolButton *wt = QWhatsThis::whatsThisButton (  rangeWidget );
    rangeLayout->addWidget( (QWidget*)wt );
    layout->addWidget(rangeWidget);
    // Results list view
    listView = new KOListView(mCalendar,topFrame);
    layout->addWidget(listView);
    listView->readSettings(KOGlobals::config(),"SearchListView Layout");
    connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList()));
    setCaption( i18n("KO/Pi Find: "));
 #ifdef DESKTOP_VERSION
    OkButton = new QPushButton(  i18n("Close"), this  );
    connect(OkButton,SIGNAL(clicked()),SLOT(hide()));
 #endif
 }
 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();
 }
 void SearchDialog::accept()
 {
    doSearch();
 }
 void SearchDialog::updateList()
 {
    //listView->updateList();
    if ( isVisible() ) {
        updateView();
        //qDebug("SearchDialog::updated ");
    }
    else {
        listView->clear();
        //qDebug("SearchDialog::cleared ");
    }
 }
 void SearchDialog::searchTextChanged( const QString &_text )
 {
 #if 0
    enableButton( KDialogBase::User1, !_text.isEmpty() );
 #endif
 }
 void SearchDialog::doSearch()
 {
    QRegExp re;
    re.setWildcard(true); // most people understand these better.
    re.setCaseSensitive(false);
    re.setPattern(searchEdit->text());
    if (!mSearchEvent->isChecked() && !mSearchTodo->isChecked() && !mSearchJournal->isChecked() ) {
        KMessageBox::sorry(this,
                           i18n("Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals"));
        return;
    }
    if (!re.isValid() ) {
        KMessageBox::sorry(this,
                           i18n("Invalid search expression,\ncannot perform "
                                "the search.\nPlease enter a search expression\n"
                                "using the wildcard characters\n '*' and '?'"
                                "where needed."));
        return;
    }
    search(re);
    listView->setStartDate( mStartDate->date() );
    listView->showEvents(mMatchedEvents);
    listView->addTodos(mMatchedTodos);
    listView->addJournals(mMatchedJournals);
    if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) {
        setCaption(i18n("No items found. Use '*' and '?' where needed."));
    } else {
        QString mess; 
        mess = mess.sprintf( i18n("%d item(s) found."), mMatchedEvents.count()+ mMatchedJournals.count() + mMatchedTodos.count() );
        setCaption( i18n("KO/Pi Find: ") + mess);
    }
    searchEdit->setFocus();
 }
 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());
    if (re.isValid()) {
        search(re);
    } else {
        mMatchedEvents.clear();
        mMatchedTodos.clear();
        mMatchedJournals.clear();
    }
    listView->setStartDate( mStartDate->date() );
    listView->showEvents(mMatchedEvents);
    listView->addTodos(mMatchedTodos);
    listView->addJournals(mMatchedJournals);
 }
 void SearchDialog::search(const QRegExp &re)
 {
    QPtrList<Event> events = mCalendar->events( mStartDate->date(),
                                                mEndDate->date(),
                                                false /*mInclusiveCheck->isChecked()*/ );
    mMatchedEvents.clear();
    if ( mSearchEvent->isChecked() ) {
        Event *ev;
        for(ev=events.first();ev;ev=events.next()) {
            if (mSummaryCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                if (re.search(ev->summary()) != -1) 
 #else
                    if (re.match(ev->summary()) != -1) 
 #endif
                        {
                            mMatchedEvents.append(ev);
                            continue;
                        }
 #if QT_VERSION >= 0x030000
                if (re.search(ev->location()) != -1) 
 #else
                    if (re.match(ev->location()) != -1) 
 #endif
                        {
                            mMatchedEvents.append(ev);
                            continue;
                        }
            }
            if (mDescriptionCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                if (re.search(ev->description()) != -1) 
 #else
                    if (re.match(ev->description()) != -1) 
 #endif
                        {    
                            mMatchedEvents.append(ev);
                            continue;
                        }
            }
            if (mCategoryCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                if (re.search(ev->categoriesStr()) != -1) 
 #else
                    if (re.match(ev->categoriesStr()) != -1) 
 #endif
                        {
                            mMatchedEvents.append(ev);
                            continue;
                        }
            }
            if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
                QPtrList<Attendee> tmpAList = ev->attendees();
                Attendee *a;
                for (a = tmpAList.first(); a; a = tmpAList.next()) {
                    if (mSearchAName->isChecked()) {
 #if QT_VERSION >= 0x030000
                        if (re.search(a->name()) != -1) 
 #else
                            if (re.match(a->name()) != -1) 
 #endif
                                {    
                                    mMatchedEvents.append(ev);
                                    break;
                                }
                    }
                    if (mSearchAEmail->isChecked()) {
 #if QT_VERSION >= 0x030000
                        if (re.search(a->email()) != -1) 
 #else
                            if (re.match(a->email()) != -1) 
 #endif
                                {    
                                    mMatchedEvents.append(ev);
                                    break;
                                }
                    }
                }
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index b730ed5..4559d20 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -1,94 +1,95 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 1998 Preston Brown
    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 SEARCHDIALOG_H
 #define SEARCHDIALOG_H
 #include <qregexp.h>
 #include <kdialogbase.h>
 #include <qvbox.h>
 #include <libkcal/calendar.h>
 #include "kolistview.h"
 class KDateEdit;
 class QCheckBox;
 class QLineEdit;
 class KLineEdit;
 class QLabel;
 class CalendarView;
 using namespace KCal;
 class SearchDialog : public  QVBox 
 {
    Q_OBJECT
  public:
    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();
  void updateList();
  protected slots:
  void setFocusToList();
    void  accept();
    void doSearch();
            void searchTextChanged( const QString &_text );
  signals:
    void showEventSignal(Event *);
    void editEventSignal(Event *);
    void deleteEventSignal(Event *);
  private:
    void search(const QRegExp &);
    Calendar *mCalendar;
    
    QPtrList<Event> mMatchedEvents;
    QPtrList<Todo> mMatchedTodos;
    QPtrList<Journal> mMatchedJournals;
    
    QLabel *searchLabel;
    KLineEdit *searchEdit;
    KOListView *listView;
    
    KDateEdit *mStartDate;
    KDateEdit *mEndDate;
    QCheckBox *mSummaryCheck;
    QCheckBox *mDescriptionCheck;
    QCheckBox *mCategoryCheck;
    QCheckBox *mSearchEvent;
    QCheckBox *mSearchTodo;
    QCheckBox *mSearchJournal;
    QCheckBox *mSearchAName;
    QCheckBox *mSearchAEmail;
    void keyPressEvent ( QKeyEvent *e) ;
 };
 #endif
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index c60b566..029f14b 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -19,193 +19,193 @@
 ** 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.
 **
 **********************************************************************/
 #include "KDGanttMinimizeSplitter.h"
 #ifndef QT_NO_SPLITTER___
 #include "qpainter.h"
 #include "qdrawutil.h"
 #include "qbitmap.h" 
 #if QT_VERSION >= 0x030000
 #include "qptrlist.h"
 #include "qmemarray.h"
 #else
 #include <qlist.h>
 #include <qarray.h>
 #define QPtrList QList
 #define QMemArray QArray
 #endif
 #include "qlayoutengine_p.h"
 #include "qobjectlist.h"
 #include "qstyle.h"
 #include "qapplication.h" //sendPostedEvents
 #include <qvaluelist.h>
 #include <qcursor.h>
 #ifndef KDGANTT_MASTER_CVS
 //#include "KDGanttMinimizeSplitter.moc"
 #endif
 #ifndef DOXYGEN_SKIP_INTERNAL
 #if QT_VERSION >= 232
 static int mouseOffset;
 static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky
 KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
                                  KDGanttMinimizeSplitter *parent, const char * name )
    : QWidget( parent, name ), _activeButton( 0 ), _collapsed( false )
 {
    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 );
    mMouseDown = false;
    //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()*/ ) {
+    if ( 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());
        mMouseDown = true;
        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 )
 {
    mMouseDown = false;
    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;
@@ -390,192 +390,197 @@ void kdganttGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int
  \endcode
  In KDGanttMinimizeSplitter, the boundary can be either horizontal or
  vertical.  The default is horizontal (the children are side by side)
  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) );
+#ifndef DESKTOP_VERSION
+     setOpaqueResize( false );
+#else
+     setOpaqueResize( true );
+#endif
 }
 #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() )
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index f05b91b..80a83e0 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -1,111 +1,126 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "kapplication.h"
 #include "ktextedit.h"
 #include <qapplication.h>
 #include <qstring.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qtextbrowser.h>
 int KApplication::random()
 {
  return rand();
 }
 //US
 QString KApplication::randomString(int length)
 {
   if (length <=0 ) return QString::null;
   QString str;
   while (length--)
   {
      int r=random() % 62;
      r+=48;
      if (r>57) r+=7;
      if (r>90) r+=6;
      str += char(r);
      // so what if I work backwards?
   }
   return str;
 }
 int KApplication::execDialog( QDialog* d )
 {
    if (QApplication::desktop()->width() <= 640 )    
        d->showMaximized();
    else
        ;//d->resize( 800, 600 );
    return d->exec();
 }
 void KApplication::showLicence()
 {
   KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/licence.txt" );
 }
+void KApplication::testCoords( int* x, int* y, int* wid, int * hei )
+{
+    int dWid = QApplication::desktop()->width() ;
+    int dHei = QApplication::desktop()->height();
+    if ( *x + *wid > dWid ) {
+        *x = 0;
+        if ( *wid > dWid )
+            *wid = dWid; 
+    }
+    if ( *y + *hei > dHei ) {
+        *y = 0;
+        if ( *hei > dHei )
+            *hei = dHei; 
+    }
+}
 void KApplication::showFile(QString caption, QString fn)
 {
    QString text;
    QString fileName;
 #ifndef DESKTOP_VERSION
   fileName = getenv("QPEDIR");
   fileName += "/pics/" + fn ;
 #else
   fileName  = qApp->applicationDirPath () + "/" + fn;
 #endif 
    QFile file( fileName );
    if (!file.open( IO_ReadOnly ) ) {
        return ;
    } 
    QTextStream ts( &file );
    text = ts.read();
    file.close();
    KApplication::showText( caption, text );
  
 }
 
 bool KApplication::convert2latin1(QString fileName)
 {
    QString text;
    QFile file( fileName );
    if (!file.open( IO_ReadOnly ) ) {
        return false;
        
    } 
    QTextStream ts( &file );
    ts.setEncoding( QTextStream::UnicodeUTF8 );
    text = ts.read();
    file.close();  
    if (!file.open( IO_WriteOnly ) ) {
        return false;
    }
    QTextStream tsIn( &file );
    tsIn.setEncoding( QTextStream::Latin1 );
    tsIn << text.latin1();
    file.close(); 
    return true; 
 
 }
 void KApplication::showText(QString caption, QString text)
 {
    QDialog dia( 0, "name", true ); ;
    dia.setCaption( caption );
    QVBoxLayout* lay = new QVBoxLayout( &dia );
    lay->setSpacing( 3 );
    lay->setMargin( 3 );
    KTextEdit tb ( &dia );
    tb.setWordWrap( QMultiLineEdit::WidgetWidth );
    lay->addWidget( &tb ); 
    tb.setText( text );
 #ifdef DESKTOP_VERSION
    dia.resize( 640, 480);
 #else
    dia.showMaximized();
 #endif
    dia.exec();
 }
diff --git a/microkde/kapplication.h b/microkde/kapplication.h
index 497ec2f..f7eb1ef 100644
--- a/microkde/kapplication.h
+++ b/microkde/kapplication.h
@@ -1,30 +1,31 @@
 #ifndef MINIKDE_KAPPLICATION_H
 #define MINIKDE_KAPPLICATION_H
 #include "qstring.h"
 #include <qdialog.h>
 #ifdef QDialog 
 #undef  QDialog 
 #endif
 class KApplication
 {
  public:
    static int random();
 //US
  /**
   * Generates a random string.  It operates in the range [A-Za-z0-9]
   * @param length Generate a string of this length.
   * @return the random string
   */
  static QString randomString(int length);
  static int execDialog( QDialog* ); 
  static void showLicence(); 
+  static void testCoords( int* x, int* y, int* wid, int * hei ); 
  static void showFile(QString caption, QString file); 
  static void showText(QString caption, QString text); 
  static bool convert2latin1(QString file); 
 };
 #endif
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index 3d1889f..a3b7fff 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -1,191 +1,191 @@
 /*
    This file is part of libkresources.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library 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
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #include <kdebug.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 //#ifndef DESKTOP_VERSION
 #include <klibloader.h>
 //#endif
 #include <qfile.h>
 #include "resource.h"
 #include "factory.h"
 using namespace KRES;
 QDict<Factory> *Factory::mSelves = 0;
 static KStaticDeleter< QDict<Factory> > staticDeleter;
 Factory *Factory::self( const QString& resourceFamily)
 {
  Factory *factory = 0;
  if ( !mSelves )
  {
    mSelves = staticDeleter.setObject( new QDict<Factory> );
  }
  factory = mSelves->find( resourceFamily );
  if ( !factory ) {
    factory = new Factory( resourceFamily);
    mSelves->insert( resourceFamily, factory );
  }
  return factory;
 }
 Factory::Factory( const QString& resourceFamily) :
  mResourceFamily( resourceFamily )
 {
 //US so far we have three types available for resourceFamily "contact"
 // and that are "file", "dir", "ldap"
 /*US
  KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin", QString( "[X-KDE-ResourceFamily] == '%1'" )
                                                .arg( resourceFamily ) );
  KTrader::OfferList::ConstIterator it;
  for ( it = plugins.begin(); it != plugins.end(); ++it ) {
    QVariant type = (*it)->property( "X-KDE-ResourceType" );
    if ( !type.toString().isEmpty() )
      mTypeMap.insert( type.toString(), *it );
  }
 */
 //US new
  PluginInfo* info = new PluginInfo;
  info->library = "microkabc_file";
  info->nameLabel = i18n( "file" );
-  info->descriptionLabel = i18n( "Choose one file" );
+  info->descriptionLabel = i18n( "One file" );
  mTypeMap.insert( "file", info );
  info = new PluginInfo;
  info->library = "microkabc_dir";
  info->nameLabel = i18n( "dir" );
-  info->descriptionLabel = i18n( "Choose a directory with may files" );
+  info->descriptionLabel = i18n( "A directory with many files" );
  mTypeMap.insert( "dir", info );
  info = new PluginInfo;
  info->library = "microkabc_ldap";
  info->nameLabel = i18n( "ldap" );
-  info->descriptionLabel = i18n( "No description available" );
+  info->descriptionLabel = i18n( "Connect to a directory server" );
  mTypeMap.insert( "ldap", info );
  //US add opie plugin only, if the library exists.
  /*US
  QString libname = "microkabc_opie";
  QString path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
  if ( !path.isEmpty() )
  {
    info = new PluginInfo;
    info->library = libname;
    info->nameLabel = i18n( "opie" );
    info->descriptionLabel = i18n( "Opie PIM Addressbook." );
    mTypeMap.insert( "opie", info );
  }
  */
  //US add qtopia plugin only, if the library exists.
  QString libname = "microkabc_qtopia";
  QString path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
  if ( !path.isEmpty() )
  {
    info = new PluginInfo;
    info->library = libname;
    info->nameLabel = i18n( "qtopia" );
    info->descriptionLabel = i18n( "Qtopia PIM Addressbook." );
    mTypeMap.insert( "qtopia", info );
  }
  //US add sharp plugin only, if the library exists.
  libname = "microkabc_sharpdtm";
  path = KLibLoader::findLibrary( QFile::encodeName( libname ) );
  if ( !path.isEmpty() )
  {
    info = new PluginInfo;
    info->library = libname;
    info->nameLabel = i18n( "sharp" );
    info->descriptionLabel = i18n( "Sharp DTM Addressbook." );
    mTypeMap.insert( "sharp", info );
  }
 }
 Factory::~Factory()
 {
 }
 QStringList Factory::typeNames() const
 {
 //US method QMap::keys() not available yet. SO collect the data manually
 //US return mTypeMap.keys();
  QStringList result;
  QMap<QString, PluginInfo*>::ConstIterator it;
  for( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) {
    result << it.key().latin1();
 //    qDebug("Factory::typeNames() : %s ", it.key().latin1());
  }
  return result;
 }
 ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent )
 {
  if ( type.isEmpty() || !mTypeMap.contains( type ) )
    return 0;
 //US  KService::Ptr ptr = mTypeMap[ type ];
 //US  KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() );
  PluginInfo* pi = mTypeMap[ type ];
  KLibFactory *factory = (KLibFactory *)KLibLoader::self()->factory( pi->library.latin1() );
  if ( !factory ) {
    qDebug("KRES::Factory::configWidget(): Factory creation failed for library %s", pi->library.latin1());
    kdDebug() << "KRES::Factory::configWidget(): Factory creation failed" << endl;
    return 0;
  }
  PluginFactoryBase *pluginFactory = static_cast<PluginFactoryBase *>( factory );
  if ( !pluginFactory ) {
    qDebug("KRES::Factory::configWidget(): no plugin factory for library %s", pi->library.latin1());
    kdDebug() << "KRES::Factory::configWidget(): no plugin factory." << endl;
    return 0;
  }
  ConfigWidget *wdg = pluginFactory->configWidget( parent );
  if ( !wdg ) {
 //US    kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
      qDebug("%s is not a %s plugin.", pi->library.latin1(), mResourceFamily.latin1());
    return 0;
  }
  return wdg;
 }
 QString Factory::typeName( const QString &type ) const