fixes

11 files changed, 35 insertions, 17 deletions

diff --git a/kaddressbook/details/look_details.cpp b/kaddressbook/details/look_details.cpp
index 51ec0c0..11d06e9 100644
--- a/kaddressbook/details/look_details.cpp
+++ b/kaddressbook/details/look_details.cpp
@@ -1,258 +1,258 @@
 /*                                                                      
     This file is part of KAddressBook.
     Copyright (c) 1996-2002 Mirko Boehm <mirko@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 <kconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
 #include <qcursor.h>
 #include <qdir.h>
 #include <qpainter.h>
 #include <qpopupmenu.h>
 
 #include "global.h"
 #include "kabentrypainter.h"
 
 #include "look_details.h"
 
 #define GRID 5
 
 const QString KABDetailedView::mBorderedBGDir = "kab3part/backgrounds/bordered/";
 const QString KABDetailedView::mTiledBGDir = "kab3part/backgrounds/tiled/";
 
 KABDetailedView::KABDetailedView( QWidget *parent, const char *name )
   : KABBasicLook( parent, name ), mPainter( 0 ), mBackgroundStyle( None ),
     mDefaultBGColor( white ), mHeadLineBGColor( darkBlue ),
     mHeadLineTextColor( yellow ), mGrid( 3 ), mMenuBorderedBG( 0 ),
     mMenuTiledBG( 0 )
 {
   KToggleAction** actions[] = {
     &mActionShowAddresses,
     &mActionShowEmails,
     &mActionShowPhones,
     &mActionShowURLs
   };
 
   QString actionTexts[] = {
     i18n( "Show Postal Addresses" ),
     i18n( "Show Email Addresses" ),
     i18n( "Show Telephone Numbers" ),
     i18n( "Show Web Pages (URLs)" )
   };
 
-  QFont general = KGlobalSettings::generalFont();
+  QFont general = KGlobalSettings::generalMaxFont();
   QFont fixed = KGlobalSettings::fixedFont();
   QString gfont = general.family();
   QString ffont = fixed.family();
 
   int gpointsize = general.pixelSize();
   if ( gpointsize == -1 )
     gpointsize = general.pointSize();
 
   int fpointsize = fixed.pixelSize();
   if ( fpointsize == -1 )
     fpointsize = fixed.pointSize();
 
   mPainter = new KABEntryPainter;
 
   mPainter->setForegroundColor( black );
   mPainter->setHeaderColor( mHeadLineTextColor );
   mPainter->setUseHeaderColor( mUseHeadLineBGColor );
   mPainter->setBackgroundColor( mHeadLineBGColor );
 
   mPainter->setHeaderFont( QFont( gfont, gpointsize + 4, QFont::Bold, true ) );
   mPainter->setHeadLineFont( QFont( gfont, gpointsize + 2, QFont::Bold, true ) );
   mPainter->setBodyFont( QFont( gfont, gpointsize, QFont::Normal, false ) );
   mPainter->setFixedFont( QFont( ffont, fpointsize, QFont::Normal, false ) );
   mPainter->setCommentFont( QFont( gfont, gpointsize, QFont::Normal, false ) );
 
   const int numActions = sizeof( actions ) / sizeof( actions[ 0 ] );
 
   for ( int count = 0; count < numActions; ++count ) {
     *actions[ count ] = new KToggleAction( actionTexts[ count ] );
     (*actions[ count ])->setChecked( true );
   }
 
   setMouseTracking( true );
 
   setBackgroundMode( NoBackground );
 }
 
 KABDetailedView::~KABDetailedView()
 {
   delete mPainter;
   mPainter = 0;
 }
 
 bool KABDetailedView::getBackground( QString path, QPixmap& image )
 {
   QMap<QString, QPixmap>::iterator pos;
 
   pos = mBackgroundMap.find( path );
   if ( pos == mBackgroundMap.end() ) { // the image has not been loaded previously
     if ( image.load( path ) ) {
       mBackgroundMap[ path ] = image;
       return true;
     } else
       return false;
   } else { // image found in cache
     image = pos.data();
     return true;
   }
 }
 
 void KABDetailedView::paintEvent( QPaintEvent* )
 {
   const int BorderSpace = mGrid;
   QPixmap pm( width(), height() );
   QPainter p;
 
   QRect entryArea = QRect( BorderSpace, mGrid, width() - mGrid - BorderSpace,
                            height() - 2 * mGrid );
   p.begin( &pm );
 
   p.setPen( darkBlue );
   p.setBrush( mDefaultBGColor );
   p.drawRect( 0, 0, width(), height() );
   switch ( mBackgroundStyle ) {
     case Tiled:
       p.drawTiledPixmap( 1, 1, width() - 2, height() - 2, mCurrentBackground );
       break;
     case Bordered:
       p.drawTiledPixmap( 1, 1, QMIN( width() - 2, mCurrentBackground.width() ),
                          height() - 2, mCurrentBackground );
       break;
     case None: // no BG image defined for this entry:
     default:
       if ( mUseDefaultBGImage )
         p.drawTiledPixmap( 1, 1, width() - 2, height() - 2, mDefaultBGImage );
       break;
   };
 
   p.setViewport( entryArea );
 
   mPainter->setShowAddresses( mActionShowAddresses->isChecked() );
   mPainter->setShowEmails( mActionShowEmails->isChecked() );
   mPainter->setShowPhones( mActionShowPhones->isChecked() );
   mPainter->setShowURLs( mActionShowURLs->isChecked() );
   mPainter->printAddressee( addressee(), QRect( 0, 0, entryArea.width(),
                             entryArea.height() ), &p );
   p.end();
   bitBlt( this, 0, 0, &pm );
 }
 
 void KABDetailedView::mouseMoveEvent( QMouseEvent *e )
 {
   QPoint bias( mGrid, mGrid );
   int rc;
   bool hit = false;
 
   if ( ( rc = mPainter->hitsEmail( e->pos() - bias ) ) != -1 )
     hit = true;
   else if ( ( rc = mPainter->hitsURL( e->pos() - bias ) ) != -1 )
     hit = true;
   else if ( ( rc = mPainter->hitsPhone( e->pos() - bias ) ) != -1 )
     hit = true;
   else if ( ( rc = mPainter->hitsTalk( e->pos() - bias ) ) != -1 )
     hit = true;
 
   if ( hit ) {
     if ( cursor().shape() != PointingHandCursor )
       setCursor( PointingHandCursor );
     else if( cursor().shape() != ArrowCursor )
       setCursor(ArrowCursor);
   }
 }
 
 void KABDetailedView::mousePressEvent( QMouseEvent *e )
 {
   QPopupMenu menu( this );
   QPopupMenu *menuBG = new QPopupMenu( &menu );
   mMenuBorderedBG = new QPopupMenu( &menu );
   mMenuTiledBG = new QPopupMenu( &menu );
 
   menu.insertItem( i18n( "Select Background" ), menuBG );
   menuBG->insertItem( i18n( "Bordered Backgrounds" ), mMenuBorderedBG );
   menuBG->insertItem( i18n( "Tiled Backgrounds" ), mMenuTiledBG );
   menu.insertSeparator();
 
   QPoint point = e->pos() - QPoint( mGrid, mGrid );
   int rc;
   QStringList dirsBorderedBG, dirsTiledBG;
   QDir dir;
 
   switch( e->button() ) {
     case QMouseEvent::RightButton:
       if ( isReadOnly() )
         menu.setItemEnabled( menu.idAt( 0 ), false );
       else {
         // TODO: settings need to be saved in view options
         dirsBorderedBG = KGlobal::instance()->dirs()->findDirs( "data", mBorderedBGDir );
         if ( dirsBorderedBG.count() > 0 ) {
           dir.setPath( dirsBorderedBG[ 0 ] );
           mBorders = dir.entryList( QDir::Files );
           for ( uint count = 0; count < mBorders.count(); ++count )
             mMenuBorderedBG->insertItem( mBorders[ count ], count );
 
           connect( mMenuBorderedBG, SIGNAL( activated( int ) ),
                    SLOT( slotBorderedBGSelected( int ) ) );
         } else
           menuBG->setItemEnabled( menuBG->idAt( 0 ), false );
 
         dirsTiledBG = KGlobal::instance()->dirs()->findDirs( "data", mTiledBGDir );
         if ( dirsTiledBG.count() > 0 ) {
           dir.setPath( dirsTiledBG[ 0 ] );
           mTiles = dir.entryList( QDir::Files );
           for ( uint count = 0; count < mTiles.count(); ++count )
             mMenuTiledBG->insertItem( mTiles[ count ], count );
 
           connect( mMenuTiledBG, SIGNAL( activated( int ) ),
                    SLOT( slotTiledBGSelected( int ) ) );
         } else
           menuBG->setItemEnabled( menuBG->idAt( 1 ), false );
       }
 
       mActionShowAddresses->plug( &menu );
       mActionShowEmails->plug( &menu );
       mActionShowPhones->plug( &menu );
       mActionShowURLs->plug( &menu );
 
       menu.exec( e->globalPos() );
       break;
 
     case QMouseEvent::LeftButton:
       // find whether the pointer touches an email address, URL,
       // talk address or telephone number:
       if ( ( rc = mPainter->hitsEmail( point ) ) != -1 ) {
         emit sendEmail( addressee().emails()[ rc ] );
         break;
       }
       if ( ( rc = mPainter->hitsURL( point ) ) != -1 ) {
         emit browse( addressee().url().prettyURL() );
         break;
       }
       if ( ( rc = mPainter->hitsPhone( point ) ) != -1 ) {
         // not implemented yet
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 9cde5cf..7de7064 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -1,263 +1,263 @@
 /*
     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.
 */
 #include <kdialog.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qgroupbox.h>
 #include <qbuttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qstrlist.h>
 #include <qapplication.h>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <kemailsettings.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
 #include <klineedit.h>
 
 
 #include "koprefs.h"
 
 #include "koprefsdialog.h"
 //#include <kprefswidget.h>
 
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
   
-    setFont( KGlobalSettings::generalFont() );
+    setFont( KGlobalSettings::generalMaxFont() );
   setCaption( i18n("Settings - some need a restart (nr)"));
   setupGlobalTab();
   setupMainTab();
   setupMailTab();;
   setupFontsTab();
   readConfig();
 #ifndef DESKTOP_VERSION
   if ( QApplication::desktop()->height() == 480  )
       hideButtons();
 #endif
 
 #if 0
 
   setupMainTab();
   setupLocaleTab();
   setupTimeZoneTab();
   setupTimeTab();
   setupLocaleDateTab();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
   //setupSyncTab();
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
 #endif
 }
 
 #include "kpimglobalprefs.h"
 
 KOPrefsDialog::~KOPrefsDialog()
 {
 }
 void KOPrefsDialog::setupGlobalTab() 
 {
    QFrame *topFrame = addPage(i18n("Global"),0,0);
    kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
    topLayout->addWidget( kdelibcfg );
 
 
 } 
 void KOPrefsDialog::setupMainTab() 
 {
     QFrame *topFrame = addPage(i18n("General"),0,0);
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
 
   mNameEdit = new QLineEdit(topFrame);
   mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
   topLayout->addWidget(mNameLabel,0,0);
   topLayout->addWidget(mNameEdit,0,1);
 
   mEmailEdit = new QLineEdit(topFrame);
   mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
   topLayout->addWidget(mEmailLabel,1,0);
   topLayout->addWidget(mEmailEdit,1,1); 
   QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame);
   topLayout->addMultiCellWidget(lab,2,2,0,1);
   KPrefsDialogWidBool*  ttt =  addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"),
                                     &(KOPrefs::instance()->mUseKapi),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1);
 }
 
 void KOPrefsDialog::setupMailTab()
 {
  QFrame *topFrame = addPage(i18n("Mail"),0,0);
 
   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
   KPrefsDialogWidBool*  ttt =  addWidBool(i18n("View mail as html"),
                  &(KOPrefs::instance()->mViewAsHtml),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1);
   
   
   ttt =  addWidBool(i18n("Send mails later"),
                     &(KOPrefs::instance()->mSendLater),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1);
   ttt =  addWidBool(i18n("Show \"To\" field in list view"),
                     &(KOPrefs::instance()->mShowToField),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),2,2,0,1);
 
   int iii =3;
   ttt =  addWidBool(i18n("Show info fields at startup"),
                     &(KOPrefs::instance()->mShowInfoStart),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
   ++iii;
   ttt =  addWidBool(i18n("Show \"Subject\" info field"),
                     &(KOPrefs::instance()->mShowInfoSub),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
   ++iii;
   ttt =  addWidBool(i18n("Show \"From\" info field"),
                     &(KOPrefs::instance()->mShowInfoFrom),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
   ++iii;
   ttt =  addWidBool(i18n("Show \"To\" info field"),
                     &(KOPrefs::instance()->mShowInfoTo),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
   ++iii;
 
   /*
   mCodecEdit = new QLineEdit(topFrame);
   topLayout->addMultiCellWidget( new QLabel(mCodecEdit, i18n("User defined codec for new mails:"), topFrame),2,2,0,1);
   topLayout->addMultiCellWidget(mCodecEdit,3,3,0,1);
   topLayout->addMultiCellWidget( new QLabel(0, i18n("Example: iso-8859-15"), topFrame),4,4,0,1);
   */
 }
 void KOPrefsDialog::setupFontsTab()
 {
 
     QFrame *topFrame = addPage(i18n("Fonts"),0,0);
     //  DesktopIcon("fonts",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
   KPrefsDialogWidFont * tVFont;
   int i = 0;
   KPrefsDialogWidFont *timeLabelsFont =
       addWidFont(i18n("OK"),i18n("Application(nr)"),
                  &(KOPrefs::instance()->mAppFont),topFrame);
   topLayout->addWidget(timeLabelsFont->label(),i,0);
   topLayout->addWidget(timeLabelsFont->preview(),i,1);
   topLayout->addWidget(timeLabelsFont->button(),i,2);
   ++i;
 
 
   timeLabelsFont =
       addWidFont(i18n("Dear Mr."),i18n("Compose mail:"),
                  &(KOPrefs::instance()->mComposeFont),topFrame);
   topLayout->addWidget(timeLabelsFont->label(),i,0);
   topLayout->addWidget(timeLabelsFont->preview(),i,1);
   topLayout->addWidget(timeLabelsFont->button(),i,2);
   ++i;
 
   KPrefsDialogWidFont *timeBarFont =
       addWidFont(i18n("Hello"),i18n("Read mail:"),
                  &(KOPrefs::instance()->mReadFont),topFrame);
   topLayout->addWidget(timeBarFont->label(),i,0);
   topLayout->addWidget(timeBarFont->preview(),i,1);
   topLayout->addWidget(timeBarFont->button(),i,2);
   ++i;
 
   topLayout->setColStretch(1,1);
   topLayout->setRowStretch(4,1);
 
 }
 void KOPrefsDialog::usrReadConfig()
 {
  
   mNameEdit->setText(KOPrefs::instance()->mName);
   mEmailEdit->setText(KOPrefs::instance()->mEmail);
   //mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
   kdelibcfg->readConfig();
 }
 void KOPrefsDialog::usrWriteConfig()
 {
     KOPrefs::instance()->mName = mNameEdit->text();
     KOPrefs::instance()->mEmail = mEmailEdit->text();
     //KOPrefs::instance()->mSendCodec = mCodecEdit->text();
     kdelibcfg->writeConfig();
  
     
 }
 
 #if 0
 void KOPrefsDialog::setupLocaleDateTab()
 {
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
 
    
    KPrefsWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
    QString format;
    if ( QApplication::desktop()->width() < 480 )
        format = "(%d.%m.%Y)";
    else 
        format = "(%d.%m.%Y|%A %d %B %Y)";
    syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%m.%d.%Y)";
    else 
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index e57daa4..f9c8b73 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -1,327 +1,326 @@
 /*
     This file is part of KOrganizer.
 
     Copyright (c) 2001,2002,2003 Cornelius Schumacher <schumacher@kde.org>
     Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
 
     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 <kdebug.h>
 #include <klocale.h>
 
 //#include "koglobals.h"
 #include "navigatorbar.h"
 #include "kdatenavigator.h"
 
 #include <kcalendarsystem.h>
 
 #include "datenavigatorcontainer.h"
 #include "koprefs.h"
 
 DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
                                                 const char *name )
   : QWidget( parent, name ), mCalendar( 0 ),
     mHorizontalCount( 1 ), mVerticalCount( 1 )
 {
     mResizeEnabled = false;
   mExtraViews.setAutoDelete( true );
 
   mNavigatorView = new KDateNavigator( this, name );
   mNavigatorView->hide();
   connectNavigatorView( mNavigatorView );
   //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
   mLastDisplayedDN = 0;
   mUpdateTimer; 
   mUpdateTimer = new QTimer( this );
   connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() ));
   mFirstSelectedDate = QDate::currentDate();
   mSelectedDateCount = 1;
 }
 
 DateNavigatorContainer::~DateNavigatorContainer()
 {
 }
 
 void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
 {
   connect( v, SIGNAL( datesSelected( const KCal::DateList & ) ),
            SIGNAL( datesSelected( const KCal::DateList & ) ) );
 #if 0
   connect( v, SIGNAL( incidenceDropped( Incidence *, const QDate & ) ),
            SIGNAL( incidenceDropped( Incidence *, const QDate & ) ) );
   connect( v, SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ),
            SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ) );
 #endif
   connect( v, SIGNAL( weekClicked( const QDate & ) ),
            SIGNAL( weekClicked( const QDate & ) ) );
   connect( v, SIGNAL( showMonth( const QDate & ) ),
            SIGNAL( showMonth( const QDate & ) ) );
 
   connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) );
   connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) );
 
   connect( v, SIGNAL( goNextMonth() ), SLOT( slotgoNextMonth() ) );
   connect( v, SIGNAL( goPrevMonth() ), SLOT( slotgoPrevMonth() ) );
   connect( v, SIGNAL( goNextYear() ), SLOT( slotgoNextYear() ) );
   connect( v, SIGNAL( goPrevYear() ), SLOT( slotgoPrevYear() ) );
 
   connect( v, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) );
 }
 void DateNavigatorContainer::slotgoNextYear()
 {
     jumpMonth( 12 );
     emit goNextYear();
 
 }
 void DateNavigatorContainer::slotgoPrevYear()
 {
     jumpMonth( -12 );
     emit goPrevYear();
 
 }
 void DateNavigatorContainer::slotgoPrevMonth()
 {
     jumpMonth( -1 );
     emit goPrevMonth();
 
 }
 void DateNavigatorContainer::slotgoNextMonth()
 { 
     jumpMonth( 1 );
     emit goNextMonth();
 }
 void DateNavigatorContainer::jumpMonth( int month )
 {
 
     QDate baseDate = mNavigatorView->baseDate();
     computeMonthSelected( baseDate.month() + month, false );
 }
 void DateNavigatorContainer::slotMonthSelected( int month )
 {
     computeMonthSelected( month, true );
 }
 void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
 {
  //qDebug("slotMonthSelected %d ", month);
     QDate baseDate = mNavigatorView->baseDate();
     if ( baseDate.month() == month )
         return;
     //qDebug("month %d %d  ",baseDate.month(),month);
     QDate date = QDate (  baseDate.year(), baseDate.month() , 15 );
     date = date.addDays( -(baseDate.month()-month ) *30 );
     QDate newBase = QDate (  date.year(), date.month() ,1 ); 
     
     //qDebug("NEW BASE %s", newBase.toString().latin1());
     mNavigatorView->setBaseDate( newBase );
     QDate last = lastAvailableDate();
     QDate first = firstAvailableDate();
-
     QDate selFirst = mFirstSelectedDate;
     QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
     if (  selFirst >= first && selLast <= last ) {
         setBaseDates();
         if ( forceEmit ) 
             updateDayMatrixDates();
     }
     else {
         setBaseDates();
         if ( forceEmit ) 
             updateDayMatrixDates();
         if ( forceEmit ) 
             emit monthSelected( month );
     }
 }
 void DateNavigatorContainer::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
   mNavigatorView->setCalendar( cal );
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->setCalendar( cal );
   }
 }
 void DateNavigatorContainer::checkUpdateDayMatrixDates()
 { 
     //qDebug("KODNC: wid %d  hei %d ", width(), height());
     mUpdateTimer->stop();
     //return;
     if ( width() < 3 || height() < 3 )
         return;
      static int lastWid = 0;
     static int lastHei = 0;
     if ( lastWid == width() && height() == lastHei ) {
         qDebug("KODNC: No layout computing needed. ");
     } else {
         lastWid = width();
         lastHei = height();
 
         QSize minSize = mNavigatorView->yourSizeHint();
 
         int verticalCount = size().height() / minSize.height();
         int horizontalCount = size().width() / minSize.width();
         //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() );  
         //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount );
         bool fontchange = false;  
         if ( horizontalCount == 1)
             horizontalCount = size().width() / mNavigatorView->yourFullSizeHint().width();  
         QFont fo;
         if ( horizontalCount != mHorizontalCount ||
              verticalCount != mVerticalCount ) {
             uint count = horizontalCount * verticalCount;
             if ( count == 0 ) {
                 bool ok;
                 fo = mNavigatorView->yourFontHint( size() , &ok );
                 //mNavigatorView->resize( size() );
                 //if ( ! ok )
                 //  return;
                 int butt = 2;
                 horizontalCount =  size().width() / mNavigatorView->sizeHintTwoButtons( ).width();
                 if (  horizontalCount <= 1 )
                     minSize = mNavigatorView->sizeHintTwoButtons( 4 ); 
                 else 
                     minSize = mNavigatorView->sizeHintTwoButtons(); 
                 verticalCount = size().height() / minSize.height();
                 horizontalCount = size().width() / minSize.width();
                 if ( horizontalCount == 0 )
                     horizontalCount = 1;
                 if ( verticalCount == 0 )
                     verticalCount = 1;
                 fontchange = true;
                 count = horizontalCount * verticalCount;
             } else {
                 if ( mNavigatorView->fontChanged() ) {
                     fontchange = true;
                     fo = KOPrefs::instance()->mDateNavigatorFont;
                     mNavigatorView->changeFont( fo );
                     mNavigatorView->unsetFontChanged();
                 }
             }
             mLastDisplayedDN =  horizontalCount*verticalCount-1;
             while ( count > ( mExtraViews.count() + 1 ) ) {
                 KDateNavigator *n = new KDateNavigator( this );
                 n->setMonthSignalOffset ( mExtraViews.count()+1 );
                 mExtraViews.append( n );
                 n->setCalendar( mCalendar );
                 connectNavigatorView( n );
                 // n->show();
             }
             
             setBaseDates();
             if ( fontchange ) {
                 //mNavigatorView->changeFont( fo );
                 uint i;
                 for( i = 0; i < mExtraViews.count(); ++i ) {
                     KDateNavigator *view = mExtraViews.at( i );
                     view->changeFont( fo );
                 }
             }
             mHorizontalCount = horizontalCount;
             mVerticalCount = verticalCount;
     
         }
         if ( mNavigatorView->fontChanged() && ! fontchange  ) {
             qDebug("KDNC: Resetting all fonts ");
             fo = KOPrefs::instance()->mDateNavigatorFont;
             mNavigatorView->changeFont( fo );
             mNavigatorView->unsetFontChanged();
             uint i;
             for( i = 0; i < mExtraViews.count(); ++i ) {
                 KDateNavigator *view = mExtraViews.at( i );
                 view->changeFont( fo );
             }
         }
         int theight = height() / mVerticalCount;
         int twidth = width() / mHorizontalCount;
 
         NavigatorBar *bar = mNavigatorView->navigatorBar();
         if ( mHorizontalCount > 1 ) bar->showButtons( true, false );
         else bar->showButtons( true, true );
 
         mNavigatorView->setGeometry(0,
                                     0, twidth, theight );
         for( uint i = 0; i < mLastDisplayedDN; ++i ) {
             int x = ( i + 1 ) % mHorizontalCount;
             int y = ( i + 1 ) / mHorizontalCount;
 
             KDateNavigator *view = mExtraViews.at( i );
             bar = view->navigatorBar();
             if ( y > 0 ) bar->showButtons( false, false );
             else {
                 if ( x + 1 == mHorizontalCount ) bar->showButtons( false, true );
                 else bar->showButtons( false, false );
             }
             view->setGeometry( x * twidth,
                                y * theight, twidth, theight );
         }
         int iii = 0;
         int ccc = mHorizontalCount * mVerticalCount;
         mNavigatorView->show();
         while ( iii < ( mExtraViews.count()  ) ) {
             if ( iii < ccc-1 )
                 mExtraViews.at( iii )->show();
             else
                 mExtraViews.at( iii )->hide();
             ++iii;
         }
     }
 
     QDate last = lastAvailableDate();
     QDate first = firstAvailableDate();
 
     QDate selFirst = mFirstSelectedDate;
     QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
     if ( selFirst >= first && selLast <= last ) {
         updateDayMatrixDates();
     }
     else {
         updateDayMatrixDates();
         emit monthSelected( mFirstSelectedDate.month() );
     }
 }
 void DateNavigatorContainer::updateDayMatrixDates()
 { 
     QDate fDate =  mFirstSelectedDate;
     QDate lDate =  fDate.addDays( mSelectedDateCount - 1 );
     mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate );
     mNavigatorView->dayMatrix()->repaint( false );
     for( uint i = 0; i < mLastDisplayedDN; ++i ) {
         KDateNavigator *n = mExtraViews.at( i );
         if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) {
             n->dayMatrix()->repaint( false );
         }
     }
 }
 
 void DateNavigatorContainer::updateDayMatrix()
 {
   mNavigatorView->updateDayMatrix();
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->updateDayMatrix();
   }
 }
 
 void DateNavigatorContainer::updateToday()
 {
     qDebug("DateNavigatorContainer::updateToday() NOT IMPL ");
 #if 0
   mNavigatorView->updateToday();
   KDateNavigator *n;
   for( n = mExtraViews.first(); n; n = mExtraViews.next() ) {
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 322131f..ecca374 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -151,388 +151,388 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
 
     int tmp = getDayIndexFrom(p.x(), p.y());
     if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar )
         return QString();
     QDate mDate = days[tmp];
     QPtrList<Event> eventlist = mCalendar->events(mDate);
     Event *event;
     QStringList mToolTip;
     for(event=eventlist.first();event != 0;event=eventlist.next()) {
         QString mToolTipText;
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
         if (event->isMultiDay()) {
             QString prefix = "<->";multiday = 2; 
             QString time;
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) ) {
                     prefix ="->" ;multiday = 1;
                 }
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) ) {
                         prefix ="<-" ;multiday = 3;
                     }
                 } 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;multiday = 1;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;multiday = 3;
                 }
             }
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
             mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
         if ( !event->location().isEmpty() )
             mToolTipText += " (" + event->location() + ")";
 #if QT_VERSION >= 0x030000
         mToolTipText.replace( '<' , "&lt;" );
         mToolTipText.replace( '>' , "&gt;" );
 #else
         if ( mToolTipText.find ('<') >= 0 ) {
             mToolTipText.replace( QRegExp("<") , "&lt;" );
         }
         if ( mToolTipText.find ('>') >= 0 ) {
             mToolTipText.replace( QRegExp(">") , "&gt;" );
         }
 #endif
         //qDebug("TTT: %s ", mToolTipText.latin1());
         mToolTip.append( mToolTipText );
     }
     mToolTip.sort();
     return  "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>");
 }
 void KODayMatrix::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
 
   setAcceptDrops( mCalendar );
 
   updateEvents();
 }
 
 QColor KODayMatrix::getShadedColor(QColor color)
 {
   QColor shaded;
   int h=0;
   int s=0;
   int v=0;
   color.hsv(&h,&s,&v);
   s = s/4;
   v = 192+v/4;
   shaded.setHsv(h,s,v);
 
   return shaded;
 }
 
 KODayMatrix::~KODayMatrix()
 {
     //  delete mKODaymatrixWhatsThis;
   delete [] days;
   delete [] daylbls;
   //delete [] events;
   delete mToolTip;
 }
 
 /*
 void KODayMatrix::setStartDate(QDate start)
 {
   updateView(start);
 }
 */
 
 void KODayMatrix::addSelectedDaysTo(DateList& selDays)
 {
  
   if (mSelStart == NOSELECTION) {
     return;
   }
 
   //cope with selection being out of matrix limits at top (< 0)
   int i0 = mSelStart;
   if (i0 < 0) {
     for (int i = i0; i < 0; i++) {
       selDays.append(days[0].addDays(i));
     }
     i0 = 0;
   }
 
   //cope with selection being out of matrix limits at bottom (> NUMDAYS-1)
   if (mSelEnd > NUMDAYS-1) {
     for (int i = i0; i <= NUMDAYS-1; i++) {
       selDays.append(days[i]);
     }
     for (int i = NUMDAYS; i < mSelEnd; i++) {
       selDays.append(days[0].addDays(i));
     }
 
   // apply normal routine to selection being entirely within matrix limits
   } else {
     for (int i = i0; i <= mSelEnd; i++) {
       selDays.append(days[i]);
     }
   }
 }
 
 bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
 {  
     mRedrawNeeded = true;
     bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION );
   mSelStart = startdate.daysTo(start);
   if ( mSelStart < 0 )
       mSelStart = 0;
   mSelEnd = startdate.daysTo(end);
   if ( mSelEnd  > NUMDAYS-1 )
       mSelEnd = NUMDAYS-1;
   if ( mSelEnd < 0 || mSelStart >  NUMDAYS-1 ) {
       clearSelection();
       if ( noSel )
           return false;
   }
  
   return true;
 }
 void KODayMatrix::clearSelection()
 {
     mSelEnd = mSelStart = NOSELECTION;
 }
 
 
 void KODayMatrix::recalculateToday()
 {
     today = -1;
     for (int i=0; i<NUMDAYS; i++) {
         //events[i] = 0;
       days[i] = startdate.addDays(i);
       daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] ));
       
       // if today is in the currently displayed month, hilight today
       if (days[i].year() == QDate::currentDate().year() &&
           days[i].month() == QDate::currentDate().month() &&
           days[i].day() == QDate::currentDate().day()) {
         today = i;
       }
     }
     // qDebug(QString("Today is visible at %1.").arg(today));
 }
 
 void KODayMatrix::updateView()
 {
   updateView(startdate);
 }
 void KODayMatrix::repaintViewTimed()
 { 
     mRedrawNeeded = true;
-    bDays.fill( false);
-    pDays.fill( false);
-    hDays.fill( false);
-    eDays.fill( false);
+    // bDays.fill( false);
+    //pDays.fill( false);
+    //hDays.fill( false);
+    //eDays.fill( false);
     mRepaintTimer->stop(); 
     int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday
     int i;
     for(i = 0; i < NUMDAYS; i++) {
         if ( ( (i+startDay) % 7 == 0 ) ) {
             pDays.setBit(i);
         }
     }
     repaint(false);
 }
 void KODayMatrix::computeEvent(Event *event, int i )
 {
     QString holiStr = mHolidays[i];
     if ( event->isHoliday()) {
         pDays.setBit(i);
         hDays.setBit(i);
         if ( !holiStr.isEmpty() )
             holiStr += "\n";
         holiStr += event->summary();
         if ( !event->location().isEmpty() )
             holiStr += " (" + event->location() + ")";
         mHolidays[i] =holiStr ;
     }
     if ( event->isBirthday()) {
         pDays.setBit(i);
         if ( !holiStr.isEmpty() )
             holiStr += "\n";
         holiStr += i18n("Birthday") + ": "+event->summary();
         if ( !event->location().isEmpty() )
             holiStr += " (" + event->location() + ")";
         bDays.setBit(i);
         mHolidays[i] =holiStr ;
     }
     eDays.setBit(i);
 }
 void KODayMatrix::updateViewTimed()
 {
     mUpdateTimer->stop(); 
     if ( !mCalendar ) {
         qDebug("NOT CAL ");
         return;
     }
 #if 1
 
  int i;
     int timeSpan = NUMDAYS-1;
     QPtrList<Event> events = mCalendar->events();
     Event *event;
     QDateTime dt;
     bool ok;
     bDays.fill( false);
     pDays.fill( false);
     hDays.fill( false);
     eDays.fill( false);
     mHolidays.clear();
     QDate mStartDate = days[0];
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         ushort recurType = event->recurrence()->doesRecur();
         if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
             (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
             continue;
         }
         if ( event->doesRecur() ) {
             bool last;
             QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
             QDateTime incidenceEnd;
             int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date()  );
             bool invalid = false;
             while( true ) {
                     if ( incidenceStart.isValid() ) {
                         incidenceEnd = incidenceStart.addDays( eventlen );
                         int st =   incidenceStart.date().daysTo( endDate );
                         if ( st >= 0 ) { // start before timeend
                             int end = mStartDate.daysTo( incidenceEnd.date() );
                             if ( end >= 0 ) { // end after timestart --- got one!
                                 //normalize
                                 st =  timeSpan - st;
                                 if ( st < 0 ) st = 0;
                                 if ( end > timeSpan ) end = timeSpan;
                                 int iii;
                                 //qDebug("found %s %d %d ",event->summary().latin1(), st, end );
                                 for ( iii = st;iii<= end;++iii) {
                                     computeEvent( event, iii );
                                 }
                             }
                         }
                     } else {
                         if ( invalid )
                             break;
                         invalid = true;
                         //qDebug("invalid %s", event->summary().latin1());
                         incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                     }
                     if ( last )
                         break;
                     bool ok;
                     incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok );
                     if ( ! ok )
                         break;
                     if ( incidenceStart.date() > endDate )
                         break;
             }
         } else { // no recur 
             int st =  event->dtStart().date().daysTo( endDate );
             if ( st >= 0 ) { // start before timeend
                 int end = mStartDate.daysTo( event->dtEnd().date() );
                 if ( end >= 0 ) { // end after timestart --- got one!
                     //normalize
                     st =  timeSpan - st;
                     if ( st < 0 ) st = 0;
                     if ( end > timeSpan ) end = timeSpan;
                     int iii;
                     for ( iii = st;iii<= end;++iii)
                         computeEvent( event, iii );
                 }
             }
         }
     }
     int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday
     for(i = 0; i < NUMDAYS; i++) {
         if ( ( (i+startDay) % 7 == 0 ) ) {
             pDays.setBit(i);
         }
     }
 
 #if 0
     // insert due todos
     QPtrList<Todo> todos = calendar()->todos( );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         //insertTodo( todo );
         if ( todo->hasDueDate() ) {
             int day = mStartDate.daysTo( todo->dtDue().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
                 (*cells)[day]->insertTodo( todo );
             }
         }
     }
 #endif
 
 #else
     //qDebug("KODayMatrix::updateViewTimed ");
     for(int i = 0; i < NUMDAYS; i++) {
         // if events are set for the day then remember to draw it bold
         QPtrList<Event> eventlist = mCalendar->events(days[i]);
         Event *event;
         int numEvents = eventlist.count();
         QString holiStr = "";
         bDays.clearBit(i);
         hDays.clearBit(i);
         eDays.clearBit(i);
         for(event=eventlist.first();event != 0;event=eventlist.next()) {
             qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF ");
             ushort recurType = event->recurrence()->doesRecur();
             if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
                 (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
                 numEvents--;
             }
             if ( event->isHoliday()) {
                 hDays.setBit(i);
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += event->summary();
                 if ( !event->location().isEmpty() )
                      holiStr += " (" + event->location() + ")";
             }
             if ( event->isBirthday()) {
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += i18n("Birthday") + ": "+event->summary();
                 if ( !event->location().isEmpty() )
                      holiStr += " (" + event->location() + ")";
                 bDays.setBit(i);
             }
         }
         if ( numEvents ) 
             eDays.setBit(i);
         //if it is a holy day then draw it red. Sundays are consider holidays, too
         if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) ||
              !holiStr.isEmpty()) {
             mHolidays[i] = holiStr;
         } else {
             mHolidays[i] = QString::null;
         }
     }
 #endif
     mRedrawNeeded = true;
     if ( ! mPendingUpdateBeforeRepaint )
         repaint(false);
 }
 void KODayMatrix::updateView(QDate actdate)
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 35d084d..1dce841 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -1,308 +1,314 @@
 /*
     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.
 */
 
 #include <klocale.h>
 
 #include <libkcal/event.h>
 #include <qtimer.h>
 #include <qpushbutton.h>
 
 #include "koeventviewer.h"
 #include <kmessagebox.h>
 #include "koprefs.h"
 #include <libkcal/todo.h>
 #include "qapp.h"
 
 #include "koeventviewerdialog.h"
 extern int globalFlagBlockAgenda;
 
 KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name)
   : KDialogBase(parent,name,
 #ifndef DESKTOP_VERSION
                 true ,
 #else
                 false,
 #endif
                 i18n("Event Viewer"),Ok|User1|Close,Close, false,  i18n("Agenda"))
 {
     sendSignalViewerClosed = true;
   mEventViewer = new KOEventViewer(this);
   mEventViewer->setFont( KOPrefs::instance()->mEventViewFont );
   setMainWidget(mEventViewer);
   setButtonText(Ok, i18n("Edit") );
 
  QObject::connect(findButton( Ok ),SIGNAL(clicked()),
                    SLOT(editIncidence())); 
  QObject::connect(this,SIGNAL(user1Clicked()),
                    SLOT(showIncidence())); 
  mIncidence = 0;
   // TODO: Set a sensible size (based on the content?).
   //showMaximized();
   //qDebug("++++++++++++KOEventViewerDialog() ");
  //  if ( KOPrefs::instance()->mCompactDialogs ) {
 //     setFixedSize( 240,284 );
 //     move( 0, 15 );
 //   } else {
 //     setMinimumSize(300,200);
 //     resize(320,300);
 //   }
  mSyncMode = false;
  mSyncResult = 0;
 
 }
 
 KOEventViewerDialog::~KOEventViewerDialog()
 {
     //qDebug("-------~KOEventViewerDialog() ");
 }
 void KOEventViewerDialog::showMe()
 {
  
 #ifdef DESKTOP_VERSION
     int x,y,w,h;
     x = geometry().x();
     y = geometry().y();
     w = width();
     h = height();
     show();
     setGeometry(x,y,w,h);
+    raise();
 #else
     showMaximized();
 #endif
-    raise();
+   QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) );
+
+}
+void KOEventViewerDialog::setMyFocus()
+{
+   
     setActiveWindow();
     mEventViewer->setFocus(); 
-    //raise();
 
 }
 void KOEventViewerDialog::print()
 {
     mEventViewer->printMe();
 
 }
 void KOEventViewerDialog::setSyncMode( bool b )
 {
   mSyncMode = b;
   //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode );
   if ( mSyncMode ) {
     findButton( Close )->setText( i18n("Cancel Sync"));
     findButton( Ok )->setText( i18n("Remote"));
     findButton( User1 )->setText( i18n("Local"));
   } else {
     findButton( Close )->setText( i18n("Close"));
     findButton( Ok )->setText( i18n("Edit"));
     findButton( User1 )->setText( i18n("Agenda"));
   }
   mEventViewer->setSyncMode( b );
 }
 void KOEventViewerDialog::setColorMode( int m )
 {
     mEventViewer->setColorMode( m );
 }
 int KOEventViewerDialog::executeS( bool local )
 {
     mSyncResult = 3; 
     if ( local ) 
         findButton( User1 )->setFocus();
     else 
         findButton( Ok )->setFocus();
     exec();
     return mSyncResult;
 }
 
 void KOEventViewerDialog::updateConfig()
 {
   mEventViewer->setFont( KOPrefs::instance()->mEventViewFont );
 
 }
 void KOEventViewerDialog::setEvent(Event *event)
 {
   mEventViewer->setEvent(event);
   mIncidence = event; 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus();
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Agenda"));
   }
 }
 void KOEventViewerDialog::setIncidence(Incidence *in )
 {
     if ( in->type() == "Event" )
         setEvent( (Event*) in );
     else if ( in->type() =="Todo" )
         setTodo( (Todo*) in );
     else if ( in->type() =="Journal" )
         setJournal( (Journal*) in );
 }
 void KOEventViewerDialog::addIncidence(Incidence *in)
 {
     if ( in->type() == "Event" )
         addEvent( (Event*) in );
     else if ( in->type() =="Todo" )
          mEventViewer->setTodo( (Todo*) in, false );
     else if ( in->type() =="Journal" )
          mEventViewer->setJournal( (Journal*) in, false );
   if ( mSyncMode ) {
       findButton( User1 )->setFocus();
       setCaption(i18n("Conflict! Please choose entry"));
   }   
 }
 
 void KOEventViewerDialog::addEvent(Event *event)
 { 
   mEventViewer->addEvent(event);
   mIncidence = event; 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus(); 
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Agenda"));
   }
 }
 
 void KOEventViewerDialog::setTodo(Todo *event)
 {
   mEventViewer->setTodo(event);
   mIncidence = (Incidence*)event; 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus(); 
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Set complete"));
   }
 }
 void KOEventViewerDialog::setJournal(Journal *j)
 {
   mEventViewer->setJournal(j);
   mIncidence = (Incidence*)j; 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus();
   if ( !mSyncMode ) {
     findButton( User1 )->setText( i18n("Agenda"));
   }
 }
 
 void KOEventViewerDialog::addText(QString text)
 {
   mEventViewer->addText(text); 
   mEventViewer->setFocus(); 
   //findButton( Close )->setFocus();
 }
 void KOEventViewerDialog::editIncidence()
 {   
     sendSignalViewerClosed = false;
     if ( mSyncMode ) {
         mSyncResult = 2;
         accept();
         return;
     }
     if ( mIncidence ){
 #ifndef DESKTOP_VERSION
-        hide();
+        //hide();
+        close();
 #endif
         emit editIncidence( mIncidence );
     }
 }
 void KOEventViewerDialog::showIncidence()
 {
     sendSignalViewerClosed = false;
     if ( mSyncMode ) {
         mSyncResult = 1;
         accept();
         return;
     }
 
     if ( mIncidence ){
 #ifndef DESKTOP_VERSION
         hide();
 #endif
         QDate date;
         if ( mIncidence->type() == "Todo" ) {
             /*
             if ( ((Todo*)mIncidence)->hasDueDate() )
                 date = ((Todo*)mIncidence)->dtDue().date();
             else {
                 globalFlagBlockAgenda = 2;
                 emit showAgendaView( false );
                 return;
             }
             */
             ((Todo*)mIncidence)->setCompleted( true );
             ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime()  );
             hide();
             emit todoCompleted(((Todo*)mIncidence));
             return;
         
         } else
             date = mIncidence->dtStart().date();
         globalFlagBlockAgenda = 1;
         emit showAgendaView( false );
         globalFlagBlockAgenda = 2;
         emit jumpToTime( date );
     }
 }
 void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) 
 {
     switch ( e->key() ) {
    
     case Qt::Key_A :
     case Qt::Key_L :
         showIncidence();
         break;
     case Qt::Key_E :
     case Qt::Key_R :
         editIncidence();
         break;
     case Qt::Key_C:
     case Qt::Key_Escape:
         sendSignalViewerClosed = true;
         close();
         break; 
     case Qt::Key_I:
 #ifndef DESKTOP_VERSION
         sendSignalViewerClosed = true;
         close();
 #else
         sendSignalViewerClosed = true;
         slotViewerClosed();
         //accept();
 #endif
         break; 
     default:
         KDialogBase::keyPressEvent ( e );
         break; 
     }
     
 }
 void KOEventViewerDialog::hideEvent ( QHideEvent * e )
 { 
     KDialogBase::hideEvent ( e );
     QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) );
 }
 
 void KOEventViewerDialog::slotViewerClosed()
 {
     if ( mSyncMode )
         return;
                    
     if ( sendSignalViewerClosed  ) {
         //qDebug("KOEventViewerDialog::hideEvent ");
         emit signalViewerClosed(); 
     }
     sendSignalViewerClosed = true;
 }
         
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 8e1cd44..29fee49 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -1,76 +1,77 @@
 /*
     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.
 */
 #ifndef KOEVENTVIEWERDIALOG_H
 #define KOEVENTVIEWERDIALOG_H
 //
 // Viewer dialog for events.
 //
 
 #include <qtextview.h>
 
 #include <kdialogbase.h>
 
 #include <libkcal/event.h>
 
 using namespace KCal;
 
 class KOEventViewer;
 
 class KOEventViewerDialog : public KDialogBase {
     Q_OBJECT
   public:
     KOEventViewerDialog(QWidget *parent=0,const char *name=0);
     virtual ~KOEventViewerDialog();
 
     void setEvent(Event *event);
     void addEvent(Event *event);
     void setTodo(Todo *event);
     void setJournal(Journal *journal);
     void setIncidence(Incidence *inc);
     void addIncidence(Incidence *inc);
     void addText(QString text);
     void showMe();
     void setSyncMode( bool );
     void setColorMode( int m );
     int executeS( bool );
   public slots:
      void  updateConfig();
      void print();
+     void setMyFocus();
  signals:
     void editIncidence( Incidence* );
     void jumpToTime( const QDate &);
     void showAgendaView( bool );
     void todoCompleted(Todo*); 
     void signalViewerClosed();  
 private slots:
     void slotViewerClosed();
     void editIncidence();
     void showIncidence();
  protected:
     void hideEvent ( QHideEvent * e );
   private:
     bool sendSignalViewerClosed;  
     bool mSyncMode;
     int mSyncResult;
     KOEventViewer *mEventViewer;
     Incidence* mIncidence;
     void keyPressEvent ( QKeyEvent * e );
 };
 
 #endif
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index e72f94b..0bbb3bf 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1,270 +1,270 @@
 /*
     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.
 */
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qgroupbox.h>
 #include <qbuttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qstrlist.h>
 #include <qapplication.h>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <kemailsettings.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
 #include <kurlrequester.h>
 #include <klineedit.h>
 
 #if defined(USE_SOLARIS)
 #include <sys/param.h>
 
 #define ZONEINFODIR    "/usr/share/lib/zoneinfo"
 #define INITFILE       "/etc/default/init"
 #endif
 
 #include "koprefs.h"
 
 #include "koprefsdialog.h"
 #include "kpimglobalprefs.h"
 
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
-    setFont( KGlobalSettings::generalFont() );
+    setFont( KGlobalSettings::generalMaxFont() );
   setCaption( i18n("Preferences - some settings need a restart (nr)"));
   mCategoryDict.setAutoDelete(true);
 
   KGlobal::locale()->insertCatalogue("timezones");
   mSpacingHint = spacingHintSmall();
    mMarginHint = marginHintSmall();
 #ifndef DESKTOP_VERSION
   if ( QApplication::desktop()->height() == 480  )
       hideButtons();
 #endif
 
   setupGlobalTab();
   setupMainTab();
   // setupLocaleTab();
   //setupTimeZoneTab();
   setupTimeTab();
   //setupLocaleDateTab();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
   //setupSyncTab();
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
 
 
 }
 
 
 KOPrefsDialog::~KOPrefsDialog()
 {
 }
 void KOPrefsDialog::setupGlobalTab() 
 {
    QFrame *topFrame = addPage(i18n("Global"),0,0);
    kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
    topLayout->addWidget( kdelibcfg );
 
 
 } 
 void KOPrefsDialog::setupLocaleDateTab()
 {
 #if 0
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;
 
    
    KPrefsDialogWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
    QString format;
    if ( QApplication::desktop()->width() < 480 )
        format = "(%d.%m.%Y)";
    else 
        format = "(%d.%m.%Y|%A %d %B %Y)";
    syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%m.%d.%Y)";
    else 
        format = "(%m.%d.%Y|%A %B %d %Y)";
    syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%Y-%m-%d)";
    else 
        format = "(%Y-%m-%d|%A %Y %B %d)";
    syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
    syncPrefsGroup->addRadio(i18n("User defined"));
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
    ++iii;
    QLabel * lab;
    mUserDateFormatLong = new QLineEdit(topFrame);
    lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mUserDateFormatLong,iii,1);
    ++iii;
    mUserDateFormatShort = new QLineEdit(topFrame);
    lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mUserDateFormatShort,iii,1);
    ++iii;
    lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
    lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;  
    lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
 #endif
 
 }
 
 void  KOPrefsDialog::setupLocaleTab()
 {
 #if 0
  QFrame *topFrame = addPage(i18n("Locale"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;
  KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
    syncPrefsGroup->addRadio(i18n("English"));
    syncPrefsGroup->addRadio(i18n("German")); 
    syncPrefsGroup->addRadio(i18n("French")); 
    syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
    if (  QApplication::desktop()->width() <  300   ) 
        ;//   syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
  
    syncPrefsGroup =
        addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame);
    if (  QApplication::desktop()->width() >  300   )
        syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    syncPrefsGroup->addRadio(i18n("24:00"));
    syncPrefsGroup->addRadio(i18n("12:00am"));
    syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
    KPrefsDialogWidBool *sb;
   if ( QApplication::desktop()->width() <  300 ) {
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
        ++iii;   
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
    }
    else {
        QWidget * hb = new QWidget( topFrame );
        QHBoxLayout  *hbLayout = new QHBoxLayout(hb);
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
        hbLayout->addWidget(sb->checkBox()  );
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),hb);
        hbLayout->addWidget(sb->checkBox()  );
        topLayout->addMultiCellWidget(hb, iii,iii,0,1);
 
    }
   //   KPrefsDialogWidBool *sb;  //#ifndef DESKTOP_VERSION
 #if 0
   ++iii;
   sb =
            addWidBool(i18n("Quick load/save (w/o Unicode)"), 
                       &(KOPrefs::instance()->mUseQuicksave),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 #endif
 #endif
 }
 void KOPrefsDialog::showSyncPage()
 {
     showPage ( 0 ) ;
     kdelibcfg->showTimeZoneTab() ;
 
 }
 void KOPrefsDialog::setupSyncAlgTab()
 {
 #if 0
   QLabel * lab;
    QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
    mSetupSyncAlgTab = topFrame;
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;  
    
    KPrefsDialogWidBool *sb =
        addWidBool(i18n("Ask for preferences before syncing"),
                   &(KOPrefs::instance()->mAskForPreferences),topFrame);
    topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 
    ++iii;
 
    KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
                    topFrame);
    syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
@@ -530,385 +530,384 @@ void KOPrefsDialog::setupTimeTab()
   QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
                                                i18n("Working Hours"),
                                                topFrame);
   topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
   workingHoursGroup->layout()->setSpacing( 0 );
   workingHoursGroup->layout()->setMargin( 4 );
   QHBox *workStartBox = new QHBox(workingHoursGroup);
   // workStartBox->setMargin( 0 );
   addWidTime(i18n("Daily starting hour:"),
              &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
 
   QHBox *workEndBox = new QHBox(workingHoursGroup);
   //workEndBox->setMargin( 0 );
   addWidTime(i18n("Daily ending hour:"),
              &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
   QVBox *excludeBox  = new QVBox(workingHoursGroup);
   //excludeBox->setMargin( 0 );
   addWidBool(i18n("Exclude holidays"),
              &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
 
   addWidBool(i18n("Exclude Saturdays"),
              &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
 
 //   KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
 // 	     &(KOPrefs::instance()->mMarcusBainsShowSeconds),
 // 	     topFrame);
 //   topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
 
   // topLayout->setRowStretch(6,1);
 }
 
 
 void KOPrefsDialog::setupViewsTab()
 {
 
     QFrame *topFrame = addPage(i18n("Views"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
 //   QBoxLayout *dayBeginsLayout = new QHBoxLayout;
 //   topLayout->addLayout(dayBeginsLayout,0,0);
 
 //   KPrefsDialogWidTime *dayBegins =
 //     addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
 //                topFrame);
 //   dayBeginsLayout->addWidget(dayBegins->label());
 //   dayBeginsLayout->addStretch(1);
 //   dayBeginsLayout->addWidget(dayBegins->spinBox());
 
 //   QBoxLayout *nextDaysLayout = new QHBoxLayout;
 //   topLayout->addLayout(nextDaysLayout,1,0);
 //   nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
 //   mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
 //   nextDaysLayout->addStretch(1);
 //   nextDaysLayout->addWidget(mNextXDaysSpin);
 
 
   int ii = 0; 
   KPrefsDialogWidBool *dummy =
     addWidBool(i18n("Edit item on doubleclick (if not, show)"),
                &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   
  
 
 
  
  
   // topLayout->addWidget(hourSizeGroup,ii++,0);
   // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0);
   //topLayout->setRowStretch(11,1);
 
 
 
 
 #if 0
 
    topFrame = addPage(i18n("ViewChange"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,6,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 #endif
 
   dummy =
     addWidBool(i18n("Hold fullscreen on view change"),
                &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Hold non-fullscreen on view change"),
                &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
   KPrefsDialogWidBool *fullViewMonth =
       addWidBool(i18n("Next days view uses full window"),
                  &(KOPrefs::instance()->mFullViewMonth),topFrame);
   topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *fullViewTodo =
       addWidBool(i18n("Event list view uses full window"),
                  &(KOPrefs::instance()->mFullViewTodo),topFrame);
   topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
   dummy =
     addWidBool(i18n("Listview uses monthly timespan"),
                &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
  dummy  =
     addWidBool(i18n("Highlight selection in Time Edit"),
                &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
    topLayout->addWidget( dummy->checkBox(), ii++,0);
 
   KPrefsDialogWidBool *dailyRecur =
     addWidBool(i18n("Show events that recur daily in date nav."),
                &(KOPrefs::instance()->mDailyRecur),topFrame);
   topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
 
   KPrefsDialogWidBool *weeklyRecur =
     addWidBool(i18n("Show ev. that recur weekly in date nav."),
                &(KOPrefs::instance()->mWeeklyRecur),topFrame);
   topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
 
 #ifdef DESKTOP_VERSION
   KPrefsDialogWidBool *enableToolTips =
       addWidBool(i18n("Enable tooltips displaying summary of ev."),
                  &(KOPrefs::instance()->mEnableToolTips),topFrame);
   topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
 #endif
   //  *********************************************************
 
   topFrame = addPage(i18n("Agenda View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 
  dummy =
     addWidBool(i18n("Show time in agenda items"),
                &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Highlight current day in agenda"),
                &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Use light color for highlight current day"),
                &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *marcusBainsEnabled =
       addWidBool(i18n("Show current time"),
                  &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
   topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
   
 
  dummy =
     addWidBool(i18n("Set agenda to DayBeginsAt on change"),
                &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Set agenda to current time on change"),
                &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
 
 
 
 
    topFrame = addPage(i18n("Month View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
-  qDebug("%d %d ",mSpacingHint, mMarginHint );
   ii = 0;
   QLabel *lab;
   QHBox *habo = new QHBox( topFrame );
   if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel ( i18n("Show events that recur "), topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
   } else {
       new QLabel ( i18n("Show events that recur "), habo );
   }
   dailyRecur =
     addWidBool(i18n("daily"),
                &(KOPrefs::instance()->mMonthDailyRecur),habo);
   // topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
 
   weeklyRecur =
     addWidBool(i18n("weekly"),
                &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 
 
   habo = new QHBox( topFrame ); 
   if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel (i18n("Show in every cell ") , topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
       
   } else {
       new QLabel ( i18n("Show in every cell "), habo );
   }
   weeklyRecur = 
     addWidBool(i18n("short month"),
                &(KOPrefs::instance()->mMonthShowShort),habo);
  weeklyRecur =
     addWidBool(i18n("icons"),
                &(KOPrefs::instance()->mMonthShowIcons),habo);
 
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 #ifdef DESKTOP_VERSION
  KPrefsDialogWidBool *enableMonthScroll =
       addWidBool(i18n("Enable scrollbars in month view cells"),
                  &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
   topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
 #endif
   dummy =
     addWidBool(i18n("Week view mode uses bigger font"),
                &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy =
     addWidBool(i18n("Show Sat/Sun together"),
                &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  KPrefsDialogWidBool *coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses category colors"),
                   &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 
 
   dummy =
     addWidBool(i18n("Categorie colors are applied to text"),
                &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
  coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses day colors"),
                   &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
 
  KPrefsDialogWidColor *holidayColor =
       addWidColor(i18n("Day color odd months"),
                   &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  holidayColor =
       addWidColor(i18n("Day color even months"),
                   &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  
   holidayColor =
       addWidColor(i18n("Color for Sundays + category \"Holiday\""),
                   &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
   // *********************** What'sNext View
   topFrame = addPage(i18n("What's Next View"),0,0);
   //  DesktopIcon("viewmag",KIcon::SizeMedium));
   
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 
   QHBox* hdummy = new QHBox(topFrame);
   new QLabel(i18n("Days in What's Next:"),hdummy);
   mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
   
   topLayout->addWidget(hdummy,ii++,0);
 
   QHBox *prioBox = new QHBox(topFrame);
   // intervalBox->setSpacing(mSpacingHint);
   topLayout->addWidget(prioBox,ii++,0);
  
   QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox);
   mPrioSpin = new QSpinBox(0,5,1,prioBox);
   if ( QApplication::desktop()->width() <  300 )
       mPrioSpin->setFixedWidth( 40 );
 
   KPrefsDialogWidBool *passwdk =
 
       addWidBool(i18n("Show events, that are done"),
                  &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   passwdk =
       addWidBool(i18n("Show parent To-Do's"),
                  &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
   passwdk =
       addWidBool(i18n("Show location"),
                  &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
   passwdk =
       addWidBool(i18n("Show Sync Events in WN+Agenda"),
                  &(KOPrefs::instance()->mShowSyncEvents),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   passwdk =
       addWidBool(i18n("Use short date in WN+Event view"),
                  &(KOPrefs::instance()->mShortDateInViewer),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
    
 
  
 
   // *********************** Todo View
 
    topFrame = addPage(i18n("Todo View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 dummy =
     addWidBool(i18n("Hide not running Todos in To-do view"),
                &(KOPrefs::instance()->mHideNonStartedTodos),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *showCompletedTodo =
       addWidBool(i18n("To-do view shows completed Todos"),
                  &(KOPrefs::instance()->mShowCompletedTodo),topFrame);
   topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0);
  dummy =
     addWidBool(i18n("To-do view shows complete as 'xx %'"),
                &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Small To-do view uses smaller font"),
                &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
  dummy =
     addWidBool(i18n("Todo view uses category colors"),
                &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
   QWidget* wid = new QWidget( topFrame );
   // Todo due today color
   KPrefsDialogWidColor *todoDueTodayColor =
       addWidColor(i18n("Todo due today color:"),
                   &(KOPrefs::instance()->mTodoDueTodayColor),wid);
   QHBoxLayout *widLayout = new QHBoxLayout(wid);
   widLayout->addWidget( todoDueTodayColor->label() );
   widLayout->addWidget( todoDueTodayColor->button() );
   topLayout->addWidget(wid,ii++,0);
   //topLayout->addWidget(todoDueTodayColor->button(),ii++,1);
 
   // Todo overdue color
   wid = new QWidget( topFrame );
   widLayout = new QHBoxLayout(wid);
   KPrefsDialogWidColor *todoOverdueColor =
       addWidColor(i18n("Todo overdue color:"),
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9505d06..94f4677 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1585,388 +1585,384 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
 
         } else {
             if ( incidence->dtStart().time() != incidence->dtEnd().time() )
                 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
             if ( incidence->categories().contains( i18n("Birthday") ) || incidence->categories().contains( i18n("Anniversary") )  ) {
                 bool ok;
                 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
                 if ( ok ) {
                     int years = noc.date().year() - incidence->dtStart().date().year();
                     startString += i18n(" (%1 y.)"). arg( years );
                 }
             }
             else
                 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
         }
 
     }
     else
         startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
     if ( !incidence->location().isEmpty() )
         startString += " (" +incidence->location()+")";
     setCaption( incidence->summary()+startString);
 
     enableIncidenceActions( true );
 
     if ( incidence->type() == "Event" ) {
         mShowAction->setText( i18n("Show Event...") );
         mEditAction->setText( i18n("Edit Event...") );
         mDeleteAction->setText( i18n("Delete Event...") );
 
         mNewSubTodoAction->setEnabled( false );
     } else if ( incidence->type() == "Todo" ) {
         mShowAction->setText( i18n("Show Todo...") );
         mEditAction->setText( i18n("Edit Todo...") );
         mDeleteAction->setText( i18n("Delete Todo...") );
 
         mNewSubTodoAction->setEnabled( true );
     } else {
         mShowAction->setText( i18n("Show...") );
         mShowAction->setText( i18n("Edit...") );
         mShowAction->setText( i18n("Delete...") );
 
         mNewSubTodoAction->setEnabled( false );
     }
 }
 
 void MainWindow::enableIncidenceActions( bool enabled )
 {
     mShowAction->setEnabled( enabled );
     mEditAction->setEnabled( enabled );
     mDeleteAction->setEnabled( enabled );
 
     mCloneAction->setEnabled( enabled );
     mMoveAction->setEnabled( enabled );
     mBeamAction->setEnabled( enabled );
     mCancelAction->setEnabled( enabled );
 }
 
 void MainWindow::importOL()
 { 
 #ifdef _OL_IMPORT_
       KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
       id->exec();
       delete id;
       mView->updateView();
 #endif
 }
 void MainWindow::importBday()
 {
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
         mView->importBday();
 
     }
 
 
 }
 void MainWindow::importQtopia()
 {
     //#ifndef DESKTOP_VERSION
     QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing");
 #ifdef DESKTOP_VERSION
     mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml");
 #endif
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess,
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
 #ifndef DESKTOP_VERSION
         QString datebook = Global::applicationFileName( "datebook", "datebook.xml");
         QString todolist = Global::applicationFileName( "todolist", "todolist.xml");
         QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml";
 #else
         QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml";
         QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml";
         QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml";
 #endif
         mView->importQtopia( categories, datebook, todolist );
     }
 #if 0
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("Not supported \non desktop!\n"),
                                        i18n("Ok"), i18n("Cancel"), 0,
                                        0, 1 );
 
 #endif
 }
 
 void MainWindow::saveOnClose()
 {
     KOPrefs *p = KOPrefs::instance();
     p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal );
     p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal );
     p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal );
     if ( filterToolBar ) {
         p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal );
     }
 #ifdef DESKTOP_VERSION
     
     QPoint myP;
     myP = mapFromGlobal( iconToolBar->mapToGlobal( QPoint( 0,0) ) );
     if (  p->mToolBarHor )
         p->mToolBarUp = myP.y() > height()/2;
     else
         p->mToolBarUp = myP.x() > width()/2;
     myP = mapFromGlobal( viewToolBar->mapToGlobal( QPoint( 0,0) ) );
     if ( p->mToolBarHorV )
         p->mToolBarUpV = myP.y()  > height()/2;
     else
         p->mToolBarUpV = myP.x() > width()/2 ;
     myP = mapFromGlobal( navigatorToolBar->mapToGlobal( QPoint( 0,0) ) );
     if ( p->mToolBarHorN )
         p->mToolBarUpN = myP.y() > height()/2;
     else
         p->mToolBarUpN = myP.x() > width()/2 ;
     if ( filterToolBar ) {
         myP = mapFromGlobal( filterToolBar->mapToGlobal( QPoint( 0,0) ) );
         if ( p->mToolBarHorF )
             p->mToolBarUpF = myP.y() > height()/2;
         else
             p->mToolBarUpF = myP.x() > width()/2 ;
     }
 #else
     if (  p->mToolBarHor )
         p->mToolBarUp = iconToolBar->y() > height()/2;
     else
         p->mToolBarUp = iconToolBar->x() > width()/2;
     if ( p->mToolBarHorV )
         p->mToolBarUpV = viewToolBar->y() > height()/2;
     else
         p->mToolBarUpV = viewToolBar->x() > width()/2 ;
     
     if ( p->mToolBarHorN )
         p->mToolBarUpN = navigatorToolBar->y() > height()/2;
     else
         p->mToolBarUpN = navigatorToolBar->x() > width()/2 ;
     if ( filterToolBar ) {
         if ( p->mToolBarHorF )
             p->mToolBarUpF = filterToolBar->y() > height()/2;
         else
             p->mToolBarUpF = filterToolBar->x() > width()/2 ;
     }
 #endif
 
 
     mView->writeSettings();
     if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
         save();
 }
 void MainWindow::slotModifiedChanged( bool changed )
 {
     if ( mBlockAtStartup )
         return;
    
     int msec;
     // we store the changes after 1 minute,
     // and for safety reasons after 10 minutes again
     if ( !mSyncManager->blockSave() )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
-    if (mSaveTimer.isActive() )
-        qDebug("ti active ");
-    else
-        qDebug("KO: Save timer stopped");
 }
 void MainWindow::save()
 {
     if ( !mCalendarModifiedFlag ) {
         qDebug("KO: Calendar not modified. Nothing saved.");
         return;
     }
     if ( mSyncManager->blockSave() )
         return;
     mSyncManager->setBlockSave(true);
     if ( mView->checkFileVersion( defaultFileName()) ) {
         QTime neededSaveTime = QDateTime::currentDateTime().time();
         setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         mView->saveCalendar( defaultFileName() );
         mCalendarModifiedFlag = false;
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
         setCaption(savemes);
     } else
         setCaption(i18n("Saving cancelled!"));
     mSyncManager->setBlockSave( false );
 }
 
 void MainWindow::keyReleaseEvent ( QKeyEvent * e)
 {
     if ( !e->isAutoRepeat() ) {
         mFlagKeyPressed = false;
     }
 }
 void MainWindow::keyPressEvent ( QKeyEvent * e )
 {
     qApp->processEvents();
     if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
         e->ignore();
         // qDebug("  ignore  %d",e->isAutoRepeat()  );
         return;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
     KOPrefs *p = KOPrefs::instance();
     bool showSelectedDates = false;
     int size;
     int pro = 0;
     //qDebug("MainWindow::keyPressEvent ");
     switch ( e->key() ) {
     case Qt::Key_Right:
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
             mView->goNextMonth();
         else
             mView->goNext();
         showSelectedDates = true;
         break;
     case Qt::Key_Left:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->goPreviousMonth();
         else
             mView->goPrevious();
         showSelectedDates = true;
         break;
     case Qt::Key_Down:
         mView->viewManager()->agendaView()->scrollOneHourDown();
         break;
     case Qt::Key_Up:
         mView->viewManager()->agendaView()->scrollOneHourUp();
         break;
     case Qt::Key_K:
         mView->viewManager()->showMonthViewWeek();
         break;
     case Qt::Key_I:
         mView->showIncidence();
         break;
     case Qt::Key_Delete:
     case Qt::Key_Backspace:
         mView->deleteIncidence();
         break;
     case Qt::Key_D:
         mView->viewManager()->showDayView();
         showSelectedDates = true;
         break;
     case Qt::Key_O:
         mView->toggleFilerEnabled( );
         break;
     case Qt::Key_0:
     case Qt::Key_1:
     case Qt::Key_2:
     case Qt::Key_3:
     case Qt::Key_4:
     case Qt::Key_5:
     case Qt::Key_6:
     case Qt::Key_7:
     case Qt::Key_8:
     case Qt::Key_9:
         pro =  e->key()-48;
         if ( pro == 0 )
             pro = 10;
         if ( e->state() == Qt::ControlButton)
             pro += 10;
         break;
     case Qt::Key_M:
         mView->viewManager()->showMonthView();
         showSelectedDates = true;
         break;
     case Qt::Key_Insert:
         mView->newEvent();
         break;
     case Qt::Key_S :
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
             mView->newSubTodo();
         else
             mView->dialogManager()->showSearchDialog();
         break;
     case Qt::Key_Y :
     case Qt::Key_Z :
         mView->viewManager()->showWorkWeekView();
         showSelectedDates = true;
         break;
     case Qt::Key_U :
         mView->viewManager()->showWeekView();
         showSelectedDates = true;
         break;
     case Qt::Key_H :
         keyBindings();
         break;
     case Qt::Key_W:
         mView->viewManager()->showWhatsNextView();
         break;
     case Qt::Key_L:
         mView->viewManager()->showListView();
         break;
     case Qt::Key_N:
         mView->viewManager()->showNextView();
         break;
     case Qt::Key_V:
         mView->viewManager()->showTodoView();
         break;
     case Qt::Key_C:
         mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() );
         break;
     case Qt::Key_P:
         mView->showDatePicker( );
         break;
     case Qt::Key_F:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->editFilters();
         else
             mView->toggleFilter();
         break;
     case Qt::Key_X: 
         if ( e->state() == Qt::ControlButton )
             mView->toggleDateNavigatorWidget();
         else {
             mView->viewManager()->showNextXView();
             showSelectedDates = true;
         }
         break;
     case Qt::Key_Space:
         mView->toggleExpand();
         break;
     case Qt::Key_A:
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton )
             mView->showNextAlarms();
         else
             mView->toggleAllDaySize();
         break;
     case Qt::Key_T:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->newTodo();
         else {
             mView->goToday();
             showSelectedDates = true;
         }
         break;
     case Qt::Key_J:
         mView->viewManager()->showJournalView();
         break;
     case Qt::Key_B:
         mView->editIncidenceDescription();;
         break;
         // case Qt::Key_Return:
     case Qt::Key_E:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->newEvent();
         else
             mView->editIncidence();
         break;
     case Qt::Key_Plus:
         size = p->mHourSize +2;
         if ( size <= 22 )
             configureAgenda( size );
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index b6d2feb..b837b23 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -1,50 +1,66 @@
 #include "kglobalsettings.h"
 #include "kconfig.h"
 #include "kglobal.h"
 #include "kconfigbase.h"
 
 #include <qapplication.h>
 
 QFont KGlobalSettings::generalFont()
 {
    int size = 12;
    if (QApplication::desktop()->width() < 480 ) {
         size = 10;   
    }
 #ifndef DESKTOP_VERSION
    else
     if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
         size = 18;  
 #endif 
     QFont f = QApplication::font();
     //qDebug("pointsize %d %s", f.pointSize(),f.family().latin1());
     f.setPointSize( size );
     return f;
 }
+QFont KGlobalSettings::generalMaxFont()
+{
+   int size = 12;
+   if (QApplication::desktop()->width() < 480 ) {
+        size = 10;   
+   }
+#ifndef DESKTOP_VERSION
+   else
+    if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
+        size = 18;  
+#endif 
+    QFont f = QApplication::font();
+    if ( f.pointSize() > size )
+        f.setPointSize( size );
+    return f;
+}
 QFont KGlobalSettings::toolBarFont()
 {
     return  QApplication::font();
 }
 
 QColor KGlobalSettings::toolBarHighlightColor()
 {
     return QColor( "black" );
 }
 
 QRect KGlobalSettings::desktopGeometry( QWidget * )
 {
   return QApplication::desktop()->rect();
 }
 
     /**
      * Returns whether KDE runs in single (default) or double click
      * mode.
      * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html
      * @return true if single click mode, or false if double click mode.
      **/
 bool KGlobalSettings::singleClick()
 {   
     KConfig *c = KGlobal::config();
     KConfigGroupSaver cgs( c, "KDE" );
     return c->readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK);
 }
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h
index 7df8012..075bb1c 100644
--- a/microkde/kglobalsettings.h
+++ b/microkde/kglobalsettings.h
@@ -1,30 +1,31 @@
 #ifndef MICROKDE_KGLOBALSETTINGS_H
 #define MICROKDE_KGLOBALSETTINGS_H
 
 #include <qfont.h>
 #include <qrect.h>
 
 
 #define KDE_DEFAULT_SINGLECLICK true
 
 
 class KGlobalSettings
 {
   public:
     static QFont generalFont();
+    static QFont generalMaxFont();
     static QFont toolBarFont();
     
     static QColor toolBarHighlightColor();
     static QRect desktopGeometry( QWidget * );
     
     /**
      * Returns whether KDE runs in single (default) or double click
      * mode.
      * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html
      * @return true if single click mode, or false if double click mode.
      **/
     static bool singleClick();
     
 };
 
 #endif
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp
index bb41b18..9c87682 100644
--- a/microkde/kutils/kcmultidialog.cpp
+++ b/microkde/kutils/kcmultidialog.cpp
@@ -1,229 +1,229 @@
 /*
    Copyright (c) 2000 Matthias Elter <elter@kde.org>
    Copyright (c) 2003 Daniel Molkentin <molkentin@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 <qhbox.h>
 #include <qvbox.h>
 #include <qcursor.h>
 #include <qlayout.h>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 //US #include <klibloader.h>
 #include <krun.h>
 #include <kprocess.h>
 #include <kglobalsettings.h>
 
 #include "kcmultidialog.h"
 //US #include "kcmultidialog.moc"
 //US #include "kcmoduleloader.h"
 
 KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal)
   : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok,
                 parent, name, modal, true), d(0L)
 {   
-    setFont( KGlobalSettings::generalFont() );
+    setFont( KGlobalSettings::generalMaxFont() );
     enableButton(Apply, false);
     //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *)));
 
   connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) );
 
   _baseGroup = baseGroup;
   mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed );
   setMainWidget(mMainWidget );
 #ifdef DESKTOP_VERSION
     resize(640,480);
 #else
     //resize(640,480);
     //setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480));
     resize(800,800);
     setMaximumSize( 800, 800 );
     //showMaximized();
 #endif
 
 }
 
 KCMultiDialog::~KCMultiDialog()
 {
 //US    moduleDict.setAutoDelete(true);
 }
 
 void KCMultiDialog::slotDefault()
 {
 
     int curPageIndex = activePageIndex();
 
     QPtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
     {
        if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex)
        {
           (*it)->defaults();
           clientChanged(true);
           return;
        }
     }
 
 }
 void KCMultiDialog::accept()
 {
     slotOk();
 }
 void KCMultiDialog::slotApply()
 {
     QPtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
       (*it)->save();
     clientChanged(false);
 
     emit applyClicked();
 
 }
 
 
 void KCMultiDialog::slotOk()
 {
 qDebug("KCMultiDialog::slotOk clicked");
 
     QPtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
       (*it)->save();
     QDialog::accept();
 
     emit okClicked();
 }
 
 void KCMultiDialog::slotHelp()
 {
 /*US
     KURL url( KURL("help:/"), _docPath );
 
     if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") {
         KProcess process;
         process << "khelpcenter"
                 << url.url();
         process.start(KProcess::DontCare);
 		process.detach();
     } else {
         new KRun(url);
     }
 */
 }
 
 void KCMultiDialog::clientChanged(bool state)
 {
     enableButton(Apply, state);
 }
 
 /*US
 void KCMultiDialog::addModule(const QString& path, bool withfallback)
 {
     kdDebug(1208) << "KCMultiDialog::addModule " << path << endl;
 
     KCModuleInfo info(path, _baseGroup);
 
     QHBox* page = addHBoxPage(info.moduleName(), info.comment(),
                               KGlobal::iconLoader()->loadIcon(info.icon(), KIcon::Desktop, KIcon::SizeMedium));
     if(!page) {
         KCModuleLoader::unloadModule(info);
         return;
     }
     moduleDict.insert(page, new LoadInfo(path, withfallback));
     if (modules.isEmpty())
        slotAboutToShow(page);
 }
 */
 QVBox * KCMultiDialog::getNewVBoxPage( const QString & modulename )
 {
     QVBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() );
     return page;
 
 }
 //US special method for microkde. We dop noty want to load everything dynamically.
 void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname)
 {
 
     modules.append(module);
     connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
 //US
   	module->load();
 
 
 }
 
 void KCMultiDialog::slotAboutToShow(QWidget *page)
 {
 /*US
     LoadInfo *loadInfo = moduleDict[page];
     if (!loadInfo)
        return;
 
     QApplication::setOverrideCursor(Qt::WaitCursor);
 
     moduleDict.remove(page);
 
     KCModuleInfo info(loadInfo->path, _baseGroup);
 
     KCModule *module = KCModuleLoader::loadModule(info, loadInfo->withfallback);
 
     if (!module)
     {
         QApplication::restoreOverrideCursor();
         KCModuleLoader::showLastLoaderError(this);
         delete loadInfo;
         return;
     }
 
     module->reparent(page,0,QPoint(0,0),true);
     connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
     //setHelp( docpath, QString::null );
     _docPath = info.docPath();
     modules.append(module);
 
     //KCGlobal::repairAccels( topLevelWidget() );
 
     delete loadInfo;
 
     QApplication::restoreOverrideCursor();
 */
 
 qDebug("KCMultiDialog::slotAboutToShow not implemented");
 }
 
 
 bool KCMultiDialog::showPage( int index )
 {
   return(mMainWidget->showPage(index) );
 }
 
 
 int KCMultiDialog::activePageIndex() const
 {
   return( mMainWidget->activePageIndex() );
 }
 
 
 int KCMultiDialog::pageIndex( QWidget *widget ) const
 {
   return( mMainWidget->pageIndex( widget) );
 }