fixxx

2 files changed, 59 insertions, 40 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index bdad248..fefc778 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -302,52 +302,52 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Meeting " )+ event->summary();
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This event has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
-    if (!event->location().isEmpty()) {
-        addTag("b",i18n("Location: "));
-        mText.append(deTag(event->location())+"<br>");
-        mMailSubject += i18n(" at ") + event->location();
-    }
+   
     if (event->doesFloat()) {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>")
                          .arg(event->dtStartDateStr(shortDate))
                          .arg(event->dtEndDateStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate )));
         }
     } else {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1</p> ")
                          .arg(event->dtStartStr( shortDate)));
             mText.append(i18n("<p><b>To:</b> %1</p>")
                          .arg(event->dtEndStr(shortDate)));
         } else {
-            mText.append(i18n("<p><b>On:</b> %1</p> ")
-                         .arg(event->dtStartDateStr( shortDate )));
             mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>")
                          .arg(event->dtStartTimeStr())
                          .arg(event->dtEndTimeStr()));
+            mText.append(i18n("<p><b>On:</b> %1</p> ")
+                         .arg(event->dtStartDateStr( shortDate )));
         }
     }
-
+    if (!event->location().isEmpty()) {
+        addTag("b",i18n("Location: "));
+        mText.append(deTag(event->location())+"<br>");
+        mMailSubject += i18n(" at ") + event->location();
+    }
     if (event->recurrence()->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>");
         bool ok;
         QDate start = QDate::currentDate();
         QDateTime next;
         next = event->getNextOccurence( QDateTime::currentDateTime() , &ok );
         if ( ok ) {
             addTag("p",i18n("<b>Next recurrence is on:</b>")  );
             addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
             mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true );
@@ -371,44 +371,53 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
         QString s =i18n("( %1 before )").arg( alarm->offsetText() );
         addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         //addTag("p",s);
     }
 
     addTag("b",i18n("Access: "));
     mText.append(event->secrecyStr()+"<br>");
   
 
-    if ( KOPrefs::instance()->mEVshowDetails ) {
-        if (!event->description().isEmpty()) {
-            addTag("p",i18n("<b>Details: </b>"));
-            addTag("p",deTag(event->description()));
-        }
-    }
+ 
     formatCategories(event);
 
     formatReadOnly(event);
     formatAttendees(event);
   
     if ( KOPrefs::instance()->mEVshowCreated ) {
+#ifdef DESKTOP_VERSION
+        addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
+#else
         addTag("p",i18n("<b>Created: ")  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
+#endif
         
     }
     if ( KOPrefs::instance()->mEVshowChanged ) {
+#ifdef DESKTOP_VERSION
+        addTag("p",i18n("<b>Last modified: ")  +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
+#else
         addTag("p",i18n("<b>Last modified: ")  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
+#endif
         
+    }   
+    if ( KOPrefs::instance()->mEVshowDetails ) {
+        if (!event->description().isEmpty()) {
+            addTag("p",i18n("<b>Details: </b>"));
+            addTag("p",deTag(event->description()));
+        }
     }
     setText(mText);
     //QWhatsThis::add(this,mText);
 
 }
 
 void KOEventViewer::appendTodo(Todo *event, int mode )
 {
     mMailSubject = "";
     mCurrentIncidence = event;
     topLevelWidget()->setCaption(i18n("Todo Viewer"));
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
@@ -440,91 +449,100 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         mText.append(i18n("<p><i>%1 % completed</i></p>")
                      .arg(event->percentComplete()));
     }
 
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This todo has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
-    if (!event->location().isEmpty()) {
-        addTag("b",i18n("Location: "));
-        mText.append(deTag(event->location())+"<br>");
-        mMailSubject += i18n(" at ") + event->location();
-    }
+   
 
     if (event->recurrence()->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>");
             
     }
     if (event->hasStartDate()) {
         mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer)));
     }
     if (event->hasDueDate()) {
         mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer)));
         mMailSubject += i18n(" - " )+event->dtDueStr(  true );
     }
-
+    if (!event->location().isEmpty()) {
+        addTag("b",i18n("Location: "));
+        mText.append(deTag(event->location())+"<br>");
+        mMailSubject += i18n(" at ") + event->location();
+    }
+    mText.append(i18n("<p><b>Priority:</b> %2</p>")
+                 .arg(QString::number(event->priority())));
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
         QString s =i18n("( %1 before )").arg( alarm->offsetText() );
         addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         //addTag("p",s);
     }
 
     addTag("b",i18n("Access: "));
     mText.append(event->secrecyStr()+"<br>");
-    if ( KOPrefs::instance()->mEVshowDetails ) {
-        if (!event->description().isEmpty()) {
-            addTag("p",i18n("<b>Details: </b>"));
-            addTag("p",deTag(event->description()));
-        }
-    }
 
     formatCategories(event);
 
-    mText.append(i18n("<p><b>Priority:</b> %2</p>")
-                 .arg(QString::number(event->priority())));
-
     formatReadOnly(event);
     formatAttendees(event);
+    
+    if ( KOPrefs::instance()->mEVshowCreated ) {
+#ifdef DESKTOP_VERSION
+        addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
+#else
+        addTag("p",i18n("<b>Created: ")  +" </b>");
+        addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
+#endif
+        
+    }
+    if ( KOPrefs::instance()->mEVshowChanged ) {
+#ifdef DESKTOP_VERSION
+        addTag("p",i18n("<b>Last modified: ")  +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );
+#else
+        addTag("p",i18n("<b>Last modified: ")  +" </b>");
+        addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
+#endif
+        
+    } 
     if ( event->relatedTo() ) {
         addTag("b",i18n("Parent todo:<br>"));
         mText.append(deTag(event->relatedTo()->summary())+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>");
     }
     QPtrList<Incidence> Relations = event->relations();
     Incidence *to;
     if ( Relations.first() )
         addTag("b",i18n("Sub todos:<br>"));
     for (to=Relations.first();to;to=Relations.next()) {
         mText.append( deTag(to->summary())+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>");
         
     }  
-    if ( KOPrefs::instance()->mEVshowCreated ) {
-        addTag("p",i18n("<b>Created: ")  +" </b>");
-        addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
-        
-    }
-    if ( KOPrefs::instance()->mEVshowChanged ) {
-        addTag("p",i18n("<b>Last modified: ")  +" </b>");
-        addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
-        
+
+    if ( KOPrefs::instance()->mEVshowDetails ) {
+        if (!event->description().isEmpty()) {
+            addTag("p",i18n("<b>Details: </b>"));
+            addTag("p",deTag(event->description()));
+        }
     }
     setText(mText);
 }
 
 void KOEventViewer::formatCategories(Incidence *event)
 {
     if (!event->categoriesStr().isEmpty()) {
         if (event->categories().count() == 1) {
             addTag("h3",i18n("Category"));
         } else {
             addTag("h3",i18n("Categories"));
         }
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 65d6acf..b175f9a 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -633,25 +633,25 @@ void MonthViewCell::startUpdateCell()
     if ( !mHolidayString.isEmpty() ) {
         MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
         item->setPalette( mHolidayPalette );
         insertItem( item );
         mToolTip.append ( mHolidayString ); 
     }
 #endif
 }
 
 int MonthViewCell::insertEvent(Event *event)
 {
     bool useToolTips = true;
-#ifndef DEKSTOP_VERSION
+#ifndef DESKTOP_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;
         }
         
@@ -765,26 +765,27 @@ int MonthViewCell::insertEvent(Event *event)
             uint i;
             int pos = mdayCount;
             for ( i = mdayCount; i < count();++i ) {
                 QListBoxItem* it = this->item ( i );
                 if ( text < it->text() ) {
                     pos = i;
                     break;
                 }
                 ++pos;
             }
             insertItem( item ,pos);
         }
-        if ( useToolTips )
+        if ( useToolTips ) {
             mToolTip.append( mToolTipText );
+        }
         return mdayCount;
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
     setFocusPolicy(WheelFocus); 
       QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }