summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-29 12:52:24 (UTC)
committer zautrix <zautrix>2005-06-29 12:52:24 (UTC)
commit4c19dcc4e5b45d9cf04c91af82f00b764b01e985 (patch) (unidiff)
treeb9b6b679c499207c06f74db090ead71bc175866d
parent0d4d5898a32f162dca010db329e02310a14629d5 (diff)
downloadkdepimpi-4c19dcc4e5b45d9cf04c91af82f00b764b01e985.zip
kdepimpi-4c19dcc4e5b45d9cf04c91af82f00b764b01e985.tar.gz
kdepimpi-4c19dcc4e5b45d9cf04c91af82f00b764b01e985.tar.bz2
fixesss
Diffstat (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
@@ -171,50 +171,55 @@ void JournalEntry::setDate(const QDate &date)
171 writeJournal(); 171 writeJournal();
172 int id = mCalendar->defaultCalendar(); 172 int id = mCalendar->defaultCalendar();
173 QString calname = KOPrefs::instance()->getCalendar( id )->mName; 173 QString calname = KOPrefs::instance()->getCalendar( id )->mName;
174 mTitleLabel->setText( " (" + calname +")"); 174 mTitleLabel->setText( " (" + calname +")");
175} 175}
176 176
177void JournalEntry::toggleShowJournal() 177void JournalEntry::toggleShowJournal()
178{ 178{
179 flushEntry(); 179 flushEntry();
180 if ( showOnlyMode ) 180 if ( showOnlyMode )
181 emit showJournalOnly( 0 ); 181 emit showJournalOnly( 0 );
182 else 182 else
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}
209 214
210void JournalEntry::setDirty() 215void JournalEntry::setDirty()
211{ 216{
212 mDirty = true; 217 mDirty = true;
213 218
214// kdDebug() << "JournalEntry::setDirty()" << endl; 219// kdDebug() << "JournalEntry::setDirty()" << endl;
215} 220}
216 221
217void JournalEntry::clear() 222void JournalEntry::clear()
218{ 223{
219 mJournal = 0; 224 mJournal = 0;
220 mEditor->setText(""); 225 mEditor->setText("");
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index dcbb99f..8c1e5b2 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -678,61 +678,67 @@ void KOEventViewer::formatAttendees(Incidence *event)
678 if ( a_count_nr > 1 ) { 678 if ( a_count_nr > 1 ) {
679 mText += "<a href=\"mailto:RSVP\">"; 679 mText += "<a href=\"mailto:RSVP\">";
680 mText += i18n( "Mail to selected" ); 680 mText += i18n( "Mail to selected" );
681 mText += "</a> ( "; 681 mText += "</a> ( ";
682 mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath ); 682 mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath );
683 mText += "<br>\n"; 683 mText += "<br>\n";
684 } 684 }
685 } 685 }
686 686
687} 687}
688void KOEventViewer::appendJournal(Journal *jour, int mode ) 688void KOEventViewer::appendJournal(Journal *jour, int mode )
689{ 689{
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 )
727 clearEvents(); 733 clearEvents();
728 if ( mSyncMode ) { 734 if ( mSyncMode ) {
729 if ( clearV ) 735 if ( clearV )
730 appendTodo(event,1 ); 736 appendTodo(event,1 );
731 else 737 else
732 appendTodo(event,2); 738 appendTodo(event,2);
733 } else 739 } else
734 appendTodo(event); 740 appendTodo(event);
735} 741}
736void KOEventViewer::setJournal(Journal *event, bool clearV ) 742void KOEventViewer::setJournal(Journal *event, bool clearV )
737{ 743{
738 if ( clearV ) 744 if ( clearV )