fixes

6 files changed, 99 insertions, 5 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index b175f9a..2b7e41f 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -217,390 +217,400 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
         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 () ) {  
         if ( currentItem()+1 == count () ) {
             emit nextCell();
         } else {
             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;
     mdayPos = 0;
     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; 
     mdayPos = 0;
     //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 ) );
+    if ( KOPrefs::instance()->mMonthShowTimes || isWeekItem) {
     p->drawText( x, yPos, text() );
     if ( mIncidence->cancelled() ) {
         int wid = fm.width( text() );
         p->drawLine( x, heihei/2 ,x+wid, heihei/2 );
     }
-      
+    } else {
+        QString pText = text();
+        if( pText.mid(2,1) == ":" )
+            pText =  pText.mid( 6 );
+        p->drawText( x, yPos,  pText );
+        if ( mIncidence->cancelled() ) {
+            int wid = fm.width( pText );
+            p->drawLine( x, heihei/2 ,x+wid, heihei/2 );
+        }
+    }  
 }
 
 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 || 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 )
 {
     //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( 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()
 {
     mdayCount = 0;
     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() ){
@@ -853,542 +863,570 @@ void MonthViewCell::finishUpdateCell()
     }
 #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() ) {
                 setHScrollBarMode(QScrollView::AlwaysOff);
             }
             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 )
 {
+    mMonthView->setSelectedCell( this );
     qDebug("CELL ");
     if ( item == 0 ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
 
 }
 
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
-    if ( !item ) return;
-  
+    mMonthView->setPopupCell( this );
+    if ( !item )  {
+        mMonthView->showContextMenu( 0 );
+        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;
+    mPopupCell = 0;
     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[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[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 ) ) );
             connect( cell, SIGNAL( nextCell() ),
                      SLOT( nextCell() ) );
             connect( cell, SIGNAL( prevCell() ),
                      SLOT( prevCell() ) );
         }
     }
     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 ) ) );
         connect( cell, SIGNAL( nextCell() ),
                  SLOT( nextCell() ) );
         connect( cell, SIGNAL( prevCell() ),
                  SLOT( prevCell() ) );
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
+    mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
+                                  i18n("New Event..."),this,
+                                  SLOT(slotNewEvent()),false);
+    mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
+                                  i18n("New Todo..."),this,
+                                  SLOT(slotNewTodo()),false);
+    mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
+                                  i18n("Journal"),this,
+                                  SLOT(slotEditJournal()),false);
+
+
+
+    QString pathString = "";
+    if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
+        if ( QApplication::desktop()->width() < 480 )
+            pathString += "icons16/";
+    } else
+        pathString += "iconsmini/";
+    mNewItemMenu = new QPopupMenu( this );
+    mNewItemMenu->insertItem( SmallIcon( pathString +"newevent" ), i18n("New Event..."),this, SLOT(slotNewEvent()));
+    mNewItemMenu->insertItem( SmallIcon( pathString +"newtodo" ),i18n("New Todo..."),this,SLOT(slotNewTodo()),false);
+    mNewItemMenu->insertItem( SmallIcon( pathString +"journal" ),i18n("Journal"),this,SLOT(slotEditJournal()),false);
+
     // 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;
@@ -1704,313 +1742,350 @@ void KOMonthView::computeLayoutWeek()
         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;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabels[0]->sizeHint().height();
     int cellHei = (hei - dayLabelHei) /6; 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- dayLabelHei) % 6;
     //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 == daysToShow-colModulo )
             ++w;
         if ( combinedSatSun ) {
             if ( i >=  daysToShow-1 ) {
 
                 if ( i == 6 )
                     mDayLabels[i]->setGeometry( x+weeklabelwid,y,width()-x-weeklabelwid,h);
                 else
                     mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
                 x -= w/2 ;
             }
             else
                 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         } else
             mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei ;
     int max = 0;
     for ( i = 0; i < mCells.count(); ++i) {
         //qDebug("iii %d ", i);
         w = colWid;
         if ( ((i) % 7) >= 7-colModulo ) {
             ++w;
         }
         if ( i  == (6-rowModulo)*7)
             ++h; 
         if ( combinedSatSun ) {
             if ( (i)%7 >=  daysToShow-1 ) {
                 if ( (i)%7 ==  daysToShow-1 ) {
                     w = width()-x-weeklabelwid;
                     max = h/2;
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                     x -= w ;y += h/2;
                 } else {
                     w = width()-x-weeklabelwid;
                     max = h-h/2;
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                     y -= h/2;
                 }
             } else {
                 max = h;
                 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
             }
                 
         }
         else {
             max = h;
             mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
         }
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h;
         } 
         //mCells[i]->dateLabel()->setMaximumHeight( max- mCells[i]->lineWidth()*2 );
     }
     y= dayLabelHei;
     h = cellHei ;
     for ( i = 0; i < 6; i++) {
         if ( i  == (6-rowModulo))
             ++h;
         mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
         y += h;                            
     }
     mWeekLabels[6]->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());
     mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ;
     updateDayLabels();
     //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 }
 
 void KOMonthView::showContextMenu( Incidence *incidence )
 {
+    if( incidence )
     mContextMenu->showIncidencePopup(incidence);
+    else {
+        //qDebug("KOMonthView::showContextMenu ");
+        mNewItemMenu->popup(QCursor::pos());
+    }
     /*
       if( incidence && incidence->type() == "Event" ) {
       Event *event = static_cast<Event *>(incidence);
       mContextMenu->showEventPopup(event);
       } else {
       kdDebug() << "MonthView::showContextMenu(): cast failed." << endl;
       }
     */
 }
 MonthViewCell * KOMonthView::selectedCell( )
 {
     return mSelectedCell;
 }
 void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
-    //qDebug("KOMonthView::setSelectedCell ");
+    //qDebug("KOMonthView::setSelectedCell %d", cell);
     if ( mSelectedCell && mSelectedCell != cell ) {
         MonthViewCell * mvc = mSelectedCell;
         mSelectedCell = cell;
         mvc->deselect();
     } else 
         mSelectedCell = cell;
     //  if ( mSelectedCell )
     //         mSelectedCell->select();
     if ( !mSelectedCell )
         emit incidenceSelected( 0 );
     else 
         emit incidenceSelected( mSelectedCell->selectedIncidence() );
 }
 
 void KOMonthView::processSelectionChange()
 {
     QPtrList<Incidence> incidences = selectedIncidences();
     if (incidences.count() > 0) {
         emit incidenceSelected( incidences.first() );
     } else {
         emit incidenceSelected( 0 );
         clearSelection();
     }
 }
 
 void KOMonthView::clearSelection()
 {
     if ( mSelectedCell ) {
         mSelectedCell->deselect();
         mSelectedCell = 0;
     }
 }
 
 void KOMonthView::keyReleaseEvent ( QKeyEvent * e)
 {
     if ( !e->isAutoRepeat() ) {
         mFlagKeyPressed = false;
     }
 }
 
 void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
    
     qApp->processEvents();
     if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
         //e->ignore();
         e->accept();
         return;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
     switch(e->key()) {
     case Key_Up: 
         {
             if ( mShowWeekView ) {
                 emit selectWeekNum ( currentWeek() - 1 );
             }
             else {
                 emit prevMonth();
             }
         }
         e->accept();
         break;
     case Key_Down:
         {
             if ( mShowWeekView ) {
                 emit selectWeekNum ( currentWeek() +1);
             }
             else {
                 emit nextMonth();
             }
            
         }
         e->accept();
         break;
     case Key_Return:
     case Key_Enter:
         {
             selectInternalWeekNum ( currentWeek() );
         }
         e->accept();
         break;
     case Key_D:
         if ( mSelectedCell ) {
             mSelectedCell->showDay();
             e->accept();
         } else {
             e->ignore();     
         }
         break;
     default:
         e->ignore();     
         break;
     }
 }
 
 void KOMonthView::nextCell()
 {
    bool res =  focusNextPrevChild ( true ); 
 }
 void KOMonthView::prevCell()
 {
     focusNextPrevChild ( false ); 
 }
+
+void KOMonthView::slotNewTodo()
+{
+    //qDebug("KOMonthView::slotNewTodo() ");
+    if ( mPopupCell ){
+        QDateTime dt( mPopupCell->date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
+        emit newTodoSignal(dt,true);
+    }
+    mPopupCell = 0;
+}
+void KOMonthView::slotNewEvent()
+{
+    if ( mPopupCell ) {
+        QDateTime dt( mPopupCell->date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
+        emit newEventSignal( dt );
+    }
+    //qDebug("KOMonthView::slotNewEvent() ");
+    mPopupCell = 0;
+}
+
+void KOMonthView::slotEditJournal()
+{ 
+    if (  mPopupCell )
+        emit showJournalSignal( 7, mPopupCell->date() );
+    //qDebug("KOMonthView::slotEditJournal() ");
+    mPopupCell = 0;
+}
+
+void KOMonthView::setPopupCell( MonthViewCell * c)
+{
+    mPopupCell = c;
+}
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index c6b6b5e..de5c014 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -82,251 +82,259 @@ class KNoScrollListBox: public QListBox
   signals:
     void shiftDown();
     void shiftUp();
     void rightClick();
     void nextCell();
     void prevCell();
 
    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 setMultiDayPos(int type) { mdayPos = type; }
     int gettMultiDayPos() { return mdayPos; }
     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:
     int mdayPos;
     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();
     int 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:
     int mdayCount;
     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:
     void nextCell();
     void prevCell();
     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 setPopupCell( MonthViewCell * );
     void switchView();
     void setKeyBoardFocus();
     void setKeyBFocus();
 
   protected slots:
+    void slotNewTodo();
+    void slotNewEvent();
+    void slotEditJournal();
     void slotComputeLayout();
     void selectInternalWeekNum ( int );
     void processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
     void selectWeekNum ( int );
     void selectMonth ();
     void showDaySignal( QDate );
+    void newTodoSignal( QDateTime, bool );
+    void showJournalSignal( int,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;
+    MonthViewCell *mPopupCell;
     bool mFlagKeyPressed;
     KOEventPopupMenu *mContextMenu;
+    QPopupMenu *mNewItemMenu;
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
 
 };
 
 #endif
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index a571ed4..34044ab 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -48,384 +48,385 @@
 #include "mainwindow.h"
 
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 
 KOPrefs::KOPrefs() :
   KPimPrefs("korganizerrc")
 {
   mCategoryColors.setAutoDelete(true);
   fillMailDefaults();
   mDefaultCategoryColor           = QColor(175,210,255);//196,196,196);
   QColor defaultHolidayColor      = QColor(255,0,0);
   QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
   QColor defaultAgendaBgColor     = QColor(239,241,169);//128,128,128);
   QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
   QColor defaultTodoDueTodayColor = QColor(255,220,100);
   QColor defaultTodoOverdueColor  = QColor(255,153,125);
   QColor defaultTodoRunColor  = QColor(99,194,30);
   KPrefs::setCurrentGroup("General");
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
   addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
   addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
   addItemBool("ShowIconSearch",&mShowIconSearch,true);
   addItemBool("ShowIconList",&mShowIconList,true);
   addItemBool("ShowIconDay1",&mShowIconDay1,true);
   addItemBool("ShowIconDay5",&mShowIconDay5,true);
   addItemBool("ShowIconDay6",&mShowIconDay6,true);
   addItemBool("ShowIconDay7",&mShowIconDay7,true);
   addItemBool("ShowIconMonth",&mShowIconMonth,true);
   addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
   addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
   addItemBool("ShowIconBack",&mShowIconBack,true);
   addItemBool("ShowIconToday",&mShowIconToday,true);
   addItemBool("ShowIconForward",&mShowIconForward,true);
   addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
   addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
   addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true);
   addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
   addItemBool("ShowIconNext",&mShowIconNext,true);
   addItemBool("ShowIconJournal",&mShowIconJournal,true); 
   addItemBool("ShowIconStretch",&mShowIconStretch,true); 
   addItemBool("ShowIconFilter",&mShowIconFilter,false); 
   addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true); 
 
   bool addIcons = false;
 #ifdef DESKTOP_VERSION
   addIcons = true;
 #endif
   addItemBool("ShowIconNavigator",&mShowIconNavigator,addIcons); 
   addItemBool("ShowIconAllday",&mShowIconAllday,addIcons); 
   addItemBool("ShowIconFilterview",&mShowIconFilterview,addIcons); 
   addItemBool("ShowIconToggleFull",&mShowIconToggleFull,addIcons); 
 
   addItemInt("LastLoadedLanguage",&mOldLanguage,0);
 
   addItemBool("AskForQuit",&mAskForQuit,false); 
 
 #ifndef DESKTOP_VERSION
   addItemBool("ShowFullMenu",&mShowFullMenu,false); 
 #else
   addItemBool("ShowFullMenu",&mShowFullMenu,true); 
 #endif
   addItemBool("ToolBarHor",&mToolBarHor, true );
   addItemBool("ToolBarUp",&mToolBarUp, false );
   addItemBool("ToolBarHorV",&mToolBarHorV, true );
   addItemBool("ToolBarUpV",&mToolBarUpV, false );
   addItemBool("ToolBarHorN",&mToolBarHorN, true );
   addItemBool("ToolBarUpN",&mToolBarUpN, false );
   addItemBool("ToolBarHorF",&mToolBarHorF, true );
   addItemBool("ToolBarUpF",&mToolBarUpF, false );
   addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
   addItemInt("Whats Next Days",&mWhatsNextDays,3);
   addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
 
   addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
   addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
   addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
   addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
   addItemInt("AllDay Size",&mAllDaySize,28);
   QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
   addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
 
   addItemStringList("LocationDefaults",&mLocationDefaults );
   addItemStringList("EventSummary User",&mEventSummaryUser);
   addItemStringList("TodoSummary User",&mTodoSummaryUser);
 
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
   addItemBool("Enable Project View",&mEnableProjectView,false);
   addItemBool("Auto Save",&mAutoSave,false);
   addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
   addItemBool("Confirm Deletes",&mConfirm,true);
   addItemString("Archive File",&mArchiveFile);
   addItemString("Html Export File",&mHtmlExportFile,
       QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
   addItemBool("Html With Save",&mHtmlWithSave,false);
 
   KPrefs::setCurrentGroup("Personal Settings");
 
   addItemInt("Mail Client",&mMailClient,MailClientKMail);
   addItemBool("Use Control Center Email",&mEmailControlCenter,false);
   addItemBool("Bcc",&mBcc,false);
 
   KPrefs::setCurrentGroup("Time & Date");
 
 
   addItemInt("Default Start Time",&mStartTime,10);
   addItemInt("Default Duration",&mDefaultDuration,2);
   addItemInt("Default Alarm Time",&mAlarmTime,3);
   KPrefs::setCurrentGroup("AlarmSettings");
   addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
   addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
   addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
   addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
 
 
   KPrefs::setCurrentGroup("Calendar");
 
   addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
 
   KPrefs::setCurrentGroup("Fonts");
   // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
   QFont fon = KGlobalSettings::generalFont();
   addItemFont("TimeBar Font",&mTimeBarFont,fon );
   addItemFont("MonthView Font",&mMonthViewFont,fon);
   addItemFont("AgendaView Font",&mAgendaViewFont,fon);
   addItemFont("MarcusBains Font",&mMarcusBainsFont,fon);
   addItemFont("TimeLabels Font",&mTimeLabelsFont,fon);
   addItemFont("TodoView Font",&mTodoViewFont,fon);
   addItemFont("ListView Font",&mListViewFont,fon);
   addItemFont("DateNavigator Font",&mDateNavigatorFont,fon);
   addItemFont("EditBox Font",&mEditBoxFont,fon);
   addItemFont("JournalView Font",&mJornalViewFont,fon);
   addItemFont("WhatsNextView Font",&mWhatsNextFont,fon);
   addItemFont("EventView Font",&mEventViewFont,fon);
 
   KPrefs::setCurrentGroup("RemoteSyncing");
   addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
   addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
   addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
   addItemInt("LastSyncTime",&mLastSyncTime,0); 
 
 #ifdef _WIN32_
   QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
   QString hdp= locateLocal("data","korganizer")+"/";
 #endif
 
   KPrefs::setCurrentGroup("LoadSaveFileNames");
 
   addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
   addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
   addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
   addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
  
 
   KPrefs::setCurrentGroup("Locale");
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
 
 
   KPrefs::setCurrentGroup("Colors");
   addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
   addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
   addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
   addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
   addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
   addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
   addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
   addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
   addItemColor("Todo running Color",&mTodoRunColor,defaultTodoRunColor);
   addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
   addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
   addItemBool("MonthViewWeek",&mMonthViewWeek,false);
   addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
   addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
   addItemBool("UseAppColors",&mUseAppColors,false); 
 
   
 
   KPrefs::setCurrentGroup("Views");
   addItemBool("Block Popup Menu",&mBlockPopupMenu,true);
   addItemBool("Show Date Navigator",&mShowDateNavigator,true);
   addItemInt("Hour Size",&mHourSize,8);
   addItemBool("Show Daily Recurrences",&mDailyRecur,true);
   addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
   addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
   addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
   addItemBool("ShowShortMonthName",&mMonthShowShort,false);
   addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
+  addItemBool("ShowTimesInMonthCell",&mMonthShowTimes,true);
 #ifdef DESKTOP_VERION
   addItemBool("Enable ToolTips",&mEnableToolTips,true);
 #else
   addItemBool("Enable ToolTips",&mEnableToolTips,false);
 #endif
   addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
   addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
   addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
   addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
   addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
   addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
   addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
   addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
   addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
   addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
   addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
   addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
   addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
   addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
   addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
   addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
   addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
   addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
   addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
   addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
   addItemInt("Day Begins",&mDayBegins,7);
   addItemInt("Working Hours Start",&mWorkingHoursStart,8);
   addItemInt("Working Hours End",&mWorkingHoursEnd,17);
   addItemBool("Exclude Holidays",&mExcludeHolidays,true);
   addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
 
   addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
   addItemBool("Full View Month",&mFullViewMonth,true);
   addItemBool("Full View Todo",&mFullViewTodo,true);
   addItemBool("Quick Todo",&mEnableQuickTodo,false);
 
   addItemInt("Next X Days",&mNextXDays,3);
 
   KPrefs::setCurrentGroup("Printer");
 
   KPrefs::setCurrentGroup("Layout");
 
   addItemBool("CompactDialogs",&mCompactDialogs,false);
   addItemBool("VerticalScreen",&mVerticalScreen,true);
 
   KPrefs::setCurrentGroup("KOrganizer Plugins");
 
   addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
 
   KPrefs::setCurrentGroup("Group Scheduling");
 
   addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
   addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
   addItemStringList("AdditionalMails",&mAdditionalMails,"");
   addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
   addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
   addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
   addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
   addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
 
   KPrefs::setCurrentGroup( "Editors" );
 
   addItemStringList( "EventTemplates", &mEventTemplates );
   addItemStringList( "TodoTemplates", &mTodoTemplates );
 
   addItemInt("DestinationPolicy",&mDestination,standardDestination);
 
   KPrefs::setCurrentGroup( "ViewOptions" );
   addItemBool("EVshowDetails",&mEVshowDetails,true);
   addItemBool("EVshowCreated",&mEVshowCreated,true);
   addItemBool("EVshowChanged",&mEVshowChanged,true);
   addItemBool("WTshowDetails",&mWTshowDetails,false);
   addItemBool("WTshowCreated",&mWTshowCreated,false);
   addItemBool("WTshowChanged",&mWTshowChanged,false);
 
 }
 
 
 KOPrefs::~KOPrefs()
 {
   if (mInstance == this)
       mInstance = insd.setObject(0); 
  
   //qDebug("KOPrefs::~KOPrefs() ");
 }
 
 
 KOPrefs *KOPrefs::instance()
 {
   if (!mInstance) {
       mInstance = insd.setObject(new KOPrefs());
       mInstance->readConfig();
   }
 
   return mInstance;
 }
 
 void KOPrefs::usrSetDefaults()
 {
    
 }
 
 void KOPrefs::fillMailDefaults()
 {
   if (mName.isEmpty()) mName = i18n("Anonymous");
   if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
 }
 
 void KOPrefs::setTimeZoneIdDefault()
 {
     ;
 }
 
 void KOPrefs::setAllDefaults()
 {
     setCategoryDefaults();
     mEventSummaryUser  = getDefaultList() ;
     mTodoSummaryUser  = getDefaultList() ;
     mLocationDefaults  = getLocationDefaultList();
 }
 
 void KOPrefs::setCategoryDefaults()
 {
   mCustomCategories.clear();
   mCustomCategories = getDefaultList();
 
   QStringList::Iterator it;
   for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
     setCategoryColor(*it,mDefaultCategoryColor);
   }
 }
 QStringList KOPrefs::getLocationDefaultList()
 {
  QStringList retval ;
  retval << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 
         << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") 
         << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarten")
         << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
  // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
 
     retval.sort();
     return retval; 
 }
 QStringList KOPrefs::getDefaultList()
 {
     QStringList retval ;
     retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema")  << i18n("Customer")
            << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner")
            << i18n("Education")<< i18n("Family")  << i18n("Favorites")  << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts")  
            << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") 
                     << i18n("Lunch")  << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel")
            << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping")
            << i18n("Speach")  << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
            << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent")  ;
     retval.sort();
     //qDebug("cat %s ", retval.join("-").latin1());
     return retval; 
 }
 
 void KOPrefs::usrReadConfig()
 {
     config()->setGroup("General");
     
     //qDebug("KOPrefs::usrReadConfig() ");
     mCustomCategories = config()->readListEntry("Custom Categories");
     mOldLoadedLanguage = mOldLanguage ;
     mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
     if (mLocationDefaults.isEmpty()) {
         mLocationDefaults  = getLocationDefaultList();
     }
        
     if (mEventSummaryUser.isEmpty()) {
         mEventSummaryUser  = getDefaultList() ;
     }
     if (mTodoSummaryUser.isEmpty()) {
         mTodoSummaryUser  = getDefaultList() ;
     }
   
     if (mCustomCategories.isEmpty()) setCategoryDefaults();
 
     config()->setGroup("Personal Settings");
     mName = config()->readEntry("user_name","");
     mEmail = config()->readEntry("user_email","");
     fillMailDefaults();
 
     config()->setGroup("Category Colors");
     QStringList::Iterator it;
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 2a0ee64..e06df1c 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -1,319 +1,320 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOPREFS_H
 #define KOPREFS_H
 
 
 #include <libkdepim/kpimprefs.h>
 #include <qdict.h>
 
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 
 #define VIEW_WN_VIEW 1
 #define VIEW_NX_VIEW 2
 #define VIEW_J_VIEW 3
 #define VIEW_A_VIEW 4
 #define VIEW_ML_VIEW 5
 #define VIEW_M_VIEW 6
 #define VIEW_L_VIEW 7
 #define VIEW_T_VIEW 8
 
 class KOPrefs : public KPimPrefs
 {
   public:
     enum { FormatVCalendar, FormatICalendar };
     enum { MailClientKMail, MailClientSendmail };
     enum { IMIPDummy, IMIPKMail };
     enum { IMIPOutbox, IMIPdirectsend };
     enum { neverAuto, addressbookAuto, selectedAuto };
     enum { standardDestination, askDestination };
 
     virtual ~KOPrefs();
 
     /** Get instance of KOPrefs. It is made sure that there is only one
     instance. */
     static KOPrefs *instance();
 
     /** Set preferences to default values */
     void usrSetDefaults();
 
     /** Read preferences from config file */
     void usrReadConfig();
 
     /** Write preferences to config file */
     void usrWriteConfig();
     void setCategoryDefaults();
     void setAllDefaults();
 
   protected:
     void setTimeZoneIdDefault();
 
     /** Fill empty mail fields with default values. */
     void fillMailDefaults();
 
   private:
     /** Constructor disabled for public. Use instance() to create a KOPrefs
     object. */
     KOPrefs();
 
     static KOPrefs *mInstance;
     QStringList getDefaultList();
     QStringList getLocationDefaultList();
   public:
     // preferences data
     KConfig* getConfig();
     void setFullName(const QString &);
     QString fullName();
     void setEmail(const QString &);
     QString email();
 
     QString mAdditional;
 
     bool    mEmailControlCenter;
 
     bool    mBcc;
     bool    mAutoSave;
     int     mAutoSaveInterval;
     bool    mConfirm;
 
     bool    mEnableGroupScheduling;
     bool    mEnableProjectView;
 
     int     mDefaultFormat;
     int     mMailClient;
 
     int     mStartTime;
     int     mDefaultDuration;
     int     mAlarmTime;
 
     int     mWorkingHoursStart;
     int     mWorkingHoursEnd;
     bool    mExcludeHolidays;
     bool    mExcludeSaturdays;
     bool    mMarcusBainsShowSeconds;
 
     QFont   mTimeBarFont;
     QFont   mMonthViewFont;
     QFont   mAgendaViewFont;
     QFont   mMarcusBainsFont;
     QFont   mTimeLabelsFont;
     QFont   mTodoViewFont;
     QFont   mListViewFont;
     QFont   mDateNavigatorFont;
     QFont   mEditBoxFont;
     QFont   mJornalViewFont;
     QFont   mWhatsNextFont;
     QFont   mEventViewFont;
 
 
 
 
     QColor  mHolidayColor;
     QColor  mHighlightColor;
     QColor  mEventColor;
     QColor  mTodoDoneColor;
     QColor  mAgendaBgColor;
     QColor  mWorkingHoursColor;
     QColor  mTodoDueTodayColor;
     QColor  mTodoOverdueColor;
     QColor  mTodoRunColor;
     QColor  mMonthViewEvenColor;
     QColor  mMonthViewOddColor;
     QColor  mMonthViewHolidayColor;
     bool mMonthViewUsesDayColors;
     bool mMonthViewSatSunTog;
     bool mMonthViewWeek;
     QColor  mAppColor1;
     QColor  mAppColor2;
     bool mUseAppColors;
 
     int     mDayBegins;
     int     mHourSize;
     int     mAllDaySize;
     bool    mShowFullMenu;
     bool    mDailyRecur;
     bool    mWeeklyRecur;
     bool    mMonthDailyRecur;
     bool    mMonthWeeklyRecur;
     bool    mMonthShowIcons;
+    bool    mMonthShowTimes;
     bool    mMonthShowShort;
     bool    mEnableToolTips;
     bool    mEnableMonthScroll;
     bool    mFullViewMonth;
     bool    mMonthViewUsesCategoryColor;
     bool    mFullViewTodo;
     bool    mShowCompletedTodo;
     bool    mMarcusBainsEnabled;
     int     mNextXDays;
     int     mWhatsNextDays;
     int     mWhatsNextPrios;
     bool    mEnableQuickTodo;
 
     bool    mCompactDialogs;
     bool    mVerticalScreen;
 
     bool mShowIconNewTodo;
     bool mShowIconNewEvent;
     bool mShowIconSearch;
     bool mShowIconList;
     bool mShowIconDay1;
     bool mShowIconDay5;
     bool mShowIconDay6;
     bool mShowIconDay7;
     bool mShowIconMonth;
     bool mShowIconTodoview;
     bool mShowIconBackFast;
     bool mShowIconBack;
     bool mShowIconToday;
     bool mShowIconForward;
     bool mShowIconForwardFast;
     bool mShowIconWhatsThis;
     bool mShowIconWeekNum;
     bool mShowIconNextDays;
     bool mShowIconNext;
     bool mShowIconJournal;
     bool mShowIconFilter;
     bool mShowIconOnetoolbar;
     bool mShowIconNavigator;
     bool mShowIconAllday;
     bool mShowIconFilterview;
     bool mShowIconToggleFull;
     
     bool mShowIconStretch;
 
     bool mToolBarHor;
     bool mToolBarUp;
     bool mToolBarHorV;
     bool mToolBarUpV;
     bool mToolBarHorN;
     bool mToolBarUpN;
     bool mToolBarHorF;
     bool mToolBarUpF;
     bool mToolBarMiniIcons;
 
     bool mAskForQuit;
     bool mUsePassWd;
     bool mShowSyncEvents;
     bool mShowTodoInAgenda;
     bool mShowTimeInAgenda;
     bool mHideNonStartedTodos;
 
     bool mBlockPopupMenu;
 
     int mLastSyncTime;
     void setCategoryColor(QString cat,const QColor & color);
     QColor *categoryColor(QString cat);
 
     QString mArchiveFile;
     QString mHtmlExportFile;
     bool    mHtmlWithSave;
 
     QStringList mSelectedPlugins;
   
     QString mLastImportFile;
     QString mLastVcalFile;
     QString mLastSaveFile;
     QString mLastLoadFile;
 
 
     QString mDefaultAlarmFile;
     int mIMIPScheduler;
     int mIMIPSend;
     QStringList mAdditionalMails;
     int mIMIPAutoRefresh;
     int mIMIPAutoInsertReply;
     int mIMIPAutoInsertRequest;
     int mIMIPAutoFreeBusy;
     int mIMIPAutoFreeBusyReply;
 
     QStringList mTodoTemplates;
     QStringList mEventTemplates;
 
     int mDestination;
 
 
     bool mEditOnDoubleClick;
     bool mViewChangeHoldFullscreen;
     bool mViewChangeHoldNonFullscreen;
     bool mCenterOnCurrentTime;
     bool mSetTimeToDayStartAt;
     bool mHighlightCurrentDay;
     bool mUseHighlightLightColor;
     bool mListViewMonthTimespan;
     bool mWNViewShowsParents;
     bool mWNViewShowsPast;
     bool mWNViewShowLocation;
     bool mTodoViewShowsPercentage;
     bool mTodoViewUsesCatColors;
     bool mMonthViewUsesBigFont;
     bool mTodoViewUsesSmallFont;
     bool mTodoViewUsesForegroundColor;
     bool mMonthViewUsesForegroundColor;
 
     bool mHightlightDateTimeEdit;
     bool mShortDateInViewer;
 
     bool mShowDateNavigator;
 
     QStringList mLocationDefaults;
     QStringList mEventSummaryUser;
     QStringList mTodoSummaryUser;
 
     bool mUseInternalAlarmNotification;
     int mAlarmPlayBeeps;
     int mAlarmSuspendTime;
     int mAlarmSuspendCount;
     int mAlarmBeepInterval;
     int mOldLanguage;
     int mOldLoadedLanguage;
 
   
     QString mActiveSyncPort;
     QString mActiveSyncIP;
 
     // settings for eventviewer
     bool mEVshowDetails;
     bool mEVshowCreated;
     bool mEVshowChanged;
     bool mWTshowDetails;
     bool mWTshowCreated;
     bool mWTshowChanged;
 
     int mCurrentDisplayedView;
 
   private:
     QDict<QColor> mCategoryColors;
     QColor mDefaultCategoryColor;
 
     QFont mDefaultTimeBarFont;
     QFont mDefaultViewFont;
     QFont mDefaultMonthViewFont;
 
     QString mName;
     QString mEmail;
 };
 
 #endif
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index ad3c61c..cb9c272 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -575,385 +575,387 @@ void KOPrefsDialog::setupViewsTab()
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
 //   QBoxLayout *dayBeginsLayout = new QHBoxLayout;
 //   topLayout->addLayout(dayBeginsLayout,0,0);
 
 //   KPrefsDialogWidTime *dayBegins =
 //     addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
 //                topFrame);
 //   dayBeginsLayout->addWidget(dayBegins->label());
 //   dayBeginsLayout->addStretch(1);
 //   dayBeginsLayout->addWidget(dayBegins->spinBox());
 
 //   QBoxLayout *nextDaysLayout = new QHBoxLayout;
 //   topLayout->addLayout(nextDaysLayout,1,0);
 //   nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
 //   mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
 //   nextDaysLayout->addStretch(1);
 //   nextDaysLayout->addWidget(mNextXDaysSpin);
 
 
   int ii = 0; 
   KPrefsDialogWidBool *dummy =
     addWidBool(i18n("Edit item on doubleclick (if not, show)"),
                &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   
  
 
 
  
  
   // topLayout->addWidget(hourSizeGroup,ii++,0);
   // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0);
   //topLayout->setRowStretch(11,1);
 
 
 
 
 #if 0
 
    topFrame = addPage(i18n("ViewChange"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,6,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 #endif
 
   dummy =
     addWidBool(i18n("Hold fullscreen on view change"),
                &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Hold non-fullscreen on view change"),
                &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
   KPrefsDialogWidBool *fullViewMonth =
       addWidBool(i18n("Next days view uses full window"),
                  &(KOPrefs::instance()->mFullViewMonth),topFrame);
   topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *fullViewTodo =
       addWidBool(i18n("Event list view uses full window"),
                  &(KOPrefs::instance()->mFullViewTodo),topFrame);
   topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
   dummy =
     addWidBool(i18n("Listview uses monthly timespan"),
                &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
  dummy  =
     addWidBool(i18n("Highlight selection in Time Edit"),
                &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
    topLayout->addWidget( dummy->checkBox(), ii++,0);
 
   KPrefsDialogWidBool *dailyRecur =
     addWidBool(i18n("Show events that recur daily in date nav."),
                &(KOPrefs::instance()->mDailyRecur),topFrame);
   topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
 
   KPrefsDialogWidBool *weeklyRecur =
     addWidBool(i18n("Show ev. that recur weekly in date nav."),
                &(KOPrefs::instance()->mWeeklyRecur),topFrame);
   topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
 
 #ifdef DESKTOP_VERSION
   KPrefsDialogWidBool *enableToolTips =
       addWidBool(i18n("Enable tooltips displaying summary of ev."),
                  &(KOPrefs::instance()->mEnableToolTips),topFrame);
   topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
 #endif
   //  *********************************************************
 
   topFrame = addPage(i18n("Agenda View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 
  dummy =
     addWidBool(i18n("Show time in agenda items"),
                &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Highlight current day in agenda"),
                &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Use light color for highlight current day"),
                &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *marcusBainsEnabled =
       addWidBool(i18n("Show current time"),
                  &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
   topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
   
 
  dummy =
     addWidBool(i18n("Set agenda to DayBeginsAt on change"),
                &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Set agenda to current time on change"),
                &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
 
 
 
 
    topFrame = addPage(i18n("Month View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
   QLabel *lab;
   QHBox *habo = new QHBox( topFrame );
   if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel ( i18n("Show events that recur "), topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
   } else {
       new QLabel ( i18n("Show events that recur "), habo );
   }
   dailyRecur =
     addWidBool(i18n("daily"),
                &(KOPrefs::instance()->mMonthDailyRecur),habo);
   // topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
 
   weeklyRecur =
     addWidBool(i18n("weekly"),
                &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 
 
   habo = new QHBox( topFrame ); 
   if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel (i18n("Show in every cell ") , topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
       
   } else {
       new QLabel ( i18n("Show in every cell "), habo );
   }
   weeklyRecur = 
     addWidBool(i18n("short month"),
                &(KOPrefs::instance()->mMonthShowShort),habo);
  weeklyRecur =
     addWidBool(i18n("icons"),
                &(KOPrefs::instance()->mMonthShowIcons),habo);
-
+ weeklyRecur =
+     addWidBool(i18n("times"),
+                &(KOPrefs::instance()->mMonthShowTimes),habo);
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 #ifdef DESKTOP_VERSION
  KPrefsDialogWidBool *enableMonthScroll =
       addWidBool(i18n("Enable scrollbars in month view cells"),
                  &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
   topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
 #endif
   dummy =
     addWidBool(i18n("Week view mode uses bigger font"),
                &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy =
     addWidBool(i18n("Show Sat/Sun together"),
                &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  KPrefsDialogWidBool *coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses category colors"),
                   &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 
 
   dummy =
     addWidBool(i18n("Categorie colors are applied to text"),
                &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
  coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses day colors"),
                   &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
 
  KPrefsDialogWidColor *holidayColor =
       addWidColor(i18n("Day color odd months"),
                   &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  holidayColor =
       addWidColor(i18n("Day color even months"),
                   &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  
   holidayColor =
       addWidColor(i18n("Color for Sundays + category \"Holiday\""),
                   &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
   // *********************** What'sNext View
   topFrame = addPage(i18n("What's Next View"),0,0);
   //  DesktopIcon("viewmag",KIcon::SizeMedium));
   
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 
   QHBox* hdummy = new QHBox(topFrame);
   new QLabel(i18n("Days in What's Next:"),hdummy);
   mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
   
   topLayout->addWidget(hdummy,ii++,0);
 
   QHBox *prioBox = new QHBox(topFrame);
   // intervalBox->setSpacing(mSpacingHint);
   topLayout->addWidget(prioBox,ii++,0);
  
   QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox);
   mPrioSpin = new QSpinBox(0,5,1,prioBox);
   if ( QApplication::desktop()->width() <  300 )
       mPrioSpin->setFixedWidth( 40 );
 
   KPrefsDialogWidBool *passwdk =
 
       addWidBool(i18n("Show events, that are done"),
                  &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   passwdk =
       addWidBool(i18n("Show parent To-Do's"),
                  &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
   passwdk =
       addWidBool(i18n("Show location"),
                  &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
   passwdk =
       addWidBool(i18n("Show Sync Events in WN+Agenda"),
                  &(KOPrefs::instance()->mShowSyncEvents),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   passwdk =
       addWidBool(i18n("Use short date in WN+Event view"),
                  &(KOPrefs::instance()->mShortDateInViewer),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
    
 
  
 
   // *********************** Todo View
 
    topFrame = addPage(i18n("Todo View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 dummy =
     addWidBool(i18n("Hide not running Todos in To-do view"),
                &(KOPrefs::instance()->mHideNonStartedTodos),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *showCompletedTodo =
       addWidBool(i18n("To-do view shows completed Todos"),
                  &(KOPrefs::instance()->mShowCompletedTodo),topFrame);
   topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0);
  dummy =
     addWidBool(i18n("To-do view shows complete as 'xx %'"),
                &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Small To-do view uses smaller font"),
                &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
  dummy =
     addWidBool(i18n("Todo view uses category colors"),
                &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
  QWidget* wid = new QWidget( topFrame );
   // Todo run today color
   KPrefsDialogWidColor *todoRunColor =
       addWidColor(i18n("Color for running todos:"),
                   &(KOPrefs::instance()->mTodoRunColor),wid);
   QHBoxLayout *widLayout = new QHBoxLayout(wid);
   widLayout->addWidget( todoRunColor->label() );
   widLayout->addWidget( todoRunColor->button() );
   topLayout->addWidget(wid,ii++,0);
 
   wid = new QWidget( topFrame );
   // Todo due today color
   KPrefsDialogWidColor *todoDueTodayColor =
       addWidColor(i18n("Todo due today color:"),
                   &(KOPrefs::instance()->mTodoDueTodayColor),wid);
   widLayout = new QHBoxLayout(wid);
   widLayout->addWidget( todoDueTodayColor->label() );
   widLayout->addWidget( todoDueTodayColor->button() );
   topLayout->addWidget(wid,ii++,0);
   //topLayout->addWidget(todoDueTodayColor->button(),ii++,1);
 
   // Todo overdue color
   wid = new QWidget( topFrame );
   widLayout = new QHBoxLayout(wid);
   KPrefsDialogWidColor *todoOverdueColor =
       addWidColor(i18n("Todo overdue color:"),
                   &(KOPrefs::instance()->mTodoOverdueColor),wid);
   widLayout->addWidget(todoOverdueColor->label());
   widLayout->addWidget(todoOverdueColor->button());
   topLayout->addWidget(wid,ii++,0);
 
  dummy =
     addWidBool(i18n("Colors are applied to text"),
                &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Allday Agenda view shows todos"),
                &(KOPrefs::instance()->mShowTodoInAgenda),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
    topFrame = addPage(i18n("View Options"),0,0);
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
   lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame);
   topLayout->addWidget(lab ,ii++,0);
 
   dummy = addWidBool(i18n("Details"),
                &(KOPrefs::instance()->mEVshowDetails),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 406e741..f1f2dd2 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -410,384 +410,391 @@ void  KOViewManager::slotprintWNV()
 
 }
 void KOViewManager::showListView()
 {
     if (!mListView) {
         mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView");
         addView(mListView);
 
         connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
         connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); 
         connect( mListView, SIGNAL( signalNewEvent() ),
                  mMainView, SLOT( newEvent() ) );
         connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); 
         connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); 
         connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); 
         connect( mListView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mListView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
     }
     // bool temp = mFlagShowNextxDays;
     //globalFlagBlockPainting = true;
     globalFlagBlockAgenda = 1;
     if ( KOPrefs::instance()->mListViewMonthTimespan ) {
         mMainView->setBlockShowDates( true );
         mMainView->dateNavigator()->selectMonth();
         mMainView->setBlockShowDates( false );
     }
     showView(mListView, KOPrefs::instance()->mFullViewTodo);
     //mFlagShowNextxDays = temp;
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW;
 }
 
 void KOViewManager::showAgendaView( bool fullScreen )
 {
 
     mMainView->dialogManager()->hideSearchDialog();
     // qDebug("KOViewManager::showAgendaView ");
     bool full;
     full = fullScreen;
     if (!mAgendaView) {
         full = false; 
         mAgendaView = new KOAgendaView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::AgendaView"); 
         addView(mAgendaView);
 #ifndef DESKTOP_VERSION
         QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold );
 #endif
         connect( mAgendaView, SIGNAL( incidenceChanged(Incidence  *, int )),
                  mMainView, SLOT( changeIncidenceDisplay( Incidence  *, int ) ));
 
         // SIGNALS/SLOTS FOR DAY/WEEK VIEW
 
         connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate )));
 
         connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)),
                 mMainView, SLOT(newTodoDateTime(QDateTime,bool)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)),
                 mMainView, SLOT(newEvent(QDateTime)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)),
              mMainView, SLOT(newEvent(QDateTime,QDateTime)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDate)),
                 mMainView, SLOT(newEvent(QDate)));
 
         connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
 
         connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
 
         connect(mAgendaView, SIGNAL( toggleExpand() ),
                 mMainView, SLOT( toggleExpand() ) );
       
         connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), 
                  mMainView, SLOT(cloneIncidence(Incidence *) ) ) ;
         connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), 
                  mMainView, SLOT(cancelIncidence(Incidence *) ) ) ;
         connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); 
         connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView,
                  SLOT( updateTodo( Todo *, int ) ) );  
         connect(  mAgendaView,SIGNAL( todoMoved( Todo *, int )),
                   mMainView, SIGNAL( todoModified( Todo *, int )));
         connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         connect( mAgendaView, SIGNAL( selectWeekNum( int ) ),
                  mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) );
         mAgendaView->readSettings(); 
         mAgendaView->updateConfig(); 
     }
    
     showView( mAgendaView, full);
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW;
 }
 
 void KOViewManager::showDayView()
 { 
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays =  false;
     globalFlagBlockLabel = 1;
     globalFlagBlockAgenda = 1;
     if ( mCurrentAgendaView != 1 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
     globalFlagBlockAgenda = 2;
     globalFlagBlockLabel = 0;
     mMainView->dateNavigator()->selectDates( 1 );
     mCurrentAgendaView = 1 ;
     
 }
 
 void KOViewManager::showWorkWeekView()
 {
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays =  false;
     globalFlagBlockAgenda = 1;
     globalFlagBlockLabel = 1;
     if ( mCurrentAgendaView != 5 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
     globalFlagBlockAgenda = 2;
     globalFlagBlockLabel = 0;
     mMainView->dateNavigator()->selectWorkWeek();
     mCurrentAgendaView = 5 ;
    
 }
 
 void KOViewManager::showWeekView()
 {
     /*
       globalFlagBlockAgenda = 2;
       qDebug("4globalFlagBlockAgenda = 2; ");
       //globalFlagBlockPainting = true;
       mMainView->dateNavigator()->selectWeek();
       showAgendaView();
     */
 
 
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays = false;
     globalFlagBlockAgenda = 1;
     globalFlagBlockLabel = 1;
     if ( mCurrentAgendaView != 7 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
     globalFlagBlockAgenda = 2;
     globalFlagBlockLabel = 0;  
     mMainView->dateNavigator()->selectWeek();
     mCurrentAgendaView = 7 ;
 }
 
 void KOViewManager::showNextXView()
 {
       
     globalFlagBlockAgenda = 1;
     if ( mCurrentAgendaView != 3 )
         mCurrentAgendaView = -1;
     showAgendaView(KOPrefs::instance()->mFullViewMonth);
     globalFlagBlockAgenda = 2;
     mMainView->dateNavigator()->selectDates( QDate::currentDate(),
                                              KOPrefs::instance()->mNextXDays );
     mFlagShowNextxDays = true;
     mCurrentAgendaView = 3 ;
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW;
 }
 bool KOViewManager::showsNextDays() 
 {
     return mFlagShowNextxDays;
 }
 void KOViewManager::createMonthView()
 {
 if (!mMonthView) {
         mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView");
      
         addView(mMonthView);
         // mMonthView->show();
         // SIGNALS/SLOTS FOR MONTH VIEW
+
+        connect(mMonthView,SIGNAL(showJournalSignal( int, QDate )),SLOT(showDateView( int, QDate )));
+ 
+        connect(mMonthView, SIGNAL(newTodoSignal(QDateTime,bool)),
+                mMainView, SLOT(newTodoDateTime(QDateTime, bool)));
+
+
         connect(mMonthView, SIGNAL(newEventSignal(QDateTime)),
                 mMainView, SLOT(newEvent(QDateTime)));
 
         connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
 
         connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
         connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
         connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
 
         connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         connect( mMonthView, SIGNAL( selectWeekNum( int ) ),
                  mMainView->dateNavigator(), SLOT ( selectWeekFromMonthView( int ) ) );
         connect( mMonthView, SIGNAL( selectMonth() ),
                  mMainView->dateNavigator(), SLOT ( selectMonthFromMonthview() ) );
         connect( mMonthView, SIGNAL( showDaySignal( QDate ) ),
                  mMainView, SLOT ( showDay( QDate ) ) );
         connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig()));
         connect( mMonthView, SIGNAL(nextMonth() ),
                  mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) );
         connect( mMonthView, SIGNAL(prevMonth() ),
                  mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ),
                  mMainView->dateNavigator(), SLOT( selectPreviousYear() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ),
                  mMainView->dateNavigator(), SLOT( selectNextYear() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ),
                  mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ),
                  mMainView->dateNavigator(), SLOT( selectNextMonth() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ),
                  mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ),
                  mMainView->dateNavigator(), SLOT( selectNextWeek() ) );
         
         connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
                  mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) );
         
         
         connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ),
                  mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) );
 
     }
 }
 void KOViewManager::showMonthViewWeek()
 {
     createMonthView();
     globalFlagBlockAgenda = 1;
     bool full = true;
     if ( mCurrentView == mMonthView)
         full = mMainView->leftFrame()->isVisible();
     if ( !KOPrefs::instance()->mMonthViewWeek ) {
         mMonthView->switchView();
         if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
             full = false;
         else
             full = true;
     }
     mMainView->dateNavigator()->selectWeek();
     showView(mMonthView, full );
     mMonthView->setKeyBFocus();
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_ML_VIEW ;
 }
 
 void KOViewManager::showMonth( const QDate & date )
 {
     mMainView->dateNavigator()->blockSignals( true );
     mMainView->dateNavigator()->selectDate( date );
     mMainView->dateNavigator()->blockSignals( false );
     showMonthView();
 }
 void KOViewManager::showMonthView()
  {
     
      createMonthView();
     globalFlagBlockAgenda = 1;
     //mFlagShowNextxDays = false;
     bool full = true;
     if ( mCurrentView == mMonthView)
         full = mMainView->leftFrame()->isVisible();
     // if(mMonthView == mCurrentView) return; 
     if ( KOPrefs::instance()->mMonthViewWeek ) {
         mMonthView->switchView();
         if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
             full = false;
         else
             full = true;
     }
     mMainView->dateNavigator()->selectMonth();
 
     showView(mMonthView, full );
     mMonthView->setKeyBFocus();
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_M_VIEW ;
    
 }
 
 void KOViewManager::showTodoView()
 {
     //mFlagShowNextxDays = false;
     if ( !mTodoView ) {
         mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(),
                                     "KOViewManager::TodoView" );
     
         addView( mTodoView ); 
         // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold );
   
         // SIGNALS/SLOTS FOR TODO VIEW
         connect( mTodoView, SIGNAL( newTodoSignal() ),
                  mMainView, SLOT( newTodo() ) );
         connect( mTodoView, SIGNAL( newSubTodoSignal( Todo * ) ),
                  mMainView, SLOT( newSubTodo( Todo *) ) );
         connect( mTodoView, SIGNAL( showTodoSignal( Todo *) ),
                  mMainView, SLOT( showTodo( Todo * ) ) );
         connect( mTodoView, SIGNAL( editTodoSignal( Todo * ) ),
                  mMainView, SLOT( editTodo( Todo * ) ) );
         connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ),
                  mMainView, SLOT( deleteTodo( Todo * ) ) );
         connect( mTodoView, SIGNAL( purgeCompletedSignal() ),
                  mMainView, SLOT( purgeCompleted() ) );
 
         connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
 
         connect( mMainView, SIGNAL( configChanged() ), mTodoView,
                  SLOT( updateConfig() ) ); 
         connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView,
                  SLOT( updateTodo( Todo *, int ) ) );
         connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ),
                  mMainView, SIGNAL ( todoModified( Todo *, int ) ) );
         connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ),
                  mMainView, SLOT ( todo_unsub( Todo * ) ) );
         connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ),
                  mMainView, SLOT ( todo_resub( Todo *, Todo *) ) );
         connect( mTodoView, SIGNAL( moveTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( beamTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         KConfig *config = KOGlobals::config();
         mTodoView->restoreLayout(config,"Todo View");
         mTodoView->setNavigator( mMainView->dateNavigator() );
     }
 
     globalFlagBlockAgenda = 1;
     showView( mTodoView, true );
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_T_VIEW ;
 
 }
 
 void KOViewManager::showJournalView()
 {
     //mFlagShowNextxDays = false;
     if (!mJournalView) {
         mJournalView = new KOJournalView(mMainView->calendar(),mMainView->viewStack(),
                                          "KOViewManager::JournalView"); 
         connect( mMainView, SIGNAL( configChanged() ), mJournalView,
                  SLOT( updateConfig() ) );
         connect(mJournalView, SIGNAL(deleteJournal(Journal *) ), mMainView,SLOT(deleteJournal(Journal *)) );
         addView(mJournalView);
     }
 
     showView(mJournalView);
     mMainView->dateNavigator()->selectDates( 1 );
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW  ;
 }
 
 void KOViewManager::showTimeSpanView()
 {
     //mFlagShowNextxDays = false;
     if (!mTimeSpanView) {
         mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(),
                                            "KOViewManager::TimeSpanView");
         addView(mTimeSpanView);
 
         mTimeSpanView->readSettings();
     }
 
     showView(mTimeSpanView);
 }