| -rw-r--r-- | korganizer/komonthview.cpp | 120 |
1 files changed, 115 insertions, 5 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index cba85fa..9b0389d 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -129,32 +129,33 @@ void KNoScrollListBox::focusInEvent ( QFocusEvent * e ) } else { setVScrollBarMode(QScrollView::Auto); setHScrollBarMode(QScrollView::Auto); } } } } void KNoScrollListBox::focusOutEvent ( QFocusEvent * e ) { int i = currentItem (); 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 ) { return i18n("Click in the cell\nto add an event!"); } return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence(), KOPrefs::instance()->mWTshowDetails, KOPrefs::instance()->mWTshowCreated, KOPrefs::instance()->mWTshowChanged); } void KNoScrollListBox::keyPressEvent(QKeyEvent *e) { //qDebug("KNoScrollListBox::keyPressEvent "); @@ -267,71 +268,97 @@ void KNoScrollListBox::keyReleaseEvent(QKeyEvent *e) 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() { + mDisplayHightlighted = false; mblockRepaint = true; setText( s ); mMultiday = 0; mIncidence = incidence; mDate = qd; mRecur = false; mAlarm = false; mReply = false; 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; int size = PIXMAP_SIZE; if ( QApplication::desktop()->width() < 300 ) size = 3; int y = (heihei - size -1 ) /2; if ( mIncidence->calID() > 1 ) { p->fillRect ( x, y-2,size,size+4, KOPrefs::instance()->defaultColor( mIncidence->calID() ) ); p->drawRect ( x, y-2,size,size+4); x += size + 1; } @@ -587,32 +614,33 @@ 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 ); clear(); } @@ -1070,38 +1098,65 @@ void MonthViewCell::cellClicked( QListBoxItem *item ) } void MonthViewCell::contextMenu( QListBoxItem *item ) { 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; - + 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) : 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; @@ -1187,49 +1242,53 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) 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() ) ); + 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 ); 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() ) ); + 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()), 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); @@ -1275,32 +1334,83 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) resize(640, 480 ); updatePossible = true; #endif computeLayout(); if ( mShowWeekView ) mWidStack->raiseWidget( mWeekView ); else mWidStack->raiseWidget( mMonthView ); } 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 emit selectWeekNum ( n ); } int KOMonthView::currentWeek() { if ( mShowWeekView ) return mWeekLabelsW[0]->getWeekNum(); return mWeekLabels[0]->getWeekNum(); } void KOMonthView::switchView() |