fixxx

10 files changed, 89 insertions, 27 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index ce73168..f860f7d 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -379,65 +379,74 @@ bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
     }
 }
 void KOAgenda::popupMenu()
 {
     mPopupTimer->stop();
     if (  mPopupKind == 1 || mPopupKind == 3 ) {
         if (mActionItem ) {
             endItemAction();
         }
         mLeftMouseDown = false; // no more leftMouse computation
         if (mPopupItem) {
             //mClickedItem = mPopupItem;
             selectItem(mPopupItem);
             if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 1 )
                 mAllAgendaPopup->installEventFilter( this );
             emit showIncidencePopupSignal(mPopupItem->incidence());
             
         } 
     } else if ( mPopupKind == 2 || mPopupKind == 4 ) {
         if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action
             endSelectAction( false ); // do not emit new event signal
             mLeftMouseDown = false; // no more leftMouse computation
         }
         if ( KOPrefs::instance()->mBlockPopupMenu &&  mPopupKind == 2 )
             mNewItemPopup->installEventFilter( this );
         mNewItemPopup->popup( mPopupPos);
         
     }
     mLeftMouseDown = false;
     mPopupItem = 0;
     mPopupKind = 0;
 }
-
+void KOAgenda::categoryChanged(Incidence * inc)
+{
+    KOAgendaItem *item;
+    for ( item=mItems.first(); item != 0; item=mItems.next() ) {
+        if ( item->incidence() == inc ) {
+            item->initColor ();
+            item->updateItem();
+        }
+    }
+}
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
     static int startX = 0;
     static int startY = 0;
     int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 );
     static bool blockMoving = true;
 
     //qDebug("KOAgenda::eventFilter_mous ");
     if ( object == mNewItemPopup ) {
         //qDebug("mNewItemPopup ");
         if ( me->type() == QEvent::MouseButtonRelease ) {
             mNewItemPopup->removeEventFilter( this ); 
             int dX = me->globalPos().x() - mPopupPos.x();;
             if ( dX < 0   )
                 dX = -dX;
             int dY =  me->globalPos().y() - mPopupPos.y();
             if ( dY < 0 )
                 dY = -dY;
             if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
                 mNewItemPopup->hide();
             }
         }
         return true;
     }
     if ( object == mAllAgendaPopup ) {
         //qDebug(" mAllAgendaPopup ");
         if ( me->type() == QEvent::MouseButtonRelease ) {
             mAllAgendaPopup->removeEventFilter( this );
             int dX = me->globalPos().x() - mPopupPos.x();;
             if ( dX < 0   )
                 dX = -dX;
             int dY =  me->globalPos().y() - mPopupPos.y();
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index fb9983e..de6acac 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -98,64 +98,65 @@ class KOAgenda : public QScrollView
 
     int columns() { return mColumns; }
     int rows() { return mRows; }
 
     int gridSpacingX() const { return mGridSpacingX; }
     int gridSpacingY() const { return mGridSpacingY; }
 
 //    virtual QSizePolicy sizePolicy() const;
 
     void clear();
     
     void clearSelection();
     void hideUnused();
 
     /** Calculates the minimum width */
     virtual int minimumWidth() const;
     /** Update configuration from preference settings */
     void updateConfig();
 
     void checkScrollBoundaries();
 
     void setHolidayMask(QMemArray<bool> *);
     void setDateList(const DateList &selectedDates);
     DateList dateList() const;
     void drawContentsToPainter( QPainter* paint = 0, bool backgroundOnly = false);
     void finishUpdate();
     void printSelection();
     void storePosition();
     void restorePosition();
     void setPopup( KOEventPopupMenu * p ) { mAllAgendaPopup = p; }
 
   public slots:
+    void categoryChanged(Incidence * inc);
     void slotClearSelection();
     void popupMenu();
     void newItem( int );
     void moveChild( QWidget *, int, int );
     void scrollUp();
     void scrollDown();
     void updateTodo( Todo * t, int , bool );
     void popupAlarm();
 
     void checkScrollBoundaries(int);
 
     /** Deselect selected items. This function does not emit any signals. */
     void deselectItem();
     /** Select item. If the argument is 0, the currently selected item gets
      deselected. This function emits the itemSelected(bool) signal to inform
      about selection/deseelction of events. */
     void selectItem(KOAgendaItem *);
     void finishResize();
 
   signals:
     void signalClearSelection();
     void showDateView( int, int);
     void newEventSignal();
     void newEventSignal(int gx,int gy);
     void newTodoSignal(int gx,int gy);
     void newEventSignal(int gxStart, int gyStart, int gxEnd, int gyEnd);
     void newTimeSpanSignal(int gxStart, int gyStart, int gxEnd, int gyEnd);
     void newStartSelectSignal();
     void showIncidenceSignal(Incidence *);
     void editIncidenceSignal(Incidence *);
     void deleteIncidenceSignal(Incidence *);
     void showIncidencePopupSignal(Incidence *);
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index a8e0678..a42d07b 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -68,108 +68,112 @@ protected:
     return _view->getWhatsThisText() ;
   }
 private:
   KOAgendaItem * _view;
 };
 
 KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday,
                            const char *name,WFlags) :
     QWidget(parent, name), mIncidence(incidence), mDate(qd)
 {
 #ifndef DESKTOP_VERSION
     //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 #endif
     mKOAgendaItemWhatsThis =  new KOAgendaItemWhatsThis(this);
     int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
     setWFlags ( wflags);
     mAllDay = allday;
     init ( incidence, qd );
     //setMouseTracking(true);
     //setAcceptDrops(true);
     xPaintCoord = -1;
     yPaintCoord = -1;
 }
 QString KOAgendaItem::getWhatsThisText()
 {
     if ( mIncidence )
         return KIncidenceFormatter::instance()->getFormattedText( mIncidence, 
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
     return "KOAgendaItem::getWhatsThisText()::internal error";
 }
-void KOAgendaItem::init ( Incidence *incidence, QDate qd )
+
+void KOAgendaItem::initColor ()
 {
-    mIncidence = incidence;
-    mDate = qd;
-    mFirstMultiItem = 0;
-    mNextMultiItem = 0;
-    mLastMultiItem = 0;  
-    computeText();
-   
-    if ( (incidence->typeID() == todoID ) &&
-         ( !((static_cast<Todo*>(incidence))->isCompleted()) &&
-           ((static_cast<Todo*>(incidence))->dtDue().date() <=  QDate::currentDate()) ) ) {
-        if (  (static_cast<Todo*>(incidence))->dtDue() <  QDateTime::currentDateTime().date()) 
+    if ( (mIncidence->typeID() == todoID ) &&
+         ( !((static_cast<Todo*>(mIncidence))->isCompleted()) &&
+           ((static_cast<Todo*>(mIncidence))->dtDue().date() <=  QDate::currentDate()) ) ) {
+        if (  (static_cast<Todo*>(mIncidence))->dtDue() <  QDateTime::currentDateTime().date()) 
             mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ;
         else 
             mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor;
     }
     else {
         QStringList categories = mIncidence->categories();
         QString cat = categories.first();
         if (cat.isEmpty()) {
-            if ( (incidence->typeID() == todoID ) &&((static_cast<Todo*>(incidence))->isCompleted()) )
+            if ( (mIncidence->typeID() == todoID ) &&((static_cast<Todo*>(mIncidence))->isCompleted()) )
                 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
             else
-                mBackgroundColor =KOPrefs::instance()->defaultColor( incidence->calID() );
+                mBackgroundColor =KOPrefs::instance()->defaultColor( mIncidence->calID() );
         } else {
             mBackgroundColor = *KOPrefs::instance()->categoryColor(cat);
-            if ( (incidence->typeID() == todoID ) &&((static_cast<Todo*>(incidence))->isCompleted()) ) {
+            if ( (mIncidence->typeID() == todoID ) &&((static_cast<Todo*>(mIncidence))->isCompleted()) ) {
                 if ( mBackgroundColor == KOPrefs::instance()->mEventColor )
                     mBackgroundColor = KOPrefs::instance()->mTodoDoneColor;
             }
         }
             
     }
 
     QColor BackgroundColor ( mBackgroundColor );
     if ( mIncidence->calID() > 1 ) {
         BackgroundColor = KOPrefs::instance()->defaultColor( mIncidence->calID() );
     }
     mColorGroup  = QColorGroup( BackgroundColor.light(), 
                                 BackgroundColor.dark(),BackgroundColor.light(),
                                 BackgroundColor.dark(),BackgroundColor, black, BackgroundColor) ;
     setBackgroundColor( mBackgroundColor );
     mWhiteText = (mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue() < 250);
+}
+void KOAgendaItem::init ( Incidence *incidence, QDate qd )
+{
+    mIncidence = incidence;
+    mDate = qd;
+    mFirstMultiItem = 0;
+    mNextMultiItem = 0;
+    mLastMultiItem = 0;  
+    computeText();
+    initColor();
     mConflictItems.clear();
     setCellXY(0,0,1);
     setCellXWidth(0);
     setSubCell(0);
     setSubCells(1);
     setMultiItem(0,0,0);
     startMove();
     mSelected = true;
     select(false);
     QFontMetrics fontinf(KOPrefs::instance()->mAgendaViewFont);
     mFontPixelSize = fontinf.height();;
     hide();
     xPaintCoord = -1;
     yPaintCoord = -1;
 }
 
 
 KOAgendaItem::~KOAgendaItem()
 {
 #if QT_VERSION >= 0x030000
 
 #else
     delete mKOAgendaItemWhatsThis;
 #endif 
   
 }
 
 void KOAgendaItem::recreateIncidence()
 {
 #if 0
     Incidence* newInc = mIncidence->clone();
     newInc->recreate();
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index d1b1940..dc2316a 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -80,64 +80,65 @@ class KOAgendaItem : public QWidget
     void setMultiItem(KOAgendaItem *first,KOAgendaItem *next,
                       KOAgendaItem *last);
     KOAgendaItem *firstMultiItem() { return mFirstMultiItem; }
     KOAgendaItem *nextMultiItem() { return mNextMultiItem; }
     KOAgendaItem *lastMultiItem() { return mLastMultiItem; }
 
     Incidence *incidence() const { return mIncidence; }
     QDate itemDate() { return mDate; }
     
     /** Update the date of this item's occurence (not in the event) */ 
     void setItemDate(QDate qd);
     
     void setText ( const QString & text ) { mDisplayedText = text; }
     QString text () { return mDisplayedText; }
 
     virtual bool eventFilter ( QObject *, QEvent * );
 
     static QToolTipGroup *toolTipGroup();
     
     QPtrList<KOAgendaItem> conflictItems();
     void setConflictItems(QPtrList<KOAgendaItem>);
     void addConflictItem(KOAgendaItem *ci);
     void paintMe( bool, QPainter* painter = 0 );
     void repaintMe();
     static void resizePixmap( int, int );
     static QPixmap * paintPix();
     static QPixmap * paintPixSel();
     static QPixmap * paintPixAllday();
     void updateItem();
     void computeText();
     void recreateIncidence();
     bool checkLayout();
+    void initColor ();
   public slots:
     bool updateIcons( QPainter *, bool );
     void select(bool=true);
 
  protected:
     void dragEnterEvent(QDragEnterEvent *e);
     void dropEvent(QDropEvent *e);
     void paintEvent ( QPaintEvent * );
     void resizeEvent ( QResizeEvent *ev );
 
   private:
     KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis;
     bool mAllDay;
     bool mWhiteText;
     int mCellX;
     int mCellXWidth;
     int mCellYTop,mCellYBottom;
     int mSubCell;  // subcell number of this item
     int mSubCells;  // Total number of subcells in cell of this item
     int xPaintCoord;
     int yPaintCoord;
     int wPaintCoord;
     int hPaintCoord;
     // Variables to remember start position
     int mStartCellX;
     int mStartCellXWidth;
     int mStartCellYTop,mStartCellYBottom;
     int mLastMovePos;
 
     // Multi item pointers
     KOAgendaItem *mFirstMultiItem;
     KOAgendaItem *mNextMultiItem;
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index c851ab5..a42227c 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -445,64 +445,69 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
 
     mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom,
                                                agendaFrame);
     agendaLayout->addWidget(mEventIndicatorBottom,3,1);
     QWidget *dummyAgendaRight = new QWidget(agendaFrame);
     agendaLayout->addWidget(dummyAgendaRight,1,2);
 
     // Create time labels
     mTimeLabels = new TimeLabels(24,agendaFrame);
     agendaLayout->addWidget(mTimeLabels,2,0);
     connect(mTimeLabels,SIGNAL( scaleChanged()),
             this,SLOT(updateConfig()));
 
     // Create agenda
     mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame);
     agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2);
     agendaLayout->setColStretch(1,1);
     mAgenda->setFocusPolicy(NoFocus);
     // Create event context menu for agenda
     mAllAgendaPopup = eventPopup();
   
 #if 0
     mAllAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
                                     i18n("Toggle Alarm"),mAgenda,
                                     SLOT(popupAlarm()),true);
 
 #endif
     connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
             mAllAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
   
     connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
             mAllAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
+
+    connect(mAllAgendaPopup,SIGNAL(categoryChanged(Incidence *)),
+            this,SLOT(categoryChanged(Incidence *)));
+
+
     mAgenda->setPopup( mAllAgendaPopup );
     mAllDayAgenda->setPopup( mAllAgendaPopup );
     // make connections between dependent widgets
     mTimeLabels->setAgenda(mAgenda);
 
     // Update widgets to reflect user preferences
     //  updateConfig();
 
     // createDayLabels();
 
     // these blank widgets make the All Day Event box line up with the agenda
     dummyAllDayRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
     dummyAgendaRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
     mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
 
     // Scrolling
     connect(mAgenda->verticalScrollBar(),SIGNAL(valueChanged(int)),
             mTimeLabels, SLOT(positionChanged()));
     connect(mTimeLabels->verticalScrollBar(),SIGNAL(valueChanged(int)),
             SLOT(setContentsPos(int)));
 
     connect(mAgenda,SIGNAL(showDateView( int, int)),SLOT(slotShowDateView( int, int )));
     connect(mAllDayAgenda,SIGNAL(showDateView( int, int )), SLOT(slotShowDateView( int, int ) ));
 
     // Create/Show/Edit/Delete Event
     connect(mAgenda,SIGNAL(newEventSignal(int,int)),
             SLOT(newEvent(int,int)));
     connect(mAgenda,SIGNAL(newTodoSignal(int,int)),
             SLOT(newTodo(int,int)));
     connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)),
             SLOT(newEvent(int,int,int,int)));
     connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)),
@@ -559,65 +564,69 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
              SIGNAL( incidenceSelected( Incidence * ) ) );
     connect( mAgenda, SIGNAL( resizedSignal() ),
              SLOT( updateConfig( ) ) );  
     connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ),
              SLOT( addToCalSlot(Incidence *, Incidence * ) ) );  
     connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ),
              SLOT( addToCalSlot(Incidence * , Incidence *) ) );  
     // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
     //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
 
     connect( mAllDayAgenda, SIGNAL( signalClearSelection() ),mAgenda, SLOT( slotClearSelection()) ); 
     connect( mAgenda, SIGNAL( signalClearSelection() ),mAllDayAgenda, SLOT( slotClearSelection()) );   
  
 }
 
 void KOAgendaView::toggleAllDay()
 {
     if ( mSplitterAgenda->firstHandle() ) 
         mSplitterAgenda->firstHandle()->toggle();
 }
 void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld )
 {
     calendar()->addIncidence( inc ); 
     
     if ( incOld ) {
         if ( incOld->typeID() == todoID )
             emit  todoMoved((Todo*)incOld,  KOGlobals::EVENTEDITED );
         else
             emit incidenceChanged(incOld, KOGlobals::EVENTEDITED);
     }
     
 }
-
+void KOAgendaView::categoryChanged(Incidence * inc)
+{
+    mAgenda->categoryChanged( inc );
+    mAllDayAgenda->categoryChanged( inc );
+}
 KOAgendaView::~KOAgendaView()
 {
     delete mAllAgendaPopup;
     //delete mAllDayAgendaPopup;
     delete KOAgendaItem::paintPix();
     delete KOAgendaItem::paintPixSel();
 }
 void KOAgendaView::resizeEvent( QResizeEvent* e )
 {
     //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width());
     bool uc = false;
     int ow =  e->oldSize().width();
     int oh =  e->oldSize().height();
     int w = e->size().width();
     int h =  e->size().height();
     if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { 
         if ( ! mBlockUpdating  && !globalFlagBlockStartup && !globalFlagBlockAgenda )
             uc = true;
         //qDebug("view changed %d %d %d %d ", ow, oh , w , h);
     }
     mUpcomingWidth = e->size().width() ;
     if ( mBlockUpdating || uc ) {
         mBlockUpdating = false;
         //mAgenda->setMinimumSize(800 , 600 );
         //qDebug("mAgenda->resize+++++++++++++++ ");
         updateConfig();
         //qDebug("KOAgendaView::Updating now possible ");
     } else 
         createDayLabels();
     //qDebug("resizeEvent end "); 
    
 }
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index cc953fc..a1cf308 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -210,64 +210,65 @@ class KOAgendaView : public KOEventView {
     void scrollOneHourDown();
     void addToCalSlot(Incidence *, Incidence *);
     void slotShowDateView( int, int );
 
   signals:
     void showDateView( int, QDate );
     void newTodoSignal( QDateTime ,bool );
     void toggleExpand();
     void selectWeekNum( int );
     void todoMoved( Todo *, int );
     void incidenceChanged(Incidence * , int );
     // void cloneIncidenceSignal(Incidence *);
 
   protected:
     KOAgendaButton* getNewDaylabel();
     bool mBlockUpdating;
     int mUpcomingWidth;
     /** Fill agenda beginning with date startDate */
     void fillAgenda(const QDate &startDate);
     void resizeEvent( QResizeEvent* e );
     /** Fill agenda using the current set value for the start date */
     void fillAgenda();
 
     /** Create labels for the selected dates. */
     void createDayLabels();
 
     /**
       Set the masks on the agenda widgets indicating, which days are holidays.
     */
     void setHolidayMasks();
 
   protected slots:
+    void categoryChanged( Incidence * );
     void slotDaylabelClicked( int );
     /** Update event belonging to agenda item */
     void updateEventDates(KOAgendaItem *item, int mode = -1);
   //void updateMovedTodo();
 
     void updateEventIndicatorTop(int newY);
     void updateEventIndicatorBottom(int newY);
     
     /** Updates data for selected timespan */    
     void newTimeSpanSelected(int gxStart, int gyStart, int gxEnd, int gyEnd);
     /** Updates data for selected timespan for all day event*/    
     void newTimeSpanSelectedAllDay(int gxStart, int gyStart, int gxEnd, int gyEnd);
 
   private:
     // view widgets
     QFrame *mDayLabels;
     QHBox *mDayLabelsFrame;
     QBoxLayout *mLayoutDayLabels;
     QFrame *mAllDayFrame;
     KOAgenda *mAllDayAgenda;
     KOAgenda *mAgenda;
     TimeLabels *mTimeLabels;
     QWidget *mDummyAllDayLeft;
 
     KDGanttMinimizeSplitter* mSplitterAgenda;
     QPushButton *mExpandButton;
 
     DateList mSelectedDates;  // List of dates to be displayed
     int mViewType;
 
     bool mWeekStartsMonday;
     int mStartHour;
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 17ef81e..90caaf4 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -1,116 +1,154 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qcursor.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
 #include <libkcal/event.h>
 
 #include "koeventpopupmenu.h"
+#include "koprefs.h"
 
-KOEventPopupMenu::KOEventPopupMenu()
+KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
 {
   mCurrentIncidence = 0;
   mHasAdditionalItems = false;
 
   
   mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow())));
   mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit())));
   mEditOnlyItems.append(insertItem (i18n("&Delete"),
       this,SLOT(popupDelete())));
   mEditOnlyItems.append(insertItem (i18n("&Clone..."),
       this,SLOT(popupClone())));
   mEditOnlyItems.append(insertItem (i18n("&Move..."),
       this,SLOT(popupMove())));
 #ifndef DESKTOP_VERSION
   mEditOnlyItems.append(insertItem (i18n("&Beam..."),
       this,SLOT(popupBeam())));
 #endif
   mEditOnlyItems.append(insertItem (i18n("&Toggle Cancel"),
       this,SLOT(popupCancel())));
    isDisabled = false;  
+   mCatPopup = new QPopupMenu ( this );
+   mCatPopup->setCheckable (true);
+   connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup()));
+   connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCatPopup( int )));
+   mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup ));
    QValueList<int>::Iterator it;
    for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
        mSingleOnlyItems.append(*it);
    }
+
 }
 void KOEventPopupMenu::enableDefault( bool enable )
 {
     isDisabled = !enable;
     QValueList<int>::Iterator it;
     for( it = mSingleOnlyItems.begin(); it != mSingleOnlyItems.end(); ++it ) {
         setItemEnabled(*it,enable);
     }
     
 }
 
+void KOEventPopupMenu::fillCatPopup()
+{
+    mCatPopup->clear(); 
+    QStringList checkedCategories = mCurrentIncidence->categories();
+    int index = 0;
+    for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin ();
+         it != KOPrefs::instance()->mCustomCategories.end ();
+         ++it) {
+        mCatPopup->insertItem (*it, index );
+        if (checkedCategories.find (*it) != checkedCategories.end ()) {
+            mCatPopup->setItemChecked (index, true);
+        }
+        ++index;
+    }
+}
+void KOEventPopupMenu::computeCatPopup( int index )
+{
+    QStringList categories =  mCurrentIncidence->categories();
+    QString colcat = categories.first();
+    if (categories.find (KOPrefs::instance()->mCustomCategories[index]) != categories.end ())
+      categories.remove (KOPrefs::instance()->mCustomCategories[index]);
+    else
+        categories.insert (categories.end(), KOPrefs::instance()->mCustomCategories[index]);
+    categories.sort ();
+    if ( !colcat.isEmpty() ) {
+        if ( categories.find ( colcat ) != categories.end () ) {
+            categories.remove( colcat );
+            categories.prepend( colcat );
+        }
+    }
+     mCurrentIncidence->setCategories( categories );
+    emit categoryChanged( mCurrentIncidence );
+}
 void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
 {
   mCurrentIncidence = incidence;
   
   if (mCurrentIncidence) {
     // Enable/Disabled menu items only valid for editable events.
       if ( !isDisabled  ) {
           QValueList<int>::Iterator it;
           for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
               setItemEnabled(*it,!mCurrentIncidence->isReadOnly());
           }
       }
     popup(QCursor::pos());
-  } else {
-    kdDebug() << "KOEventPopupMenu::showEventPopup(): No event selected" << endl;
   }
 }
 
 void KOEventPopupMenu::addAdditionalItem(const QIconSet &icon,const QString &text,
                                     const QObject *receiver, const char *member,
                                     bool editOnly)
 {
   if (!mHasAdditionalItems) {
     mHasAdditionalItems = true;
     insertSeparator();
   }
   int id = insertItem(icon,text,receiver,member);
   if (editOnly) mEditOnlyItems.append(id);
 }
 
 void KOEventPopupMenu::popupShow()
 {
   if (mCurrentIncidence) emit showIncidenceSignal(mCurrentIncidence);
 }
 
 void KOEventPopupMenu::popupEdit()
 {
   if (mCurrentIncidence) emit editIncidenceSignal(mCurrentIncidence);
 }
 
 void KOEventPopupMenu::popupDelete()
 {
   if (mCurrentIncidence) emit deleteIncidenceSignal(mCurrentIncidence);
 }
 void KOEventPopupMenu::popupClone()
 {
   if (mCurrentIncidence) emit cloneIncidenceSignal(mCurrentIncidence);
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index 8fb51fa..3d8b595 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -25,52 +25,56 @@
 //
 // Context menu for event views with standard event actions
 //
 
 #include <qpopupmenu.h>
 
 #include <libkcal/incidence.h>
 
 using namespace KCal;
 
 class KOEventPopupMenu : public QPopupMenu {
     Q_OBJECT
   public:
     KOEventPopupMenu();
   
     void addAdditionalItem(const QIconSet &icon,const QString &text,
                            const QObject *receiver, const char *member,
                            bool editOnly=false);
 
 
   public slots:
     void showIncidencePopup(Incidence *);
     void enableDefault( bool );
 
   protected slots:
     void popupShow();
     void popupEdit();
     void popupDelete();
     void popupClone();
     void popupCancel();
     void popupMove();
     void popupBeam();
+    void fillCatPopup();
+    void computeCatPopup( int );
 
   signals:
     void editIncidenceSignal(Incidence *);
     void showIncidenceSignal(Incidence *);
     void deleteIncidenceSignal(Incidence *);
     void cloneIncidenceSignal(Incidence *);
     void cancelIncidenceSignal(Incidence *);
     void moveIncidenceSignal(Incidence *);
     void beamIncidenceSignal(Incidence *);
+    void categoryChanged( Incidence * );
     
   private:
     Incidence *mCurrentIncidence;
     
     bool mHasAdditionalItems;
     QValueList<int> mEditOnlyItems;
     QValueList<int> mSingleOnlyItems;
     bool isDisabled;
+    QPopupMenu *mCatPopup;
 };
 
 #endif
diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp
index bce2626..1d26930 100644
--- a/korganizer/koeventview.cpp
+++ b/korganizer/koeventview.cpp
@@ -48,65 +48,64 @@ KOEventView::~KOEventView()
 }
 
 //---------------------------------------------------------------------------
 
 KOEventPopupMenu *KOEventView::eventPopup()
 {
   KOEventPopupMenu *eventPopup = new KOEventPopupMenu;
   
   connect(eventPopup,SIGNAL(editIncidenceSignal(Incidence *)),
                      SIGNAL(editIncidenceSignal(Incidence *)));
   connect(eventPopup,SIGNAL(showIncidenceSignal(Incidence *)),
                      SIGNAL(showIncidenceSignal(Incidence *)));
   connect(eventPopup,SIGNAL(deleteIncidenceSignal(Incidence *)),
                      SIGNAL(deleteIncidenceSignal(Incidence *)));
   connect(eventPopup,SIGNAL(cancelIncidenceSignal(Incidence *)),
                      SIGNAL(cancelIncidenceSignal(Incidence *)));
   connect(eventPopup,SIGNAL(cloneIncidenceSignal(Incidence *)),
                      SIGNAL(cloneIncidenceSignal(Incidence *)));
   connect(eventPopup,SIGNAL(beamIncidenceSignal(Incidence *)),
                      SIGNAL(beamIncidenceSignal(Incidence *)));
   connect(eventPopup,SIGNAL(moveIncidenceSignal(Incidence *)),
                      SIGNAL(moveIncidenceSignal(Incidence *)));
 
   return eventPopup;
 }
 
 //---------------------------------------------------------------------------
 
 void KOEventView::showIncidencePopup(QPopupMenu *popup,Incidence *event)
 {
   mCurrentIncidence = event;
   if (event) popup->popup(QCursor::pos());
-  else kdDebug() << "KOEventView::showEventPopup(): No event selected" << endl;
 }
 
 //---------------------------------------------------------------------------
 
 void KOEventView::popupShow()
 {
   emit showIncidenceSignal(mCurrentIncidence);
 }
 
 //---------------------------------------------------------------------------
 
 void KOEventView::popupEdit()
 {
   emit editIncidenceSignal(mCurrentIncidence);
 }
 
 //---------------------------------------------------------------------------
 
 void KOEventView::popupDelete()
 {
   emit deleteIncidenceSignal(mCurrentIncidence);
 }
 void KOEventView::popupClone()
 {
   emit cloneIncidenceSignal(mCurrentIncidence);
 }
 void KOEventView::popupCancel()
 {
   emit cancelIncidenceSignal(mCurrentIncidence);
 }
 
 //---------------------------------------------------------------------------
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 8f17e6e..43e1113 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -206,65 +206,65 @@ bool ListItemVisitor::visit(Todo *t)
     }
     if ( t->hasStartDate() ) {
         d = t->dtStart().date();
         QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(1,key);
     }
     return true;
 }
 
 bool ListItemVisitor::visit(Journal * j)
 { 
     
     QString des;
     if ( !j->summary().isEmpty() ) {
         des = j->summary();
     } else {
         des = j->description().left(30);
         des = des.simplifyWhiteSpace ();
         des.replace (QRegExp ("\\n"),"" );
         des.replace (QRegExp ("\\r"),"" );
     }
     mItem->setText(0,i18n("Journal: ")+des.left(25));
     mItem->setText(1,j->dtStartDateStr());
     mItem->setText(2,"---");
     mItem->setText(3,"---");
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
     mItem->setText(7,j->dtStartDateStr());
     mItem->setText(8,"---");
     mItem->setText(9,"---");
-    mItem->setText(10,i18n("Last Modified: ")+  KGlobal::locale()->formatDateTime( j->lastModified() , true) );
+    mItem->setText(10,j->categoriesStr());
     mItem->setText(11, KOPrefs::instance()->calName( j->calID() ));
 
     QString key;
     QDate d = j->dtStart().date();
     key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     mItem->setSortKey(1,key);
     mItem->setSortKey(7,key);
 
     return true;
 }
 
 KOListView::KOListView(Calendar *calendar, QWidget *parent,
                        const char *name)
     : KOEventView(calendar, parent, name)
 {
     
     mActiveItem = 0;
     mForceShowCompletedTodos = false;
     mListView = new KOListViewListView(this);
     mListView->addColumn(i18n("Summary"));
     mListView->addColumn(i18n("Start Date"));
     mListView->addColumn(i18n("Start Time"));
     mListView->addColumn(i18n("End Date"));
     mListView->addColumn(i18n("End Time"));
     mListView->addColumn(i18n("Alarm")); // alarm set?
     mListView->addColumn(i18n("Recurs")); // recurs?
     mListView->addColumn(i18n("Due Date"));
     mListView->addColumn(i18n("Due Time"));
     mListView->addColumn(i18n("Cancelled"));
     mListView->addColumn(i18n("Categories"));
     mListView->addColumn(i18n("Calendar"));
 
@@ -982,74 +982,70 @@ void KOListView::hideDates()
     showDates(false);
 }
 
 void KOListView::resetFocus()
 { 
     topLevelWidget()->setActiveWindow();
     topLevelWidget()->raise();
     mListView->setFocus();
 }
 void KOListView::updateView()
 {
     mListView->setFocus();
     if ( mListView->firstChild () )
         mListView->setCurrentItem( mListView->firstChild () );
 }
 void KOListView::updateConfig()
 {
 
     mListView->setFont ( KOPrefs::instance()->mListViewFont );
     updateView();
 
 }
 void KOListView::setStartDate(const QDate &start)
 {
     mStartDate = start;
 }
 
 void KOListView::showDates(const QDate &start, const QDate &end)
 {
     clear();
     mStartDate = start;
     QDate date = start;
-    QPtrList<Journal> j_list;
     while( date <= end ) {
         addEvents(calendar()->events(date));
         addTodos(calendar()->todos(date));
-        Journal* jo = calendar()->journal(date);
-        if ( jo )
-            j_list.append( jo );
+        addJournals( calendar()->journals4Date(date)  );
         date = date.addDays( 1 );
     }
-    addJournals(j_list);
     emit incidenceSelected( 0 );
     updateView();
   
 }
 
 void KOListView::addEvents(QPtrList<Event> eventList)
 {
  
     Event *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);
     }
     if ( !mListView->currentItem() ){
         updateView();
     }
 }
 
 void KOListView::addTodos(QPtrList<Todo> eventList)
 {
     Todo *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);
     }
     if ( !mListView->currentItem() ){
         updateView();
     }
 }
 void KOListView::addJournals(QPtrList<Journal> eventList)
 {
     Journal *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);