2 files changed, 10 insertions, 1 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 0dad1c1..54376a0 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,66 +1,75 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.1.11 ************
+
+KO/Pi:
+Because we can have many calendars now in KO/Pi we can have more than one journal entry per day.
+Added features to handle (and add ) more than one journal entry per day.
+Added option for a journal title.
+
+Added info about the calendar, the item belongs to, to the event/todo/journal viewer. 
+
 ********** VERSION 2.1.10 ************
 
 KO/Pi:
 Importing Birthdays will now create another file resource "Birthdays" and import the birthday data from KA/Pi into that file.
 When a multidayevent is selected in monthview all occurences of this event in the monthview are now hightlighted.
 Fixed a bug in searching for a small timerange, i.e. one day.
 
 KA/Pi:
 Fixed two problems in csv export.
 Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi.
 
 ********** VERSION 2.1.9 ************
 
 KO/Pi:
 Fixed some problems of the new search options in the search dialog.
 Fixed some problems in the new resource config options.
 Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page.
 Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown:
 Now you can click on the bottom/top of an allday agenda item or on the left/right side of an agenda item to get the "new todo/new event" popup.
 
 Fixed a problem in recurrence range in syncing with DTM.
 
 KA/Pi:
 Made it posiible to show in the contact overview the details of all data available for that contact( e.g. office, spouse, children, nickname ...)
 
 PwM/Pi:
 Added "sec" to the timeout config settings to make it clear the timeout values are seconds.
 
 ********** VERSION 2.1.8 ************
 
 KO/Pi:
 Added info about the completion state of a todo in the ListView/Searchdialog.
 If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
 Fixed some updating problems when changing the filter.
 
 KA/Pi:
 In the addressee selection dialog now the formatted name is shown, if not empty.
 Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category.
 Now in the addressee selection dialog a selected contact is remove with a single click from the selected list.
 
 Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored.
 Fixed the sorting for size in the file selector on the Z.
 
 Changed the color selection dialog on the Zaurus to a more user friendly version.
 
 ********** VERSION 2.1.7 ************
 
 KO/Pi:
 Fixed several problems in the new Resource handling.
 Added more options to the search dialog. 
 Fixed a problem in the Month view.  
 Added more options to the dialog when setting a todo to stopped.     
 
 Fixed two small problems in KO/Pi Alarm applet.
 
 ********** VERSION 2.1.6 ************
 
 This release is for testing only.
 
 KO/Pi:
 Added to the list view (the list view is used in search dialog as well) the possibility to print it.
 Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view.
 Added to the list view the possibility to add all subtodos of selected todos to an export/beam.
 Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout.
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 8c1e5b2..52c5247 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -655,129 +655,129 @@ void KOEventViewer::formatAttendees(Incidence *event)
                         ++a_count;
                         mText += "<IMG src=\"" + NOiconPath + "\">";
                     }
                     mText += "</a>\n";
                 }
             }
             if (a->status() != Attendee::NeedsAction )
                 mText +="[" + a->statusStr() + "] ";
             if (a->role() == Attendee::Chair )
                 mText +="(" + a->roleStr().left(1) + ".)";
         }
         mText.append("</li></ul>");
         if ( (a_count+a_count_nr) > 1 ) {
                 mText += "<a href=\"mailto:ALL\">";
                 mText += i18n( "Mail to all" );
                 mText += "</a> ( ";
                 mText += "<IMG src=\"" + iconPath + "\">";
                 mText += i18n( " and " );
                 mText += "<IMG src=\"" + NOiconPath + "\"> )";
                 mText += "<br>\n";
 
 
         }
         if ( a_count_nr > 1 ) {
                 mText += "<a href=\"mailto:RSVP\">";
                 mText += i18n( "Mail to selected" );
                 mText += "</a> ( ";
                 mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath );
                 mText += "<br>\n";
         }
     }
 
 }
 void KOEventViewer::appendJournal(Journal *jour, int mode )
 { 
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     if (mode == 0 ) {
         addTag("h2",i18n("Journal from: "));
     }
     else {
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +i18n("Journal from: "));
         } else {
             addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); 
         } 
     }
     topLevelWidget()->setCaption("Journal Viewer");
     mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); 
     if (!jour->summary().isEmpty()) {
         addTag("b",i18n(" Title: ") + deTag(jour->summary()));
     }
     formatReadOnly(jour);
     addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) );
    
     if (!jour->description().isEmpty()) {
         addTag("p",deTag(jour->description()));
     }
     setText(mText);
 }
 
 void KOEventViewer::formatReadOnly(Incidence *event)
 {
     int id = event->calID();
     if ( id > 1 ) {
-        addTag("p", i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName );
+        addTag("p", "<em>("+i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName + ")</em>");
     }
     if (event->isReadOnly()) {
         addTag("p","<em>(" + i18n("read-only") + ")</em>");
     }
 }
 void KOEventViewer::setSyncMode( bool b )
 {
     mSyncMode = b;
 }
 
 void KOEventViewer::setTodo(Todo *event, bool clearV )
 {
     if ( clearV )
         clearEvents();
     if ( mSyncMode ) {
         if ( clearV )
             appendTodo(event,1 );
         else
             appendTodo(event,2);
     } else
         appendTodo(event);
 }
 void KOEventViewer::setJournal(Journal *event, bool clearV )
 {
     if ( clearV )
         clearEvents();
     if ( mSyncMode ) {
         if ( clearV )
             appendJournal(event, 1); 
         else
             appendJournal(event, 2); 
     } else
         appendJournal(event);
 }
 
 void KOEventViewer::setEvent(Event *event)
 {
     clearEvents();
     if ( mSyncMode )
         appendEvent(event, 1);
     else
         appendEvent(event);
 }
 
 void KOEventViewer::addEvent(Event *event)
 {  
     if ( mSyncMode )
         appendEvent(event, 2);
     else
         appendEvent(event);
 }
 
 void KOEventViewer::clearEvents(bool now)
 {
     mText = "";
     if (now) setText(mText);
 }
 
 void KOEventViewer::addText(QString text)
 {
     mText.append(text);
     setText(mText);
 }
 QString KOEventViewer::deTag(QString text)