fixi

1 files changed, 6 insertions, 3 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index c8c2f28..6315827 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -237,318 +237,321 @@ void KOEventViewer::mailToAttendees( bool all )
     QString uid = "ComposeMailUIpick2"+mMailSubject;
 #ifndef DESKTOP_VERSION
     bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList);
 #endif
 
 }
 void KOEventViewer::addTag(const QString & tag,const QString & text)
 {
     int number=text.contains("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
     QString tmpStr=str;
     if(number !=-1) 
         {
             if (number > 0) {
                 int pos=0;
                 QString tmp;
                 for(int i=0;i<=number;i++) {
                     pos=tmpText.find("\n");
                     tmp=tmpText.left(pos);
                     tmpText=tmpText.right(tmpText.length()-pos-1);
                     tmpStr+=tmp+"<br>";
                 }
             }
             else tmpStr += tmpText;
             tmpStr+="</" + tag + ">";
             mText.append(tmpStr);
         }
     else
         {
             str += text + "</" + tag + ">";
             mText.append(str);
         }
 }
 
 void KOEventViewer::setColorMode( int m )
 {
     mColorMode = m;
 }
 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()));
+        formatReadOnly(event);
     }
     else {
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#C00000\">";
         }
         // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
         } else {
             addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
         } 
+        formatReadOnly(event);
         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->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>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("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
         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 ) {
             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 ) {
                 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 );
 
     }
 
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
         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("p",s);
     }
 
     addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
   
     formatCategories(event);
 
-    formatReadOnly(event);
     formatAttendees(event);
   
     if ( KOPrefs::instance()->mEVshowCreated ) {
         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 ) {
         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()) {
             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;
     bool wideScreen = ( QApplication::desktop()->width() >= 640 );
-    if (mode == 0 )
+    if (mode == 0 ) {
         addTag("h2",deTag(event->summary()));
+        formatReadOnly(event);
+    }
     else { 
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#B00000\">";
         }
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
         } else {
             addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
         }
+        formatReadOnly(event);
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Todo " )+ event->summary();
 
      if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
         mText +="<font color=\"#B00000\">";
         addTag("i",  i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) );
         mText += "</font>";
     } else {
         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->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("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() ); 
         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","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
 
     formatCategories(event);
 
-    formatReadOnly(event);
     formatAttendees(event);
     
     if ( KOPrefs::instance()->mEVshowCreated ) {
         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 ) {
         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>");
     }
     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()->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("p","<b>"+i18n("Category") + ":</b> " + event->categoriesStrWithSpace());