font fix

5 files changed, 15 insertions, 23 deletions

diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index a2095d4..01e84d0 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -1,155 +1,155 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Mike Pilone <mpilone@slac.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.
 */
 
 //US#ifdef KAB_EMBEDDED
 //#include <qstring.h>
 //#endif //KAB_EMBEDDED
 
 #include <qtextstream.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <stdlib.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include <kconfig.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
+#include <kglobalsettings.h>
 //US#include <kdebug.h> // defines kdDebug()
 
 #include "kabprefs.h"
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #endif
 
 KABPrefs *KABPrefs::sInstance = 0;
 static KStaticDeleter<KABPrefs> staticDeleterAB;
 
 KABPrefs::KABPrefs()
   : KPimPrefs("kaddressbookrc")
 {
-  mDetailsFont = QFont("helvetica",12);
   KPrefs::setCurrentGroup( "Views" );
   addItemBool( "HonorSingleClick", &mHonorSingleClick, false );
 
   KPrefs::setCurrentGroup( "General" );
   addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true );
   addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 );
 
 #ifdef KAB_EMBEDDED
   addItemBool("AskForQuit",&mAskForQuit,true);
   addItemBool("ToolBarHor",&mToolBarHor, true );
   addItemBool("ToolBarUp",&mToolBarUp, false );
   addItemBool("SearchWithReturn",&mSearchWithReturn, false );
-  addItemFont("DetailsFont",&mDetailsFont);
+  addItemFont("DetailsFont",&mDetailsFont,KGlobalSettings::generalFont());
 
 
 #endif //KAB_EMBEDDED
 
   KPrefs::setCurrentGroup( "MainWindow" );
   bool m_visible = false;
 #ifdef DESKTOP_VERSION
   m_visible = true;
 #endif
   addItemBool( "FullMenuBarVisible", &mFullMenuBarVisible, m_visible );
   addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false );
   addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true );
   addItemIntList( "ExtensionsSplitter", &mExtensionsSplitter );
   addItemIntList( "DetailsSplitter", &mDetailsSplitter );
   addItemBool( "MultipleViewsAtOnce", &mMultipleViewsAtOnce, true );
 
 
   KPrefs::setCurrentGroup( "Extensions_General" );
   QStringList defaultExtensions;
   defaultExtensions << "merge";
   defaultExtensions << "distribution_list_editor";
   addItemInt( "CurrentExtension", &mCurrentExtension, 0 );
   addItemStringList( "ActiveExtensions", &mActiveExtensions, defaultExtensions );
 
   KPrefs::setCurrentGroup( "Views" );
   QString defaultView = i18n( "Default Table View" );
   addItemString( "CurrentView", &mCurrentView, defaultView );
   addItemStringList( "ViewNames", &mViewNames, defaultView );
 
   KPrefs::setCurrentGroup( "Filters" );
   addItemInt( "CurrentFilter", &mCurrentFilter, 0 );
 
 }
 
 KABPrefs::~KABPrefs()
 {
     //qDebug("KABPrefs::~KABPrefs() ");
  if (sInstance == this)
      sInstance = staticDeleterAB.setObject(0);
 }
  
 KABPrefs *KABPrefs::instance()
 {
   if ( !sInstance ) {
 #ifdef KAB_EMBEDDED
     sInstance = staticDeleterAB.setObject( new KABPrefs() );
 #else  //KAB_EMBEDDED
     //US the following line has changed ???. Why
     staticDeleterAB.setObject( sInstance, new KABPrefs() );
 #endif //KAB_EMBEDDED
     sInstance->readConfig();
   }
 
   return sInstance;
 }
 
 void KABPrefs::setCategoryDefaults()
 {
   mCustomCategories.clear();
 
   mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" )
                     << i18n( "Customer" ) << i18n( "Friend" );
 }
 
     // US introduce a nonconst way to return the config object.
 KConfig* KABPrefs::getConfig()
 {
     return config();
 }
 void KABPrefs::usrReadConfig()
 {
   KPimPrefs::usrReadConfig();
 }
 
 
 /*US
 void KABPrefs::usrSetDefaults()
 {
   KPimPrefs::usrSetDefaults();
 }
 
 void KABPrefs::usrReadConfig()
 {
   KPimPrefs::usrReadConfig();
 }
 
 void KABPrefs::usrWriteConfig()
 {
   KPimPrefs::usrWriteConfig();
 }
 */
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 521781e..751ba57 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -1,258 +1,261 @@
 /*
     This file is part of the KDE alarm daemon.
     Copyright (c) 2000 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.
 */
 
 // $Id$
 
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qapp.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qsound.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <stdlib.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #include <sys/ioctl.h>
 #endif
 #include <stdio.h>
 #include <fcntl.h>
 
 #ifndef DESKTOP_VERSION
 #include <qtopia/alarmserver.h>
 #include <qpe/resource.h>
 #include <qtopia/sound.h>
 #endif     
 
 #include "alarmdialog.h"
 
 
 AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
     : QDialog (parent, name, true, Qt::WStyle_StaysOnTop ) 
 {
     setCaption( "KO/Pi Alarm!" );
     QVBoxLayout* layout = new QVBoxLayout( this);
   QLabel* l = new QLabel("The following event triggered alarm:",this);
   layout->addWidget ( l );
   l->setAlignment( AlignCenter);
   mMessage = new QLabel ( " ", this );
   int fs = 18;
   int fs2 = 12;
   if ( QApplication::desktop()->width() < 480 ) {
       setMaximumSize(220, 260);
       fs2 = 10;
   }
   else {
       setMaximumSize(440, 440);
   }
   layout->setSpacing( 3 );
   layout->setMargin( 3 );
-
-  l->setFont( QFont("helvetica",fs2, QFont::Bold) );
-  mMessage->setFont( QFont("helvetica",fs, QFont::Bold) );
+  QFont fo = QApplication::font();
+  fo.setBold( true );
+  fo.setPointSize( fs2 );
+  l->setFont( fo );
+  fo.setPointSize( fs );
+  mMessage->setFont(fo );
   mMessage->setAlignment( AlignCenter);
   l = new QLabel("Missed Alarms:",this);
   l->setAlignment( AlignCenter);
   layout->addWidget ( mMessage );
   layout->addWidget ( l );
   mMissedAlarms= new QLabel ( "", this );
   mMissedAlarms->setAlignment( AlignCenter);
 
   playSoundTimer = new QTimer( this );
   connect ( playSoundTimer, SIGNAL( timeout()  ), this, SLOT (playSound() ) );
 
   playSoundTimer->stop();
   
   layout->addWidget ( mMissedAlarms );
   QHBox *suspendBox = new QHBox( this );
   suspendBox->setSpacing(3);
   layout->addWidget ( suspendBox );
   (void)new QLabel("Suspend duration (minutes):",suspendBox);
   mSuspendSpin = new QSpinBox(1,1440,1,suspendBox);
   mSuspendSpin->setValue(7);  // default suspend duration
   QHBox * bbox  = new QHBox ( this );
   layout->addWidget ( bbox );
   bbox->layout()->setSpacing( 5 );
   QPushButton* suspend = new QPushButton( "Suspend", bbox);
   QPushButton* silen = new QPushButton( " Stop sound ", bbox);
   QPushButton* okbut = new QPushButton( "Ok", bbox); 
   connect (silen , SIGNAL( clicked() ), this, SLOT (silent() ) ); 
   connect (suspend , SIGNAL( clicked() ), this, SLOT (slotSuspend() ) );
   connect (okbut , SIGNAL( clicked() ), this, SLOT (slotOk() ) );
 #ifndef _WIN32_
   if ( QFile::exists ( "/dev/sharp_led" ) )
       fd_led = open ( "/dev/sharp_led", O_RDWR|O_NONBLOCK );
   else
 #endif
       fd_led = 0;
   statusLED.which = SHARP_LED_SALARM;
   mSilent = false;
   mSuspendCounter = 0;
   setServerNotification( true );
 }
 void AlarmDialog::reject () 
 {
     QTimer::singleShot ( 3000, this, SLOT (suspend())  );
     slotSuspend();
 }
 AlarmDialog::~AlarmDialog()
 {
 }
 void AlarmDialog::silent () 
 {
     mSilent = true;
 }
 void AlarmDialog::accept()
 {
     slotOk();
 }
 
 void AlarmDialog::suspend()
 {
 #ifdef DESKTOP_VERSION
 
 #else
     Sound::soundAlarm ();
 #endif
 }
 void AlarmDialog::slotOk()
 {
     mStopAlarm = true;
     mMissedAlarms->setText("");
     mMessage->setText("");
 #ifndef _WIN32_
     if (  fd_led > 0 ) {
         statusLED.status =  LED_SALARM_OFF ;
         ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED);
     }
 #endif
     QDialog::accept();
 }
 
 void AlarmDialog::slotSuspend() 
 {
     //qDebug("AlarmDialog::suspend() ");  // emit suspendSignal(mSuspendSpin->value());
    mStopAlarm = true;
    QDateTime nextA = QDateTime::currentDateTime().addSecs( mSuspendSpin->value() * 60 );
    QString mess = "suspend_alarm" +mFileName+"+++" ;
    if ( mMessage->text().left( 10 ) !="Suspended:" )
        mess += "Suspended:\n";
    mess +=mMessage->text();
 #ifndef DESKTOP_VERSION
    if ( mServerNotification )
        AlarmServer::addAlarm ( nextA,"koalarm",mess.latin1());
 #endif 
     emit addAlarm( nextA , mess  );  
    slotOk();
 }
 
 void AlarmDialog::setServerNotification( bool b )
 {
     mServerNotification = b;
 }
 int  AlarmDialog::getSuspendTime( )
 {
     return mSuspendSpin->value();
 
 }
 void AlarmDialog::setSuspendTime( int val )
 {
     mSuspendSpin->setValue( val );
 }
 bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, bool playwav, int pause , int suspendtimes)
 {
     if ( mess.left( 9) != "Suspended" )
         mSuspendCounter = suspendtimes;
     mPauseCount = pause;
     mFileName = fn;
     mPlayWav = playwav;
     if ( !QFile::exists( fn ) )
         mFileName = "";
     alarmCounter = 0 ;
     maxAlarmReplay = replay ;
     mStopAlarm = false;
     mSilent = false;
     if ( mMissedAlarms->text() == "" )
         mMissedAlarms->setText( mMessage->text());
     else
         mMissedAlarms->setText( mMessage->text()+ "\n" + mMissedAlarms->text() );
     if ( mMissedAlarms->text().length() > 180 )
         mMissedAlarms->setText(mMissedAlarms->text().left ( 180 ));
     mMessage->setText(mess);
     int w =sizeHint().width() ;
     int h = sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     show();
     raise();
     qApp->processEvents();
     repaint();
     qApp->processEvents();
 
 #ifndef _WIN32_
     if (  fd_led > 0 ) {
         statusLED.status =  LED_SALARM_ON ;
         ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED);
     }
 #endif
     playSoundTimer->start( 1000, true );
     return true;
  
 }
 
 
 void  AlarmDialog::playSound ()
 {
     if (mStopAlarm )
         return;
     showNormal();
     setActiveWindow();
     setFocus();
     raise();
     
     qApp->processEvents();
     if (  alarmCounter < maxAlarmReplay && ! mSilent) {
         ++alarmCounter;
         if ( !mPlayWav || mFileName.length() < 2 ) {
 
 #ifndef DESKTOP_VERSION
             Sound::soundAlarm ();
 #endif
         } else {
             QSound::play ( mFileName );
             //qDebug("BEEP!");
         }
     } else {
         if ( ! mSilent && mSuspendCounter > 0 ) {
             --mSuspendCounter;
             reject (); 
             hide();
             return;
         } 
     }
     playSoundTimer->start( mPauseCount * 1000, true );
 }
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index 7b1e169..e4b61dc 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -1,129 +1,126 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
+#include <kglobalsettings.h>
 
 #include "koprefs.h"
 #include "mainwindow.h"
 
 
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 
 KOPrefs::KOPrefs() :
   KPimPrefs("kopiemailrc")
 {
-    mAppFont = QFont("helvetica",12);
-    mComposeFont = QFont("helvetica",12);
-    mReadFont = QFont("helvetica",12);
-
     KPrefs::setCurrentGroup("General");
     addItemString("SendCodec",&mSendCodec,i18n ("userdefined") );
     addItemString("SenderName",&mName,i18n ("Please set at") );
     addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") );
     addItemBool("ViewMailAsHtml",&mViewAsHtml,false);
     addItemBool("SendMailLater",&mSendLater,true);
     addItemBool("ShowToField",&mShowToField,false);
     addItemBool("UseKapi",&mUseKapi,false);
     addItemInt("CurrentCodec",&mCurrentCodec,0);
     addItemBool("ShowInfoSub",&mShowInfoSub,true);
     addItemBool("ShowInfoFrom",&mShowInfoFrom,true);
     addItemBool("ShowInfoTo",&mShowInfoTo,true);
     addItemBool("ShowInfoStart",&mShowInfoStart,true);
     KPrefs::setCurrentGroup("Fonts");
-    addItemFont("Application Font",&mAppFont);
-    addItemFont("Compose Font",&mComposeFont);
-    addItemFont("Read Font",&mReadFont);
+    addItemFont("Application Font",&mAppFont,KGlobalSettings::generalFont());
+    addItemFont("Compose Font",&mComposeFont,KGlobalSettings::generalFont());
+    addItemFont("Read Font",&mReadFont,KGlobalSettings::generalFont());
     fillMailDefaults();
     isDirty = false;
 }
 
 
 KOPrefs::~KOPrefs()
 {
     if ( isDirty )
         writeConfig();
   if (mInstance == this)
       mInstance = insd.setObject(0); 
 
 }
 
 
 KOPrefs *KOPrefs::instance()
 {
   if (!mInstance) {
       mInstance = insd.setObject(new KOPrefs());
       mInstance->readConfig();
   }
 
   return mInstance;
 }
 
 void KOPrefs::usrSetDefaults()
 {
    
 }
 
 void KOPrefs::fillMailDefaults()
 {
   if (mName.isEmpty()) mName = i18n ("Please set at");
   if (mEmail.isEmpty()) mEmail = i18n ("Settings@General TAB");
 }
 
 void KOPrefs::usrReadConfig()
 {
 
   KPimPrefs::usrReadConfig();
 }
 
 
 void KOPrefs::usrWriteConfig()
 {
   KPimPrefs::usrWriteConfig();
 }
 
 
 
 KConfig* KOPrefs::getConfig()
 {
     return config();
 }
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 5bfe2a1..7efb6a6 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -1,460 +1,450 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include "koprefs.h"
 #include "mainwindow.h"
 
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 
 KOPrefs::KOPrefs() :
   KPimPrefs("korganizerrc")
 {
   mCategoryColors.setAutoDelete(true);
   fillMailDefaults();
   mDefaultCategoryColor           = QColor(175,210,255);//196,196,196);
   QColor defaultHolidayColor      = QColor(255,0,0);
   QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
   QColor defaultAgendaBgColor     = QColor(239,241,169);//128,128,128);
   QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
   QColor defaultTodoDueTodayColor = QColor(255,220,100);
   QColor defaultTodoOverdueColor  = QColor(255,153,125);
 
-  /*
-  mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
-  mDefaultViewFont = QFont("helvetica",10);
-  mDefaultMonthViewFont = QFont("helvetica",8);
-  mMarcusBainsFont= QFont("helvetica",10);
-  mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
-  mEditBoxFont = QFont("helvetica",12);
-  mJornalViewFont = QFont("helvetica",12);
-  */
-
-
+ 
   KPrefs::setCurrentGroup("General");
 
 
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
 
   addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
   addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
   addItemBool("ShowIconSearch",&mShowIconSearch,true);
   addItemBool("ShowIconList",&mShowIconList,true);
   addItemBool("ShowIconDay1",&mShowIconDay1,true);
   addItemBool("ShowIconDay5",&mShowIconDay5,true);
   addItemBool("ShowIconDay7",&mShowIconDay7,true);
   addItemBool("ShowIconMonth",&mShowIconMonth,true);
   addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
   addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
   addItemBool("ShowIconBack",&mShowIconBack,true);
   addItemBool("ShowIconToday",&mShowIconToday,true);
   addItemBool("ShowIconForward",&mShowIconForward,true);
   addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
   addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
   addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
   addItemBool("ShowIconNext",&mShowIconNext,true);
   addItemBool("ShowIconJournal",&mShowIconJournal,true); 
   addItemBool("ShowIconStretch",&mShowIconStretch,true); 
   addItemInt("LastLoadedLanguage",&mOldLanguage,0);
 
   addItemBool("AskForQuit",&mAskForQuit,false); 
 
 #ifndef DESKTOP_VERSION
   addItemBool("ShowFullMenu",&mShowFullMenu,false); 
 #else
   addItemBool("ShowFullMenu",&mShowFullMenu,true); 
 #endif
   addItemBool("ToolBarHor",&mToolBarHor, true );
   addItemBool("ToolBarUp",&mToolBarUp, false );
   addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
   addItemInt("Whats Next Days",&mWhatsNextDays,3);
   addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
 
   addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
   addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
   addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
   addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
   addItemInt("AllDay Size",&mAllDaySize,28);
   QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
   addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
 
   addItemStringList("LocationDefaults",&mLocationDefaults );
   addItemStringList("EventSummary User",&mEventSummaryUser);
   addItemStringList("TodoSummary User",&mTodoSummaryUser);
 
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
   addItemBool("Enable Project View",&mEnableProjectView,false);
   addItemBool("Auto Save",&mAutoSave,false);
   addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
   addItemBool("Confirm Deletes",&mConfirm,true);
   addItemString("Archive File",&mArchiveFile);
   addItemString("Html Export File",&mHtmlExportFile,
       QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
   addItemBool("Html With Save",&mHtmlWithSave,false);
 
   KPrefs::setCurrentGroup("Personal Settings");
 
   addItemInt("Mail Client",&mMailClient,MailClientKMail);
   addItemBool("Use Control Center Email",&mEmailControlCenter,false);
   addItemBool("Bcc",&mBcc,false);
 
   KPrefs::setCurrentGroup("Time & Date");
 
 
   addItemInt("Default Start Time",&mStartTime,10);
   addItemInt("Default Duration",&mDefaultDuration,2);
   addItemInt("Default Alarm Time",&mAlarmTime,3);
   KPrefs::setCurrentGroup("AlarmSettings");
   addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
   addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
   addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
   addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
 
 
   KPrefs::setCurrentGroup("Calendar");
 
   addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
 
   KPrefs::setCurrentGroup("Fonts");
   // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
   addItemFont("TimeBar Font",&mTimeBarFont,KGlobalSettings::generalFont() );
   addItemFont("MonthView Font",&mMonthViewFont,KGlobalSettings::generalFont());
   addItemFont("AgendaView Font",&mAgendaViewFont,KGlobalSettings::generalFont());
   addItemFont("MarcusBains Font",&mMarcusBainsFont,KGlobalSettings::generalFont());
   addItemFont("TimeLabels Font",&mTimeLabelsFont,KGlobalSettings::generalFont());
   addItemFont("TodoView Font",&mTodoViewFont,KGlobalSettings::generalFont());
   addItemFont("ListView Font",&mListViewFont,KGlobalSettings::generalFont());
   addItemFont("DateNavigator Font",&mDateNavigatorFont,KGlobalSettings::generalFont());
   addItemFont("EditBox Font",&mEditBoxFont,KGlobalSettings::generalFont());
   addItemFont("JournalView Font",&mJornalViewFont,KGlobalSettings::generalFont());
   addItemFont("WhatsNextView Font",&mWhatsNextFont,KGlobalSettings::generalFont());
   addItemFont("EventView Font",&mEventViewFont,KGlobalSettings::generalFont());
 
   KPrefs::setCurrentGroup("RemoteSyncing");
   addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
   addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
   addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
   addItemInt("LastSyncTime",&mLastSyncTime,0); 
 
 #ifdef _WIN32_
   QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
   QString hdp= locateLocal("data","korganizer")+"/";
 #endif
 
   KPrefs::setCurrentGroup("LoadSaveFileNames");
 
   addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
   addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
   addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
   addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
  
 
   KPrefs::setCurrentGroup("Locale");
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
 
 
   KPrefs::setCurrentGroup("Colors");
   addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
   addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
   addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
   addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
   addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
   addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
   addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
   addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
   addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
   addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
   addItemBool("MonthViewWeek",&mMonthViewWeek,false);
   addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
   addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
   addItemBool("UseAppColors",&mUseAppColors,false); 
 
   
 
   KPrefs::setCurrentGroup("Views");
   addItemBool("Show Date Navigator",&mShowDateNavigator,true);
   addItemInt("Hour Size",&mHourSize,8);
   addItemBool("Show Daily Recurrences",&mDailyRecur,true);
   addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
   addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
   addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
   addItemBool("ShowShortMonthName",&mMonthShowShort,false);
   addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
 #ifdef DESKTOP_VERION
   addItemBool("Enable ToolTips",&mEnableToolTips,true);
 #else
   addItemBool("Enable ToolTips",&mEnableToolTips,false);
 #endif
   addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
   addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
   addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
   addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
   addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
   addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
   addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
   addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
   addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
   addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
   addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
   addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
   addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
   addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
   addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
   addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
   addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
   addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
   addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
   addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
   addItemInt("Day Begins",&mDayBegins,7);
   addItemInt("Working Hours Start",&mWorkingHoursStart,8);
   addItemInt("Working Hours End",&mWorkingHoursEnd,17);
   addItemBool("Exclude Holidays",&mExcludeHolidays,true);
   addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
 
   addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
   addItemBool("Full View Month",&mFullViewMonth,true);
   addItemBool("Full View Todo",&mFullViewTodo,true);
   addItemBool("Quick Todo",&mEnableQuickTodo,false);
 
   addItemInt("Next X Days",&mNextXDays,3);
 
   KPrefs::setCurrentGroup("Printer");
 
   KPrefs::setCurrentGroup("Layout");
 
   addItemBool("CompactDialogs",&mCompactDialogs,false);
   addItemBool("VerticalScreen",&mVerticalScreen,true);
 
   KPrefs::setCurrentGroup("KOrganizer Plugins");
 
   addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
 
   KPrefs::setCurrentGroup("Group Scheduling");
 
   addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
   addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
   addItemStringList("AdditionalMails",&mAdditionalMails,"");
   addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
   addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
   addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
   addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
   addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
 
   KPrefs::setCurrentGroup( "Editors" );
 
   addItemStringList( "EventTemplates", &mEventTemplates );
   addItemStringList( "TodoTemplates", &mTodoTemplates );
 
   addItemInt("DestinationPolicy",&mDestination,standardDestination);
 
 
 
 }
 
 
 KOPrefs::~KOPrefs()
 {
   if (mInstance == this)
       mInstance = insd.setObject(0); 
  
   //qDebug("KOPrefs::~KOPrefs() ");
 }
 
 
 KOPrefs *KOPrefs::instance()
 {
   if (!mInstance) {
       mInstance = insd.setObject(new KOPrefs());
       mInstance->readConfig();
   }
 
   return mInstance;
 }
 
 void KOPrefs::usrSetDefaults()
 {
    
 }
 
 void KOPrefs::fillMailDefaults()
 {
   if (mName.isEmpty()) mName = i18n("Anonymous");
   if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
 }
 
 void KOPrefs::setTimeZoneIdDefault()
 {
     ;
 }
 
 void KOPrefs::setAllDefaults()
 {
     setCategoryDefaults();
     mEventSummaryUser  = getDefaultList() ;
     mTodoSummaryUser  = getDefaultList() ;
     mLocationDefaults  = getLocationDefaultList();
 }
 
 void KOPrefs::setCategoryDefaults()
 {
   mCustomCategories.clear();
   mCustomCategories = getDefaultList();
 
   QStringList::Iterator it;
   for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
     setCategoryColor(*it,mDefaultCategoryColor);
   }
 }
 QStringList KOPrefs::getLocationDefaultList()
 {
  QStringList retval ;
  retval << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 
         << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") 
         << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarten")
         << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
  // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
 
     retval.sort();
     return retval; 
 }
 QStringList KOPrefs::getDefaultList()
 {
     QStringList retval ;
     retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema")  << i18n("Customer")
            << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner")
            << i18n("Education")<< i18n("Family")  << i18n("Favorites")  << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts")  
            << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") 
                     << i18n("Lunch")  << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel")
            << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping")
            << i18n("Speach")  << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
            << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent")  ;
     retval.sort();
     //qDebug("cat %s ", retval.join("-").latin1());
     return retval; 
 }
 
 void KOPrefs::usrReadConfig()
 {
     config()->setGroup("General");
     
     //qDebug("KOPrefs::usrReadConfig() ");
     mCustomCategories = config()->readListEntry("Custom Categories");
     mOldLoadedLanguage = mOldLanguage ;
     mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
     if (mLocationDefaults.isEmpty()) {
         mLocationDefaults  = getLocationDefaultList();
     }
        
     if (mEventSummaryUser.isEmpty()) {
         mEventSummaryUser  = getDefaultList() ;
     }
     if (mTodoSummaryUser.isEmpty()) {
         mTodoSummaryUser  = getDefaultList() ;
     }
   
     if (mCustomCategories.isEmpty()) setCategoryDefaults();
 
     config()->setGroup("Personal Settings");
     mName = config()->readEntry("user_name","");
     mEmail = config()->readEntry("user_email","");
     fillMailDefaults();
 
     config()->setGroup("Category Colors");
     QStringList::Iterator it;
     for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
         setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
    
     }
  
     KPimPrefs::usrReadConfig();
 }
 
 
 void KOPrefs::usrWriteConfig()
 {
   config()->setGroup("General");
   config()->writeEntry("Custom Categories",mCustomCategories); 
   
   config()->setGroup("Personal Settings");
   config()->writeEntry("user_name",mName);
   config()->writeEntry("user_email",mEmail);
 
   config()->setGroup("Category Colors");
   QDictIterator<QColor> it(mCategoryColors);
   while (it.current()) {
     config()->writeEntry(it.currentKey(),*(it.current()));
     ++it;
   }
 
 
   KPimPrefs::usrWriteConfig();
 }
 
 void KOPrefs::setCategoryColor(QString cat,const QColor & color)
 {
   mCategoryColors.replace(cat,new QColor(color));
 }
 
 QColor *KOPrefs::categoryColor(QString cat)
 {
   QColor *color = 0;
 
   if (!cat.isEmpty()) color = mCategoryColors[cat];
 
   if (color) return color;
   else return &mDefaultCategoryColor;
 }
 
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index a9924ba..1024796 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -76,768 +76,770 @@ void
 KDateValidator::fixup( QString& ) const
 {
 
 }
 
 KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
     : QGridView(parent, name, f)
 {
     setFont( KGlobalSettings::generalFont() );
     if(!date_.isValid())
         {
             date_=QDate::currentDate();
         }
     setFocusPolicy( QWidget::StrongFocus );
     setNumRows(7); // 6 weeks max + headline
     setNumCols(7); // 7 days a week
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
     viewport()->setBackgroundColor(QColor(220,245,255));
 #if 0
     viewport()->setEraseColor(lightGray);
 #endif
     mMarkCurrent = false;
     setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth
 }
 
 void
 KDateTable::paintCell(QPainter *painter, int row, int col)
 {
     QRect rect;
     QString text;
     QPen pen;
     int w=cellWidth();
     int h=cellHeight();
     int pos;
     QBrush brushBlue(blue);
     QBrush brushLightblue(QColor(220,245,255));
     QFont _font=font();
     // -----
     if(row==0)
         { // we are drawing the headline
             _font.setBold(true);
             painter->setFont(_font);
             bool normalday = true;
             QString daystr;
             if (KGlobal::locale()->weekStartsMonday())
                 {
                     daystr = KGlobal::locale()->weekDayName(col+1, true);
                     if (col == 5 || col == 6)
                         normalday = false;
                 } else {
                 daystr = KGlobal::locale()->weekDayName(col==0? 7 : col, true);
                 if (col == 0 || col == 6)
                     normalday = false;
             }
             if (!normalday)
                 {
                     painter->setPen(QColor(220,245,255));
                     painter->setBrush(brushLightblue);
                     painter->drawRect(0, 0, w, h);
                     painter->setPen(blue);
                 } else {
                 painter->setPen(blue);
                 painter->setBrush(brushBlue);
                 painter->drawRect(0, 0, w, h);
                 painter->setPen(white);
             }
             painter->drawText(0, 0, w, h-1, AlignCenter,
                               daystr, -1, &rect);
             painter->setPen(black);
             painter->moveTo(0, h-1);
             painter->lineTo(w-1, h-1);
             // ----- draw the weekday:
         } else {
         painter->setFont(_font);
         pos=7*(row-1)+col;
         if (KGlobal::locale()->weekStartsMonday())
             pos++;
         if(pos<firstday || (firstday+numdays<=pos))
             { // we are either
                 // ° painting a day of the previous month or
                 // ° painting a day of the following month
                 if(pos<firstday)
                     { // previous month
                         text.setNum(numDaysPrevMonth+pos-firstday+1);
                     } else { // following month
                     text.setNum(pos-firstday-numdays+1);
                 }
                 painter->setPen(gray);
             } else { // paint a day of the current month
             text.setNum(pos-firstday+1);
             painter->setPen(black);
         }
 
         pen=painter->pen();
         if(firstday+date.day()-1==pos)
             {
                 if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
                     painter->setPen(green);
                 else
                     painter->setPen(red);
                 if(hasFocus())
                     {  
                         painter->setBrush(darkRed);
                         pen=white;
                     } else {
                     painter->setBrush(darkGray);
                     pen=white;
                 }
             } else {
             if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
                 {
                     painter->setPen(green);
                     painter->setBrush(darkGreen);
                     pen=white;
                 } else {
                 painter->setBrush(QColor(220,245,255));
                 painter->setPen(QColor(220,245,255));
             }
         }
         painter->drawRect(0, 0, w, h);
         painter->setPen(pen);
         painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect);
     }
     /*
     if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); 
     if(rect.height()>maxCell.height()) {
         maxCell.setHeight(rect.height());
     }
     */
 }
 
 void
 KDateTable::keyPressEvent( QKeyEvent *e )
 {
     /*
     // not working properly
     if ( e->key() == Qt::Key_Prior ) {
     if ( date.month() == 1 ) {
     KNotifyClient::beep();
     return;
     }
     int day = date.day();
     if ( day > 27 )
     while ( !QDate::isValid( date.year(), date.month()-1, day ) )
     day--;
     setDate(QDate(date.year(), date.month()-1, day));
     return;
     }
     if ( e->key() == Qt::Key_Next ) {
     if ( date.month() == 12 ) {
     KNotifyClient::beep();
     return;
     }
     int day = date.day();
     if ( day > 27 )
     while ( !QDate::isValid( date.year(), date.month()+1, day ) )
     day--;
     setDate(QDate(date.year(), date.month()+1, day));
     return;
     }
     */
     int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
 
     int temp=firstday+date.day()-dayoff;
     int pos = temp;
     bool irgnore = true;
     if ( e->state() != Qt::ControlButton ) {
         if ( e->key() == Qt::Key_Up ) {
             pos -= 7;
             irgnore = false;
         }
         if ( e->key() == Qt::Key_Down ) {
             pos += 7;
             irgnore = false;
         }
         if ( e->key() == Qt::Key_Left ) {
             pos--;
             irgnore = false;
         }
         if ( e->key() == Qt::Key_Right ) {
             pos++;
             irgnore = false;
         }
     } 
     if ( irgnore )
         e->ignore();
 
     if(pos+dayoff<=firstday)
         { // this day is in the previous month
             KNotifyClient::beep();
             return;
         }
     if(firstday+numdays<pos+dayoff)
         { // this date is in the next month
             KNotifyClient::beep(i18n( "Month not long enough" ));
             return;
         }
 
     if ( pos == temp )
         return;
 
     setDate(QDate(date.year(), date.month(), pos-firstday+dayoff));
     updateCell(temp/7+1, temp%7); // Update the previously selected cell
     updateCell(pos/7+1, pos%7); // Update the selected cell
     assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid());
   
 
 }
 
 void
 KDateTable::viewportResizeEvent(QResizeEvent * e)
 {
     QGridView::viewportResizeEvent(e);
 
     setCellWidth(viewport()->width()/7);
     setCellHeight(viewport()->height()/7);
 }
 
 void
 KDateTable::setFontSize(int size)
 {
     int count;
     QRect rect;
     // ----- store rectangles:
     fontsize=size;
     QFont  _font = font();
     _font.setPointSize(fontsize);
     setFont( _font );
     _font.setBold( true );
     QFontMetrics metrics(_font);
 
     // ----- find largest day name:
     maxCell.setWidth(0);
     maxCell.setHeight(0);
     for(count=0; count<7; ++count)
         {
             rect=metrics.boundingRect(KGlobal::locale()->weekDayName(count+1, true));
             maxCell.setWidth(QMAX(maxCell.width(), rect.width()));
             maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
         }
     // ----- compare with a real wide number and add some space:
     rect=metrics.boundingRect(QString::fromLatin1("88"));
     maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
 #ifdef DESKTOP_VERSION
     maxCell.setHeight(QMAX(maxCell.height()+8, rect.height()));
 #else
     maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
 #endif
     if ( maxCell.width() * 1000 / maxCell.height()  > 1900 ) {
         maxCell.setHeight(maxCell.width() * 1000 / 1900 );
         qDebug("setmax ");
     }
 }
 
 void
 KDateTable::contentsMousePressEvent(QMouseEvent *e)
 {
     if(e->type()!=QEvent::MouseButtonPress)
         { // the KDatePicker only reacts on mouse press events:
             return;
         }
     if(!isEnabled())
         {
             KNotifyClient::beep();
             return;
         }
 
     int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
     // -----
     int row, col, pos, temp;
     QPoint mouseCoord;
     // -----
     mouseCoord = e->pos();
     row=rowAt(mouseCoord.y());
     col=columnAt(mouseCoord.x());
     if(row<0 || col<0)
         { // the user clicked on the frame of the table
             return;
         }
     pos=7*(row-1)+col+1;
 #if 0
     if(pos+dayoff<=firstday)
         { // this day is in the previous month
             KNotifyClient::beep();
             return;
         }
     if(firstday+numdays<pos+dayoff)
         { // this date is in the next month
             KNotifyClient::beep();
             return;
         }
 #endif
     temp=firstday+date.day()-dayoff-1;
     QDate da = QDate(date.year(), date.month(),1);
     setDate(da.addDays( pos-firstday+dayoff-1));
     updateCell(temp/7+1, temp%7); // Update the previously selected cell
     updateCell(row, col); // Update the selected cell
     // assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid());
     emit(tableClicked());
 }
 
 bool
 KDateTable::setDate(const QDate& date_)
 {
     bool changed=false;
     QDate temp;
     mMarkCurrent = false;
     // -----
     if(!date_.isValid())
         {
             kdDebug() << "KDateTable::setDate: refusing to set invalid date." << endl;
             return false;
         }
     if(date!=date_)
         {
             date=date_;
             changed=true;
         }
     mMarkCurrent = ( date.month() ==  QDate::currentDate().month() && date.year() ==  QDate::currentDate().year() );
     temp.setYMD(date.year(), date.month(), 1);
     firstday=temp.dayOfWeek();
     if(firstday==1) firstday=8;
     numdays=date.daysInMonth();
     if(date.month()==1)
         { // set to december of previous year
             temp.setYMD(date.year()-1, 12, 1);
         } else { // set to previous month
         temp.setYMD(date.year(), date.month()-1, 1);
     }
     numDaysPrevMonth=temp.daysInMonth();
     if(changed)
         {
             repaintContents(false);
         }
     emit(dateChanged(date));
     return true;
 }
 
 const QDate&
 KDateTable::getDate() const
 {
     return date;
 }
 
 void KDateTable::focusInEvent( QFocusEvent *e )
 {
     repaintContents(false);
     QGridView::focusInEvent( e );
 }
 
 void KDateTable::focusOutEvent( QFocusEvent *e )
 {
     repaintContents(false);
     QGridView::focusOutEvent( e );
 }
 
 QSize
 KDateTable::sizeHint() const
 {
     if(maxCell.height()>0 && maxCell.width()>0)
         {
             return QSize((maxCell.width()+2)*numCols()+2*frameWidth(),
                          (maxCell.height()+4)*numRows()+2*frameWidth());
         } else {
         return QSize(-1, -1);
     }
 }
 
 KDateInternalMonthPicker::KDateInternalMonthPicker
 (QWidget* parent, const char* name)
     : QGridView(parent, name),
       result(0) // invalid
 {
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
     activeRow = -1;
     font=KGlobalSettings::generalFont();
     int fontsize = 10;
     int add = 2;
     if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
         add += 8;
+    if ( QApplication::desktop()->width() > 640 )
+        add += 4;
     font.setPointSize(fontsize+add);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
     setFrameStyle(QFrame::NoFrame);
     setNumRows(4);
     setNumCols(3);
     // enable to find drawing failures:
     // setTableFlags(Tbl_clipCellPainting);
 #if 0
     viewport()->setEraseColor(lightGray); // for consistency with the datepicker
 #endif
     // ----- find the preferred size
     //       (this is slow, possibly, but unfortunatly it is needed here):
     QFontMetrics metrics(font);
     for(int i=1; i <= 12; ++i)
         {
             rect=metrics.boundingRect(KGlobal::locale()->monthName(i, false));
             if(max.width()<rect.width()) max.setWidth(rect.width());
             if(max.height()<rect.height()) max.setHeight(rect.height());
         }
 
 }
 
 QSize
 KDateInternalMonthPicker::sizeHint() const
 {
     return QSize((max.width()+6)*numCols()+2*frameWidth(),
                  (max.height()+6)*numRows()+2*frameWidth());
 }
 
 int
 KDateInternalMonthPicker::getResult() const
 {
     return result;
 }
 
 void
 KDateInternalMonthPicker::setupPainter(QPainter *p)
 {
     p->setPen(black);
 }
 
 void
 KDateInternalMonthPicker::viewportResizeEvent(QResizeEvent*)
 {
     setCellWidth(width()/3);
     setCellHeight(height()/4);
 }
 
 void
 KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
 {
     int index;
     QString text;
     // ----- find the number of the cell:
     index=3*row+col+1;
     text=KGlobal::locale()->monthName(index, false);
     painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
     if ( activeCol == col && activeRow == row )
         painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
 
 void
 KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 {
     if(!isEnabled() || e->button() != LeftButton)
         {
             KNotifyClient::beep();
             return;
         }
     // -----
     int row, col;
     QPoint mouseCoord;
     // -----
     mouseCoord = e->pos();
     row=rowAt(mouseCoord.y());
     col=columnAt(mouseCoord.x());
 
     if(row<0 || col<0)
         { // the user clicked on the frame of the table
             activeCol = -1;
             activeRow = -1;
         } else {
         activeCol = col;
         activeRow = row;
         updateCell( row, col /*, false */ );
     }
 }
 
 void
 KDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
     if (e->state() & LeftButton)
         {
             int row, col;
             QPoint mouseCoord;
             // -----
             mouseCoord = e->pos();
             row=rowAt(mouseCoord.y());
             col=columnAt(mouseCoord.x());
             int tmpRow = -1, tmpCol = -1;
             if(row<0 || col<0)
                 { // the user clicked on the frame of the table
                     if ( activeCol > -1 )
                         {
                             tmpRow = activeRow;
                             tmpCol = activeCol;
                         }
                     activeCol = -1;
                     activeRow = -1;
                 } else {
                 bool differentCell = (activeRow != row || activeCol != col);
                 if ( activeCol > -1 && differentCell)
                     {
                         tmpRow = activeRow;
                         tmpCol = activeCol;
                     }
                 if ( differentCell)
                     {
                         activeRow = row;
                         activeCol = col;
                         updateCell( row, col /*, false */ ); // mark the new active cell
                     }
             }
             if ( tmpRow > -1 ) // repaint the former active cell
                 updateCell( tmpRow, tmpCol /*, true */ );
         }
 }
 
 void
 KDateInternalMonthPicker::contentsMouseReleaseEvent(QMouseEvent *e)
 {
     if(!isEnabled())
         {
             return;
         }
     // -----
     int row, col, pos;
     QPoint mouseCoord;
     // -----
     mouseCoord = e->pos();
     row=rowAt(mouseCoord.y());
     col=columnAt(mouseCoord.x());
     if(row<0 || col<0)
         { // the user clicked on the frame of the table
             emit(closeMe(0));
         }
     pos=3*row+col+1;
     result=pos;
     emit(closeMe(1));
 }
 
 
 
 KDateInternalYearSelector::KDateInternalYearSelector
 (int fontsize, QWidget* parent, const char* name)
     : QLineEdit(parent, name),
       val(new QIntValidator(this)),
       result(0)
 {
     QFont font;
     // -----
     font=KGlobalSettings::generalFont();
     font.setPointSize(fontsize);
     setFont(font);
 #if 0
     setFrameStyle(QFrame::NoFrame);
 #endif
     // we have to respect the limits of QDate here, I fear:
     val->setRange(0, 8000);
     setValidator(val);
     connect(this, SIGNAL(returnPressed()), SLOT(yearEnteredSlot()));
 }
 
 void
 KDateInternalYearSelector::yearEnteredSlot()
 {
     bool ok;
     int year;
     QDate date;
     // ----- check if this is a valid year:
     year=text().toInt(&ok);
     if(!ok)
         {
             KNotifyClient::beep();
             return;
         }
     date.setYMD(year, 1, 1);
     if(!date.isValid())
         {
             KNotifyClient::beep();
             return;
         }
     result=year;
     emit(closeMe(1));
 }
 
 int
 KDateInternalYearSelector::getYear()
 {
     return result;
 }
 
 void
 KDateInternalYearSelector::setYear(int year)
 {
     QString temp;
     // -----
     temp.setNum(year);
     setText(temp);
 }
 
 KPopupFrame::KPopupFrame(QWidget* parent, const char*  name)
     : QFrame(parent, name, WType_Popup),
       result(0), // rejected
       main(0)
 {
     setFrameStyle(QFrame::Box|QFrame::Raised);
     setMidLineWidth(2);
 }
 
 void
 KPopupFrame::keyPressEvent(QKeyEvent* e)
 {
     if(e->key()==Key_Escape)
         {
             result=0; // rejected
             qApp->exit_loop();
         }
 }
 
 void
 KPopupFrame::close(int r)
 {
     result=r;
     qApp->exit_loop();
 }
 
 void
 KPopupFrame::setMainWidget(QWidget* m)
 {
     main=m;
     if(main!=0)
         {
             resize(main->width()+2*frameWidth(), main->height()+2*frameWidth());
         }
 }
 
 void
 KPopupFrame::resizeEvent(QResizeEvent*)
 {
     if(main!=0)
         {
             main->setGeometry(frameWidth(), frameWidth(),
                               width()-2*frameWidth(), height()-2*frameWidth());
         }
 }
 
 void
 KPopupFrame::popup(const QPoint &pos)
 {
     // Make sure the whole popup is visible.
     QRect d = QApplication::desktop()->frameGeometry();
     int x = pos.x();
     int y = pos.y();
     int w = width();
     int h = height();
     if (x+w > d.x()+d.width())
         x = d.width() - w;
     if (y+h > d.y()+d.height())
         y = d.height() - h;
     if (x < d.x())
         x = 0;
     if (y < d.y())
         y = 0;
 
     // Pop the thingy up.
     move(x, y);
     show();
 }
 
 int
 KPopupFrame::exec(QPoint pos)
 {
     popup(pos);
     repaint();
     qApp->enter_loop();
     hide();
     return result;
 }
 
 int
 KPopupFrame::exec(int x, int y)
 {
     return exec(QPoint(x, y));
 }
 
 void KPopupFrame::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KDateTable::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 //#include "kdatetbl.moc"
 
 
 KDateInternalWeekPicker::KDateInternalWeekPicker
 (QWidget* parent, const char* name)
     : QGridView(parent, name),
       result(0) // invalid
 {
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
     activeRow = -1;
     font=KGlobalSettings::generalFont();
     int fontsize = 10;
     int add = 2;
     if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
         add += 6;
     font.setPointSize(fontsize+add);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
     setFrameStyle(QFrame::NoFrame);
     setNumRows(13);
     setNumCols(4);
     // enable to find drawing failures:
     // setTableFlags(Tbl_clipCellPainting);
 #if 0
     viewport()->setEraseColor(lightGray); // for consistency with the datepicker
 #endif
     // ----- find the preferred size
     //       (this is slow, possibly, but unfortunatly it is needed here):
     QFontMetrics metrics(font);
     for(int i=1; i <= 52; ++i)
         {
             rect=metrics.boundingRect(QString::number( i ));
             if(max.width()<rect.width()) max.setWidth(rect.width());
             if(max.height()<rect.height()) max.setHeight(rect.height());
         }
     if ( QApplication::desktop()->width() > 640 ) {
       
         max.setWidth(max.width()+6);
         max.setHeight(max.height()+8);
     }
 }
 
 QSize
 KDateInternalWeekPicker::sizeHint() const
 {
     return QSize((max.width()+6)*numCols()+2*frameWidth(),
                  (max.height()+6)*numRows()+2*frameWidth());
 }
 
 int
 KDateInternalWeekPicker::getResult() const
 {
     return result;
 }
 
 void
 KDateInternalWeekPicker::setupPainter(QPainter *p)
 {
     p->setPen(black);
 }
 
 void
 KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*)
 {
     setCellWidth(width()/4);
     setCellHeight(height()/13);
 }
 
 void
 KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col)
 {
     int index;
     QString text;
     // ----- find the number of the cell:
     index=4*row+col+1;
     text=QString::number( index );