1 files changed, 35 insertions, 5 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 08232e2..9344567 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -41,63 +41,65 @@
 
 #include <kcalendarsystem.h>
 
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "koprefs.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koglobals.h"
 #include <libkcal/kincidenceformatter.h>
 
 #include "komonthview.h"
 
 #define PIXMAP_SIZE 5
-
+#ifdef DESKTOP_VERSION
+   QToolTipGroup *MonthViewCell::mToolTipGroup = 0; 
+#endif
 class KNOWhatsThis :public QWhatsThis
 {
 public:
     KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { };
 
 protected:
   virtual QString text( const QPoint& p)
   {
     return _wid->getWhatsThisText(p) ;
   };
 private:
     KNoScrollListBox* _wid;
   
 };
 
 
 KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
   : QListBox(parent, name)
 {
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif 
     new KNOWhatsThis(this);
 }
 
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
     QListBoxItem* item = itemAt ( p );
     if ( ! item ) {
-        return i18n("Click in the cell or\non the date label\nto add an event!");
+        return i18n("Click in the cell\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence());
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
  
   switch(e->key()) {
     case Key_Right:
         // if ( e->state() == Qt::ControlButton )
         {
             e->ignore();
             return;
         }
         scrollBy(4,0);
       break;
     case Key_Left:
@@ -282,33 +284,40 @@ MonthViewCell::MonthViewCell( KOMonthView *parent)
   enableScrollBars( false );
   updateConfig();
   //connect( mLabel, SIGNAL( clicked( )), SLOT( newEvent() ));
   connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() ));
   connect( mItemList, SIGNAL( doubleClicked( QListBoxItem *) ),
            SLOT( defaultAction( QListBoxItem * ) ) );
   connect( mItemList, SIGNAL( rightButtonPressed( QListBoxItem *,
                                                   const QPoint &) ),
            SLOT( contextMenu( QListBoxItem * ) ) );
    connect( mItemList, SIGNAL( highlighted( QListBoxItem *) ),
        SLOT( selection( QListBoxItem * ) ) );
   connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
            SLOT( cellClicked( QListBoxItem * ) ) );  
   connect( mItemList, 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;
 
   QString text;
   bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
    if ( KOGlobals::self()->calendarSystem()->day( date ) == 1 || (date.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 
      text = KOGlobals::self()->calendarSystem()->monthName( date, true ) + " ";
     mLabel->resize( mLabelBigSize  );
     text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
   } else {
     mLabel->resize( mLabelSize );
     text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
   }
@@ -379,74 +388,83 @@ void MonthViewCell::keyPressEvent ( QKeyEvent * e )
 {
 
      e->ignore();
 
 }
 void MonthViewCell::updateCell()
 {
   
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
     if ( mDate == QDate::currentDate()  ) {
         mItemList->setLineWidth( 3 );
     } else {
             mItemList->setLineWidth( 1 );
     }
     mItemList->clear();
+#ifdef DESKTOP_VERSION
+    QToolTip::remove(this); 
+#endif
+    QString tipText(""); 
     //qApp->processEvents();
     if ( !mHolidayString.isEmpty() ) {
         MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
         item->setPalette( mHolidayPalette );
         mItemList->insertItem( item );
+        tipText += mHolidayString+"\n"; 
     }
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
     Event *event;
     for( event = events.first(); event; event = events.next() ) {
         if ( event->categories().contains("Holiday") ||
              event->categories().contains(i18n("Holiday"))) {
             setHoliday( true );
             if ( mDate.dayOfWeek() == 7 )
                 mItemList->setLineWidth( 3 );
         }
         QString text;
         if (event->isMultiDay()) {
             QString prefix = "<->";
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) )
                     prefix ="->" ;
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) )
                         prefix ="<-" ;
                 } 
 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;
                 }
             }
             text = prefix + event->summary();
+            tipText += text;
         } else {
-            if (event->doesFloat())
+            if (event->doesFloat()) {
                 text = event->summary();
+                tipText += text;
+            }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
+                tipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
 
         MonthViewItem *item = new MonthViewItem( event, mDate, text );
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = event->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                 pal = getPalette();
                 if (cat.isEmpty()) {
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
@@ -470,34 +488,37 @@ void MonthViewCell::updateCell()
         if ( me != 0 ) {
             if ( me->status() == Attendee::NeedsAction && me->RSVP())
                 item->setReply(true);
             else
                 item->setReply(false);
         } else
             item->setReply(false);
         bool insert = true;
         if ( !(event->doesRecur() == Recurrence::rNone) ) {
             if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
                 insert = false;
             else
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                     insert = false;
 
         }
-        if ( insert )
+        if ( insert ) {
             mItemList->insertItem( item );
+            tipText += "\n";
+        } else
+            tipText = "";
     }
 
     // insert due todos
     QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }
         text += i18n("To-Do: %1").arg(todo->summary());
 
         MonthViewItem *item = new MonthViewItem( todo, mDate, text );
@@ -514,33 +535,39 @@ void MonthViewCell::updateCell()
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         mItemList->insertItem( item );
+        tipText += text+"\n"; 
     }
+#ifdef DESKTOP_VERSION
+    if (tipText != "")
+        QToolTip::add(this,tipText,toolTipGroup(),"");
+#endif
+ 
     //setMyPalette(); 
     setMyPalette();
     resizeEvent( 0 );
     // if ( isVisible())
     //   qApp->processEvents();
 }
 
 void MonthViewCell::updateConfig()
 {
 
   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;
@@ -801,32 +828,35 @@ void KOMonthView::updateConfig()
 
   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 ( 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();
   }
+#ifdef DESKTOP_VERSION
+   MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
+#endif
 }
 
 void KOMonthView::updateDayLabels()
 {
   
   for (int i = 0; i < 7; i++) {
     if (mWeekStartsMonday) {
         bool show = mShortDayLabels;
         if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > mDayLabels[i]->width()  )
             show = true;
         mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
     } else {
        if (i==0) mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels));
        else mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
 
     }