month view fixes

2 files changed, 67 insertions, 54 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9f7db69..1ed288b 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1,1730 +1,1742 @@
 /*
   This file is part of KOrganizer.
   Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include <qpopupmenu.h>
 #include <qfont.h>
 #include <qfontmetrics.h>
 #include <qkeycode.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qwidgetstack.h>
 #include <qpushbutton.h>
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kiconloader.h>
 
 #include <kcalendarsystem.h>
 
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "koprefs.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koglobals.h"
 #include <libkcal/kincidenceformatter.h>
 
 #include "komonthview.h"
 
 #define PIXMAP_SIZE 5
 #ifdef DESKTOP_VERSION
 QToolTipGroup *MonthViewCell::mToolTipGroup = 0; 
 #endif
 class KNOWhatsThis :public QWhatsThis
 {
 public:
     KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { };
     //~KNOWhatsThis( ) {qDebug("~KNOWhatsThis( ) "); };
 
 protected:
     virtual QString text( const QPoint& p)
     {
         return _wid->getWhatsThisText(p) ;
     };
 private:
     KNoScrollListBox* _wid;
   
 };
  
 
 KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
     : QListBox(parent, name, WRepaintNoErase)
 {
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif 
     mWT = new KNOWhatsThis(this);
     resetOnFocusIn = true;
+    setVScrollBarMode(QScrollView::AlwaysOff);
+    setHScrollBarMode(QScrollView::AlwaysOff);
 }
 KNoScrollListBox::~KNoScrollListBox()
 {
  
 }
 
 
 void KNoScrollListBox::focusInEvent ( QFocusEvent * e )
 {
     QListBox::focusInEvent ( e );
     QListBoxItem * i = item ( 0 );
     if ( i && resetOnFocusIn  ) {
         setCurrentItem( i );
         setSelected ( 0, true ); 
     } 
     resetOnFocusIn = true;
+
+  if (  KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) {
+        QListBoxItem *fi =  firstItem ();
+        if (fi ) {
+            int ihei = fi->height( this );
+            int hei = numRows ()  * ihei;
+            if ( hei < height() - horizontalScrollBar()->height () ) {
+                setVScrollBarMode(QScrollView::AlwaysOff);
+            }
+            else 
+                setVScrollBarMode(QScrollView::Auto);
+            if ( ihei *3 > height() ) {
+                setHScrollBarMode(QScrollView::AlwaysOff);
+            }
+            else {
+                setHScrollBarMode(QScrollView::Auto);
+            }
+        } else {
+            setVScrollBarMode(QScrollView::Auto);
+            setHScrollBarMode(QScrollView::Auto);
+        }
+    } 
 }
 void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
 {
     int i =  currentItem ();
     if ( i >= 0 ) {
         setSelected ( i, false ); 
     }
-    QListBox::focusOutEvent ( e );
+    QListBox::focusOutEvent ( e ); 
+    setVScrollBarMode(QScrollView::AlwaysOff);
+    setHScrollBarMode(QScrollView::AlwaysOff);
 }
 
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
     QListBoxItem* item = itemAt ( p );
     if ( ! item ) {
         return i18n("Click in the cell\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
     //qDebug("KNoScrollListBox::keyPressEvent ");
     switch(e->key()) {
     case Key_Right:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton  )
         {
             e->ignore();
             return;
         }
         scrollBy(10,0);
         break;
     case Key_Left:
         if (e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
         {
             e->ignore();
             return;
         }
         scrollBy(-10,0);
         break;
     case Key_Up:
         if( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
         if ( count() ) {
             setCurrentItem((currentItem()+count()-1)%count());
             if(!itemVisible(currentItem())) {
                 if((unsigned int) currentItem() == (count()-1)) {
                     setTopItem(currentItem()-numItemsVisible()+1);
                 } else {
                     setTopItem(topItem()-1);
                 }
             }
         }
         break;
     case Key_Down:
         if(e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
         if ( count () ) {
             setCurrentItem((currentItem()+1)%count());
             if(!itemVisible(currentItem())) {
                 if(currentItem() == 0) {
                     setTopItem(0);
                 } else {
                     setTopItem(topItem()+1);
                 }
             }
         }
         break;
     case Key_I:
         QTimer::singleShot( 1, this, SLOT ( oneDown() ) );
         e->ignore();
         break; 
     case Key_Return:
     case Key_Enter:
         {
             if ( currentItem() >= 0 ) {
                 emit doubleClicked( item( currentItem() ) );
                 e->accept();
             } else {
                 e->ignore();
             }
         }
         break;
     case Key_Shift:
         emit shiftDown();
         break;
     default:
         e->ignore();
         break;
     }
 }
 
 void KNoScrollListBox::oneDown()
 {
     if ( count () ) { 
         resetOnFocusIn = false;
         setCurrentItem((currentItem()+1)%count());
         if(!itemVisible(currentItem())) {
             if(currentItem() == 0) {
                 setTopItem(0);
             } else {
                 setTopItem(topItem()+1);
             }
         }
     }
 }
 void KNoScrollListBox::keyReleaseEvent(QKeyEvent *e)
 {
     switch(e->key()) {
     case Key_Shift:
         emit shiftUp();
         break;
     default:
         break;
     }
 }
 
 void KNoScrollListBox::mousePressEvent(QMouseEvent *e)
 {
     QListBox::mousePressEvent(e);
 
     if(e->button() == RightButton) {
         emit rightClick();
     }
 }
 
 MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s)
     : QListBoxItem()
 {
     mblockRepaint = true;
     setText( s );
     mMultiday = 0; 
     mIncidence = incidence;
     mDate = qd;
     mRecur = false;
     mAlarm = false;
     mReply = false;
     mInfo = false;
+    isWeekItem = KOPrefs::instance()->mMonthViewWeek;
     //qDebug("NEWWWWWWWWWWWWW ");
 }
 void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s)
 {
     setText( s );
     mMultiday = 0; 
     mIncidence = incidence;
     mDate = qd;
     mRecur = false;
     mAlarm = false;
     mReply = false;
     mInfo = false;
     //qDebug("recucleeeeeeeeeeeeeeeee ");
 }
 
 void MonthViewItem::paint(QPainter *p)
 {
     if ( mblockRepaint ) {
         //qDebug("block ");
         return;
     }
     //qDebug("NON block ");
 #if QT_VERSION >= 0x030000
     bool sel = isSelected();
 #else
     bool sel = selected();
 #endif 
 
 
     if (KOPrefs::instance()->mMonthViewUsesCategoryColor)
         {
             p->setBackgroundColor( palette().color( QPalette::Normal,  \
                                                     sel ? QColorGroup::Highlight : QColorGroup::Background ) );
             p->eraseRect( 0, 0, listBox()->maxItemWidth(), height( listBox() ) );
         }
     int x = 1;
     //int y = 3;//(height() - mRecurPixmap.height()) /2; 
     int size = PIXMAP_SIZE;
     if ( QApplication::desktop()->width() < 300 )
         size = 3;
     int heihei = height( listBox () );
     int y = (heihei - size -1 ) /2; 
 
     if ( KOPrefs::instance()->mMonthShowIcons ) {
         if ( mInfo ) { 
             p->fillRect ( x, y,size,size, Qt::darkGreen );
             x += size + 1;
         }
         if ( mRecur ) {
             p->fillRect ( x, y,size,size, Qt::blue );
             x += size + 1;
         }
         if ( mAlarm ) {
             p->fillRect ( x, y,size,size, Qt::red );
             x += size + 1;
         }
         if ( mReply ) {
             p->fillRect ( x, y,size,size, Qt::yellow );
             x += size + 1;
         }
     }
     if ( mMultiday ) { 
         int yyy = y+(size/2);
         int sizeM = size+2;
         p->setBrush( QBrush::SolidPattern );
         p->drawLine ( x+1, yyy, x +sizeM +sizeM/2-1, yyy ) ;
         if ( mMultiday == 2 || mMultiday == 3 ) { 
             QPointArray pa ( 3 );
             pa.setPoint (0,  x, yyy );
             pa.setPoint (1,  x+sizeM/2, yyy+sizeM/2 );
             pa.setPoint (2,  x+sizeM/2, yyy-sizeM/2 );
             p->drawPolygon( pa );
         }
         if ( mMultiday == 2 || mMultiday == 1 ) { 
             QPointArray pa ( 3 );
             pa.setPoint (0,  x+sizeM +sizeM/2, yyy );
             pa.setPoint (1,  x+sizeM, yyy+sizeM/2 );
             pa.setPoint (2,  x+sizeM, yyy-sizeM/2 );
             p->drawPolygon( pa );
         }
         if ( mMultiday == 1 ) {  
             // p->fillRect (  x, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern   ) );
            
             p->drawLine (  x+1, yyy-sizeM/2,  x+1, yyy+sizeM/2 );
         }
         if (  mMultiday == 3 ) { 
             // p->fillRect (  x+sizeM, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern   ) );
             p->drawLine (  x+sizeM +sizeM/2-1, yyy-sizeM/2,  x+sizeM +sizeM/2-1, yyy+sizeM/2 );
            
         }
         x += sizeM/2 + 1;
         x += sizeM + 1;
     }
 
     if ( mIncidence->type() == "Todo" ){
         Todo* td = ( Todo* ) mIncidence;
         if ( td->isCompleted() ) {
             int half = size/2;
             p->drawLine ( x, heihei/2, x +half , heihei/2 +half ) ;
             p->drawLine (  x +half , heihei/2 +half ,  x +half+half +2 , heihei/2  -2 ) ;
             x += half+half + 4;
 
         } else {
             int val = td->percentComplete()/20;
             p->fillRect ( x+1, y-2, val ,size+4,Qt::black );
             p->drawRect ( x, y-2,7,size+4);
             x += size + 3;
         }
     }
     QFontMetrics fm = p->fontMetrics();
     int yPos;
     int pmheight = size;
     if( pmheight < fm.height() )
         yPos = fm.ascent() + fm.leading()/2;
     else
         yPos = pmheight/2 - fm.height()/2  + fm.ascent();
     p->setPen( palette().color( QPalette::Normal, sel ? \
                                 QColorGroup::HighlightedText : QColorGroup::Foreground ) );
     p->drawText( x, yPos, text() );
     if ( mIncidence->cancelled() ) {
         int wid = fm.width( text() );
         p->drawLine( x, heihei/2-1 ,x+wid, heihei/2-1 );
     }
       
 }
 
 int MonthViewItem::height(const QListBox *lb) const
 {
     int ret = 10;
     if ( lb )
         ret = lb->fontMetrics().lineSpacing()+1;
     return ret;
 }
 
 int MonthViewItem::width(const QListBox *lb) const
 { 
 
-    if( KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) {
+    if( KOPrefs::instance()->mEnableMonthScroll || isWeekItem ) {
         int size = PIXMAP_SIZE;
         if ( QApplication::desktop()->width() < 300 )
             size = 3;
         int x = 1; 
         if ( KOPrefs::instance()->mMonthShowIcons ) {
             if ( mInfo ) {
                 x += size + 1;
             }
             if( mRecur ) {
                 x += size+1;
             }
             if( mAlarm ) {
                 x += size+1;
             }
             if( mReply ) {
                 x += size+1;
             }
         }
         if( mMultiday ) {
             x += size+1+2+size/2;
         }
         return( x + lb->fontMetrics().width( text() ) + 1 );
     }
     if ( ! lb )
         return 10;
     //qDebug("ret wid %d ", lb->width());
     return lb->width();
 }
 
 
 MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
     : KNoScrollListBox( par ),
       mMonthView( parent )
 {
-
-    mCurrentAvailItem = 0;
     //QVBoxLayout *topLayout = new QVBoxLayout( this );
     currentPalette = 0; 
     // mLabel = new QLabel( this );QPushButton 
     mLabel = new QPushButton( this );
     //mLabel->setFrameStyle( QFrame::Panel | QFrame::Plain );
     //mLabel->setLineWidth( 1 );
     //mLabel->setAlignment( AlignCenter );
     mLabel->setFlat( true );
     mLabel->setFocusPolicy(NoFocus); 
     //mItemList = new KNoScrollListBox( this );
     setMinimumSize( 10, 10 );
     setFrameStyle( QFrame::Panel | QFrame::Plain );
     setLineWidth( 1 );
     //topLayout->addWidget( mItemList );
     mLabel->raise();
     // QColor( 0,0,255 )    QColor( 160,1600,255 )
     mStandardPalette = palette();
     mStandardPalette.setColor(QColorGroup::Base, mStandardPalette.color( QPalette::Normal, QColorGroup::Background ) );
 
     enableScrollBars( false );
     updateConfig();
     //connect( mLabel, SIGNAL( clicked( )), SLOT( newEvent() ));
     connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() ));
     connect( this , SIGNAL( doubleClicked( QListBoxItem *) ),
              SLOT( defaultAction( QListBoxItem * ) ) );
     connect( this, SIGNAL( rightButtonPressed( QListBoxItem *,
                                                     const QPoint &) ),
              SLOT( contextMenu( QListBoxItem * ) ) );
     connect( this, SIGNAL( highlighted( QListBoxItem *) ),
              SLOT( selection( QListBoxItem * ) ) );
     connect( this, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( cellClicked( QListBoxItem * ) ) );  
     connect( this, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( selection( QListBoxItem * ) ) ); 
 }
 #ifdef DESKTOP_VERSION
 QToolTipGroup *MonthViewCell::toolTipGroup()
 {
     if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
     return mToolTipGroup;
 }
 #endif
  
 void MonthViewCell::setDate( const QDate &date )
 {
     //  kdDebug() << "MonthViewCell::setDate(): " << date.toString() << endl;
     mDate = date;
 
  
 
     //resizeEvent( 0 );
 }
 
 QDate MonthViewCell::date() const
 {
     return mDate;
 }
 
 void MonthViewCell::setPrimary( bool primary )
 {
     mPrimary = primary;
     //setMyPalette();
 }
 void MonthViewCell::setMyPalette()
 {
    
     if ( mHoliday) {
         if ( currentPalette == 1 ) return;
         mLabel->setPalette( QPalette ( mHolidayPalette.color( QPalette::Normal,QColorGroup::Base),mHolidayPalette.color(QPalette::Normal,QColorGroup::Base )  ));
         setPalette( mHolidayPalette );
         //mLabel->setPalette( mHolidayPalette );
         currentPalette = 1;
 
     } else {
         if ( mPrimary ) {
             if ( currentPalette == 2 ) return;
             mLabel->setPalette( QPalette ( mPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mPrimaryPalette.color(QPalette::Normal,QColorGroup::Base )  ));
             //mLabel->setPalette( mPrimaryPalette );
             setPalette( mPrimaryPalette );
             currentPalette = 2;
 
         } else {
             if ( currentPalette == 3 ) return;
             setPalette( mNonPrimaryPalette );
              mLabel->setPalette( QPalette ( mNonPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mNonPrimaryPalette.color(QPalette::Normal,QColorGroup::Base )  ));
              //mLabel->setPalette( mNonPrimaryPalette );;
              currentPalette = 3;
         }
     }
     //QPalette pal = palette();
     
     //mLabel->setPalette( QPalette ( pal.color( QPalette::Normal,QColorGroup::Base),pal.color(QPalette::Normal,QColorGroup::Base )  ));
 }
 QPalette  MonthViewCell::getPalette ()
 {
     if ( !KOPrefs::instance()->mMonthViewUsesDayColors )
         return mStandardPalette;
     if ( mHoliday) {
         return mHolidayPalette ;
     } else {
         if ( mPrimary ) {
             return mPrimaryPalette ;
         } 
     }
     return mNonPrimaryPalette; 
 }
 bool MonthViewCell::isPrimary() const
 {
     return mPrimary;
 }
 
 void MonthViewCell::setHoliday( bool holiday )
 {
     mHoliday = holiday; 
     //setMyPalette();
 }
 
 void MonthViewCell::setHoliday( const QString &holiday )
 {
     mHolidayString = holiday;
 
     if ( !holiday.isEmpty() ) {
         setHoliday( true );
     }
 }
 
 void MonthViewCell::startUpdateCell()
 {
 
     setFocusPolicy(NoFocus); 
     if ( !mMonthView->isUpdatePossible() )
         return;
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         mitem->setBlockRepaint( true );
         mitem = (MonthViewItem *)mitem->next();
     }
     if ( mAvailItemList.count() > 20 ) {
         mAvailItemList.setAutoDelete( true );
         mAvailItemList.clear();
         mAvailItemList.setAutoDelete( false );
     }
     /*    
           if ( !isVisible() ){
           return;
           }
     */
     // qDebug("MonthViewCell::updateCell() ");
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
     if ( mDate == QDate::currentDate()  ) {
         setLineWidth( 3 );
     } else {
         setLineWidth( 1 );
     }
-    mCurrentAvailItem = (MonthViewItem*) firstItem ();
-    //clear();
+    MonthViewItem* CurrentAvailItem = (MonthViewItem*) firstItem ();
+    //clear(); 
+    while ( CurrentAvailItem ) {
+            MonthViewItem *item = CurrentAvailItem;
+            CurrentAvailItem = (MonthViewItem *)item->next();
+            mAvailItemList.append( item ); 
+            takeItem ( item );
+    }
 
 #ifdef DESKTOP_VERSION
     QToolTip::remove(this); 
 #endif 
     mToolTip.clear(); 
     //qApp->processEvents();
 #if 0
     if ( !mHolidayString.isEmpty() ) {
         MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
         item->setPalette( mHolidayPalette );
         insertItem( item );
         mToolTip.append ( mHolidayString ); 
     }
 #endif
 }
 
 void MonthViewCell::insertEvent(Event *event)
 {
     QString mToolTipText;
-    bool insertNewItem = false;
     setFocusPolicy(WheelFocus); 
         if ( !(event->doesRecur() == Recurrence::rNone) ) {
             if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
                 return;
             else
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                     return;
         }
         
         if ( event->isHoliday()) {
             setHoliday( true );
             if ( mDate.dayOfWeek() == 7 )
                 setLineWidth( 3 );
         }
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
         if (event->isMultiDay()) {
             QString prefix = "<->";multiday = 2; 
             QString time;
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) ) {
                     prefix ="->" ;multiday = 1;
                 }
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) ) {
                         prefix ="<-" ;multiday = 3;
                     }
                 } 
 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;multiday = 1;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;multiday = 3;
                 }
             }
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
             mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
         MonthViewItem *item ;
-        if ( mCurrentAvailItem ) {
-            item = mCurrentAvailItem;
-            mCurrentAvailItem = (MonthViewItem*) item->next();
+        
+        if ( mAvailItemList.count() ) {
+            item = mAvailItemList.first();
+            mAvailItemList.remove( item );
             item->recycle( event, mDate, text );
         } else {
-            if ( mAvailItemList.count() ) {
-                item = mAvailItemList.first();
-                mAvailItemList.remove( item );
-                item->recycle( event, mDate, text );
-                insertNewItem = true;
-            } else {
-                insertNewItem = true;
-                item = new MonthViewItem( event, mDate, text );
-            }
+            item = new MonthViewItem( event, mDate, text );
         }
+        
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = event->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                 pal = getPalette();
                 if (cat.isEmpty()) {
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         item->setRecur( event->recurrence()->doesRecur() );
         item->setAlarm( event->isAlarmEnabled() && multiday < 2 );
         item->setMoreInfo( event->description().length() > 0  );
 #ifdef DESKTOP_VERSION
         Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails,
                                               KOPrefs::instance()->email());
         if ( me != 0 ) {
             if ( me->status() == Attendee::NeedsAction && me->RSVP())
                 item->setReply(true && multiday < 2);
             else
                 item->setReply(false);
         } else
             item->setReply(false);
 #endif
         item->setMultiDay( multiday );
-        if ( insertNewItem) 
-            insertItem( item );
+        insertItem( item );
         mToolTip.append( mToolTipText );
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
-    bool insertNewItem = false;
     setFocusPolicy(WheelFocus); 
       QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }
         text += todo->summary();
         MonthViewItem *item ;
-        if ( mCurrentAvailItem ) {
-            item = mCurrentAvailItem;
-            mCurrentAvailItem = (MonthViewItem*) item->next();
+        if ( mAvailItemList.count() ) {
+            item = mAvailItemList.first();
+            mAvailItemList.remove( item );
             item->recycle( todo, mDate, text );
         } else {
-            if ( mAvailItemList.count() ) {
-                item = mAvailItemList.first();
-                mAvailItemList.remove( item );
-                item->recycle( todo, mDate, text );
-                insertNewItem = true;
-            } else {
-                insertNewItem = true;
-                item = new MonthViewItem( todo, mDate, text );
-            }
+            item = new MonthViewItem( todo, mDate, text );
         }
         //MonthViewItem *item = new MonthViewItem( todo, mDate, text );
         //item->setPalette( mStandardPalette );
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = todo->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                 pal = getPalette();
                 if (cat.isEmpty()) {
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         item->setRecur( todo->recurrence()->doesRecur() );
         item->setAlarm( todo->isAlarmEnabled() );
         item->setMoreInfo( todo->description().length() > 0  );
-        if ( insertNewItem) 
-            insertItem( item );
+        insertItem( item );
         mToolTip.append( text ); 
 }
 void MonthViewCell::repaintfinishUpdateCell()
 {
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         mitem->setBlockRepaint( false );
         updateItem ( mitem );
         mitem = (MonthViewItem *)mitem->next();
     }
 }
 void MonthViewCell::finishUpdateCell()
 {
-    while ( mCurrentAvailItem ) {
-            MonthViewItem *item = mCurrentAvailItem;
-            mCurrentAvailItem = (MonthViewItem *)item->next();
-            mAvailItemList.append( item ); 
-            takeItem ( item );
-    }
+   
     
 
 #ifdef DESKTOP_VERSION
     if (mToolTip.count() > 0 ) {
         mToolTip.sort();
         QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),"");
     }
 #endif
     sort();
     //setMyPalette(); 
     setMyPalette();
   
     resizeEvent( 0 ); 
 
 }
 void MonthViewCell::updateCell()
 {
     //qDebug("MonthViewCell::updateCell() ");
     if ( !mMonthView->isUpdatePossible() )
         return;
     startUpdateCell();
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
     Event *event;
     for( event = events.first(); event; event = events.next() ) { // for event
         insertEvent(event);
     }
     // insert due todos
     QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         insertTodo( todo );
     }
     finishUpdateCell();
     // if ( isVisible())
     //qApp->processEvents();
 }
 
 void MonthViewCell::updateConfig( bool bigFont ) // = false
 {
 
     if ( bigFont ) {
         QFont fo = KOPrefs::instance()->mMonthViewFont;
         int ps = fo.pointSize() + 2;
         if ( ps < 18 )
             ps += 2;
         fo.setPointSize( ps ); 
         setFont( fo );
     } else
         setFont( KOPrefs::instance()->mMonthViewFont );
 
     QFontMetrics fm( font() );
     mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 );
     mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 );
     mHolidayPalette = mStandardPalette;
     mPrimaryPalette = mStandardPalette;
     mNonPrimaryPalette = mStandardPalette;
     if ( KOPrefs::instance()->mMonthViewUsesDayColors ) {
         mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor  );
         mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor  );
         mHolidayPalette.setColor(QColorGroup::Foreground,  KOPrefs::instance()->mMonthViewHolidayColor.dark());
         mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark());
         mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor);
         mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor);
         mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark());
         mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); 
         mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); 
     }
     //updateCell(); 
 }
 
 void MonthViewCell::enableScrollBars( bool enabled )
 {
+    
+    return;
     if ( enabled ) {
         QListBoxItem *fi =  firstItem ();
         if (fi ) {
             int ihei = fi->height( this );
             int hei = numRows ()  * ihei;
             if ( hei < height() - horizontalScrollBar()->height () ) {
                 setVScrollBarMode(QScrollView::AlwaysOff);
             }
             else 
                 setVScrollBarMode(QScrollView::Auto);
-            if ( ihei *3 > height() )
+            if ( ihei *3 > height() ) {
                 setHScrollBarMode(QScrollView::AlwaysOff);
-            else
+            }
+            else {
                 setHScrollBarMode(QScrollView::Auto);
+            }
         } else {
             setVScrollBarMode(QScrollView::Auto);
             setHScrollBarMode(QScrollView::Auto);
         }
     } else {
         setVScrollBarMode(QScrollView::AlwaysOff);
         setHScrollBarMode(QScrollView::AlwaysOff);
     }
 }
 
 Incidence *MonthViewCell::selectedIncidence()
 {
     int index = currentItem();
     if ( index < 0 ) return 0;
   
     MonthViewItem *mitem =
         static_cast<MonthViewItem *>( item( index ) );
 
     if ( !mitem ) return 0;
   
     return mitem->incidence();
 }
 
 QDate MonthViewCell::selectedIncidenceDate()
 {
     QDate qd;
     int index = currentItem();
     if ( index < 0 ) return qd;
   
     MonthViewItem *mitem =
         static_cast<MonthViewItem *>( item( index ) );
 
     if ( !mitem ) return qd;
   
     return mitem->incidenceDate();
 }
 
 void MonthViewCell::deselect()
 {
     clearSelection();
     enableScrollBars( false );
     // updateCell();
 }
 void MonthViewCell::select()
 {
     ;// updateCell();
 }
 
 void MonthViewCell::resizeEvent ( QResizeEvent * e )
 {
     if ( !mMonthView->isUpdatePossible() )
         return;
     //qDebug("++++++++++++++MonthViewCell::resizeEvent %d %d ", width(), height());
     deselect();
     mLabel->setMaximumHeight( height() - lineWidth()*2 );
     
     QString text;
     mLabel->setText( text );
     bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
     if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 
         text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " ";
         mLabel->resize( mLabelBigSize  );
         text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
     } else {
         mLabel->resize( mLabelSize );
         text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
     }
     mLabel->setText( text );
 
     int size = height() - mLabel->height() - lineWidth()-1;
     //qDebug("LW %d ", lineWidth());
     if ( size > 0 )
         verticalScrollBar()->setMaximumHeight( size );
     size = width() - mLabel->width() -lineWidth()-1;
     if ( size > 0 )
         horizontalScrollBar()->setMaximumWidth( size );
     mLabel->move( width()-lineWidth() - mLabel->width(), height()-lineWidth() - mLabel->height() );
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     // mItemList->resize ( width(), height () ); 
     if ( e )
         KNoScrollListBox::resizeEvent (  e );
 }
 
 void MonthViewCell::defaultAction( QListBoxItem *item )
 {
     if ( !item ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
 
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->defaultAction( incidence );
 }
 void MonthViewCell::showDay()
 {
     emit showDaySignal( date() );
 }
 void MonthViewCell::newEvent()
 {
     QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
     emit newEventSignal( dt );
 }
 void MonthViewCell::cellClicked( QListBoxItem *item )
 {
-    static  QListBoxItem * lastClicked = 0;
     if ( item == 0 ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
     /*
       if ( lastClicked )
       if ( ! item ) {
       if ( lastClicked->listBox() != item->listBox() )
       lastClicked->listBox()->clearSelection();
       }
     */
  
     mMonthView->setSelectedCell( this );
     if( KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) enableScrollBars( true );
     select();
 }
 
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
     if ( !item ) return;
   
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->showContextMenu( incidence );
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) return;
 
     mMonthView->setSelectedCell( this );
 }
 
 
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
 
 
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     : KOEventView( calendar, parent, name ),
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
       mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
     mFlagKeyPressed = false;
     mShortDayLabelsM = false;
     mShortDayLabelsW = false;
     skipResize = false;
     clPending = true;
     mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" );
     mWidStack = new QWidgetStack( this );
     QVBoxLayout* hb = new QVBoxLayout( this );
     mMonthView = new QWidget( mWidStack );
     mWeekView = new QWidget( mWidStack );
 #if QT_VERSION >= 0x030000
     mWidStack->addWidget(mMonthView );
     mWidStack->addWidget(mWeekView  );
 #else
     mWidStack->addWidget( mMonthView, 1 );
     mWidStack->addWidget( mWeekView , 1 );
 #endif
     hb->addWidget( mNavigatorBar );
     hb->addWidget( mWidStack );
     mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
     updatePossible = false;
     //updatePossible = true;
     mCells.setAutoDelete( true );
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     mDayLabels.resize( mDaysPerWeek );
     mDayLabelsW.resize( mDaysPerWeek );
     QFont bfont = font();
     if ( QApplication::desktop()->width() < 650 ) {
         bfont.setPointSize( bfont.pointSize() - 2 );
     }
     bfont.setBold( true );
     int i;
   
     for( i = 0; i < mDaysPerWeek; i++ ) {
         QLabel *label = new QLabel( mMonthView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabels.insert( i, label );
         label = new QLabel( mWeekView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabelsW.insert( i, label );
     }
 
     bfont.setBold( false );
     mWeekLabels.resize( mNumWeeks+1 );
     mWeekLabelsW.resize( 2 );
     for( i = 0; i < mNumWeeks+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mMonthView );
         label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabels.insert( i, label );
     }
     mWeekLabels[mNumWeeks]->setText( i18n("W"));
-    mWeekLabels[0]->setFocusPolicy(WheelFocus);
+    mWeekLabels[mNumWeeks]->setFocusPolicy(WheelFocus);
     QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
     
     for( i = 0; i < 1+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mWeekView );
         label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabelsW.insert( i, label );
     }
     mWeekLabelsW[1]->setText( i18n("W"));
-    mWeekLabelsW[0]->setFocusPolicy(WheelFocus); 
+    mWeekLabelsW[1]->setFocusPolicy(WheelFocus); 
 
 
     int row, col;
     mCells.resize( mNumCells );
     for( row = 0; row < mNumWeeks; ++row ) {
         for( col = 0; col < mDaysPerWeek; ++col ) {
             MonthViewCell *cell = new MonthViewCell( this, mMonthView );
             mCells.insert( row * mDaysPerWeek + col, cell );
 
             connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                      SLOT( defaultAction( Incidence * ) ) );
             connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                      SIGNAL( newEventSignal( QDateTime ) ) );
             connect( cell, SIGNAL( showDaySignal( QDate ) ),
                      SIGNAL( showDaySignal( QDate ) ) );
         }
     }
     mCellsW.resize( mDaysPerWeek );
     for( col = 0; col < mDaysPerWeek; ++col ) {
         MonthViewCell *cell = new MonthViewCell( this, mWeekView );
         mCellsW.insert( col, cell );
 
         connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                  SLOT( defaultAction( Incidence * ) ) );
         connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                  SIGNAL( newEventSignal( QDateTime ) ) );
         connect( cell, SIGNAL( showDaySignal( QDate ) ),
                  SIGNAL( showDaySignal( QDate ) ) );
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
     // updateConfig(); //useless here...
     // ... but we need mWidthLongDayLabel computed
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
 
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 
 #if 0
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 #endif
 
     emit incidenceSelected( 0 );
 
     mComputeLayoutTimer = new QTimer( this );
     connect (mComputeLayoutTimer ,SIGNAL(timeout()), this, SLOT ( slotComputeLayout()));
 
 
 #ifndef DESKTOP_VERSION
     resize( QApplication::desktop()->size() );
 #else
     resize(640, 480 );
     updatePossible = true;
 #endif
     computeLayout();
 
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
 
 void KOMonthView::selectInternalWeekNum ( int n )
 {
     switchView();  
     if ( !KOPrefs::instance()->mMonthViewWeek )
         emit selectMonth ();
     else
         emit selectWeekNum ( n );
 }
 
 int KOMonthView::currentWeek()
 {
     if ( mShowWeekView )
         return mWeekLabelsW[0]->getWeekNum();
     return mWeekLabels[0]->getWeekNum();
 }
 void KOMonthView::switchView()
 {
     if ( selectedCell( ) )
         selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
     KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
     if ( clPending ) {
       computeLayout();
       updateConfig();
     }
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView ); 
     clPending = false;
 }
 
 int KOMonthView::maxDatesHint()
 {
     return mNumCells;
 }
 
 int KOMonthView::currentDateCount()
 {
     return mNumCells;
 }
 
 QPtrList<Incidence> KOMonthView::selectedIncidences()
 {
     QPtrList<Incidence> selected;
 
     if ( mSelectedCell ) {
         Incidence *incidence = mSelectedCell->selectedIncidence();
         if ( incidence ) selected.append( incidence );
     }
 
     return selected;
 }
 
 DateList KOMonthView::selectedDates()
 {
     DateList selected;
 
     if ( mSelectedCell ) {
         QDate qd = mSelectedCell->selectedIncidenceDate();
         if ( qd.isValid() ) selected.append( qd );
     }
 
     return selected;
 }
 
 void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                const QDate &td)
 {
 #ifndef KORG_NOPRINTER
     calPrinter->preview(CalPrinter::Month, fd, td);
 #endif
 }
 
 void KOMonthView::updateConfig()
 {
  
     int mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView || KOPrefs::instance()->mMonthViewSatSunTog ) {
         mWeekStartsMonday = true;
     } 
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
 
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
     bool temp = mShowSatSunComp ;
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     if ( !  mShowWeekView ) {
         if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
             computeLayout();
     }
     updateDayLabels();
     //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
     //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
     //resizeEvent( 0 );
     for (uint i = 0; i < mCells.count(); ++i) {
         mCells[i]->updateConfig();
     }
 
     for (uint i = 0; i < mCellsW.count(); ++i) {
         mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
     }
 #ifdef DESKTOP_VERSION
     MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
 #endif
     updateView();
 }
 
 void KOMonthView::updateDayLabels()
 {
   
     QPtrVector<QLabel> *mDayLabelsT;
 
     mDayLabelsT = &mDayLabelsW;
     for (int i = 0; i < 7; i++) {
        {
             bool show = mShortDayLabelsW;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         }
     }
     mDayLabelsT = &mDayLabels;
     for (int i = 0; i < 7; i++) {
         if (KGlobal::locale()->weekStartsMonday() || KOPrefs::instance()->mMonthViewSatSunTog ) {
             bool show = mShortDayLabelsM;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         } else {
             if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM));
             else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM));
 
         }
     }
 
 }
 
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
     //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
 
     QPtrVector<MonthViewCell> *cells;
     QPtrVector<QLabel> *dayLabels;
     QPtrVector<KOWeekButton> *weekLabels;
     int weekNum = 6;
     mStartDate = start;
     if ( mShowWeekView ) {
         weekNum = 1;
         cells = &mCellsW;
         dayLabels = &mDayLabelsW;
         weekLabels = &mWeekLabelsW;
         if ( !KGlobal::locale()->weekStartsMonday() ) {
             mStartDate = mStartDate.addDays( 1 );
         }
     } else {
         cells = &mCells;
         dayLabels = &mDayLabels;
         weekLabels = &mWeekLabels;
     }
 
     int mWeekStartsMonday =  KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView || KOPrefs::instance()->mMonthViewSatSunTog ) {
         mWeekStartsMonday = true;
     } 
     int startWeekDay = mWeekStartsMonday ? 1 : 7;
 
     while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) {
         mStartDate = mStartDate.addDays( -1 );
     }
     bool primary = false;
     uint i;
     for( i = 0; i < (*cells).size(); ++i ) {
         QDate date = mStartDate.addDays( i );
         (*cells)[i]->setDate( date );
 
 #ifndef KORG_NOPLUGINS
         // add holiday, if present
         QString hstring(KOCore::self()->holiday(date));
         (*cells)[i]->setHoliday( hstring );
 #endif
 
     }
     QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
     for( i = 0; i < weekNum; ++i ) {
         int wno;
         // remember, according to ISO 8601, the first week of the year is the
         // first week that contains a thursday.  Thus we must subtract off 4,
         // not just 1.
         int dayOfYear = date.dayOfYear();
         if (dayOfYear % 7 != 0)
             wno = dayOfYear / 7 + 1;
         else
             wno =dayOfYear / 7;
         (*weekLabels)[i]->setWeekNum( wno );
         date = date.addDays( 7 );
     }
     updateView();
 }
 
 void KOMonthView::showEvents(QPtrList<Event>)
 {
     qDebug("KOMonthView::selectEvents is not implemented yet. ");
 }
 
 void KOMonthView::changeEventDisplay(Event *, int)
 {
     // this should be re-written to be much more efficient, but this
     // quick-and-dirty-hack gets the job done for right now.
-    qDebug("KOMonthView::changeEventDisplay ");
+    //qDebug("KOMonthView::changeEventDisplay ");
     updateView();
 }
 
 void KOMonthView::updateView()
 { 
 
     if ( !updatePossible )
         return;
     //qDebug("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU ");
     //QTime ti;
     //ti.start();
     clearSelection();
     QPtrVector<MonthViewCell> *cells;
     if ( mShowWeekView ) {
         cells = &mCellsW;
     } else {
         cells = &mCells;
     }
 #if 1
     int i;
     int timeSpan = (*cells).size()-1;
     if ( KOPrefs::instance()->mMonthViewWeek )         
         timeSpan = 6;
     for( i = 0; i < timeSpan + 1; ++i ) {
         (*cells)[i]->startUpdateCell();
     }
  
     QPtrList<Event> events = calendar()->events();
     Event *event;
     QDateTime dt;
     bool ok;
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         if ( event->doesRecur() ) {
             bool last;
             QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
             QDateTime incidenceEnd;
             int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date()  );
             bool invalid = false;
             while( true ) {
                     if ( incidenceStart.isValid() ) {
                         incidenceEnd = incidenceStart.addDays( eventlen );
                         int st =   incidenceStart.date().daysTo( endDate );
                         if ( st >= 0 ) { // start before timeend
                             int end = mStartDate.daysTo( incidenceEnd.date() );
                             if ( end >= 0 ) { // end after timestart --- got one!
                                 //normalize
                                 st =  timeSpan - st;
                                 if ( st < 0 ) st = 0;
                                 if ( end > timeSpan ) end = timeSpan;
                                 int iii;
                                 //qDebug("found %s %d %d ",event->summary().latin1(), st, end );
                                 for ( iii = st;iii<= end;++iii) 
                                     (*cells)[iii]->insertEvent( event );
                             }
                         }
                     } else {
                         if ( invalid )
                             break;
                         invalid = true;
                         //qDebug("invalid %s", event->summary().latin1());
                         incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                     }
                     if ( last )
                         break;
                     bool ok;
                     incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok );
                     if ( ! ok )
                         break;
                     if ( incidenceStart.date() > endDate )
                         break;
             }
         } else { // no recur 
             int st =  event->dtStart().date().daysTo( endDate );
             if ( st >= 0 ) { // start before timeend
                 int end = mStartDate.daysTo( event->dtEnd().date() );
                 if ( end >= 0 ) { // end after timestart --- got one!
                     //normalize
                     st =  timeSpan - st;
                     if ( st < 0 ) st = 0;
                     if ( end > timeSpan ) end = timeSpan;
                     int iii;
                     for ( iii = st;iii<= end;++iii)
                         (*cells)[iii]->insertEvent( event );
                 }
             }
         }
     }
     // insert due todos
     QPtrList<Todo> todos = calendar()->todos( );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         //insertTodo( todo );
         if ( todo->hasDueDate() ) {
             int day = mStartDate.daysTo( todo->dtDue().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
                 (*cells)[day]->insertTodo( todo );
             }
         }
     }
 
     for( i = 0; i < timeSpan+1; ++i ) {
         (*cells)[i]->finishUpdateCell();
     }
     processSelectionChange();
     //qApp->processEvents();
      for( i = 0; i < timeSpan+1; ++i ) {
          (*cells)[i]->repaintfinishUpdateCell();
     }
      setKeyBFocus();
 #else
     // old code
     //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
     int i;
     for( i = 0; i < (*cells).count(); ++i ) {
         (*cells)[i]->updateCell();
     }
  
     //qDebug("KOMonthView::updateView() ");
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
     (*cells)[0]->setFocus();
 #endif
 
     //qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::setKeyBoardFocus()
 {
+    //qDebug("KOMonthView::setKeyBoardFocus() ");
     bool shootAgain = false;
     if ( mShowWeekView ) {
-        shootAgain = !mWeekLabelsW[0]->hasFocus();
-         mWeekLabelsW[0]->setFocus();
+        shootAgain = !mWeekLabelsW[1]->hasFocus();
+         mWeekLabelsW[1]->setFocus();
     }
     else {
-        shootAgain = !mWeekLabels[0]->hasFocus();
-         mWeekLabels[0]->setFocus();
+        shootAgain = !mWeekLabels[mNumWeeks]->hasFocus();
+         mWeekLabels[mNumWeeks]->setFocus();
     }
     if ( shootAgain ) {
       QTimer::singleShot( 0, this, SLOT ( setKeyBFocus() ) );
     }
 }
 void KOMonthView::setKeyBFocus()
 {
     //qDebug("KOMonthView::setKeyBFocus() ");
     QTimer::singleShot( 0, this, SLOT ( setKeyBoardFocus() ) );
 }
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
     if ( isVisible() ) {
         //qDebug("KOMonthView::isVisible ");
         slotComputeLayout();
     } else
         mComputeLayoutTimer->start( 100 );
 }
 
 void KOMonthView::slotComputeLayout()
 {
     mComputeLayoutTimer->stop();
     //qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() );
     computeLayout();
     clPending = true;  
     setKeyBFocus();
 }
 void KOMonthView::computeLayoutWeek()
 {
     static int lastWid = 0;
     static int lastHei = 0;
     int daysToShow;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
         return;
      
     if ( lastWid == width() && lastHei == height() ) {
         //qDebug("KOListWeekView::No compute layout needed ");
         return;
     }
     lastWid = width();
     lastHei = height();
 
 
     if ( wid < hei )
         daysToShow = 2;
     else
         daysToShow = 3;
     mShowSatSunComp = true;
     combinedSatSun  = true;
         
     //qDebug("KOMonthView::computeLayout() WWW ------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
     int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
     //qDebug("rowmod %d ", rowModulo);
     int i;
     int x,y,w,h;
     x= 0;
     y= 0;
     w = colWid;
     h = dayLabelHei ;
     for ( i = 0; i < 7; i++) {
         if ( i && !( i % daysToShow) && i < 6) {
             y += hei/(5-daysToShow);
             x = 0;
             w =  colWid;
         }
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
         if ( i >=  5 ) {
             mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h);
             x -= (w/2 );
         }
         else
             mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei;
     int max = 0;
     for ( i = 0; i < mCellsW.count(); ++i) {
         if ( i > 6 ) {
             mCellsW[i]->hide();
             continue;
         }
         
         w = colWid;
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
         if ( i  == (daysToShow-1-rowModulo)*7)
             ++h; 
       
         if ( i >= 5 ) {
             if ( i ==5 ) {
                 max = h/2;
                 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                 x -= w ;y += h/2;
             } else {
                 if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
                     ++w;
                 }
                 max = h-h/2;
                 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                 y -= h/2;
             }
         } else {
             max = h;
             mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
         }
                 
        
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h+dayLabelHei ;
         }
         //mCellsW[i]->dateLabel()->setMaximumHeight( max - mCellsW[i]->lineWidth()*2 );
     }
     y= dayLabelHei;
     h = cellHei ;
     mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
     mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
     // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
     //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
     mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ;
     updateDayLabels();
     //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("M"));
     //if ( forceUpdate )
     //  updateView();
 }
 void KOMonthView::computeLayout()
 {
   
 
     static int lastWid = 0;
     static int lastHei = 0;
 
     if ( mShowWeekView ){
             computeLayoutWeek();
             return;
     }
     int daysToShow = 7;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) {
         return;  
     }
     if ( lastWid == width() && lastHei == height() ){
         //qDebug("KOMonthview::No compute layout needed ");
         return;
     }
 
     lastWid = width();
     lastHei =  height();
     //qDebug("KOMonthView::computeLayout() MMM ------------------- ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index e04cdf5..e962756 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -1,324 +1,325 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #ifndef _KOMONTHVIEW_H
 #define _KOMONTHVIEW_H
 
 #include <qlabel.h>
 #include <qframe.h>
 #include <qdatetime.h>
 #include <qlistbox.h>
 #include <qpoint.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qintdict.h>
 #include <qpushbutton.h>
 #include <qvaluelist.h>
 #include <qptrvector.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 
 #include "koeventview.h"
 #include "navigatorbar.h"
 
 #ifdef DESKTOP_VERSION
 class QToolTipGroup; 
 #endif
 
 class KNOWhatsThis; 
 class KOWeekButton : public QPushButton
 {
     Q_OBJECT
   public:
     KOWeekButton( QWidget *parent=0, const char *name=0 ) :
       QPushButton( parent, name) 
     {
       connect( this, SIGNAL( clicked() ),
                SLOT( bottonClicked() )); 
       mNumber = -1;
     }
     void setWeekNum ( int num ) {mNumber = num; setText( QString::number ( num ));}
     int getWeekNum() { return mNumber;}
     signals:
     void selectWeekNum ( int );
-private:
+private: 
+    void focusInEvent ( QFocusEvent * ){;}
     int mNumber;
     void keyPressEvent ( QKeyEvent * e )
     {
         e->ignore();     
     }
 
 private slots :
     void bottonClicked() { if ( mNumber > 0 ) emit selectWeekNum ( mNumber ); }
 };
 
 class KNoScrollListBox: public QListBox
 {
     Q_OBJECT
   public:
     KNoScrollListBox(QWidget *parent=0, const char *name=0);
     ~KNoScrollListBox();
     QString getWhatsThisText(QPoint p) ;
 
   signals:
     void shiftDown();
     void shiftUp();
     void rightClick();
 
    protected slots:
     void oneDown();
     void keyPressEvent(QKeyEvent *);
     void keyReleaseEvent(QKeyEvent *);
     void mousePressEvent(QMouseEvent *); 
     void focusInEvent ( QFocusEvent * );
     void focusOutEvent ( QFocusEvent * ); 
 
  private:
     bool resetOnFocusIn;
     KNOWhatsThis * mWT;
 };
 
 
 class MonthViewItem: public QListBoxItem
 {
   public:
     MonthViewItem( Incidence *, QDate qd, const QString & title );
     void recycle( Incidence *incidence, QDate qd, const QString & s);
     void setRecur(bool on) { mRecur = on; }
     void setAlarm(bool on) { mAlarm = on; }
     void setReply(bool on) { mReply = on; }
     void setMoreInfo(bool on) { mInfo = on; }
     void setMultiDay(int type) { mMultiday = type; }
     void setBlockRepaint(bool on) { mblockRepaint = on; }
 
 
     void setPalette(const QPalette &p) { mPalette = p; }
     QPalette palette() const { return mPalette; }
 
     Incidence *incidence() const { return mIncidence; }
     QDate incidenceDate() { return mDate; }
 
   protected:
     virtual void paint(QPainter *);
     virtual int height(const QListBox *) const;
     virtual int width(const QListBox *) const;
 
   private:
+    bool isWeekItem;
     bool mblockRepaint;
     int mMultiday;
     bool mRecur;
     bool mAlarm;
     bool mReply;
     bool mInfo;
 
     QPalette mPalette;
     QDate mDate;
 
     Incidence *mIncidence;
 };
 
 
 class KOMonthView;
 
 class MonthViewCell : public KNoScrollListBox
 {
     Q_OBJECT
   public:
     MonthViewCell(KOMonthView *,QWidget* );
     ~MonthViewCell() {mAvailItemList.setAutoDelete( true );}
 
     void setDate( const QDate & );
     QDate date() const;
 
     void setPrimary( bool );
     bool isPrimary() const;
 
     void setHoliday( bool );
     void setHoliday( const QString & );
 
     void updateCell();
     void startUpdateCell();
     void finishUpdateCell();
     void repaintfinishUpdateCell();
     void insertEvent(Event *);
     void insertTodo(Todo *);
 
     void updateConfig( bool bigFont = false );
 
     void enableScrollBars( bool );
 
     Incidence *selectedIncidence();
     QDate selectedIncidenceDate();
     QPushButton * dateLabel() { return mLabel; }
 
     void deselect();
     void select();
 #ifdef DESKTOP_VERSION
     static QToolTipGroup *toolTipGroup(); 
 #endif
   signals:
     void defaultAction( Incidence * );
     void newEventSignal( QDateTime );
     void showDaySignal( QDate );
     
   protected:
     QStringList mToolTip;
     void resizeEvent( QResizeEvent * );
 
 
 public slots:
     void showDay();
 
   protected slots:
     void defaultAction( QListBoxItem * );
     void contextMenu( QListBoxItem * );
     void selection( QListBoxItem * );
     void cellClicked( QListBoxItem * );
     void newEvent();
     
   private:
-    MonthViewItem* mCurrentAvailItem;
     QPtrList <MonthViewItem> mAvailItemList; 
     KOMonthView *mMonthView;
     int currentPalette; 
   
     QDate mDate;
     bool mPrimary;
     bool mHoliday;
     QString mHolidayString;
     
     //QLabel *mLabel;
     QPushButton *mLabel;
     //QListBox *mItemList;
 #ifdef DESKTOP_VERSION
     static QToolTipGroup *mToolTipGroup; 
 #endif 
     QSize mLabelSize;
     QSize mLabelBigSize;
     QPalette mHolidayPalette;
     QPalette mStandardPalette;
     QPalette mPrimaryPalette;
     QPalette mNonPrimaryPalette;
     void setMyPalette();
     QPalette  getPalette ();
     
 };
 
 
 class KOMonthView: public KOEventView
 {
     Q_OBJECT
   public:
     KOMonthView(Calendar *cal, QWidget *parent = 0, const char *name = 0 );
     ~KOMonthView();
 
     /** Returns maximum number of days supported by the komonthview */
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
     virtual int currentDateCount();
 
     /** returns the currently selected events */
     virtual QPtrList<Incidence> selectedIncidences();
 
     /** returns dates of the currently selected events */
     virtual DateList selectedDates();
 
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
     bool isMonthView() { return !mShowWeekView; }
     bool isUpdatePossible() { return updatePossible; }
 
     MonthViewCell * selectedCell();
     bool skipResize; 
     NavigatorBar* navigatorBar() { return mNavigatorBar ;}
   public slots:
     virtual void updateView();
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
     void clearSelection();
 
     void showContextMenu( Incidence * );
 
     void setSelectedCell( MonthViewCell * );
     void switchView();
     void setKeyBoardFocus();
     void setKeyBFocus();
 
   protected slots:
     void slotComputeLayout();
     void selectInternalWeekNum ( int );
     void processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
     void selectWeekNum ( int );
     void selectMonth ();
     void showDaySignal( QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
     QTimer* mComputeLayoutTimer;
     NavigatorBar* mNavigatorBar;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
     int mNumCells;
     //bool mWeekStartsMonday;
     bool mShowSatSunComp;
     void computeLayout();
     void computeLayoutWeek();
 
     QPtrVector<MonthViewCell> mCells;
     QPtrVector<QLabel> mDayLabels;
     QPtrVector<KOWeekButton> mWeekLabels;
     QPtrVector<MonthViewCell> mCellsW;
     QPtrVector<QLabel> mDayLabelsW;
     QPtrVector<KOWeekButton> mWeekLabelsW;
 
     bool mShortDayLabelsM;
     bool mShortDayLabelsW;
     int mWidthLongDayLabel;
 
     QDate mStartDate;
 
     MonthViewCell *mSelectedCell;
     bool mFlagKeyPressed;
     KOEventPopupMenu *mContextMenu;
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
 
 };
 
 #endif