fixes

2 files changed, 68 insertions, 54 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index f39b5e1..c8c2f28 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -277,8 +277,9 @@ void KOEventViewer::appendEvent(Event *event, int mode )
 {  
     mMailSubject = "";
     mCurrentIncidence = event;
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
+    bool wideScreen = ( QApplication::desktop()->width() >= 640 );
     topLevelWidget()->setCaption(i18n("Event Viewer"));
     if ( mode == 0 ) {
         addTag("h2",deTag(event->summary()));
     }
@@ -330,10 +331,9 @@ void KOEventViewer::appendEvent(Event *event, int mode )
                          .arg(event->dtStartDateStr( shortDate )));
         }
     }
     if (!event->location().isEmpty()) {
-        addTag("b",i18n("Location: "));
-        mText.append(deTag(event->location())+"<br>");
+        addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
         mMailSubject += i18n(" at ") + event->location();
     }
     if (event->recurrence()->doesRecur()) {
 
@@ -343,19 +343,27 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         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 ));
+            if ( wideScreen ){
+                addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) );
+            } else {
+                addTag("p",i18n("<b>Next recurrence is on:</b>")  );
+                addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
+            }
             mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true );
 
         } else {
             bool last;
             QDate nextd;
             nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last );
             if ( last ) {
-                addTag("p",i18n("<b>Last recurrence was on:</b>")  );
-                addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));
+                if ( wideScreen ){
+                    addTag("p",i18n("<b>Last recurrence was on:</b>") +" " + KGlobal::locale()->formatDate( nextd, shortDate ));
+                } else{
+                    addTag("p",i18n("<b>Last recurrence was on:</b>")  );
+                    addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));
+                }
             }
         }
     } else {
         mMailSubject += i18n(" - " )+event->dtStartStr( true );
@@ -366,39 +374,41 @@ void KOEventViewer::appendEvent(Event *event, int mode )
     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 ));
+        if(wideScreen ){
+            addTag("p",i18n("<b>Alarm on: ") + s  +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
+        }else{
+            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>");
+    addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
   
-
- 
     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(wideScreen ){
+            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 ));
+        }
+
         
     }
     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(wideScreen ){
+            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 ));
+        }
         
     }   
     if ( KOPrefs::instance()->mEVshowDetails ) {
         if (!event->description().isEmpty()) {
@@ -416,8 +426,9 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     mMailSubject = "";
     mCurrentIncidence = event;
     topLevelWidget()->setCaption(i18n("Todo Viewer"));
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
+    bool wideScreen = ( QApplication::desktop()->width() >= 640 );
     if (mode == 0 )
         addTag("h2",deTag(event->summary()));
     else { 
         if ( mColorMode == 1 ) {
@@ -468,50 +479,52 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     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>");
+    if (!event->location().isEmpty()) { 
+        addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
         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);
+        QString s =i18n("( %1 before )").arg( alarm->offsetText() ); 
+        if ( wideScreen ) {
+            addTag("p",i18n("<b>Alarm on: ") + s  +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
+        } else {
+            addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
+            addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
+        }
     }
 
-    addTag("b",i18n("Access: "));
-    mText.append(event->secrecyStr()+"<br>");
+    addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
 
     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(wideScreen ){
+
+            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 ));
+        }  
     }
     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(wideScreen ){
+            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 ));
+        }
     } 
     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>");
@@ -537,13 +550,12 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
 void KOEventViewer::formatCategories(Incidence *event)
 {
     if (!event->categoriesStr().isEmpty()) {
         if (event->categories().count() == 1) {
-            addTag("h3",i18n("Category"));
+            addTag("p","<b>"+i18n("Category") + ":</b> " + event->categoriesStrWithSpace());
         } else {
-            addTag("h3",i18n("Categories"));
+            addTag("p","<b>"+i18n("Categories")+":</b> " + event->categoriesStrWithSpace() ) ;
         }
-        addTag("p",event->categoriesStr());
     }
 }
 void KOEventViewer::formatAttendees(Incidence *event)
 {
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 0a608dc..25be63a 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -463,9 +463,12 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int)));
 
 
   
-  mItemPopupMenu = new QPopupMenu(this);
+  mItemPopupMenu = new QPopupMenu(this); 
+  mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
+                             SLOT (toggleRunningItem()));
+  mItemPopupMenu->insertSeparator();
   mItemPopupMenu->insertItem(i18n("Show..."), this,
                              SLOT (showTodo()));
   mItemPopupMenu->insertItem(i18n("Edit..."), this,
                              SLOT (editTodo()));
@@ -479,13 +482,12 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
                              SLOT (beamTodo()));
   mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this,
                              SLOT (cancelTodo()));
   mItemPopupMenu->insertSeparator();
-
-  mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
-                             SLOT (toggleRunningItem()));
+  /*
   mItemPopupMenu->insertItem( i18n("New Todo..."), this,
                              SLOT (newTodo()));
+  */
   mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
                              SLOT (newSubTodo())); 
   mItemPopupMenu->insertItem(i18n("Unparent Todo"), this,
                              SLOT (unparentTodo()),0,21);