monthview tooltip sort fixed

2 files changed, 14 insertions, 12 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 4bf9dea..004ff50 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -491,22 +491,22 @@ void MonthViewCell::startUpdateCell()
     mItemList->clear();
 
 #ifdef DESKTOP_VERSION
     QToolTip::remove(this); 
-#endif
-    mToolTip = ""; 
+#endif 
+    mToolTip.clear(); 
     //qApp->processEvents();
     if ( !mHolidayString.isEmpty() ) {
         MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
         item->setPalette( mHolidayPalette );
         mItemList->insertItem( item );
-        mToolTip += mHolidayString+"\n"; 
+        mToolTip.append ( mHolidayString ); 
     }
 }
 
 void MonthViewCell::insertEvent(Event *event)
 {
-    
+    QString mToolTipText;
     mItemList->setFocusPolicy(WheelFocus); 
         if ( !(event->doesRecur() == Recurrence::rNone) ) {
             if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
                 return;
@@ -551,18 +551,18 @@ void MonthViewCell::insertEvent(Event *event)
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
-            mToolTip += prefix + text;
+            mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
-                mToolTip += text;
+                mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
-                mToolTip +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
+                mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
 
         MonthViewItem *item = new MonthViewItem( event, mDate, text );
@@ -605,9 +605,9 @@ void MonthViewCell::insertEvent(Event *event)
             item->setReply(false);
 #endif
         item->setMultiDay( multiday );
         mItemList->insertItem( item );
-        mToolTip += "\n";
+        mToolTip.append( mToolTipText );
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
     mItemList->setFocusPolicy(WheelFocus); 
@@ -649,15 +649,17 @@ void MonthViewCell::insertTodo(Todo *todo)
         item->setRecur( todo->recurrence()->doesRecur() );
         item->setAlarm( todo->isAlarmEnabled() );
         item->setMoreInfo( todo->description().length() > 0  );
         mItemList->insertItem( item );
-        mToolTip += text+"\n"; 
+        mToolTip.append( text ); 
 }
 void MonthViewCell::finishUpdateCell()
 {
 #ifdef DESKTOP_VERSION
-    if (mToolTip != "")
-        QToolTip::add(this,mToolTip,toolTipGroup(),"");
+    if (mToolTip.count() > 0 ) {
+        mToolTip.sort();
+        QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),"");
+    }
 #endif
     mItemList->sort();
     //setMyPalette(); 
     setMyPalette();
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index fd8cbf2..a92421b 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -166,9 +166,9 @@ class MonthViewCell : public QWidget
     void newEventSignal( QDateTime );
     void showDaySignal( QDate );
     
   protected:
-    QString mToolTip;
+    QStringList mToolTip;
     void resizeEvent( QResizeEvent * );
 
 
 public slots: