summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/journalentry.cpp7
-rw-r--r--korganizer/koeventviewer.cpp12
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
@@ -183,26 +183,31 @@ void JournalEntry::toggleShowJournal()
183 emit showJournalOnly( mJournal ); 183 emit showJournalOnly( mJournal );
184} 184}
185void JournalEntry::setShowOnly() 185void JournalEntry::setShowOnly()
186{ 186{
187 showOnlyMode = true; 187 showOnlyMode = true;
188 mEditor->setFocus(); 188 mEditor->setFocus();
189} 189}
190void JournalEntry::setJournal(Journal *journal) 190void JournalEntry::setJournal(Journal *journal)
191{ 191{
192 writeJournal(); 192 writeJournal();
193 193
194 mJournal = journal; 194 mJournal = journal;
195 mTitle->setText(mJournal->summary()); 195 if ( journal->isReadOnly() )
196 mTitle->setText(mJournal->summary()+" ("+i18n("readonly")+")");
197 else
198 mTitle->setText(mJournal->summary());
196 mEditor->setText(mJournal->description()); 199 mEditor->setText(mJournal->description());
200 mTitle->setReadOnly (journal->isReadOnly() );
201 mEditor->setReadOnly ( journal->isReadOnly() );
197 int id = mJournal->calID(); 202 int id = mJournal->calID();
198 203
199 QString calname = KOPrefs::instance()->getCalendar( id )->mName; 204 QString calname = KOPrefs::instance()->getCalendar( id )->mName;
200 mTitleLabel->setText( " (" + calname +")"); 205 mTitleLabel->setText( " (" + calname +")");
201 206
202 mDirty = false; 207 mDirty = false;
203} 208}
204 209
205Journal *JournalEntry::journal() const 210Journal *JournalEntry::journal() const
206{ 211{
207 return mJournal; 212 return mJournal;
208} 213}
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index dcbb99f..8c1e5b2 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -690,37 +690,43 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
690 bool shortDate = KOPrefs::instance()->mShortDateInViewer; 690 bool shortDate = KOPrefs::instance()->mShortDateInViewer;
691 if (mode == 0 ) { 691 if (mode == 0 ) {
692 addTag("h2",i18n("Journal from: ")); 692 addTag("h2",i18n("Journal from: "));
693 } 693 }
694 else { 694 else {
695 if ( mode == 1 ) { 695 if ( mode == 1 ) {
696 addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); 696 addTag("h2",i18n( "Local: " ) +i18n("Journal from: "));
697 } else { 697 } else {
698 addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); 698 addTag("h2",i18n( "Remote: " ) +i18n("Journal from: "));
699 } 699 }
700 } 700 }
701 topLevelWidget()->setCaption("Journal Viewer"); 701 topLevelWidget()->setCaption("Journal Viewer");
702 mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); 702 mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer)));
703 addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) );
704 if (!jour->summary().isEmpty()) { 703 if (!jour->summary().isEmpty()) {
705 addTag("p",i18n(" Title: ") + deTag(jour->summary())); 704 addTag("b",i18n(" Title: ") + deTag(jour->summary()));
706 } 705 }
706 formatReadOnly(jour);
707 addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) );
708
707 if (!jour->description().isEmpty()) { 709 if (!jour->description().isEmpty()) {
708 addTag("p",deTag(jour->description())); 710 addTag("p",deTag(jour->description()));
709 } 711 }
710 setText(mText); 712 setText(mText);
711} 713}
712 714
713void KOEventViewer::formatReadOnly(Incidence *event) 715void KOEventViewer::formatReadOnly(Incidence *event)
714{ 716{
717 int id = event->calID();
718 if ( id > 1 ) {
719 addTag("p", i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName );
720 }
715 if (event->isReadOnly()) { 721 if (event->isReadOnly()) {
716 addTag("p","<em>(" + i18n("read-only") + ")</em>"); 722 addTag("p","<em>(" + i18n("read-only") + ")</em>");
717 } 723 }
718} 724}
719void KOEventViewer::setSyncMode( bool b ) 725void KOEventViewer::setSyncMode( bool b )
720{ 726{
721 mSyncMode = b; 727 mSyncMode = b;
722} 728}
723 729
724void KOEventViewer::setTodo(Todo *event, bool clearV ) 730void KOEventViewer::setTodo(Todo *event, bool clearV )
725{ 731{
726 if ( clearV ) 732 if ( clearV )