6 files changed, 31 insertions, 36 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 7f592e9..155ce24 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -46,17 +46,16 @@ static bool matchBinaryPattern( int value, int pattern );
 static bool matchBinaryPatternA( int value, int pattern );
 static bool matchBinaryPatternP( int value, int pattern );
 
 struct Addressee::AddresseeData : public KShared
 {
   QString uid;
   QString name;
   QString formattedName;
-  QString defaultFormattedName;
   QString familyName;
   QString givenName;
   QString additionalName;
   QString prefix;
   QString suffix;
   QString nickName;
   QDateTime birthday;
   QString mailer;
@@ -743,43 +742,27 @@ QString Addressee::nameLabel()
 
 void Addressee::setFormattedName( const QString &formattedName )
 {
   if ( formattedName == mData->formattedName ) return;
   detach();
   mData->empty = false;
   mData->formattedName = formattedName;
 }
-void Addressee::setDefaultFormattedName( const QString &formattedName )
-{
-  if ( formattedName == mData->defaultFormattedName ) return;
-  detach();
-  mData->empty = false;
-  mData->defaultFormattedName = formattedName;
-}
 
 QString Addressee::formattedName() const
 {
   return mData->formattedName;
 }
-QString Addressee::defaultFormattedName() const
-{
-  return mData->defaultFormattedName;
-}
 
 QString Addressee::formattedNameLabel()
 {
   return i18n("Formatted Name");
 }
 
-QString Addressee::defaultFormattedNameLabel()
-{
-  return i18n("Def.Formatted Name");
-}
-
 
 void Addressee::setFamilyName( const QString &familyName )
 {
   if ( familyName == mData->familyName ) return;
   detach();
   mData->empty = false;
   mData->familyName = familyName;
 }
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 0d688f8..a2fbcf5 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -149,27 +149,24 @@ class Addressee
       Return translated label for name field.
      */
     static QString nameLabel();
 
     /**
       Set formatted name.
      */
     void setFormattedName( const QString &formattedName );
-    void setDefaultFormattedName( const QString &formattedName );
     /**
       Return formatted name.
      */
     QString formattedName() const;
-    QString defaultFormattedName() const;
     /**
       Return translated label for formattedName field.
      */
     static QString formattedNameLabel();
-    static QString defaultFormattedNameLabel();
 
     /**
       Set family name.
      */
     void setFamilyName( const QString &familyName );
     /**
       Return family name.
      */
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 5c561c3..fd51026 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -82,17 +82,16 @@ class Field::FieldImpl
       Mailer,
       Title,
       Role,
       Organization,
       Note,
       Url,
       Resource,
       Sip,
-      DefaultFormattedName,
       MobileWorkPhone,
       MobileHomePhone
     };
 
     int fieldId() { return mFieldId; }
     int category() { return mCategory; }
     
     QString label() { return mLabel; }
@@ -124,18 +123,16 @@ Field::~Field()
   delete mImpl;
 }
 
 QString Field::label()
 {
   switch ( mImpl->fieldId() ) {
     case FieldImpl::FormattedName:
       return Addressee::formattedNameLabel();
-    case FieldImpl::DefaultFormattedName:
-      return Addressee::defaultFormattedNameLabel();
     case FieldImpl::FamilyName:
       return Addressee::familyNameLabel();
     case FieldImpl::GivenName:
       return Addressee::givenNameLabel();
     case FieldImpl::AdditionalName:
       return Addressee::additionalNameLabel();
     case FieldImpl::Prefix:
       return Addressee::prefixLabel();
@@ -243,18 +240,16 @@ QString Field::categoryLabel( int category )
   }
 }
 
 QString Field::value( const KABC::Addressee &a )
 {
   switch ( mImpl->fieldId() ) {
     case FieldImpl::FormattedName:
       return a.formattedName();
-    case FieldImpl::DefaultFormattedName:
-      return a.defaultFormattedName();
     case FieldImpl::FamilyName:
       return a.familyName();
     case FieldImpl::GivenName:
       return a.givenName();
     case FieldImpl::AdditionalName:
       return a.additionalName();
     case FieldImpl::Prefix:
       return a.prefix();
@@ -403,17 +398,16 @@ bool Field::isCustom()
 {
   return mImpl->fieldId() == FieldImpl::CustomField;
 }
 
 Field::List Field::allFields()
 {
   if ( mAllFields.isEmpty() ) {
     createField( FieldImpl::FormattedName, Frequent );
-    createField( FieldImpl::DefaultFormattedName, Frequent );
     createField( FieldImpl::FamilyName, Frequent );
     createField( FieldImpl::GivenName, Frequent );
     createField( FieldImpl::AdditionalName );
     createField( FieldImpl::Prefix );
     createField( FieldImpl::Suffix );
     createField( FieldImpl::NickName, Personal );
     createField( FieldImpl::Birthday, Personal );
     createField( FieldImpl::Category );
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index b3da428..294ce7d 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -51,17 +51,17 @@
 SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     : QLabel( parent )
 {
     mAlarmDialog = new AlarmDialog( 0 );
     mPopUp = new QPopupMenu( this );
     mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) );
     mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) );
     mPopUp->insertSeparator();
-    mPopUp->insertItem( "What's Todo?", this, SLOT ( showTodo() ) );
+    mPopUp->insertItem( "Todo List", this, SLOT ( showTodo() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) );
     mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) );
     mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) );
     mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
     mPopUp->insertSeparator();
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,17 +529,16 @@ 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())+")";
         } 
@@ -548,17 +556,17 @@ void KOAgendaItem::computeText()
     
     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();
+            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 );
         } else {
             item = new MonthViewItem( event, mDate, text );
@@ -759,16 +769,17 @@ int MonthViewCell::insertEvent(Event *event)
                 if ( text < it->text() ) {
                     pos = i;
                     break;
                 }
                 ++pos;
             }
             insertItem( item ,pos);
         }
+        if ( useToolTips )
         mToolTip.append( mToolTipText );
         return mdayCount;
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
     setFocusPolicy(WheelFocus); 
       QString text;
         if (todo->hasDueDate()) {
@@ -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();