summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-29 12:54:34 (UTC)
committer zautrix <zautrix>2005-06-29 12:54:34 (UTC)
commitf29d4de96b6fd334ff64f11731f5d4899b69f124 (patch) (side-by-side diff)
tree389555e0e180443d946174b5e97b153047935d16
parent4c19dcc4e5b45d9cf04c91af82f00b764b01e985 (diff)
downloadkdepimpi-f29d4de96b6fd334ff64f11731f5d4899b69f124.zip
kdepimpi-f29d4de96b6fd334ff64f11731f5d4899b69f124.tar.gz
kdepimpi-f29d4de96b6fd334ff64f11731f5d4899b69f124.tar.bz2
nf
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt9
-rw-r--r--korganizer/koeventviewer.cpp2
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,18 +1,27 @@
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.
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 8c1e5b2..52c5247 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -703,33 +703,33 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
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 )