monthview enh

2 files changed, 122 insertions, 7 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index cba85fa..9b0389d 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -139,12 +139,13 @@ void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
     if ( i >= 0 ) {
         setSelected ( i, false ); 
     }
     QListBox::focusOutEvent ( e ); 
     setVScrollBarMode(QScrollView::AlwaysOff);
     setHScrollBarMode(QScrollView::AlwaysOff);
+    emit highligtIncidence( 0, (MonthViewCell*)this, 0 );
 }
 
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
     QListBoxItem* item = itemAt ( p );
     if ( ! item ) {
@@ -277,12 +278,13 @@ void KNoScrollListBox::mousePressEvent(QMouseEvent *e)
     }
 }
 
 MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s)
     : QListBoxItem()
 {
+    mDisplayHightlighted = false;
     mblockRepaint = true;
     setText( s );
     mMultiday = 0; 
     mIncidence = incidence;
     mDate = qd;
     mRecur = false;
@@ -291,37 +293,62 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s)
     mInfo = false;
     mdayPos = 0;
     isWeekItem = KOPrefs::instance()->mMonthViewWeek;
 }
 void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s)
 {
+    mDisplayHightlighted = false;
     setText( s );
     mMultiday = 0; 
     mIncidence = incidence;
     mDate = qd;
     mRecur = false;
     mAlarm = false;
     mReply = false;
     mInfo = false; 
     mdayPos = 0;
 }
+bool MonthViewItem::setHighlightedFalse()
+{
+    if ( !mDisplayHightlighted )
+        return false;
+    mDisplayHightlighted = false;
+    return true;
+}
 
+bool MonthViewItem::setHighlighted( Incidence * inc )
+{
+    if ( inc == mIncidence ) {
+        if ( mDisplayHightlighted )
+            return false;
+        mDisplayHightlighted = true;
+        return true;
+    } else {
+        if ( !mDisplayHightlighted )
+            return false;
+        mDisplayHightlighted = false;
+        return true;
+    }
+    return false;
+}
 void MonthViewItem::paint(QPainter *p)
 {
     if ( mblockRepaint ) {
         return;
     }
 #if QT_VERSION >= 0x030000
     bool sel = isSelected();
 #else
     bool sel = selected();
 #endif 
     int heihei = height( listBox () );
     int x = 1;
-    if (KOPrefs::instance()->mMonthViewUsesCategoryColor)
+    if (KOPrefs::instance()->mMonthViewUsesCategoryColor || mDisplayHightlighted )
         {
+            if ( mDisplayHightlighted )
+                sel = true;
             p->setBackgroundColor( palette().color( QPalette::Normal,  \
                                                     sel ? QColorGroup::Highlight : QColorGroup::Background ) );
             p->eraseRect( 0, 0, listBox()->maxItemWidth(), heihei );
         }
    
     //int y = 3;//(height() - mRecurPixmap.height()) /2; 
@@ -597,12 +624,13 @@ void MonthViewCell::setHoliday( const QString &holiday )
         setHoliday( true );
     }
 }
 
 void MonthViewCell::startUpdateCell()
 {
+    
     mdayCount = 0;
     setFocusPolicy(NoFocus); 
     if ( !mMonthView->isUpdatePossible() )
         return;
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
@@ -1080,18 +1108,45 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->showContextMenu( incidence );
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
-    if ( !item ) return;
-
+    if ( !item ) {
+        emit highligtIncidence( 0 , this, 0 );
+        return;
+    }
+    MonthViewItem * it = (static_cast<MonthViewItem *>( item ));
+    emit highligtIncidence( it->incidence(), this, it->multiDay() );
     mMonthView->setSelectedCell( this );
 }
 
+void  MonthViewCell::deHightLight()
+{
+    MonthViewItem *mitem = (MonthViewItem*) firstItem ();
+    while ( mitem ) {
+        if ( mitem->setHighlightedFalse() )
+            updateItem ( mitem );
+        mitem = (MonthViewItem *)mitem->next();
+    }
+}
+// returns true if no inc found
+bool MonthViewCell::doHightLight( Incidence * inc )
+{
 
+    MonthViewItem *mitem = (MonthViewItem*) firstItem ();
+    while ( mitem ) {
+        if ( mitem->incidence() == inc ) {
+            if ( mitem->setHighlighted( inc ) )
+                updateItem ( mitem );
+            return false;
+        }
+        mitem = (MonthViewItem *)mitem->next();
+    }
+    return true;
+}    
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
 
 
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
@@ -1197,12 +1252,14 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
             connect( cell, SIGNAL( showDaySignal( QDate ) ),
                      SIGNAL( showDaySignal( QDate ) ) );
             connect( cell, SIGNAL( nextCell() ),
                      SLOT( nextCell() ) );
             connect( cell, SIGNAL( prevCell() ),
                      SLOT( prevCell() ) );
+            connect( cell, SIGNAL(  highligtIncidence( Incidence * , MonthViewCell *, int ) ),
+                     SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) ));
         }
     }
     mCellsW.resize( mDaysPerWeek );
     for( col = 0; col < mDaysPerWeek; ++col ) {
         MonthViewCell *cell = new MonthViewCell( this, mWeekView );
         mCellsW.insert( col, cell );
@@ -1214,12 +1271,14 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
         connect( cell, SIGNAL( showDaySignal( QDate ) ),
                  SIGNAL( showDaySignal( QDate ) ) );
         connect( cell, SIGNAL( nextCell() ),
                  SLOT( nextCell() ) );
         connect( cell, SIGNAL( prevCell() ),
                  SLOT( prevCell() ) );
+        connect( cell, SIGNAL(  highligtIncidence( Incidence * , MonthViewCell *, int ) ),
+                 SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) ));
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
@@ -1285,12 +1344,63 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
 
+void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int mday )
+{
+    //qDebug("KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday );
+    static Incidence * lastInc = 0;
+    static MonthViewCell * lastCell = 0;
+    
+    if ( lastInc == inc && lastCell == mc )
+        return;
+    lastInc = inc;
+    lastCell = mc;
+    //qDebug("KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday );
+
+    bool weekview = false;
+    int index = 0;
+    for (uint i = 0; i < mCellsW.count(); ++i) {
+        if ( mCellsW[i] == mc ) {
+            weekview = true;
+            index = i;
+            break;
+        }
+    }
+    QPtrVector<MonthViewCell> *cells;
+    if ( weekview ) 
+     cells = &mCellsW;
+    else {
+        for (uint i = 0; i < mCells.count(); ++i) {
+            if ( mCells[i] == mc ) {
+                index = i;
+                break;
+            }
+        }
+        cells = &mCells;
+    }
+    for (uint i = 0; i < (*cells).count(); ++i) {
+        (*cells)[i]->deHightLight();
+    }
+    if ( ! inc ) 
+        return;
+    if ( mday > 1 && index > 0 )
+        for (int i = index-1; i >= 0; --i) {
+            //qDebug("index %d iii %d ", index, i);
+            if ( (*cells)[(uint)i]->doHightLight(inc) )
+                break;
+        }
+    if ( mday < 3 && mday > 0 && index < (*cells).count()-1)
+        for (uint i = index+1; i < (*cells).count(); ++i) {
+            if ( (*cells)[i]->doHightLight(inc) )
+                break;
+        }
+    
+}
 void KOMonthView::selectInternalWeekNum ( int n )
 {
     switchView();  
     if ( !KOPrefs::instance()->mMonthViewWeek )
         emit selectMonth ();
     else
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 65b5e77..159af16 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -41,12 +41,13 @@
 
 #ifdef DESKTOP_VERSION
 class QToolTipGroup; 
 #endif
 
 class KNOWhatsThis; 
+class MonthViewCell; 
 class KOWeekButton : public QPushButton
 {
     Q_OBJECT
   public:
     KOWeekButton( QWidget *parent=0, const char *name=0 ) :
       QPushButton( parent, name) 
@@ -82,12 +83,13 @@ class KNoScrollListBox: public QListBox
   signals:
     void shiftDown();
     void shiftUp();
     void rightClick();
     void nextCell();
     void prevCell();
+    void highligtIncidence( Incidence * , MonthViewCell*, int );
 
    protected slots:
     void oneDown();
     void keyPressEvent(QKeyEvent *);
     void keyReleaseEvent(QKeyEvent *);
     void mousePressEvent(QMouseEvent *); 
@@ -107,20 +109,21 @@ class MonthViewItem: public QListBoxItem
     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; }
+    int multiDay() { return mMultiday; }
     void setMultiDayPos(int type) { mdayPos = type; }
     int gettMultiDayPos() { return mdayPos; }
     void setBlockRepaint(bool on) { mblockRepaint = on; }
-
+    bool setHighlighted( Incidence * );
 
     void setPalette(const QPalette &p) { mPalette = p; }
     QPalette palette() const { return mPalette; }
-
+    bool setHighlightedFalse();
     Incidence *incidence() const { return mIncidence; }
     QDate incidenceDate() { return mDate; }
 
   protected:
     virtual void paint(QPainter *);
     virtual int height(const QListBox *) const;
@@ -132,12 +135,13 @@ class MonthViewItem: public QListBoxItem
     bool mblockRepaint;
     int mMultiday;
     bool mRecur;
     bool mAlarm;
     bool mReply;
     bool mInfo;
+    bool mDisplayHightlighted;
 
     QPalette mPalette;
     QDate mDate;
 
     Incidence *mIncidence;
 };
@@ -172,13 +176,14 @@ class MonthViewCell : public KNoScrollListBox
 
     void enableScrollBars( bool );
 
     Incidence *selectedIncidence();
     QDate selectedIncidenceDate();
     QPushButton * dateLabel() { return mLabel; }
-
+    void deHightLight();
+    bool doHightLight( Incidence *);
     void deselect();
     void select();
 #ifdef DESKTOP_VERSION
     static QToolTipGroup *toolTipGroup(); 
 #endif
   signals:
@@ -189,13 +194,12 @@ class MonthViewCell : public KNoScrollListBox
   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();
@@ -255,12 +259,13 @@ class KOMonthView: public KOEventView
 
     MonthViewCell * selectedCell();
     bool skipResize; 
     NavigatorBar* navigatorBar() { return mNavigatorBar ;}
     void clearList();
   public slots:
+    void incidenceHighlighted( Incidence *, MonthViewCell*, int );
     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);