-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 9 | ||||
-rw-r--r-- | korganizer/koagendaitem.cpp | 5 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 17 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 5 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 6 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 8 | ||||
-rw-r--r-- | korganizer/koprefs.h | 8 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 32 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 5 | ||||
-rw-r--r-- | libkcal/kincidenceformatter.cpp | 32 | ||||
-rw-r--r-- | libkcal/kincidenceformatter.h | 3 |
11 files changed, 117 insertions, 13 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 6b93606..ab6d220 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1275,9 +1275,18 @@ { "List week","Listenwochenansicht" }, { "Next Week","Nächste Woche" }, { "Previous Week","Vorherige Woche" }, { "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." }, +{ "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" }, +{ "Details","Details" }, +{ "Created time","Erstellt Zeit" }, +{ "Last modified time","Geändert Zeit" }, +{ "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" }, +{ "View Options","Anzeige Optionen" }, +{ "<b>Created: ","<b>Erstellt am: " }, +{ "<b>Last modified: ","<b>Zuletzt geändert am: " }, { "","" }, { "","" }, { "","" }, { "","" }, { "","" },
\ No newline at end of file + diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 6a312b3..cead612 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -89,9 +89,12 @@ KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool } QString KOAgendaItem::getWhatsThisText() { if ( mIncidence ) - return KIncidenceFormatter::instance()->getFormattedText( mIncidence ); + return KIncidenceFormatter::instance()->getFormattedText( mIncidence, + KOPrefs::instance()->mWTshowDetails, + KOPrefs::instance()->mWTshowCreated, + KOPrefs::instance()->mWTshowChanged); return "KOAgendaItem::getWhatsThisText()::internal error"; } void KOAgendaItem::init ( Incidence *incidence, QDate qd ) { diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index f6c9624..d87938a 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -338,18 +338,31 @@ void KOEventViewer::appendEvent(Event *event, int mode ) } addTag("b",i18n("Access: ")); mText.append(event->secrecyStr()+"<br>"); + + + if ( KOPrefs::instance()->mEVshowDetails ) { if (!event->description().isEmpty()) { addTag("p",i18n("<b>Details: </b>")); addTag("p",event->description()); } - + } formatCategories(event); formatReadOnly(event); formatAttendees(event); + if ( KOPrefs::instance()->mEVshowCreated ) { + addTag("p",i18n("<b>Created: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); + + } + if ( KOPrefs::instance()->mEVshowChanged ) { + addTag("p",i18n("<b>Last modified: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); + + } setText(mText); //QWhatsThis::add(this,mText); } @@ -417,12 +430,14 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) mMailSubject += i18n(" - " )+event->dtDueStr( true ); } addTag("b",i18n("Access: ")); mText.append(event->secrecyStr()+"<br>"); + if ( KOPrefs::instance()->mEVshowDetails ) { if (!event->description().isEmpty()) { addTag("p",i18n("<b>Details: </b>")); addTag("p",event->description()); } + } formatCategories(event); mText.append(i18n("<p><b>Priority:</b> %2</p>") diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index d8e940b..1f5afc0 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -324,9 +324,12 @@ KOListView::~KOListView() QString KOListView::getWhatsThisText(QPoint p) { KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p ); if ( item ) - return KIncidenceFormatter::instance()->getFormattedText( item->data() ); + return KIncidenceFormatter::instance()->getFormattedText( item->data(), + KOPrefs::instance()->mWTshowDetails, + KOPrefs::instance()->mWTshowCreated, + KOPrefs::instance()->mWTshowChanged); return i18n("That is the list view" ); } diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index f9bc1ca..2fe80af 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -93,9 +93,12 @@ QString KNoScrollListBox::getWhatsThisText(QPoint p) QListBoxItem* item = itemAt ( p ); if ( ! item ) { return i18n("Click in the cell\nto add an event!"); } - return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence()); + return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence(), + KOPrefs::instance()->mWTshowDetails, + KOPrefs::instance()->mWTshowCreated, + KOPrefs::instance()->mWTshowChanged); } void KNoScrollListBox::keyPressEvent(QKeyEvent *e) { @@ -194,9 +197,8 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s) setText( s ); mIncidence = incidence; mDate = qd; - // QWhatsThis::add(this,KIncidenceFormatter::instance()->getFormattedText( mIncidence )); mRecur = false; mAlarm = false; mReply = false; mInfo = false; diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 5efc247..a91074f 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -290,9 +290,15 @@ KOPrefs::KOPrefs() : addItemStringList( "TodoTemplates", &mTodoTemplates ); addItemInt("DestinationPolicy",&mDestination,standardDestination); - + KPrefs::setCurrentGroup( "ViewOptions" ); + addItemBool("EVshowDetails",&mEVshowDetails,true); + addItemBool("EVshowCreated",&mEVshowCreated,true); + addItemBool("EVshowChanged",&mEVshowChanged,true); + addItemBool("WTshowDetails",&mWTshowDetails,false); + addItemBool("WTshowCreated",&mWTshowCreated,false); + addItemBool("WTshowChanged",&mWTshowChanged,false); } diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index e300067..e4e3dd7 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -268,8 +268,16 @@ class KOPrefs : public KPimPrefs QString mActiveSyncPort; QString mActiveSyncIP; + // settings for eventviewer + bool mEVshowDetails; + bool mEVshowCreated; + bool mEVshowChanged; + bool mWTshowDetails; + bool mWTshowCreated; + bool mWTshowChanged; + private: QDict<QColor> mCategoryColors; QColor mDefaultCategoryColor; diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 452d019..443508d 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -903,8 +903,40 @@ dummy = &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); topLayout->addWidget(dummy->checkBox(),ii++,0); + topFrame = addPage(i18n("View Options"),0,0); + + topLayout = new QGridLayout(topFrame,4,1); + topLayout->setSpacing(spacingHint()); + topLayout->setMargin(marginHint()); + ii = 0; + lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); + topLayout->addWidget(lab ,ii++,0); + + dummy = addWidBool(i18n("Details"), + &(KOPrefs::instance()->mEVshowDetails),topFrame); + topLayout->addWidget(dummy->checkBox(),ii++,0); + dummy = addWidBool(i18n("Created time"), + &(KOPrefs::instance()->mEVshowCreated),topFrame); + topLayout->addWidget(dummy->checkBox(),ii++,0); + dummy = addWidBool(i18n("Last modified time"), + &(KOPrefs::instance()->mEVshowChanged),topFrame); + topLayout->addWidget(dummy->checkBox(),ii++,0); + + + lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); + topLayout->addWidget(lab ,ii++,0); + + dummy = addWidBool(i18n("Details"), + &(KOPrefs::instance()->mWTshowDetails),topFrame); + topLayout->addWidget(dummy->checkBox(),ii++,0); + dummy = addWidBool(i18n("Created time"), + &(KOPrefs::instance()->mWTshowCreated),topFrame); + topLayout->addWidget(dummy->checkBox(),ii++,0); + dummy = addWidBool(i18n("Last modified time"), + &(KOPrefs::instance()->mWTshowChanged),topFrame); + topLayout->addWidget(dummy->checkBox(),ii++,0); topFrame = addPage(i18n("Alarm"),0,0); // DesktopIcon("viewmag",KIcon::SizeMedium)); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 3011458..3483e95 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -555,9 +555,12 @@ KOTodoView::~KOTodoView() QString KOTodoView::getWhatsThisText(QPoint p) { KOTodoViewItem* item = ( KOTodoViewItem* ) mTodoListView->itemAt( p ); if ( item ) - return KIncidenceFormatter::instance()->getFormattedText( item->todo() ); + return KIncidenceFormatter::instance()->getFormattedText( item->todo(), + KOPrefs::instance()->mWTshowDetails, + KOPrefs::instance()->mWTshowCreated, + KOPrefs::instance()->mWTshowChanged); return i18n("That is the todo view" ); } diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp index cc3088a..1751ae3 100644 --- a/libkcal/kincidenceformatter.cpp +++ b/libkcal/kincidenceformatter.cpp @@ -9,15 +9,18 @@ KIncidenceFormatter* KIncidenceFormatter::mInstance = 0; static KStaticDeleter<KIncidenceFormatter> insd; -QString KIncidenceFormatter::getFormattedText( Incidence * inc ) +QString KIncidenceFormatter::getFormattedText( Incidence * inc, bool details, bool created , bool modified ) { // #ifndef QT_NO_INPUTDIALOG // return QInputDialog::getItem( caption, label, items, current, editable ); // #else // return QString::null; // #endif + mDetails = details; + mCreated = created ; + mModified = modified; mText = ""; if ( inc->type() == "Event" ) setEvent((Event *) inc ); else if ( inc->type() == "Todo" ) @@ -137,17 +140,28 @@ void KIncidenceFormatter::setEvent(Event *event) addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); // mText.append(event->secrecyStr()+"<br>"); formatCategories(event); + if ( mDetails ) { if (!event->description().isEmpty()) { addTag("p",i18n("<b>Details: </b>")); addTag("p",event->description()); } - + } formatReadOnly(event); formatAttendees(event); + if ( mCreated ) { + addTag("p",i18n("<b>Created: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); + + } + if ( mModified ) { + addTag("p",i18n("<b>Last modified: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); + + } } void KIncidenceFormatter::setTodo(Todo *event ) @@ -211,19 +225,27 @@ void KIncidenceFormatter::setTodo(Todo *event ) .arg(QString::number(event->priority()))); addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); formatCategories(event); + if ( mDetails ) { if (!event->description().isEmpty()) { addTag("p",i18n("<b>Details: </b>")); addTag("p",event->description()); } - - - + } formatReadOnly(event); formatAttendees(event); + if ( mCreated ) { + addTag("p",i18n("<b>Created: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); } + if ( mModified ) { + addTag("p",i18n("<b>Last modified: ") +" </b>"); + addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); + + } +} void KIncidenceFormatter::setJournal(Journal* ) { diff --git a/libkcal/kincidenceformatter.h b/libkcal/kincidenceformatter.h index 6165a9f..068e6d2 100644 --- a/libkcal/kincidenceformatter.h +++ b/libkcal/kincidenceformatter.h @@ -16,9 +16,9 @@ class KIncidenceFormatter : public QObject public: static KIncidenceFormatter* instance(); KIncidenceFormatter(); ~KIncidenceFormatter(); - QString getFormattedText( Incidence * inc ); + QString getFormattedText( Incidence * inc , bool details = false, bool created = false, bool modified = false ); void setEvent(Event *event); void setTodo(Todo *event ); void setJournal(Journal* ); @@ -32,8 +32,9 @@ class KIncidenceFormatter : public QObject void formatReadOnly(Incidence *event); private: bool mSyncMode; + bool mDetails, mCreated ,mModified; QString mText; Incidence* mCurrentIncidence; static KIncidenceFormatter* mInstance; |