fixes

2 files changed, 35 insertions, 14 deletions

diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 23afe7a..e545ca8 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -438,32 +438,41 @@ void KOAgendaItem::resizePixmap( int w , int h )
 {
     paintPix()->resize( w, 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 )
         return; 
     if ( globalFlagBlockAgenda > 0 &&  globalFlagBlockAgenda < 5 )
@@ -520,45 +529,44 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
             return;
         }
     }
     //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()))
                 mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")";
         } 
     } else {
         if ( !(mIncidence->doesFloat()) &&  KOPrefs::instance()->mShowTimeInAgenda)
-            mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
+            mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
 
         if (  mAllDay ) {
             if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {
                 mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ;
             }
         }
 
     }
     
     if ( !mIncidence->location().isEmpty() ) {
         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();
             }
             else {
@@ -578,17 +586,17 @@ void KOAgendaItem::computeText()
             if (((Todo*)mIncidence)->hasDueDate())
                 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr();
         }
 
     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());
     paintMe( mSelected );
     repaint( false);
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 4dfb9df..65d6acf 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -636,16 +636,20 @@ void MonthViewCell::startUpdateCell()
         insertItem( item );
         mToolTip.append ( mHolidayString ); 
     }
 #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
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                     return mdayCount;
@@ -682,28 +686,34 @@ int MonthViewCell::insertEvent(Event *event)
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
-            mToolTipText += prefix + text;
+            if ( useToolTips )
+                mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
-                mToolTipText += text;
+                if ( useToolTips )
+                    mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
-                mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + 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 );
         } else {
             item = new MonthViewItem( event, mDate, text );
@@ -759,17 +769,18 @@ int MonthViewCell::insertEvent(Event *event)
                 if ( text < it->text() ) {
                     pos = i;
                     break;
                 }
                 ++pos;
             }
             insertItem( item ,pos);
         }
-        mToolTip.append( mToolTipText );
+        if ( useToolTips )
+            mToolTip.append( mToolTipText );
         return mdayCount;
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
     setFocusPolicy(WheelFocus); 
       QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
@@ -811,17 +822,19 @@ void MonthViewCell::insertTodo(Todo *todo)
         } else {
             pal = mStandardPalette ;
         }
         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 );
         updateItem ( mitem );
         mitem = (MonthViewItem *)mitem->next();