| author | zautrix <zautrix> | 2005-06-29 12:52:24 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-06-29 12:52:24 (UTC) |
| commit | 4c19dcc4e5b45d9cf04c91af82f00b764b01e985 (patch) (side-by-side diff) | |
| tree | b9b6b679c499207c06f74db090ead71bc175866d | |
| parent | 0d4d5898a32f162dca010db329e02310a14629d5 (diff) | |
| download | kdepimpi-4c19dcc4e5b45d9cf04c91af82f00b764b01e985.zip kdepimpi-4c19dcc4e5b45d9cf04c91af82f00b764b01e985.tar.gz kdepimpi-4c19dcc4e5b45d9cf04c91af82f00b764b01e985.tar.bz2 | |
fixesss
| -rw-r--r-- | korganizer/journalentry.cpp | 7 | ||||
| -rw-r--r-- | korganizer/koeventviewer.cpp | 12 |
2 files changed, 15 insertions, 4 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 05bfd31..232ea58 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -192,8 +192,13 @@ void JournalEntry::setJournal(Journal *journal) writeJournal(); mJournal = journal; - mTitle->setText(mJournal->summary()); + if ( journal->isReadOnly() ) + mTitle->setText(mJournal->summary()+" ("+i18n("readonly")+")"); + else + mTitle->setText(mJournal->summary()); mEditor->setText(mJournal->description()); + mTitle->setReadOnly (journal->isReadOnly() ); + mEditor->setReadOnly ( journal->isReadOnly() ); int id = mJournal->calID(); QString calname = KOPrefs::instance()->getCalendar( id )->mName; diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index dcbb99f..8c1e5b2 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -699,11 +699,13 @@ void KOEventViewer::appendJournal(Journal *jour, int mode ) } } topLevelWidget()->setCaption("Journal Viewer"); - mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); - addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); + mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); if (!jour->summary().isEmpty()) { - addTag("p",i18n(" Title: ") + deTag(jour->summary())); + 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())); } @@ -712,6 +714,10 @@ void KOEventViewer::appendJournal(Journal *jour, int mode ) void KOEventViewer::formatReadOnly(Incidence *event) { + int id = event->calID(); + if ( id > 1 ) { + addTag("p", i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName ); + } if (event->isReadOnly()) { addTag("p","<em>(" + i18n("read-only") + ")</em>"); } |