author | zautrix <zautrix> | 2005-06-30 08:04:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-30 08:04:41 (UTC) |
commit | 00e631189f1dca0d596b6ce5816f2fcde9124bd7 (patch) (unidiff) | |
tree | a6e770eef02b128663b3090ec4b3f9c3ac22715f | |
parent | 0bcf4379652b763423d0c1843cb8ab8945b798bd (diff) | |
download | kdepimpi-00e631189f1dca0d596b6ce5816f2fcde9124bd7.zip kdepimpi-00e631189f1dca0d596b6ce5816f2fcde9124bd7.tar.gz kdepimpi-00e631189f1dca0d596b6ce5816f2fcde9124bd7.tar.bz2 |
j fix
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
-rw-r--r-- | korganizer/journalentry.cpp | 2 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 5e2180f..2977795 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1418,55 +1418,55 @@ | |||
1418 | { "Sorry, the file \n%1\nis already loaded!\nPlease choose another file!","Sorry, die Datei \n%1\nist schon geladen!\nBitte wählen Sie eine andere!" }, | 1418 | { "Sorry, the file \n%1\nis already loaded!\nPlease choose another file!","Sorry, die Datei \n%1\nist schon geladen!\nBitte wählen Sie eine andere!" }, |
1419 | { "Choose Color","Wähle Farbe" }, | 1419 | { "Choose Color","Wähle Farbe" }, |
1420 | { " OK "," OK " }, | 1420 | { " OK "," OK " }, |
1421 | { " Cancel "," Abbrechen " }, | 1421 | { " Cancel "," Abbrechen " }, |
1422 | { "Matching items will be added to list","Passende werden zur Liste hinzugefügt" }, | 1422 | { "Matching items will be added to list","Passende werden zur Liste hinzugefügt" }, |
1423 | { "Matching items will be removed from list","Passende werden von der Liste entfernt" }, | 1423 | { "Matching items will be removed from list","Passende werden von der Liste entfernt" }, |
1424 | { "Search on displayed list only","Suche auf der dargestellten Liste" }, | 1424 | { "Search on displayed list only","Suche auf der dargestellten Liste" }, |
1425 | { "List will be cleared before search","Liste wird vor der Suche gelöscht" }, | 1425 | { "List will be cleared before search","Liste wird vor der Suche gelöscht" }, |
1426 | { "<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>","<center>%1</center> <center>ist nicht am Laufen. Möchten Sie den Zustand auf "laufend" setzen?</center>" }, | 1426 | { "<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>","<center>%1</center> <center>ist nicht am Laufen. Möchten Sie den Zustand auf "laufend" setzen?</center>" }, |
1427 | { "%1\nis running!","%1\nist am Laufen!" }, | 1427 | { "%1\nis running!","%1\nist am Laufen!" }, |
1428 | { "Additional Comment:","Zusätzlicher Kommentar:" }, | 1428 | { "Additional Comment:","Zusätzlicher Kommentar:" }, |
1429 | { "Stop and save","Stopp und Speichern" }, | 1429 | { "Stop and save","Stopp und Speichern" }, |
1430 | { "Continue running","Weiter laufen lassen" }, | 1430 | { "Continue running","Weiter laufen lassen" }, |
1431 | { "Stop - do not save","Stopp - nicht Speichern" }, | 1431 | { "Stop - do not save","Stopp - nicht Speichern" }, |
1432 | { "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" }, | 1432 | { "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" }, |
1433 | { "Time mismatch!","Zeiten stimmen nicht!" }, | 1433 | { "Time mismatch!","Zeiten stimmen nicht!" }, |
1434 | { "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" }, | 1434 | { "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" }, |
1435 | { "Yes, stop todo","Ja, stoppe Todo" }, | 1435 | { "Yes, stop todo","Ja, stoppe Todo" }, |
1436 | { "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" }, | 1436 | { "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" }, |
1437 | { "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" }, | 1437 | { "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" }, |
1438 | { "Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.","Bitte wählen Sie den <b>Default-Kalender</b> in dieser Spalte. Neu angelegte oder importierte Einträge werden dem Default-Kalender hinzugefügt." }, | 1438 | { "Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.","Bitte wählen Sie den <b>Default-Kalender</b> in dieser Spalte. Neu angelegte oder importierte Einträge werden dem Default-Kalender hinzugefügt." }, |
1439 | { "Spouse","Ehegatte" }, | 1439 | { "Spouse","Ehegatte" }, |
1440 | { "Notes","Notizen" }, | 1440 | { "Notes","Notizen" }, |
1441 | { "Messanger","Messanger" }, | 1441 | { "Messanger","Messanger" }, |
1442 | { "Assistant","Assistent" }, | 1442 | { "Assistant","Assistent" }, |
1443 | { "Manager","Manager" }, | 1443 | { "Manager","Manager" }, |
1444 | { "Secrecy","Sichtbar" }, | 1444 | { "Secrecy","Sichtbar" }, |
1445 | { "male","männlich" }, | 1445 | { "male","männlich" }, |
1446 | { "female","weiblich" }, | 1446 | { "female","weiblich" }, |
1447 | { "Hide!","Verbergen!" }, | 1447 | { "Hide!","Verbergen!" }, |
1448 | { "Show!","Anzeigen!" }, | 1448 | { "Show!","Anzeigen!" }, |
1449 | { "Details","Details" }, | 1449 | { "Details","Details" }, |
1450 | { "Profession","Beruf" }, | 1450 | { "Profession","Beruf" }, |
1451 | { "Children","Kinder" }, | 1451 | { "Children","Kinder" }, |
1452 | { "Department","Abteilung" }, | 1452 | { "Department","Abteilung" }, |
1453 | { "Backup cancelled","Backup abgebrochen" }, | 1453 | { "Backup cancelled","Backup abgebrochen" }, |
1454 | { "Backup globally disabled","Backup global abgeschaltet" }, | 1454 | { "Backup globally disabled","Backup global abgeschaltet" }, |
1455 | { "Backup succesfully finished","Backup erfolgreich beendet" }, | 1455 | { "Backup succesfully finished","Backup erfolgreich beendet" }, |
1456 | { "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" }, | 1456 | { "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" }, |
1457 | { "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" }, | 1457 | { "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" }, |
1458 | { "Birthdays","Geburtstage" }, | 1458 | { "Birthdays","Geburtstage" }, |
1459 | { "KO/Pi import information!","KO/Pi Import Information!" }, | 1459 | { "KO/Pi import information!","KO/Pi Import Information!" }, |
1460 | { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, | 1460 | { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, |
1461 | { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, | 1461 | { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, |
1462 | { "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" }, | 1462 | { "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" }, |
1463 | { "Reload","Neu laden" }, | 1463 | { "Reload","Neu laden" }, |
1464 | { "Timezone settings","Zeitzoneneinstellung" }, | 1464 | { "Timezone settings","Zeitzoneneinstellung" }, |
1465 | { " Title: "," Titel: " }, | 1465 | { " Title: "," Titel: " }, |
1466 | { "","" }, | 1466 | { "Journal from: ","Journal vom: " }, |
1467 | { "","" }, | 1467 | { "","" }, |
1468 | { "","" }, | 1468 | { "","" }, |
1469 | { "","" }, | 1469 | { "","" }, |
1470 | { "","" }, | 1470 | { "","" }, |
1471 | { "","" }, | 1471 | { "","" }, |
1472 | { "","" }, \ No newline at end of file | 1472 | { "","" }, \ No newline at end of file |
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 3c01eeb..9e2c902 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -23,97 +23,97 @@ | |||
23 | 23 | ||
24 | // | 24 | // |
25 | // Journal Entry | 25 | // Journal Entry |
26 | 26 | ||
27 | #include <qlabel.h> | 27 | #include <qlabel.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qvbox.h> | 29 | #include <qvbox.h> |
30 | #include <qfile.h> | 30 | #include <qfile.h> |
31 | #include <qdir.h> | 31 | #include <qdir.h> |
32 | #include <qtextstream.h> | 32 | #include <qtextstream.h> |
33 | #include <qtextcodec.h> | 33 | #include <qtextcodec.h> |
34 | #include <qpixmap.h> | 34 | #include <qpixmap.h> |
35 | #include <qpushbutton.h> | 35 | #include <qpushbutton.h> |
36 | #include <qapplication.h> | 36 | #include <qapplication.h> |
37 | 37 | ||
38 | #include <kdebug.h> | 38 | #include <kdebug.h> |
39 | #include <kglobal.h> | 39 | #include <kglobal.h> |
40 | #include <klocale.h> | 40 | #include <klocale.h> |
41 | #include <ktextedit.h> | 41 | #include <ktextedit.h> |
42 | #include <kfiledialog.h> | 42 | #include <kfiledialog.h> |
43 | #include <kmessagebox.h> | 43 | #include <kmessagebox.h> |
44 | #include "koprefs.h" | 44 | #include "koprefs.h" |
45 | #include <klineedit.h> | 45 | #include <klineedit.h> |
46 | 46 | ||
47 | #include <libkcal/journal.h> | 47 | #include <libkcal/journal.h> |
48 | #include <libkcal/calendarresources.h> | 48 | #include <libkcal/calendarresources.h> |
49 | #include <libkcal/resourcecalendar.h> | 49 | #include <libkcal/resourcecalendar.h> |
50 | #include <kresources/resourceselectdialog.h> | 50 | #include <kresources/resourceselectdialog.h> |
51 | 51 | ||
52 | #include "journalentry.h" | 52 | #include "journalentry.h" |
53 | //#include "journalentry.moc" | 53 | //#include "journalentry.moc" |
54 | #ifndef DESKTOP_VERSION | 54 | #ifndef DESKTOP_VERSION |
55 | #include <qpe/qpeapplication.h> | 55 | #include <qpe/qpeapplication.h> |
56 | #endif | 56 | #endif |
57 | JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | 57 | JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : |
58 | QFrame(parent) | 58 | QFrame(parent) |
59 | { | 59 | { |
60 | heiHint = QApplication::desktop()->height() / 5 ; | 60 | heiHint = QApplication::desktop()->height() / 5 ; |
61 | showOnlyMode = false; | 61 | showOnlyMode = false; |
62 | mCalendar = calendar; | 62 | mCalendar = calendar; |
63 | mJournal = 0; | 63 | mJournal = 0; |
64 | visibleMode = true; | 64 | visibleMode = true; |
65 | QHBox * vb = new QHBox ( this ); | 65 | QHBox * vb = new QHBox ( this ); |
66 | QPixmap iconp; | 66 | QPixmap iconp; |
67 | 67 | ||
68 | QPushButton * toggleJournal = new QPushButton( vb ); | 68 | QPushButton * toggleJournal = new QPushButton( vb ); |
69 | iconp = SmallIcon("1updownarrow"); | 69 | iconp = SmallIcon("1updownarrow"); |
70 | toggleJournal->setPixmap (iconp ) ; | 70 | toggleJournal->setPixmap (iconp ) ; |
71 | new QLabel(i18n(" Title: "),vb); | 71 | new QLabel(" "+i18n("Title: "),vb); |
72 | mTitle = new KLineEdit ( vb ); | 72 | mTitle = new KLineEdit ( vb ); |
73 | mTitleLabel = new QLabel(i18n("Title"),vb); | 73 | mTitleLabel = new QLabel(i18n("Title"),vb); |
74 | mTitleLabel->setMargin(0); | 74 | mTitleLabel->setMargin(0); |
75 | mTitleLabel->setAlignment(AlignCenter); | 75 | mTitleLabel->setAlignment(AlignCenter); |
76 | QPushButton * loadTemplate = new QPushButton( vb ); | 76 | QPushButton * loadTemplate = new QPushButton( vb ); |
77 | QPushButton * saveTemplate = new QPushButton( vb ); | 77 | QPushButton * saveTemplate = new QPushButton( vb ); |
78 | if ( QApplication::desktop()->width() < 321 ) | 78 | if ( QApplication::desktop()->width() < 321 ) |
79 | iconp = SmallIcon("fileexport16"); | 79 | iconp = SmallIcon("fileexport16"); |
80 | else | 80 | else |
81 | iconp = SmallIcon("fileexport"); | 81 | iconp = SmallIcon("fileexport"); |
82 | saveTemplate->setPixmap (iconp ) ; | 82 | saveTemplate->setPixmap (iconp ) ; |
83 | int size = saveTemplate->sizeHint().height(); | 83 | int size = saveTemplate->sizeHint().height(); |
84 | if ( QApplication::desktop()->width() < 321 ) | 84 | if ( QApplication::desktop()->width() < 321 ) |
85 | iconp = SmallIcon("fileimport16"); | 85 | iconp = SmallIcon("fileimport16"); |
86 | else | 86 | else |
87 | iconp = SmallIcon("fileimport"); | 87 | iconp = SmallIcon("fileimport"); |
88 | loadTemplate->setPixmap (iconp ) ; | 88 | loadTemplate->setPixmap (iconp ) ; |
89 | loadTemplate->setFixedSize( size, size ); | 89 | loadTemplate->setFixedSize( size, size ); |
90 | saveTemplate->setFixedSize( size, size ); | 90 | saveTemplate->setFixedSize( size, size ); |
91 | toggleJournal->setFixedSize( size , size ); | 91 | toggleJournal->setFixedSize( size , size ); |
92 | mEditor = new KTextEdit(this); | 92 | mEditor = new KTextEdit(this); |
93 | #ifndef DESKTOP_VERSION | 93 | #ifndef DESKTOP_VERSION |
94 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); | 94 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); |
95 | #endif | 95 | #endif |
96 | mEditor->setWordWrap( KTextEdit::WidgetWidth ); | 96 | mEditor->setWordWrap( KTextEdit::WidgetWidth ); |
97 | QBoxLayout *topLayout = new QVBoxLayout(this); | 97 | QBoxLayout *topLayout = new QVBoxLayout(this); |
98 | topLayout->addWidget(vb); | 98 | topLayout->addWidget(vb); |
99 | topLayout->addWidget(mEditor); | 99 | topLayout->addWidget(mEditor); |
100 | mEditor->installEventFilter(this); | 100 | mEditor->installEventFilter(this); |
101 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); | 101 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); |
102 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); | 102 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); |
103 | connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); | 103 | connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); |
104 | } | 104 | } |
105 | 105 | ||
106 | JournalEntry::~JournalEntry() | 106 | JournalEntry::~JournalEntry() |
107 | { | 107 | { |
108 | //qDebug("JournalEntry::~JournalEntry() "); | 108 | //qDebug("JournalEntry::~JournalEntry() "); |
109 | } | 109 | } |
110 | QSize JournalEntry::sizeHint() const | 110 | QSize JournalEntry::sizeHint() const |
111 | { | 111 | { |
112 | return QSize ( 240, heiHint ); | 112 | return QSize ( 240, heiHint ); |
113 | } | 113 | } |
114 | void JournalEntry::slotSaveTemplate() | 114 | void JournalEntry::slotSaveTemplate() |
115 | { | 115 | { |
116 | QString fileName =locateLocal( "templates", "journals" ); | 116 | QString fileName =locateLocal( "templates", "journals" ); |
117 | QDir t_dir; | 117 | QDir t_dir; |
118 | if ( !t_dir.exists(fileName) ) | 118 | if ( !t_dir.exists(fileName) ) |
119 | t_dir.mkdir ( fileName ); | 119 | t_dir.mkdir ( fileName ); |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 52c5247..d3b2ccf 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -643,113 +643,113 @@ void KOEventViewer::formatAttendees(Incidence *event) | |||
643 | mText += "</a>\n"; | 643 | mText += "</a>\n"; |
644 | #endif | 644 | #endif |
645 | 645 | ||
646 | 646 | ||
647 | if (!a->email().isEmpty()) { | 647 | if (!a->email().isEmpty()) { |
648 | if (iconPath) { | 648 | if (iconPath) { |
649 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; | 649 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; |
650 | if ( a->RSVP() ) { | 650 | if ( a->RSVP() ) { |
651 | ++a_count_nr; | 651 | ++a_count_nr; |
652 | mText += "<IMG src=\"" + iconPath + "\">"; | 652 | mText += "<IMG src=\"" + iconPath + "\">"; |
653 | } | 653 | } |
654 | else { | 654 | else { |
655 | ++a_count; | 655 | ++a_count; |
656 | mText += "<IMG src=\"" + NOiconPath + "\">"; | 656 | mText += "<IMG src=\"" + NOiconPath + "\">"; |
657 | } | 657 | } |
658 | mText += "</a>\n"; | 658 | mText += "</a>\n"; |
659 | } | 659 | } |
660 | } | 660 | } |
661 | if (a->status() != Attendee::NeedsAction ) | 661 | if (a->status() != Attendee::NeedsAction ) |
662 | mText +="[" + a->statusStr() + "] "; | 662 | mText +="[" + a->statusStr() + "] "; |
663 | if (a->role() == Attendee::Chair ) | 663 | if (a->role() == Attendee::Chair ) |
664 | mText +="(" + a->roleStr().left(1) + ".)"; | 664 | mText +="(" + a->roleStr().left(1) + ".)"; |
665 | } | 665 | } |
666 | mText.append("</li></ul>"); | 666 | mText.append("</li></ul>"); |
667 | if ( (a_count+a_count_nr) > 1 ) { | 667 | if ( (a_count+a_count_nr) > 1 ) { |
668 | mText += "<a href=\"mailto:ALL\">"; | 668 | mText += "<a href=\"mailto:ALL\">"; |
669 | mText += i18n( "Mail to all" ); | 669 | mText += i18n( "Mail to all" ); |
670 | mText += "</a> ( "; | 670 | mText += "</a> ( "; |
671 | mText += "<IMG src=\"" + iconPath + "\">"; | 671 | mText += "<IMG src=\"" + iconPath + "\">"; |
672 | mText += i18n( " and " ); | 672 | mText += i18n( " and " ); |
673 | mText += "<IMG src=\"" + NOiconPath + "\"> )"; | 673 | mText += "<IMG src=\"" + NOiconPath + "\"> )"; |
674 | mText += "<br>\n"; | 674 | mText += "<br>\n"; |
675 | 675 | ||
676 | 676 | ||
677 | } | 677 | } |
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 | } |
688 | void KOEventViewer::appendJournal(Journal *jour, int mode ) | 688 | void KOEventViewer::appendJournal(Journal *jour, int mode ) |
689 | { | 689 | { |
690 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 690 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
691 | QString text_d = i18n("Journal from: "); | ||
692 | if ( !jour->summary().isEmpty() ) | ||
693 | text_d = jour->summary(); | ||
691 | if (mode == 0 ) { | 694 | if (mode == 0 ) { |
692 | addTag("h2",i18n("Journal from: ")); | 695 | addTag("h2", text_d ); |
693 | } | 696 | } |
694 | else { | 697 | else { |
695 | if ( mode == 1 ) { | 698 | if ( mode == 1 ) { |
696 | addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); | 699 | addTag("h3",i18n( "Local: " ) + text_d ); |
697 | } else { | 700 | } else { |
698 | addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); | 701 | addTag("h3",i18n( "Remote: " ) + text_d ); |
699 | } | 702 | } |
700 | } | 703 | } |
701 | topLevelWidget()->setCaption("Journal Viewer"); | 704 | topLevelWidget()->setCaption("Journal Viewer"); |
702 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); | 705 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); |
703 | if (!jour->summary().isEmpty()) { | ||
704 | addTag("b",i18n(" Title: ") + deTag(jour->summary())); | ||
705 | } | ||
706 | formatReadOnly(jour); | 706 | formatReadOnly(jour); |
707 | addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); | 707 | addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); |
708 | 708 | ||
709 | if (!jour->description().isEmpty()) { | 709 | if (!jour->description().isEmpty()) { |
710 | addTag("p",deTag(jour->description())); | 710 | addTag("p",deTag(jour->description())); |
711 | } | 711 | } |
712 | setText(mText); | 712 | setText(mText); |
713 | } | 713 | } |
714 | 714 | ||
715 | void KOEventViewer::formatReadOnly(Incidence *event) | 715 | void KOEventViewer::formatReadOnly(Incidence *event) |
716 | { | 716 | { |
717 | int id = event->calID(); | 717 | int id = event->calID(); |
718 | if ( id > 1 ) { | 718 | if ( id > 1 ) { |
719 | addTag("p", "<em>("+i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName + ")</em>"); | 719 | addTag("p", "<em>("+i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName + ")</em>"); |
720 | } | 720 | } |
721 | if (event->isReadOnly()) { | 721 | if (event->isReadOnly()) { |
722 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); | 722 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); |
723 | } | 723 | } |
724 | } | 724 | } |
725 | void KOEventViewer::setSyncMode( bool b ) | 725 | void KOEventViewer::setSyncMode( bool b ) |
726 | { | 726 | { |
727 | mSyncMode = b; | 727 | mSyncMode = b; |
728 | } | 728 | } |
729 | 729 | ||
730 | void KOEventViewer::setTodo(Todo *event, bool clearV ) | 730 | void KOEventViewer::setTodo(Todo *event, bool clearV ) |
731 | { | 731 | { |
732 | if ( clearV ) | 732 | if ( clearV ) |
733 | clearEvents(); | 733 | clearEvents(); |
734 | if ( mSyncMode ) { | 734 | if ( mSyncMode ) { |
735 | if ( clearV ) | 735 | if ( clearV ) |
736 | appendTodo(event,1 ); | 736 | appendTodo(event,1 ); |
737 | else | 737 | else |
738 | appendTodo(event,2); | 738 | appendTodo(event,2); |
739 | } else | 739 | } else |
740 | appendTodo(event); | 740 | appendTodo(event); |
741 | } | 741 | } |
742 | void KOEventViewer::setJournal(Journal *event, bool clearV ) | 742 | void KOEventViewer::setJournal(Journal *event, bool clearV ) |
743 | { | 743 | { |
744 | if ( clearV ) | 744 | if ( clearV ) |
745 | clearEvents(); | 745 | clearEvents(); |
746 | if ( mSyncMode ) { | 746 | if ( mSyncMode ) { |
747 | if ( clearV ) | 747 | if ( clearV ) |
748 | appendJournal(event, 1); | 748 | appendJournal(event, 1); |
749 | else | 749 | else |
750 | appendJournal(event, 2); | 750 | appendJournal(event, 2); |
751 | } else | 751 | } else |
752 | appendJournal(event); | 752 | appendJournal(event); |
753 | } | 753 | } |
754 | 754 | ||
755 | void KOEventViewer::setEvent(Event *event) | 755 | void KOEventViewer::setEvent(Event *event) |