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
@@ -313,7 +313,3 @@ void KOEventViewer::appendEvent(Event *event, int mode )
     }
-    if (!event->location().isEmpty()) {
-        addTag("b",i18n("Location: "));
-        mText.append(deTag(event->location())+"<br>");
-        mMailSubject += i18n(" at ") + event->location();
-    }
+   
     if (event->doesFloat()) {
@@ -333,4 +329,2 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         } 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>")
@@ -338,5 +332,11 @@ void KOEventViewer::appendEvent(Event *event, int mode )
                          .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()) {
@@ -382,8 +382,3 @@ void KOEventViewer::appendEvent(Event *event, int mode )
 
-    if ( KOPrefs::instance()->mEVshowDetails ) {
-        if (!event->description().isEmpty()) {
-            addTag("p",i18n("<b>Details: </b>"));
-            addTag("p",deTag(event->description()));
-        }
-    }
+ 
     formatCategories(event);
@@ -394,4 +389,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
     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
         
@@ -399,5 +398,15 @@ void KOEventViewer::appendEvent(Event *event, int mode )
     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()));
+        }
     }
@@ -451,7 +460,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
    
-    if (!event->location().isEmpty()) {
-        addTag("b",i18n("Location: "));
-        mText.append(deTag(event->location())+"<br>");
-        mMailSubject += i18n(" at ") + event->location();
-    }
+   
 
@@ -470,3 +475,9 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     }
-
+    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())));
 
@@ -483,8 +494,2 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     mText.append(event->secrecyStr()+"<br>");
-    if ( KOPrefs::instance()->mEVshowDetails ) {
-        if (!event->description().isEmpty()) {
-            addTag("p",i18n("<b>Details: </b>"));
-            addTag("p",deTag(event->description()));
-        }
-    }
 
@@ -492,7 +497,23 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
 
-    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() ) {
@@ -509,11 +530,8 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     }  
-    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()));
+        }
     }
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 65d6acf..b175f9a 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -644,3 +644,3 @@ int MonthViewCell::insertEvent(Event *event)
     bool useToolTips = true;
-#ifndef DEKSTOP_VERSION
+#ifndef DESKTOP_VERSION
     useToolTips = false;
@@ -776,4 +776,5 @@ int MonthViewCell::insertEvent(Event *event)
         }
-        if ( useToolTips )
+        if ( useToolTips ) {
             mToolTip.append( mToolTipText );
+        }
         return mdayCount;