| -rw-r--r-- | korganizer/koagendaitem.cpp | 26 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 13 |
2 files changed, 30 insertions, 9 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 23afe7a..e545ca8 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -440,28 +440,37 @@ void KOAgendaItem::resizePixmap( int w , int h ) paintPixSel()->resize( w, h ); } QPixmap * KOAgendaItem::paintPix() { static QPixmap* mPaintPix = 0; - if ( ! mPaintPix ) - mPaintPix = new QPixmap(1,1); + if ( ! mPaintPix ) { + int w = QApplication::desktop()->width(); + int h = QApplication::desktop()->height(); + mPaintPix = new QPixmap(w,h); + } return mPaintPix ; } QPixmap * KOAgendaItem::paintPixAllday() { static QPixmap* mPaintPixA = 0; - if ( ! mPaintPixA ) - mPaintPixA = new QPixmap(1,1); + if ( ! mPaintPixA ) { + int w = QApplication::desktop()->width(); + int h = QApplication::desktop()->height()/3; + mPaintPixA = new QPixmap(w,h); + } return mPaintPixA ; } QPixmap * KOAgendaItem::paintPixSel() { static QPixmap* mPaintPixSel = 0; - if ( ! mPaintPixSel ) - mPaintPixSel = new QPixmap(1,1); + if ( ! mPaintPixSel ) { + int w = QApplication::desktop()->width(); + int h = QApplication::desktop()->height(); + mPaintPixSel = new QPixmap(w,h); + } return mPaintPixSel ; } void KOAgendaItem::paintEvent ( QPaintEvent *e ) { if ( globalFlagBlockAgendaItemPaint ) @@ -522,13 +531,12 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e ) } //qDebug("%d %d %d %d %d %d %d",rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh); bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); } void KOAgendaItem::computeText() { - mDisplayedText = mIncidence->summary(); if ( (mIncidence->type() == "Todo") ) { if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) { if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; else if ( !(mIncidence->doesFloat())) @@ -550,13 +558,13 @@ void KOAgendaItem::computeText() if ( mAllDay ) mDisplayedText += " ("; else mDisplayedText += "\n("; mDisplayedText += mIncidence->location() +")"; } - +#ifdef DESKTOP_VERSION QString tipText = mIncidence->summary(); if ( !mIncidence->doesFloat() ) { if ( mIncidence->type() == "Event" ) { if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr(); tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr(); @@ -580,13 +588,13 @@ void KOAgendaItem::computeText() } if (!mIncidence->location().isEmpty()) { tipText += "\n"+i18n("Location: ")+mIncidence->location(); } QToolTip::add(this,tipText,toolTipGroup(),""); - +#endif } void KOAgendaItem::updateItem() { computeText(); //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y()); diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 4dfb9df..65d6acf 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -638,12 +638,16 @@ void MonthViewCell::startUpdateCell() } #endif } int MonthViewCell::insertEvent(Event *event) { + bool useToolTips = true; +#ifndef DEKSTOP_VERSION + useToolTips = false; +#endif QString mToolTipText; setFocusPolicy(WheelFocus); if ( !(event->doesRecur() == Recurrence::rNone) ) { if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) return mdayCount; else @@ -684,24 +688,30 @@ int MonthViewCell::insertEvent(Event *event) time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; else if ( mDate == event->dtEnd().date () ) time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; } text = time + event->summary(); + if ( useToolTips ) mToolTipText += prefix + text; } else { if (event->doesFloat()) { text = event->summary(); + if ( useToolTips ) mToolTipText += text; } else { text = KGlobal::locale()->formatTime(event->dtStart().time()); text += " " + event->summary(); + if ( useToolTips ) mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); } } + if ( useToolTips && ! event->location().isEmpty() ) { + mToolTipText += " (" + event->location() +")"; + } MonthViewItem *item ; if ( mAvailItemList.count() ) { item = mAvailItemList.first(); mAvailItemList.remove( item ); item->recycle( event, mDate, text ); @@ -761,12 +771,13 @@ int MonthViewCell::insertEvent(Event *event) break; } ++pos; } insertItem( item ,pos); } + if ( useToolTips ) mToolTip.append( mToolTipText ); return mdayCount; } void MonthViewCell::insertTodo(Todo *todo) { setFocusPolicy(WheelFocus); @@ -813,13 +824,15 @@ void MonthViewCell::insertTodo(Todo *todo) } item->setPalette( pal ); item->setRecur( todo->recurrence()->doesRecur() ); item->setAlarm( todo->isAlarmEnabled() ); item->setMoreInfo( todo->description().length() > 0 ); insertItem( item , count()); +#ifdef DESKTOP_VERSION mToolTip.append( text ); +#endif } void MonthViewCell::repaintfinishUpdateCell() { MonthViewItem *mitem = (MonthViewItem*) firstItem (); while ( mitem ) { mitem->setBlockRepaint( false ); |