fixx

6 files changed, 49 insertions, 23 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 662576f..92c1cd6 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1,253 +1,254 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     Marcus Bains line.
     Copyright (c) 2001 Ali Rahimi
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef _WIN32_
 #define protected public
 #include <qwidget.h>
 #undef protected 
 #endif
 #include <qintdict.h>
 #include <qdatetime.h>
 #include <qapplication.h>
 #include <qpopupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 
 #include "koagendaitem.h"
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "koagenda.h"
 
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 
 //extern bool globalFlagBlockPainting;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockStartup;
 
 
 ////////////////////////////////////////////////////////////////////////////
 MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
     : QFrame(_agenda->viewport(),name), agenda(_agenda)
 {
     setLineWidth(0);
     setMargin(0);
     setBackgroundColor(Qt::red);
     minutes = new QTimer(this);
     connect(minutes, SIGNAL(timeout()), this, SLOT(updateLoc()));
     minutes->start(0, true);
     mTimeBox = new QLabel(this);
     mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom);
     QPalette pal = mTimeBox->palette();
     pal.setColor(QColorGroup::Foreground, Qt::red);
     mTimeBox->setPalette(pal);
     //mTimeBox->setAutoMask(true);
 
     agenda->addChild(mTimeBox);
 
     oldToday = -1;
 }
 
 MarcusBains::~MarcusBains()
 {
-    delete minutes;
+    //delete minutes;
 }
 
 int MarcusBains::todayColumn()
 {
     QDate currentDate = QDate::currentDate();
 
     DateList dateList = agenda->dateList();
     DateList::ConstIterator it;
     int col = 0;
     for(it = dateList.begin(); it != dateList.end(); ++it) {
 	if((*it) == currentDate)
 	    return KOGlobals::self()->reverseLayout() ?
 	                         agenda->columns() - 1 - col : col;
         ++col;
     }
 
     return -1;
 }
 void MarcusBains::updateLoc()
 {
     updateLocation();
 }
 void MarcusBains::updateLocation(bool recalculate)
 {
   
     QTime tim = QTime::currentTime();
     //qDebug(" MarcusBains::updateLocation %s ", tim.toString().latin1());
     if((tim.hour() == 0) && (oldTime.hour()==23))
         recalculate = true;
 
     int mins = tim.hour()*60 + tim.minute();
     int minutesPerCell = 24 * 60 / agenda->rows();
     int y = mins*agenda->gridSpacingY()/minutesPerCell;
     int today = recalculate ? todayColumn() : oldToday;
     int x = agenda->gridSpacingX()*today;
     bool disabled = !(KOPrefs::instance()->mMarcusBainsEnabled);
 
     oldTime = tim;
     oldToday = today;
 
     if(disabled || (today<0)) {
         hide(); mTimeBox->hide();
         return;
     } else {
         show(); mTimeBox->show();
     }
 
     if(recalculate)
         setFixedSize(agenda->gridSpacingX(),1);
     agenda->moveChild(this, x, y);
     raise();
 
     if(recalculate)
         //mTimeBox->setFont(QFont("helvetica",10));
       mTimeBox->setFont(KOPrefs::instance()->mMarcusBainsFont);
 
     mTimeBox->setText(KGlobal::locale()->formatTime(tim, KOPrefs::instance()->mMarcusBainsShowSeconds));
     mTimeBox->adjustSize();
     // the -2 below is there because there is a bug in this program
     // somewhere, where the last column of this widget is a few pixels
     // narrower than the other columns.
     int offs = (today==agenda->columns()-1) ? -4 : 0;
     agenda->moveChild(mTimeBox,
                x+agenda->gridSpacingX()-mTimeBox->width()+offs-1,
                   y-mTimeBox->height());
- 
     mTimeBox->raise();
     //mTimeBox->setAutoMask(true);
-    minutes->start(5000,true);
+    int secs = QTime::currentTime().second();
+    qDebug("second %d ", secs );
+    minutes->start( (60 - secs +1)*1000 ,true);
 }
 
 
 ////////////////////////////////////////////////////////////////////////////
 
 
 /*
   Create an agenda widget with rows rows and columns columns.
 */
 KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
                    const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
    
     mAllAgendaPopup = 0;
   mColumns = columns;
   mRows = rows;
   mGridSpacingY = rowSize;
   mAllDayMode = false; 
 #ifndef DESKTOP_VERSION
   //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
   connect ( this, SIGNAL (contentsMoving ( int , int )   ), this, SLOT ( slotContentMove(int,int)) );
 }
 
 /*
   Create an agenda widget with columns columns and one row. This is used for
   all-day events.
 */
 KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
     mAllAgendaPopup = 0;
   blockResize = false;
   mColumns = columns;
   mRows = 1;
   //qDebug("aaaaaaaaaaaaaaaaaaldays %d ", KOPrefs::instance()->mAllDaySize);
   mGridSpacingY = KOPrefs::instance()->mAllDaySize;
   mAllDayMode = true;
 #ifndef DESKTOP_VERSION
   //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
 }
 
 
 KOAgenda::~KOAgenda()
 {
     if(mMarcusBains) delete mMarcusBains;
     
 }
 
 Incidence *KOAgenda::selectedIncidence() const
 {
   return (mSelectedItem ? mSelectedItem->incidence() : 0);
 }
 
 
 QDate KOAgenda::selectedIncidenceDate() const
 {
   return (mSelectedItem ? mSelectedItem->itemDate() : QDate());
 }
 
 
 void KOAgenda::init()
 {  
     mPopupTimer = new QTimer(this);
     connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu()));
 
     mNewItemPopup = new QPopupMenu( this );
     connect ( mNewItemPopup, SIGNAL (activated ( int )  ), this, SLOT ( newItem(int)) );
     QString pathString = "";
     if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
     if ( QApplication::desktop()->width() < 480 )
         pathString += "icons16/";
     } else
         pathString += "iconsmini/";
     
     mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 
     mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ),  i18n("New Todo..."),2 ); 
     mNewItemPopup->insertSeparator ( ); 
     mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"xdays" ),  i18n("Next days"),8 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next week"),4 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next two weeks"),5 );   
     mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("This month"),6 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
 #ifndef _WIN32_
   int wflags = viewport()-> getWFlags() |WRepaintNoErase;//WResizeNoErase
   viewport()->setWFlags ( wflags);
 #endif
   mGridSpacingX = 80;
   mResizeBorderWidth = 8;
@@ -349,193 +350,193 @@ void KOAgenda::clear()
   mSelectedItem = 0;
   clearSelection();
 }
 
 void KOAgenda::clearSelection()
 {
   mSelectionCellX = 0;
   mSelectionYTop = 0;
   mSelectionHeight = 0;
 }
 
 void KOAgenda::marcus_bains()
 {
     if(mMarcusBains) mMarcusBains->updateLocation(true);
 }
 
 
 void KOAgenda::changeColumns(int columns)
 {
     if (columns == 0) {
         qDebug("KOAgenda::changeColumns() called with argument 0 ");
         return;
     }
     clear();
     mColumns = columns;
     computeSizes();
 }
 
 /*
   This is the eventFilter function, which gets all events from the KOAgendaItems
   contained in the agenda. It has to handle moving and resizing for all items.
 */
 bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
 {
     //  kdDebug() << "KOAgenda::eventFilter" << endl;
     switch(event->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonDblClick:
     case QEvent::MouseButtonRelease:
     case QEvent::MouseMove:
         return eventFilter_mouse(object, static_cast<QMouseEvent *>(event));
 
     case (QEvent::Leave):
         if (!mActionItem)
             setCursor(arrowCursor);
         return true;
 
     default:
         return QScrollView::eventFilter(object,event);
     }
 }
 void KOAgenda::popupMenu()
 {
     mPopupTimer->stop();
     if (  mPopupKind == 1 || mPopupKind == 3 ) {
         if (mActionItem ) {
             endItemAction();
         }
         mLeftMouseDown = false; // no more leftMouse computation
         if (mPopupItem) {
             //mClickedItem = mPopupItem;
             selectItem(mPopupItem);
             if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 1 )
                 mAllAgendaPopup->installEventFilter( this );
             emit showIncidencePopupSignal(mPopupItem->incidence());
             
         } 
     } else if ( mPopupKind == 2 || mPopupKind == 4 ) {
         if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action
             endSelectAction( false ); // do not emit new event signal
             mLeftMouseDown = false; // no more leftMouse computation
         }
         if ( KOPrefs::instance()->mBlockPopupMenu &&  mPopupKind == 2 )
             mNewItemPopup->installEventFilter( this );
         mNewItemPopup->popup( mPopupPos);
         
     }
     mLeftMouseDown = false;
     mPopupItem = 0;
     mPopupKind = 0;
 }
 void KOAgenda::categoryChanged(Incidence * inc)
 {
     KOAgendaItem *item;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if ( item->incidence() == inc ) {
             item->initColor ();
             item->updateItem();
         }
     }
 }
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
 
     if ( mInvalidPixmap ) {
         mInvalidPixmap = false;
-        qDebug("InvalidPixmap ");
+        qDebug("KO: Upsizing Pixmaps ");
         computeSizes();
         emit updateViewSignal();
         return true;
     } 
     emit sendPing(); 
     static int startX = 0;
     static int startY = 0;
     int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 );
     static bool blockMoving = true;
 
     //qDebug("KOAgenda::eventFilter_mous ");
     if ( object == mNewItemPopup ) {
         //qDebug("mNewItemPopup ");
         if ( me->type() == QEvent::MouseButtonRelease ) {
             mNewItemPopup->removeEventFilter( this ); 
             int dX = me->globalPos().x() - mPopupPos.x();;
             if ( dX < 0   )
                 dX = -dX;
             int dY =  me->globalPos().y() - mPopupPos.y();
             if ( dY < 0 )
                 dY = -dY;
             if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
                 mNewItemPopup->hide();
             }
         }
         return true;
     }
     if ( object == mAllAgendaPopup ) {
         //qDebug(" mAllAgendaPopup ");
         if ( me->type() == QEvent::MouseButtonRelease ) {
             mAllAgendaPopup->removeEventFilter( this );
             int dX = me->globalPos().x() - mPopupPos.x();;
             if ( dX < 0   )
                 dX = -dX;
             int dY =  me->globalPos().y() - mPopupPos.y();
             if ( dY < 0 )
                 dY = -dY;
             if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
                 mAllAgendaPopup->hide();
             } 
         }
         return true;
     }
     QPoint viewportPos;
     if (object != viewport()) {
         blockmoveDist = blockmoveDist*2;
         viewportPos = ((QWidget *)object)->mapToParent(me->pos());
     } else {
         viewportPos = me->pos();
     }
     bool objIsNotViewport = (object != viewport());
     bool leftButt = false;
 #ifdef DESKTOP_VERSION
     leftButt  = (me->button() == LeftButton);
 #endif
     switch (me->type())  {
     case QEvent::MouseButtonPress:
         if (me->button() == LeftButton) {
             mPopupTimer->start( 600 );
             mLeftMouseDown = true;
         }
         blockMoving = true;
         startX = viewportPos.x();
         startY = viewportPos.y();  
         mPopupPos = me->globalPos();
         if (  objIsNotViewport && !leftButt ) {
             KOAgendaItem * tempItem = (KOAgendaItem *)object;
             if (mAllDayMode) {
                 if ( tempItem->height() > 10 ) {
                     int minV = tempItem->height()/4;
                     if ( minV > (blockmoveDist/2)-2 ) {
                         if ( minV > blockmoveDist )
                             minV = blockmoveDist;
                         else
                             minV = (blockmoveDist/2);
                     }
                     bool border = false;
                     int diff = tempItem->y() - viewportPos.y();
                     if ( diff < 0 )
                         diff *= -1;
                     if ( diff < minV ) {
                         border = true;
                         objIsNotViewport = false;
                     }
                     if ( ! border ) {
                         diff = tempItem->y() + tempItem->height()- viewportPos.y();
                         if ( diff < 0 )
                             diff *= -1;
                         if ( diff < minV ) {
                             border = true;
                             objIsNotViewport = false;
                         }
                     }
                 }
             } else { // not allday
                 if ( tempItem->width() > 10 ) {
@@ -1183,334 +1184,334 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
     }
 
     if (conflictItems.count() > 0) {
         // Look for unused sub cell and insert item
         int i;
         for(i=0;i<maxSubCells;++i) {
             if (!subCellDict.find(i)) {
                 placeItem->setSubCell(i);
                 break;
             }
         }
         if (i == maxSubCells) {
             placeItem->setSubCell(maxSubCells);
             maxSubCells++;  // add new item to number of sub cells
         }
 
         // Prepare for sub cell geometry adjustment
         int newSubCellWidth;
         if (mAllDayMode) newSubCellWidth = mGridSpacingY / maxSubCells;
         else newSubCellWidth = mGridSpacingX / maxSubCells;
         conflictItems.append(placeItem);
 
 
         // Adjust sub cell geometry of all direct conflict items
         for ( item=conflictItems.first(); item != 0;
               item=conflictItems.next() ) {
             item->setSubCells(maxSubCells);
             if (mAllDayMode) {
                 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth);
             } else {
                 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY);
             }
             int x,y;
             gridToContents(item->cellX(),item->cellYTop(),x,y);
             if (mAllDayMode) {
                 y += item->subCell() * newSubCellWidth;
             } else {
                 x += item->subCell() * newSubCellWidth;
             }
             moveChild(item,x,y);  
             // qDebug("moveChild %s %d %d ", item->incidence()->summary().latin1() ,x,y);  
             //item->updateItem();
         }
         // Adjust sub cell geometry of all conflict items of all conflict items
         for ( item=conflictItems.first(); item != 0;
               item=conflictItems.next() ) {
             if ( placeItem != item ) {
                 KOAgendaItem *item2;
                 QPtrList<KOAgendaItem> conflictItems2 = item->conflictItems();
                 for ( item2=conflictItems2.first(); item2 != 0;
                       item2=conflictItems2.next() ) {
                     if ( item2->subCells() != maxSubCells) {
                         item2->setSubCells(maxSubCells);
                         if (mAllDayMode) {
                             item2->resize(item2->cellWidth() * mGridSpacingX, newSubCellWidth);
                         } else {
                             item2->resize(newSubCellWidth, item2->cellHeight() * mGridSpacingY);
                         }
                         int x,y;
                         gridToContents(item2->cellX(),item2->cellYTop(),x,y);
                         if (mAllDayMode) {
                             y += item2->subCell() * newSubCellWidth;
                         } else {
                             x += item2->subCell() * newSubCellWidth;
                         }
                         moveChild(item2,x,y);  
                         //qDebug("setttttt %d %s",maxSubCells, item2->text().latin1() );
                     }
                 }
             }
         }
     } else {
         placeItem->setSubCell(0);
         placeItem->setSubCells(1);
         if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY);
         else placeItem->resize(mGridSpacingX,placeItem->height());
         int x,y;
         gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y);
         moveChild(placeItem,x,y);
     }
     placeItem->setConflictItems(conflictItems);
   //   for ( item=conflictItems.first(); item != 0;
 //           item=conflictItems.next() ) {
 //         //item->updateItem();
 //         //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() );  
 //     }
 //     placeItem->updateItem();
 } 
 
 void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
 {
     if ( globalFlagBlockAgenda )
         return;
 
     if ( mInvalidPixmap ) {
         mInvalidPixmap = false;
-        qDebug("InvalidPixmap ");
+        qDebug("KO: Upsizing Pixmaps ");
         computeSizes();
         emit updateViewSignal();
         return;
     }
     if ( ! mAllDayMode ) {
         // currently not working for
    
         //qDebug("KOAgenda::drawContents ");
 #if 0
         if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
             qDebug("WAU ");
             drawContentsToPainter();
         }
 #endif
         QPaintDevice* pd = p->device();
         p->end();
         int vx, vy; 
         int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
         contentsToViewport ( cx, cy, vx,vy); 
         //qDebug("  %d %d %d %d %d",  cx, cy, cw,ch,mGridSpacingX-1) ;
 
         if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
             if ( mGridSpacingX == cw && mSelectionHeight > 0  &&  ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                                                                     ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
             
                 int vxSel, vySel;
                 contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 
                 int off = mSelectionHeight;
                 if ( vySel < 0 )
                     off += vySel;
                 //qDebug("OFF %d %d %d", off,vySel, vy );  
                 bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,CopyROP);
             } else {
                 bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
             }
         }
         if ( mSelectionHeight > 0 ) { 
             //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
             if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                  ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
                 contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
                 // bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
                 int hei = mSelectionHeight;
                 int offset = 0;
                 while ( hei > 0 ) {
                     int p_hei = 5;
                     if ( hei < 5 ) p_hei = hei;
                     hei -= 5;
                     bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
                     offset += 5;
                 }
             }     
         } 
         p->begin( pd );
     } else {
 #if 0
         qDebug("mCurPixWid  %d %d ",mCurPixWid, contentsWidth() );
         if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
             qDebug("WAUWAU ");
             drawContentsToPainter();
         }
 #endif
         QPaintDevice* pd = p->device();
         p->end();
         int vx, vy; 
         int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
         contentsToViewport ( cx, cy, vx,vy); 
         // qDebug("  %d %d %d %d ",  cx, cy, cw,ch) ;
         if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) )
             bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
     
         if ( mSelectionHeight > 0 ) { 
             //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
             if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                  ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
                 contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
                 //bitBlt ( pd, vx+1, vy, &mHighlightPixmap, 0, mSelectionYTop, mGridSpacingX-1, mSelectionHeight ,CopyROP); 
                 int hei = mSelectionHeight;
                 int offset = 0;
                 while ( hei > 0 ) {
                     int p_hei = 5;
                     if ( hei < 5 ) p_hei = hei;
                     hei -= 5;
                     bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
                     offset += 5;
                 }
             }     
         } 
         p->begin( pd );
     }
 
 }
 
 void KOAgenda::finishUpdate()
 {
 
     KOAgendaItem *item;
     globalFlagBlockAgendaItemPaint = 1;  
     // Adjust sub cell geometry of all conflict items of all conflict items of all conflict items ... of the conflict item with the max number of conflictitems
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if ( !item->checkLayout() ) {
             //qDebug(" conflictitem found ");
             int newSubCellWidth;
             if (mAllDayMode) newSubCellWidth = mGridSpacingY / item->subCells();
             else newSubCellWidth = mGridSpacingX / item->subCells();
 
             if (mAllDayMode) {
                 item->resize(item->cellWidth() * mGridSpacingX, newSubCellWidth);
             } else {
                 item->resize(newSubCellWidth, item->cellHeight() * mGridSpacingY);
             }
             int x,y;
             gridToContents(item->cellX(),item->cellYTop(),x,y);
             if (mAllDayMode) {
                 y += item->subCell() * newSubCellWidth;
             } else {
                 x += item->subCell() * newSubCellWidth;
             }
             moveChild(item,x,y); 
         }
     }
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if ( !item->isVisible() )
             item->show();
        
     }
     globalFlagBlockAgendaItemUpdate = 0;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
             item->repaintMe( );
     }
     globalFlagBlockAgendaItemUpdate = 1;
     qApp->processEvents(); 
     globalFlagBlockAgendaItemPaint = 0;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         item->repaint( false );
     }
-    
+    marcus_bains();
 }
 
 /*
   Draw grid in the background of the agenda.
 */
 void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// int cx, int cy, int cw, int ch)
 {
 
  
     if ( ! mGridSpacingX || ! mGridSpacingY ||! mHolidayMask )
         return;
     if ( globalFlagBlockAgenda > 1 && globalFlagBlockAgenda < 4 )
         return;
     int cx = 0, cy = 0,  cw = contentsWidth(),  ch = contentsHeight();
     if ( ch < 1 )
         ch = 1;
     if (  mPaintPixmap.width() < contentsWidth()+42 || mPaintPixmap.height() < ch ) {
         mPaintPixmap.resize( contentsWidth()+42, ch );
     }
     mCurPixWid = contentsWidth();
     mCurPixHei = ch;
     if ( mHighlightPixmap.width() < mGridSpacingX-1  ) {
         mHighlightPixmap.resize( mGridSpacingX-1, 5 );
         mHighlightPixmap.fill ( KOPrefs::instance()->mHighlightColor );
     }
     mPixPainter.begin( &mPaintPixmap) ;
     //qDebug("wid %d hei %d ",mPaintPixmap.width(),mPaintPixmap.height()  );
     QPainter * p ;
     if (paint == 0) {
         mPaintPixmap.fill(KOPrefs::instance()->mAgendaBgColor);
         p = &mPixPainter;
     }
     else
         p = paint ;
     // qDebug("++++++KOAgenda::drawContentsTo Painter %d %d %d %d ",  cx, cy, cw, ch); 
    
     //--cx;++cw;
     int lGridSpacingY = mGridSpacingY*2;
     int selDay;
     QDate curDate = QDate::currentDate();
     if ( !backgroundOnly ) {
         for ( selDay = 0; selDay < mSelectedDates.count();  ++selDay)
             {
                 if ( mSelectedDates[selDay] == curDate && KOPrefs::instance()->mHighlightCurrentDay) {
                     int x1 = cx;
                     int y1 = 0;
                     if (y1 < cy) y1 = cy;
                     int x2 = cx+cw-1;
                     int y2 = contentsHeight();
                     if (y2 > cy+ch-1) y2=cy+ch-1;
                     if (x2 >= x1 && y2 >= y1) {
                         int gxStart = selDay;
                         int gxEnd = gxStart ;
                         int xStart = KOGlobals::self()->reverseLayout() ?
                             (mColumns - 1 - gxStart)*mGridSpacingX :
                             gxStart*mGridSpacingX;
                         if (xStart < x1) xStart = x1;
                         int xEnd = KOGlobals::self()->reverseLayout() ?
                             (mColumns - gxStart)*mGridSpacingX-1 :
                             (gxStart+1)*mGridSpacingX-1;
                         if (xEnd > x2) xEnd = x2;
                         if ( KOPrefs::instance()->mUseHighlightLightColor )
                             p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
                                         KOPrefs::instance()->mAgendaBgColor.light());
                         else
                             p->fillRect(xStart,y1,xEnd-xStart+1,y2-y1+1,
                                         KOPrefs::instance()->mAgendaBgColor.dark());
                       
                     } 
                 }
             }
     }
     // Highlight working hours
 
     if ( !backgroundOnly )
         if (mWorkingHoursEnable) {
             int x1 = cx;
             int y1 = mWorkingHoursYTop;
             if (y1 < cy) y1 = cy;
             int x2 = cx+cw-1;
             //  int x2 = mGridSpacingX * 5 - 1;
             //  if (x2 > cx+cw-1) x2 = cx + cw - 1;
             int y2 = mWorkingHoursYBottom;
             if (y2 > cy+ch-1) y2=cy+ch-1;
 
             if (x2 >= x1 && y2 >= y1) {
                 // qDebug("x1 %d mGridSpacingX %d ", x1, mGridSpacingX );
                 int gxStart = x1/mGridSpacingX;
                 int gxEnd = x2/mGridSpacingX;
                 while(gxStart <= gxEnd) {
                     if (gxStart < int(mHolidayMask->count()) &&
                         !mHolidayMask->at(gxStart)) {
                         int xStart = KOGlobals::self()->reverseLayout() ?
                             (mColumns - 1 - gxStart)*mGridSpacingX :
                             gxStart*mGridSpacingX;
                         if (xStart < x1) xStart = x1;
@@ -1707,517 +1708,511 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
         for ( itemit=oldconflictItems.first(); itemit != 0;
               itemit=oldconflictItems.next() ) {
             globalFlagBlockAgendaItemUpdate = 0;
             if ( itemit != item )
                 itemit->repaintMe();
             globalFlagBlockAgendaItemUpdate = 1; 
             //qDebug("sigleshot ");
             QTimer::singleShot( 0, itemit, SLOT ( repaintItem() ));
             //itemit->repaint( false ); repaintItem()
         }
         blockSignals( false );
     }
     if ( remove ) {
         //qDebug("remove****************************************** ");
         return;
     }
     if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda )
         return;
     //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ ");
     QDate currentDate = QDate::currentDate();
     bool overdue = (!todo->isCompleted()) && (todo->dtDue() < currentDate)&&  ( KOPrefs::instance()->mShowTodoInAgenda );
     QDateTime dt;
     if ( todo->hasCompletedDate() )
         dt =  todo->completed();
     else
         dt = todo->dtDue();
     if ( overdue ) {
         days += todo->dtDue().date().daysTo( currentDate );
     }
     else
         currentDate = dt.date();
     
     if (( todo->doesFloat() || overdue) && !todo->hasCompletedDate() ) {  
         if ( ! mAllDayMode ) return;
         // aldayagenda
         globalFlagBlockAgendaItemPaint = 1;
         item = insertAllDayItem(todo, currentDate,days, days);
         item->show();
       
     }
     else {
         if (  mAllDayMode ) return;
         // mAgenda
         globalFlagBlockAgendaItemPaint = 1;
         int endY = timeToY(dt.time()) - 1; 
         int hi = 12/KOPrefs::instance()->mHourSize;
         int startY = endY - 1-hi;
         item = insertItem(todo,currentDate,days,startY,endY);
         item->show();
     }
     qApp->processEvents();
     globalFlagBlockAgendaItemPaint = 0; 
     QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
     KOAgendaItem *itemit; 
     for ( itemit=oldconflictItems.first(); itemit != 0;
           itemit=oldconflictItems.next() ) {
         globalFlagBlockAgendaItemUpdate = 0;
         itemit->repaintMe();
         globalFlagBlockAgendaItemUpdate = 1;
         itemit->repaint(); 
     } 
     globalFlagBlockAgendaItemUpdate = 0;
     item->repaintMe();
     globalFlagBlockAgendaItemUpdate = 1;
     item->repaint();
 }
 /*
   Insert KOAgendaItem into agenda.
 */
 KOAgendaItem *KOAgenda::insertItem (Incidence *event,QDate qd,int X,int YTop,int YBottom)
 {
   if (mAllDayMode) {
       qDebug("KOAgenda: calling insertItem in all-day mode is illegal. ");
     return 0;
   }
 
   KOAgendaItem *agendaItem = getNewItem(event,qd,viewport());
   //agendaItem->setFrameStyle(WinPanel|Raised);
 
   int YSize = YBottom - YTop + 1;
   if (YSize < 0) {
     YSize = 1;
   }
   int iheight = mGridSpacingY * YSize;
  
   agendaItem->resize(mGridSpacingX,iheight );
   agendaItem->setCellXY(X,YTop,YBottom);
   agendaItem->setCellXWidth(X);
 
   //addChild(agendaItem,X*mGridSpacingX,YTop*mGridSpacingY);
   mItems.append(agendaItem);
 
   placeSubCells(agendaItem);
 
   //agendaItem->show();
 
-  marcus_bains();
 
   return agendaItem;
 }
 
 
 /*
   Insert all-day KOAgendaItem into agenda.
 */
 KOAgendaItem *KOAgenda::insertAllDayItem (Incidence *event,QDate qd,int XBegin,int XEnd)
 {
    if (!mAllDayMode) {
     return 0;
   }
 
   KOAgendaItem *agendaItem = getNewItem(event,qd,viewport());
 
   agendaItem->setCellXY(XBegin,0,0);
   agendaItem->setCellXWidth(XEnd);
   agendaItem->resize(mGridSpacingX * agendaItem->cellWidth(),mGridSpacingY);
 
   //addChild(agendaItem,XBegin*mGridSpacingX,0);
   mItems.append(agendaItem);
 
   placeSubCells(agendaItem);
 
   //agendaItem->show();
 
   return agendaItem;
 }
 
 
 void KOAgenda::insertMultiItem (Event *event,QDate qd,int XBegin,int XEnd,
                                 int YTop,int YBottom)
 {
     if (mAllDayMode) {
         ;
     return;
   }
 
   int cellX,cellYTop,cellYBottom;
   QString newtext;
   int width = XEnd - XBegin + 1;
   int count = 0;
   KOAgendaItem *current = 0;
   QPtrList<KOAgendaItem> multiItems;
   for (cellX = XBegin;cellX <= XEnd;++cellX) {
     if (cellX == XBegin) cellYTop = YTop;
     else cellYTop = 0;
     if (cellX == XEnd) cellYBottom = YBottom;
     else cellYBottom = rows() - 1;
     newtext = QString("(%1/%2): ").arg(++count).arg(width);
     newtext.append(event->summary());
     current = insertItem(event,qd,cellX,cellYTop,cellYBottom);
     current->setText(newtext);
     multiItems.append(current);
   }
 
   KOAgendaItem *next = 0;
   KOAgendaItem *last = multiItems.last();
   KOAgendaItem *first = multiItems.first();
   KOAgendaItem *setFirst,*setLast;
   current = first;
   while (current) {
     next = multiItems.next();
     if (current == first) setFirst = 0;
     else setFirst = first;
     if (current == last) setLast = 0;
     else setLast = last;
 
     current->setMultiItem(setFirst,next,setLast);
     current = next;
   }
-
-  marcus_bains();
 }
 
 
 //QSizePolicy KOAgenda::sizePolicy() const
 //{
   // Thought this would make the all-day event agenda minimum size and the
   // normal agenda take the remaining space. But it doesn´t work. The QSplitter
   // don´t seem to think that an Expanding widget needs more space than a
   // Preferred one.
   // But it doesn´t hurt, so it stays.
 //  if (mAllDayMode) {
 //    return QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
 //  } else {
 //    return QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
 //  }
 //}
 void KOAgenda::finishResize ( )
 {
     //qDebug("finishResize+++++++++++++++++++++++++++++++ ( ) ");
     if ( globalFlagBlockAgenda ==  0 ) {
         finishUpdate();
         //qDebug("finishUpdate() called ");
     }
 }
 /*
   Overridden from QScrollView to provide proper resizing of KOAgendaItems.
 */
 void KOAgenda::resizeEvent ( QResizeEvent *ev )
 {
     mSelectionHeight = 0;
     mResizeTimer.start( 150 , true );
     computeSizes(); 
     return;
 
 }
 void KOAgenda::computeSizes()
 {   
     if ( globalFlagBlockStartup )
         return;
     int frameOffset = frameWidth() * 2 +1;
     if (mAllDayMode) {
         mGridSpacingX = (width()-frameOffset) / mColumns;
         mGridSpacingY = height() - 2 * frameWidth() - 1;
         resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY + 1);
         //    mGridSpacingY = height();
         //    resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 );
 
         KOAgendaItem *item;
         int subCellWidth;
         for ( item=mItems.first(); item != 0; item=mItems.next() ) {
             subCellWidth = mGridSpacingY / item->subCells();
             item->resize(mGridSpacingX * item->cellWidth(),subCellWidth);
             moveChild(item,KOGlobals::self()->reverseLayout() ?
                       (mColumns - 1 - item->cellX()) * mGridSpacingX :
                       item->cellX() * mGridSpacingX,
                       item->subCell() * subCellWidth);
         }
         KOPrefs::instance()->mAllDaySize = mGridSpacingY;
     } else {
         mGridSpacingX = (width() - verticalScrollBar()->width()-frameOffset)/mColumns;
         if (height() >   mGridSpacingY * mRows + 1 ) {
             KOPrefs::instance()->mHourSize = ((height())/mRows)+1;
             mGridSpacingY = KOPrefs::instance()->mHourSize ;
             resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 );
             emit resizedSignal();
         } else
             resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 );
         KOAgendaItem *item;
         int subCellWidth;
     
         for ( item=mItems.first(); item != 0; item=mItems.next() ) {
             subCellWidth = mGridSpacingX / item->subCells();
             item->resize(subCellWidth,item->height());
             moveChild(item,(KOGlobals::self()->reverseLayout() ?
                             (mColumns - 1 - item->cellX()) * mGridSpacingX :
                             item->cellX() * mGridSpacingX) +
                       item->subCell() * subCellWidth,childY(item));
         }
     }
     int cw = contentsWidth();
     int ch = contentsHeight();
     if ( mAllDayMode ) { 
         QPixmap* paintPixAll = KOAgendaItem::paintPixAllday();
         if ( (paintPixAll->width() < cw || paintPixAll->height() <  ch) && cw > 0  && ch > 0  ) {
-            qDebug("paintPixAll->resize ");
+            //qDebug("paintPixAll->resize ");
             paintPixAll->resize( cw, ch ); 
         }
     } else {
         QPixmap* paintPix = KOAgendaItem::paintPix();
         if ( paintPix->width() < cw || paintPix->height() <  ch ) {
-            qDebug("paintPix->resize ");
+            //qDebug("paintPix->resize ");
             paintPix->resize( cw , ch );
         }
     }
 
     checkScrollBoundaries();
-    marcus_bains();
     drawContentsToPainter();
     viewport()->repaint(false);
 }
 
 void KOAgenda::scrollUp()
 {
     scrollBy(0,-mScrollOffset);
 }
 
 
 void KOAgenda::scrollDown()
 {
     scrollBy(0,mScrollOffset);
 }
 
 void KOAgenda::popupAlarm()
 {
     if (!mClickedItem) {
         qDebug("KOAgenda::popupAlarm() called without having a clicked item ");
         return;
     }
     // TODO: deal correctly with multiple alarms
     Alarm* alarm;
     QPtrList<Alarm> list(mClickedItem->incidence()->alarms());
     for(alarm=list.first();alarm;alarm=list.next()) {
         alarm->toggleAlarm();
     }
     emit itemModified( mClickedItem , KOGlobals::EVENTEDITED );
     mClickedItem->paintMe( true );
     mClickedItem->repaint( false );
 }
 
 /*
   Calculates the minimum width
 */
 int KOAgenda::minimumWidth() const
 {
   // TODO:: develop a way to dynamically determine the minimum width
   int min = 100;
 
   return min;
 }
 
 void KOAgenda::updateConfig()
 {
    if ( viewport()->backgroundColor() != KOPrefs::instance()->mAgendaBgColor)
        viewport()->setBackgroundColor(KOPrefs::instance()->mAgendaBgColor);
   if ( mAllDayMode ) {
       mGridSpacingY = height() - 1 ;// KOPrefs::instance()->mAllDaySize;
       //mGridSpacingY = KOPrefs::instance()->mAllDaySize;
       resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY+1 );
       // setMaximumHeight(  mGridSpacingY+1 );
       viewport()->repaint( false );
       //setFixedHeight( mGridSpacingY+1 );
       //qDebug("KOPrefs:aaaaa:instance()->mAllDaySize %d  ", KOPrefs::instance()->mAllDaySize);
   }
   else {
       mGridSpacingY = KOPrefs::instance()->mHourSize;
       calculateWorkingHours();
-      marcus_bains();
   }
 }
 
 void KOAgenda::checkScrollBoundaries()
 {
   // Invalidate old values to force update
   mOldLowerScrollValue = -1;
   mOldUpperScrollValue = -1;
 
   checkScrollBoundaries(verticalScrollBar()->value());
 }
 
 void KOAgenda::checkScrollBoundaries(int v)
 {
     if ( mGridSpacingY ==  0 )
         return;
   int yMin = v/mGridSpacingY;
   int yMax = (v+visibleHeight())/mGridSpacingY;
 
 //  kdDebug() << "--- yMin: " << yMin << "  yMax: " << yMax << endl;
 
   if (yMin != mOldLowerScrollValue) {
     mOldLowerScrollValue = yMin;
     emit lowerYChanged(yMin);
   }
   if (yMax != mOldUpperScrollValue) {
     mOldUpperScrollValue = yMax;
     emit upperYChanged(yMax);
   }
 }
 
 void KOAgenda::deselectItem()
 {
   if (mSelectedItem.isNull()) return;
   mSelectedItem->select(false);
   mSelectedItem = 0;
 }
 
 void KOAgenda::selectItem(KOAgendaItem *item)
 {
   if ((KOAgendaItem *)mSelectedItem == item) return;
   deselectItem();
   if (item == 0) {
     emit incidenceSelected( 0 );
     return;
   }
   mSelectedItem = item;
   mSelectedItem->select();
   emit incidenceSelected( mSelectedItem->incidence() );
 }
 
 // This function seems never be called.
 void KOAgenda::keyPressEvent( QKeyEvent *kev )
 {
   switch(kev->key()) {
     case Key_PageDown:
       verticalScrollBar()->addPage();
       break;
     case Key_PageUp:
       verticalScrollBar()->subtractPage();
       break;
     case Key_Down:
       verticalScrollBar()->addLine();
       break;
     case Key_Up:
       verticalScrollBar()->subtractLine();
       break;
     default:
       ;
   }
 }
 
 void KOAgenda::calculateWorkingHours()
 {
 //  mWorkingHoursEnable = KOPrefs::instance()->mEnableWorkingHours;
   mWorkingHoursEnable = !mAllDayMode;
 
   mWorkingHoursYTop = mGridSpacingY *
                       KOPrefs::instance()->mWorkingHoursStart * 4;
   mWorkingHoursYBottom = mGridSpacingY *
                          KOPrefs::instance()->mWorkingHoursEnd * 4 - 1;
 }
 
 
 DateList KOAgenda::dateList() const
 {
     return mSelectedDates;
 }
 
 void KOAgenda::setDateList(const DateList &selectedDates)
 {
     mSelectedDates = selectedDates;
-    marcus_bains();
 }
 
 void KOAgenda::setHolidayMask(QMemArray<bool> *mask)
 {
   mHolidayMask = mask;
 
 /*
   kdDebug() << "HolidayMask: ";
   for(uint i=0;i<mask->count();++i) {
     kdDebug() << (mask->at(i) ? "*" : "o");
   }
   kdDebug() << endl;
 */
 }
 
 void KOAgenda::contentsMousePressEvent ( QMouseEvent *event )
 {
  
   QScrollView::contentsMousePressEvent(event);
 }
 
 void KOAgenda::storePosition()
 {
     //mContentPosition
     int max = mGridSpacingY*4*24; 
     if ( contentsY() < 5 && max > viewport()->height()*3/2 )
         mContentPosition = 0;
     else if (  contentsY() + viewport()->height() >  max - 5 && max > viewport()->height()*3/2)
         mContentPosition = -1.0;
     else
         mContentPosition = ((float) max)/ ((float)(contentsY()+ ( viewport()->height()/2)));
     //qDebug("mContentPosition %f %d %d %d",mContentPosition , max,   contentsY() ,viewport()->height());
 
 }
 void KOAgenda::restorePosition()
 {
     int posY;
     int max = mGridSpacingY*4*24; 
     if ( mContentPosition < 0 ) 
         posY = max-viewport()->height();
     else
         if ( mContentPosition == 0 ) 
             posY = 0;
         else
             posY =  (max/mContentPosition)-(viewport()->height()/2);
     setContentsPos (0, posY );
     //qDebug("posY %d hei %d", posY, max);
 
 }
 void KOAgenda::moveChild( QWidget *w, int x , int y )
 {
     ++x;
     QScrollView::moveChild( w, x , y );
 }
 #include <qmessagebox.h>
 #ifdef DESKTOP_VERSION
 #include <qprinter.h>
 #include <qpainter.h>
 #include <qpaintdevicemetrics.h>
 
 #endif
 void KOAgenda::printSelection()
 {
 #ifdef DESKTOP_VERSION
     if ( mStartCellY == mCurrentCellY ) {
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                            i18n("Nothing selected!\n\nThis prints the full width of the Agenda view as you see it!\n\nTo determine the vertical range of the printing, please select\na vertical range (with the left mouse button down) in one column. "),
                                            i18n("OK"), 0, 0,
                                            0, 1 );
         return;
     }
  
     float dx, dy; 
     int x,y,w,h;
     x= 0;  
     w= contentsWidth()+2;
     // h= contentsHeight();
     y = mGridSpacingY*mStartCellY;
     h =  mGridSpacingY*(mCurrentCellY+1)-y+2;
 
     //return;
     QPrinter* printer = new QPrinter(); 
     if ( !printer->setup()) {
         delete printer;
         return;
     }
     QPainter p( printer );
     QPaintDeviceMetrics m = QPaintDeviceMetrics ( printer ); 
     QString date = i18n("Date range: ")+KGlobal::locale()->formatDate( mSelectedDates.first()  )+" - "+KGlobal::locale()->formatDate( mSelectedDates.last()  );
     //date += " --- printing time: " + KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), true );
     int hei = p.boundingRect(0,0, 5, 5, Qt::AlignLeft, date ).height();
     // p.drawText( 0, 0, date );
     int offset = m.width()/8;
     // compute the scale
     dx = ((float) m.width()-offset)  / (float)w;
     dy  = (float)(m.height()  - ( 2 * hei )-offset ) / (float)h;
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 1b21a71..ef5c4dd 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1,175 +1,175 @@
 /*
   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 <qhbox.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qframe.h>
 #include <qlayout.h>
 #ifndef KORG_NOSPLITTER
 #include <qsplitter.h>
 #endif
 #include <qfont.h>
 #include <qfontmetrics.h>
 #include <qpopupmenu.h>
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
 
 #include <kapplication.h>
 #include <KDGanttMinimizeSplitter.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include "calendarview.h"
 #include "koviewmanager.h"
 
 #include <libkcal/calendar.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/dndfactory.h>
 
 #include <kcalendarsystem.h>
 
 #include "koglobals.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koprefs.h"
 #include "koagenda.h"
 #include "koagendaitem.h"
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 
 #include "koagendaview.h"
 //#include "koagendaview.moc"
 
 //extern bool globalFlagBlockPainting;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockLabel;
 using namespace KOrg;
 
-#define IDLETIMEOUT 15
+#define IDLETIMEOUT 45
 
 TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
     QScrollView(parent,name,f)
 {
     myPix.resize( 1, 1 );
     mRows = rows;
 
     mRedrawNeeded = true;
     setMinimumHeight( 20 );
     mCellHeight = KOPrefs::instance()->mHourSize*4;
 
     enableClipper(true);
 
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
 
     resizeContents(50,mRows * mCellHeight);
 
     viewport()->setBackgroundMode( PaletteBackground );
 }
 
 void TimeLabels::setCellHeight(int height)
 {
     mCellHeight = height;
 }
 
 /*
   Optimization so that only the "dirty" portion of the scroll view
   is redrawn.  Unfortunately, this is not called by default paintEvent() method.
 */
 void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
 {
 
     cx = contentsX() + frameWidth()*2;
     cw = contentsWidth() ;
     // end of workaround
 
     int cell = ((int)(cy/mCellHeight));
     int y = cell * mCellHeight;
     QFontMetrics fm = fontMetrics();
     QString hour;
     QString suffix = "am";
     int timeHeight =  fm.ascent();
     QFont nFont = font();
     p->setFont( font());
    
     if (!KGlobal::locale()->use12Clock()) {
             suffix = "00";
     } else
         if (cell > 11) suffix = "pm";
        
     if ( timeHeight >  mCellHeight ) {
         timeHeight = mCellHeight-1;
         int pointS = nFont.pointSize();
         while ( pointS > 4 ) {
             nFont.setPointSize( pointS );
             fm = QFontMetrics( nFont );
             if ( fm.ascent() < mCellHeight )
                 break;
             -- pointS;
         }
         fm = QFontMetrics( nFont );
         timeHeight = fm.ascent();
     }
     //timeHeight -= (timeHeight/4-2); 
     QFont sFont = nFont;
     sFont.setPointSize( sFont.pointSize()/2 );
     QFontMetrics fmS(  sFont );
     int sHei = fmS.ascent() ;
     //sHei -= (sHei/4-2); 
     int startW = mMiniWidth - frameWidth()-2 ;
     int tw2 = fmS.width(suffix);
     timeHeight = (timeHeight-1) /2 -1; 
     //testline
     //p->drawLine(0,0,0,contentsHeight());
     while (y < cy + ch+mCellHeight) {
         p->drawLine(startW-tw2+1 ,y,cw+2,y);
         hour.setNum(cell);
         // handle 24h and am/pm time formats
         if (KGlobal::locale()->use12Clock()) {
             if (cell == 12) suffix = "pm";
             if (cell == 0) hour.setNum(12);
             if (cell > 12) hour.setNum(cell - 12);
         }
 
         // center and draw the time label
         int timeWidth = fm.width(hour);
         int offset = startW - timeWidth - tw2 -1 ;
         p->setFont( nFont );
         p->drawText(  offset, y+ timeHeight, hour);
         p->setFont( sFont ); 
         offset = startW - tw2;
         p->drawText( offset, y -1, suffix);
 
         // increment indices
         y += mCellHeight;
@@ -480,225 +480,228 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
 
 
     mAgenda->setPopup( mAllAgendaPopup );
     mAllDayAgenda->setPopup( mAllAgendaPopup );
     // make connections between dependent widgets
     mTimeLabels->setAgenda(mAgenda);
 
     // Update widgets to reflect user preferences
     //  updateConfig();
 
     // createDayLabels();
 
     // these blank widgets make the All Day Event box line up with the agenda
     dummyAllDayRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
     dummyAgendaRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
     mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
 
     // Scrolling
     connect(mAgenda->verticalScrollBar(),SIGNAL(valueChanged(int)),
             mTimeLabels, SLOT(positionChanged()));
     connect(mTimeLabels->verticalScrollBar(),SIGNAL(valueChanged(int)),
             SLOT(setContentsPos(int)));
 
     connect(mAgenda,SIGNAL(showDateView( int, int)),SLOT(slotShowDateView( int, int )));
     connect(mAllDayAgenda,SIGNAL(showDateView( int, int )), SLOT(slotShowDateView( int, int ) ));
 
     // Create/Show/Edit/Delete Event
     connect(mAgenda,SIGNAL(newEventSignal(int,int)),
             SLOT(newEvent(int,int)));
     connect(mAgenda,SIGNAL(newTodoSignal(int,int)),
             SLOT(newTodo(int,int)));
     connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)),
             SLOT(newEvent(int,int,int,int)));
     connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)),
             SLOT(newEventAllDay(int,int)));
     connect(mAllDayAgenda,SIGNAL(newTodoSignal(int,int)),
             SLOT(newTodoAllDay(int,int)));
     connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int,int,int)),
             SLOT(newEventAllDay(int,int)));
     connect(mAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)),
             SLOT(newTimeSpanSelected(int,int,int,int)));
     connect(mAllDayAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)),
             SLOT(newTimeSpanSelectedAllDay(int,int,int,int)));
     connect(mAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView()));
     connect(mAllDayAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView()));
   
     connect(mAgenda,SIGNAL(editIncidenceSignal(Incidence *)),
             SIGNAL(editIncidenceSignal(Incidence *)));
     connect(mAllDayAgenda,SIGNAL(editIncidenceSignal(Incidence *)),
             SIGNAL(editIncidenceSignal(Incidence *)));
     connect(mAgenda,SIGNAL(showIncidenceSignal(Incidence *)),
             SIGNAL(showIncidenceSignal(Incidence *)));
     connect(mAllDayAgenda,SIGNAL(showIncidenceSignal(Incidence *)),
             SIGNAL(showIncidenceSignal(Incidence *)));
     connect(mAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)),
             SIGNAL(deleteIncidenceSignal(Incidence *)));
     connect(mAllDayAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)),
             SIGNAL(deleteIncidenceSignal(Incidence *)));
 
     connect(mAgenda,SIGNAL(itemModified(KOAgendaItem *, int )),
             SLOT(updateEventDates(KOAgendaItem *, int )));
     connect(mAllDayAgenda,SIGNAL(itemModified(KOAgendaItem *, int )),
             SLOT(updateEventDates(KOAgendaItem *, int)));
 
     // event indicator update
     connect(mAgenda,SIGNAL(lowerYChanged(int)),
             SLOT(updateEventIndicatorTop(int)));
     connect(mAgenda,SIGNAL(upperYChanged(int)),
             SLOT(updateEventIndicatorBottom(int)));
     // drag signals
     /*
       connect(mAgenda,SIGNAL(startDragSignal(Event *)),
       SLOT(startDrag(Event *)));
       connect(mAllDayAgenda,SIGNAL(startDragSignal(Event *)),
       SLOT(startDrag(Event *)));
     */
     // synchronize selections
     connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
              mAllDayAgenda, SLOT( deselectItem() ) );
     connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
              mAgenda, SLOT( deselectItem() ) );
     connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
              SIGNAL( incidenceSelected( Incidence * ) ) );
     connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
              SIGNAL( incidenceSelected( Incidence * ) ) );
     connect( mAgenda, SIGNAL( resizedSignal() ),
              SLOT( updateConfig( ) ) );  
     connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ),
              SLOT( addToCalSlot(Incidence *, Incidence * ) ) );  
     connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ),
              SLOT( addToCalSlot(Incidence * , Incidence *) ) );  
     // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
     //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
 
     connect( mAllDayAgenda, SIGNAL( signalClearSelection() ),mAgenda, SLOT( slotClearSelection()) ); 
     connect( mAgenda, SIGNAL( signalClearSelection() ),mAllDayAgenda, SLOT( slotClearSelection()) );   
+#ifndef DESKTOP_VERSION
     connect( mAllDayAgenda, SIGNAL( updateViewSignal() ),this, SLOT( fillAgenda()) ); 
     connect( mAgenda, SIGNAL( updateViewSignal() ), this, SLOT( fillAgenda()) );   
-  
     connect( mAllDayAgenda, SIGNAL( sendPing() ),this, SLOT( startIdleTimeout()) ); 
     connect( mAgenda, SIGNAL( sendPing() ), this, SLOT( startIdleTimeout()) );   
-
-
     mIdleTimer = new QTimer ( this );;
     connect(mIdleTimer,SIGNAL(timeout()),SLOT(slotIdleTimeout()));
+#endif
 }
 void KOAgendaView::startIdleTimeout()
 {
+#ifndef DESKTOP_VERSION
     mIdleStart = QDateTime::currentDateTime();
     mIdleTimer->start( IDLETIMEOUT * 1000 );
+#endif
 }
 void KOAgendaView::slotIdleTimeout()
 {
-    qDebug("SECS TO %d ",mIdleStart.secsTo( QDateTime::currentDateTime()  ) );
+#ifndef DESKTOP_VERSION
+    //qDebug("SECS TO %d ",mIdleStart.secsTo( QDateTime::currentDateTime()  ) );
     int secsfromstart = mIdleStart.secsTo( QDateTime::currentDateTime()  );
     mIdleTimer->stop();
     bool isActice = topLevelWidget()->isActiveWindow();
-    qDebug("KO: Active Window %d %d",  isActice, isVisible());
+    //qDebug("KO: Active Window %d %d",  isActice, isVisible());
     // we do nothing if we wake up from a suspend
     if ( secsfromstart > IDLETIMEOUT + 30 && isActice ) {
         qDebug("KO: Wakeup from suspend ");
         startIdleTimeout();
         return;
     }
     qDebug("KO: Downsizing Pixmaps ");
     mAgenda->shrinkPixmap();
     mAllDayAgenda->shrinkPixmap();
     KOAgendaItem::paintPix()->resize( 20,20);
     KOAgendaItem::paintPixAllday()->resize( 20,20);
+#endif
     
 }
 void KOAgendaView::toggleAllDay()
 {
     if ( mSplitterAgenda->firstHandle() ) 
         mSplitterAgenda->firstHandle()->toggle();
 }
 void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld )
 {
     calendar()->addIncidence( inc ); 
     
     if ( incOld ) {
         if ( incOld->typeID() == todoID )
             emit  todoMoved((Todo*)incOld,  KOGlobals::EVENTEDITED );
         else
             emit incidenceChanged(incOld, KOGlobals::EVENTEDITED);
     }
     
 }
 void KOAgendaView::categoryChanged(Incidence * inc)
 {
     mAgenda->categoryChanged( inc );
     mAllDayAgenda->categoryChanged( inc );
 }
 KOAgendaView::~KOAgendaView()
 {
     delete mAllAgendaPopup;
     //delete mAllDayAgendaPopup;
     delete KOAgendaItem::paintPix();
     delete KOAgendaItem::paintPixAllday();
 }
 void KOAgendaView::resizeEvent( QResizeEvent* e )
 {
     //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width());
     bool uc = false;
     int ow =  e->oldSize().width();
     int oh =  e->oldSize().height();
     int w = e->size().width();
     int h =  e->size().height();
     if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { 
         if ( ! mBlockUpdating  && !globalFlagBlockStartup && !globalFlagBlockAgenda )
             uc = true;
         //qDebug("view changed %d %d %d %d ", ow, oh , w , h);
     }
     mUpcomingWidth = e->size().width() ;
     if ( mBlockUpdating || uc ) {
         mBlockUpdating = false;
         //mAgenda->setMinimumSize(800 , 600 );
         //qDebug("mAgenda->resize+++++++++++++++ ");
         updateConfig();
         //qDebug("KOAgendaView::Updating now possible ");
     } else 
         createDayLabels();
     //qDebug("resizeEvent end "); 
    
 }
 void KOAgendaView::slotDaylabelClicked( int num )
 {
   
     QDate firstDate = mSelectedDates.first();
     if ( num == -1 )
         emit showDateView( 6, firstDate );
     else if (num >= 0 ) {
         if ( mSelectedDates.count() == 1)
             emit showDateView( 9, firstDate.addDays( num ) );
         else
             emit showDateView( 3, firstDate.addDays( num ) );
     }
     else
         showDateView( 10, firstDate.addDays(1) );
 }
 
 KOAgendaButton* KOAgendaView::getNewDaylabel()
 {
 
     KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels);
     connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) );
     mDayLabelsList.append( dayLabel );
     mLayoutDayLabels->addWidget(dayLabel);
     return dayLabel ;
 }
 
 void KOAgendaView::createDayLabels()
 {
 
     if ( mBlockUpdating || globalFlagBlockLabel == 1) {
         // qDebug(" KOAgendaView::createDayLabels() blocked ");
         return;
 
     }
     int newHight;
     if ( !mSelectedDates.count())
         return;
 
     // ### Before deleting and recreating we could check if mSelectedDates changed...
     // It would remove some flickering and gain speed (since this is called by
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index ff80afc..7ce3f1f 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -1,135 +1,136 @@
 /*
     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 <qcheckbox.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 
 
 #include <libkcal/calfilter.h>
 
 #include "kofilterview.h"
 #include "koprefs.h"
 #include <kiconloader.h>
 #include <kglobal.h>
+#include <kglobalsettings.h>
 #include <kcolorbutton.h>
 #include <kmessagebox.h>
 
 
 
  
 
 KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent,
                            const char* name,WFlags fl )
   : KOFilterView_base(parent,name,fl)
 {
   mFilters = filterList;
 
   connect(mSelectionCombo,SIGNAL(activated(int)),SIGNAL(filterChanged()));
   connect(mEnabledCheck,SIGNAL(clicked()),SIGNAL(filterChanged()));
   connect(mEditButton,SIGNAL(clicked()),SIGNAL(editFilters()));
 }
 
 KOFilterView::~KOFilterView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 bool KOFilterView::filtersEnabled()
 {
   return mEnabledCheck->isChecked();
 }
 
 void KOFilterView::setFiltersEnabled(bool set)
 {
   mEnabledCheck->setChecked(set);
   emit filterChanged();
 }
 
 
 void KOFilterView::updateFilters()
 {
   mSelectionCombo->clear();
 
   CalFilter *filter = mFilters->first();
   while(filter) {
     mSelectionCombo->insertItem(filter->name());
     filter = mFilters->next();
   }
 }
 
 CalFilter *KOFilterView::selectedFilter()
 {
   CalFilter *f = mFilters->at(mSelectionCombo->currentItem());
   return f;
 }
 
 void KOFilterView::setSelectedFilter(QString filterName)
 {
   int filter_num = mSelectionCombo->count();
   int i;
   for (i=0;i<filter_num;i++) {
     if (mSelectionCombo->text(i)==filterName)
       mSelectionCombo->setCurrentItem(i);
   }
   emit filterChanged();
 }
 void KOFilterView::setSelectedFilter( int fil )
 { 
   if ( fil >= mSelectionCombo->count() )
       return;
   mSelectionCombo->setCurrentItem( fil );
   emit filterChanged();
 }
 
 
 
 KOCalEditView::KOCalEditView(QWidget* parent,
                            const char* name )
   : QScrollView(parent,name)
 {
     mw = 0; 
     setResizePolicy( AutoOneFit );
     setFrameStyle ( QFrame::Panel | QFrame::Plain );
     setLineWidth ( 1 ); 
     setMidLineWidth ( 1 ); 
     setFocusPolicy(NoFocus); 
 }
 
 KOCalEditView::~KOCalEditView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 void KOCalEditView::selectCal(int id ,bool b)
 {
     KOPrefs::instance()->getCalendar( id )->isEnabled = b;
     emit calendarEnabled ( id, b );
     emit needsUpdate();
 
 }
 void KOCalEditView::selectStdCal( int id  )
@@ -305,165 +306,181 @@ void KOCalEditView::readConfig()
         if ( kkf->mErrorOnLoad ||  kkf->isReadOnly )
             rb->setEnabled( false );
         KOCalCheckButton* cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb );
         cb->setChecked( kkf->isEnabled && !kkf->mErrorOnLoad );
         cb->setNum( kkf->mCalNumber );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) );
         KOCalButton* name = new KOCalButton( mw );
         name->setNum( kkf->mCalNumber );
         name->setText(  kkf->mName );
         mainLayout->addWidget( name,row,++iii );
         connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) );
         //lab = new QLabel (" ", mw );
         //mainLayout->addWidget( lab,row,++iii );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb );
         cb->setChecked( kkf->isAlarmEnabled && !kkf->mErrorOnLoad);
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mROB.append( cb );
         cb->setChecked( kkf->isReadOnly );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         if ( row > 1) {
             KColorButton *colb = new KColorButton( mw );
             mainLayout->addWidget( colb,row,++iii );
             colb->setID( kkf->mCalNumber );
             colb->setColor( kkf->mDefaultColor );
             connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) );
             KOCalButton* calb = new KOCalButton( mw );
             mainLayout->addWidget( calb,row,++iii );
             calb->setNum( kkf->mCalNumber );
             calb->setPixmap ( SmallIcon("minus"));
             connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) );
             int hei = calb->sizeHint().height();
             //calb->setMaximumSize( hei*9/10, hei*9/10 );
         }
         ++row;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     if ( errorLoadStandard ) 
         findNewStandard();
     lab = new QLabel (  "", mw );
     mainLayout->addWidget( lab,row,0 );
     mw->show();
 
 }
 
 void KOCalEditView::defaultInfo()
 {
     KMessageBox::information( this,  i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") ); 
 }
 void KOCalEditView::addCal()
 {
     bool tryagain = true;
     QString name, file;
     while ( tryagain ) {
         KONewCalPrefs prefs ( this ); 
         prefs.nameE->setText( name );
         prefs.url->setURL( file );
         if ( !  prefs.exec() )
             return;
         name = prefs.calName();
         file = prefs.calFileName();
         tryagain = false;
         KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
         while ( kkf ) {
             if ( kkf->mName == name ) {
                 KMessageBox::information( this,  i18n("Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!").arg( name ) ); 
                 name = "";
                 tryagain = true;  
                 break;
             }
             if ( kkf->mFileName == file ) {
                 KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg(  KGlobal::formatMessage (file, 0 )) ); 
                 tryagain = true;  
                 file = "";
                 break;
             }
             kkf = KOPrefs::instance()->mCalendars.next();
         }
     }
     addCalendar ( name, file );
     QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); 
 }
 int KOCalEditView::addCalendar( QString name, QString file, bool ask )
 {
   
     QFileInfo fi ( file );
+    QString absFile = file;
+    bool isRelative = false;
+    if ( fi.isRelative() ) {
+        isRelative = true; 
+        absFile = KGlobalSettings::calendarDir()+file;
+        fi.setFile( absFile );
+    } else {
+        QString cd = KGlobalSettings::calendarDir();
+        if (  file.left( cd.length() ) ==  cd ) {
+            isRelative = true; 
+            file = fi.fileName ();
+            fi.setFile( absFile );
+        }
+    }
     if (!fi.exists() ) {
         if ( ask )
-            if ( KMessageBox::questionYesNo(this, i18n("The file\n%1\ndoes not exist!\nShall I create it for you?").arg( file ) )== KMessageBox::No )
+            if ( KMessageBox::questionYesNo(this, i18n("The file\n%1\ndoes not exist!\nShall I create it for you?").arg( KGlobal::formatMessage (absFile,0) ) )== KMessageBox::No )
                 return 0;
-        QFile fileIn( file );
+        QFile fileIn( absFile );
         if (!fileIn.open( IO_WriteOnly ) ) {
             KMessageBox::sorry( this,  i18n("Sorry, cannot create the file\n%1!\nNo calendar added!").arg( file ) ); 
             return 0;
         } 
         QTextStream tsIn( &fileIn );
         tsIn.setCodec( QTextCodec::codecForName("utf8") );
         tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n";
         fileIn.close();       
     }
     KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar();
     kkf->mName = name;
-    kkf->mFileName = file;
+    kkf->mFileName =  absFile;
+    kkf->mSavedFileName = file;
+    kkf->isRelative = isRelative;
     emit calendarAdded( kkf->mCalNumber );
     if ( ask )
         emit needsUpdate();
     QTimer::singleShot( 0, this, SLOT ( readConfig() ) );   
     return kkf->mCalNumber;
 }
 int KOCalEditView::getBirtdayID()
 {
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     while ( kkf ) {
         if ( kkf->mName == i18n("Birthdays") )
             return kkf->mCalNumber;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     QString file = locateLocal( "data", "korganizer/birthdays.ics" ); 
     return addCalendar( i18n("Birthdays"), file, false );
 }
 
 void KOCalEditView::enableAll()
 {
     toggleList( mEnabledB );
 }
 void KOCalEditView::enableAlarm()
 {
     toggleList( mAlarmB );
 }
 void KOCalEditView::disableRO()
 {
     toggleList( mROB, false );
 }
 void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list , bool enable )
 {
     bool dis = !enable;
     KOCalCheckButton* it = list.first();
     while ( it ) {
         if ( !it->isChecked() == enable && it->isEnabled() ) {
             dis = !dis;
             break;
         }
         it = list.next();
     }
     it = list.first();
     while ( it ) {
         if ( it->isEnabled() )
             it->setChecked(dis);
         it = list.next();
     }  
 }
 void KOCalEditView::deleteAll()
 {
     qDebug("delteAll");
 }
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 4322299..be7b5b6 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -1,187 +1,188 @@
 /*
     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.
 */
 #ifndef KOFILTERVIEW_H
 #define KOFILTERVIEW_H
 
 #include <qstring.h>
 #include <qcheckbox.h>
 #include <qapplication.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qscrollview.h>
 #include <qpushbutton.h>
 #include <kconfig.h>
 #include "kofilterview_base.h"
 
 #include <libkcal/calfilter.h>
 
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
 class QGridLayout;
 
 using namespace KCal;
 
 class KONewCalPrefs : public QDialog
 {
     Q_OBJECT 
   public:
     KONewCalPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Add new Calendar") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("<b>Name of new calendar:</b>"), this );
         lay->addWidget( lab ); 
         nameE = new KLineEdit( this );
         lay->addWidget( nameE ); 
         lab = new QLabel( i18n("<b>Local ical (*.ics) file:</b>"), this );
         lay->addWidget( lab ); 
         url = new KURLRequester ( this );
         lay->addWidget( url ); 
         QPushButton * ok = new QPushButton( i18n("OK"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( checkValid() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         int minwid = 220;
         if ( QApplication::desktop()->width() >= 320 ) minwid = 300;
         setMinimumWidth(  minwid );
         resize(sizeHint() );
     }
       
     QString calName() { return nameE->text(); }
     QString calFileName() { return url->url(); }
 
 public slots:
 void checkValid() {
     if ( nameE->text().isEmpty() ) {
         KMessageBox::information( this,  i18n("Sorry, the calendar name is empty!") ); 
         nameE->setText( "LPQJ_"+ QString::number( QTime::currentTime().msec () ));
         return;
     } 
     if ( url->url().isEmpty() ) {
         KMessageBox::information( this,  i18n("Sorry, the file name is empty!") ); 
+        url->setURL( nameE->text() + ".ics" );
         return;
     }
     accept();
 }
            
 public:
     KLineEdit* nameE;
     KURLRequester *url;
 };
 
 class KOCalButton : public QPushButton
 {
     Q_OBJECT
   public:
     KOCalButton( QWidget *parent=0, const char *name=0 ) :
       QPushButton( parent, name) 
     {
       connect( this, SIGNAL( clicked() ),
                SLOT( bottonClicked() )); 
       mNumber = -1;
       setFocusPolicy(NoFocus); 
     }
     void setNum ( int num ) {mNumber = num; }
     signals:
     void selectNum ( int );
 private: 
     int mNumber;
     void keyPressEvent ( QKeyEvent * e )
     {
         e->ignore();     
     }
 
 private slots :
     void bottonClicked() { if ( mNumber > 0 ) emit selectNum ( mNumber ); }
 };
 class KOCalCheckButton : public QCheckBox
 {
     Q_OBJECT
   public:
     KOCalCheckButton( QWidget *parent=0, const char *name=0 ) :
       QCheckBox( parent, name) 
     {
       connect( this, SIGNAL( toggled ( bool ) ),
                SLOT( bottonClicked( bool ) )); 
       mNumber = -1;
       setFocusPolicy(NoFocus); 
       //setMaximumWidth( 10 );
 
     }
     void setNum ( int num ) {mNumber = num; }
     signals:
     void selectNum ( int, bool );
 private: 
     int mNumber;
     void keyPressEvent ( QKeyEvent * e )
     {
         e->ignore();     
     }
 
 private slots :
     void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); }
 };
 
 class KOCalRadioButton : public QRadioButton
 {
     Q_OBJECT
   public:
     KOCalRadioButton( QWidget *parent=0, const char *name=0 ) :
       QRadioButton( parent, name) 
     {
       connect( this, SIGNAL( toggled ( bool ) ),
                SLOT( bottonClicked( bool ) )); 
       mNumber = -1;
       setFocusPolicy(NoFocus); 
       //setMaximumWidth( 10 );
 
     }
         int num() { return mNumber;}
     void setNum ( int num ) {mNumber = num; }
     signals:
     void selectNum ( int );
 private: 
     int mNumber;
     void keyPressEvent ( QKeyEvent * e )
     {
         e->ignore();     
     }
 
 private slots :
     void bottonClicked( bool b) { if ( mNumber > 0  ) emit selectNum ( mNumber); }
 };
 
 
 
 class KOFilterView : public KOFilterView_base
 {
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index a886735..f1f1442 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -361,255 +361,261 @@ void KOPrefs::setTimeZoneIdDefault()
 
 void KOPrefs::setAllDefaults()
 {
     setCategoryDefaults();
     mEventSummaryUser  = getDefaultList() ;
     mTodoSummaryUser  = getDefaultList() ;
     mJournalSummaryUser  = 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("Customer")
            << i18n("Break")
            << i18n("Family")  << i18n("Favorites") << i18n("Fishing") << i18n("Gifts")  
            << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts")  
                      << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner") << i18n("Personal") 
            << i18n("PHB") << i18n("Phone Calls")   << i18n("Shopping")
             << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV") 
            << i18n("Vacation")  ;
     retval.sort();
     //qDebug("cat %s ", retval.join("-").latin1());
     return retval; 
 }
 // << i18n("Business Travel") << i18n("Education") << i18n("Hiking") << i18n("Hunting")  << i18n("Recurring") << i18n("Personal Travel")  << i18n("Speach")   << i18n("Festival") << i18n("Competition")<< i18n("Party")<< i18n("Projects")<< i18n("Kids") << i18n("Special Occasion")<< i18n("Breakfast")<<  i18n("Dinner") << i18n("Lunch")<< i18n("University")<< i18n("School")<< i18n("Flight")<< i18n("Key Customer") << i18n("VIP") << i18n("SyncEvent")  << i18n("Cinema") 
 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));
    
     }
     KConfig fc (locateLocal("config","kopicalendarrc"));
     fc.setGroup("CC");
     int numCals = fc.readNumEntry("NumberCalendars",0 );
     mNextAvailableCalendar = 1;
     if ( numCals == 0 ) {
         KopiCalendarFile *kkf = getNewCalendar();
         kkf->isStandard = true;
         kkf->mName = i18n("Standard");
         kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" );
     } 
     while ( mNextAvailableCalendar  <= numCals ) {
         //qDebug("Read cal #%d ",  mNextAvailableCalendar );
         QString prefix = "Cal_" +QString::number( mNextAvailableCalendar );
         KopiCalendarFile *kkf = getNewCalendar();
         kkf->isStandard = fc.readBoolEntry( prefix+"_isStandard", false );
         kkf->isEnabled = fc.readBoolEntry( prefix+"_isEnabled", true);
+        kkf->isRelative = fc.readBoolEntry( prefix+"_isRelative", false );
         kkf->isAlarmEnabled = fc.readBoolEntry( prefix+"_isAlarmEnabled", true);
         kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false);
         kkf->mName =  fc.readEntry( prefix+"_Name", "Calendar");
         kkf->mFileName = fc.readEntry( prefix+"_FileName", kkf->mFileName);
+        kkf->mSavedFileName = fc.readEntry( prefix+"_SavedFileName", kkf->mFileName);
         kkf->mDefaultColor = fc.readColorEntry( prefix+"_Color",&mEventColor);
         if ( kkf->mCalNumber == 1 ) {
             kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" );
         }
         //qDebug("NAME %s %s", kkf->mName.latin1(), i18n("Birthdays").latin1() );
         if ( kkf->mName == i18n("Birthdays") ) {
             kkf->mFileName = locateLocal( "data", "korganizer/birthdays.ics" ); 
         }
+        if ( kkf->isRelative )
+            kkf->mFileName = KGlobalSettings::calendarDir() + kkf->mSavedFileName;
     }
 
     KPimPrefs::usrReadConfig();
 }
 
 KopiCalendarFile * KOPrefs::getCalendar( int num )
 {
     return mDefCalColors[num-1];
 }
 
 KopiCalendarFile * KOPrefs::getNewCalendar()
 {
     KopiCalendarFile * kkf = new KopiCalendarFile();
     kkf->mCalNumber = mNextAvailableCalendar;
     mDefCalColors.resize( mNextAvailableCalendar );
     mDefCalColors[mNextAvailableCalendar-1] = kkf;
     ++mNextAvailableCalendar;
     kkf->mDefaultColor = mEventColor;
     kkf->mName = i18n("New Calendar");
     mCalendars.append( kkf );
     return kkf;
 }
 void  KOPrefs::deleteCalendar( int num )
 {
     KopiCalendarFile * kkf = mCalendars.first();
     while ( kkf ) {
         if ( kkf->mCalNumber == num ) {
             qDebug("KOPrefs::deleteCalendar %d ", num );
             mCalendars.remove( kkf );
             delete kkf;
             return;
         }
         kkf = mCalendars.next();
     }
 }
 int KOPrefs::getCalendarID( const QString & name )
 {
     KopiCalendarFile * kkf = mCalendars.first();
     while ( kkf ) {
         if ( name == kkf->mName)
             return  kkf->mCalNumber;
         kkf = mCalendars.next();
     }
     return 1;
 }
 QString KOPrefs::calName( int calNum) const
 {
     return (mDefCalColors[calNum-1])->mName;
 }
 QColor  KOPrefs::defaultColor( int calNum ) const
 {
     if ( calNum == 1 ) return mEventColor;
     return (mDefCalColors[calNum-1])->mDefaultColor;
 }
 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;
   } 
   KConfig fc (locateLocal("config","kopicalendarrc")); 
   fc.setGroup("CC");
   fc.writeEntry("NumberCalendars",mCalendars.count());
     int numCal = 1;
     int writeCal = 0;
     while ( numCal < mNextAvailableCalendar  ) {
         KopiCalendarFile * kkf = mCalendars.first();
         while ( kkf ) {
             //qDebug("cal num %d %d ", kkf->mCalNumber, numCal);
             if ( kkf->mCalNumber == numCal ) {
                 ++writeCal;
                 //qDebug("Write calendar %d %d ", numCal , writeCal);
                 QString prefix = "Cal_" + QString::number( writeCal );
                 fc.writeEntry( prefix+"_isStandard", kkf->isStandard );
                 fc.writeEntry( prefix+"_isEnabled", kkf->isEnabled );
                 fc.writeEntry( prefix+"_isAlarmEnabled", kkf->isAlarmEnabled );
                 fc.writeEntry( prefix+"_isReadOnly", kkf->isReadOnly );
+                fc.writeEntry( prefix+"_isRelative", kkf->isRelative );
                 fc.writeEntry( prefix+"_Name", kkf->mName);
                 fc.writeEntry( prefix+"_FileName", kkf->mFileName);
+                fc.writeEntry( prefix+"_SavedFileName", kkf->mSavedFileName);
                 fc.writeEntry( prefix+"_Color",kkf->mDefaultColor);
             }
             kkf = mCalendars.next();
         }
         ++numCal;
     }
     fc.sync();
   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;
 }
 
 void KOPrefs::setFullName(const QString &name)
 {
   mName = name;
 }
 
 void KOPrefs::setEmail(const QString &email)
 {
     //qDebug(" KOPrefs::setEmai*********** %s",email.latin1() );
   mEmail = email;
 }
 
 QString KOPrefs::fullName()
 {
   if (mEmailControlCenter) {
     KEMailSettings settings;
     return settings.getSetting(KEMailSettings::RealName);
   } else {
     return mName;
   }
 }
 
 QString KOPrefs::email()
 {
   if (mEmailControlCenter) {
     KEMailSettings settings;
     return settings.getSetting(KEMailSettings::EmailAddress);
   } else {
     return mEmail;
   }
 }
 KConfig* KOPrefs::getConfig()
 {
     return config();
 }
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 7ec5327..0779e27 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -1,163 +1,167 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOPREFS_H
 #define KOPREFS_H
 
 
 #include <libkdepim/kpimprefs.h>
 #include <qdict.h>
 #include <qdir.h>
 #include <qobject.h>
 
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 
 #define VIEW_WN_VIEW 1
 #define VIEW_NX_VIEW 2
 #define VIEW_J_VIEW 3
 #define VIEW_A_VIEW 4
 #define VIEW_ML_VIEW 5
 #define VIEW_M_VIEW 6
 #define VIEW_L_VIEW 7
 #define VIEW_T_VIEW 8
 
 class KopiCalendarFile : public QObject
 {
  public:
     KopiCalendarFile(  ) : QObject( )
         {
             isStandard = false;
             isEnabled = true;
             isAlarmEnabled = true;
             isReadOnly = false;
             mName = "Calendar";
             mFileName = QDir::homeDirPath() + "/icalfile.ics";
+            mSavedFileName = "icalfile.ics";
             mCalNumber = 0;
             mDefaultColor = Qt::red;
             mErrorOnLoad = false;
+            isRelative = false;
         }
     bool isStandard;
     bool isEnabled;
     bool isAlarmEnabled;
     bool isReadOnly;
     bool mErrorOnLoad;
     QString mName;
     QString mFileName;
+    QString mSavedFileName;
+    bool isRelative;
     int mCalNumber;
     QColor mDefaultColor;
     QDateTime mLoadDt;
 };
 class KOPrefs : public KPimPrefs
 {
   public:
     enum { FormatVCalendar, FormatICalendar };
     enum { MailClientKMail, MailClientSendmail };
     enum { IMIPDummy, IMIPKMail };
     enum { IMIPOutbox, IMIPdirectsend };
     enum { neverAuto, addressbookAuto, selectedAuto };
     enum { standardDestination, askDestination };
 
     virtual ~KOPrefs();
 
     /** Get instance of KOPrefs. It is made sure that there is only one
     instance. */
     static KOPrefs *instance();
 
     /** Set preferences to default values */
     void usrSetDefaults();
 
     /** Read preferences from config file */
     void usrReadConfig();
 
     /** Write preferences to config file */
     void usrWriteConfig();
     void setCategoryDefaults();
     void setAllDefaults();
     KopiCalendarFile * getNewCalendar();
     KopiCalendarFile * getCalendar( int );
     void  deleteCalendar( int );
     QColor defaultColor( int ) const;
     QString calName( int ) const;
     int getCalendarID( const QString & name );
   protected:
     void setTimeZoneIdDefault();
 
     /** Fill empty mail fields with default values. */
     void fillMailDefaults();
 
   private:
     /** Constructor disabled for public. Use instance() to create a KOPrefs
     object. */
     KOPrefs();
 
     static KOPrefs *mInstance;
     QStringList getDefaultList();
     QStringList getLocationDefaultList();
   public:
     // preferences data
     KConfig* getConfig();
     void setFullName(const QString &);
     QString fullName();
     void setEmail(const QString &);
     QString email();
 
     QString mAdditional;
 
     bool    mEmailControlCenter;
 
     bool    mBcc;
     bool    mAutoSave;
     int     mAutoSaveInterval;
     bool    mConfirm;
 
     bool    mEnableGroupScheduling;
     bool    mEnableProjectView;
 
     int     mDefaultFormat;
     int     mMailClient;
 
     int     mStartTime;
     int     mDefaultDuration;
     int     mAlarmTime;
 
     int     mWorkingHoursStart;
     int     mWorkingHoursEnd;
     bool    mExcludeHolidays;
     bool    mExcludeSaturdays;
     bool    mMarcusBainsShowSeconds;
 
     QFont   mTimeBarFont;
     QFont   mMonthViewFont;
     QFont   mAgendaViewFont;
     QFont   mMarcusBainsFont;
     QFont   mTimeLabelsFont;
     QFont   mTodoViewFont;
     QFont   mListViewFont;
     QFont   mDateNavigatorFont;
     QFont   mEditBoxFont;
     QFont   mJornalViewFont;
     QFont   mWhatsNextFont;
     QFont   mEventViewFont;