| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
| -rw-r--r-- | korganizer/koeditorgeneral.cpp | 5 | ||||
| -rw-r--r-- | korganizer/kolistview.cpp | 11 |
3 files changed, 13 insertions, 7 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 2977795..3daf215 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1464,8 +1464,8 @@ { "Timezone settings","Zeitzoneneinstellung" }, { "Title: ","Titel: " }, { "Journal from: ","Journal vom: " }, -{ "","" }, -{ "","" }, +{ "Journal: %1 from ","Journal: %1 vom " }, +{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, { "","" }, { "","" }, { "","" }, diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 50a04ea..5c94f62 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -159,7 +159,6 @@ void KOEditorGeneral::showCatPopup() } void KOEditorGeneral::selectedCatPopup( int index ) { - qDebug("i %d c %d ", index, KOPrefs::instance()->mCustomCategories.count()); QStringList categories = QStringList::split (",", mCategoriesLabel->text()); QString colcat = categories.first(); if (categories.find (KOPrefs::instance()->mCustomCategories[index]) != categories.end ()) @@ -173,7 +172,7 @@ void KOEditorGeneral::selectedCatPopup( int index ) categories.prepend( colcat ); } } - mCategoriesLabel->setText( categories.join(",") ); + setCategories( categories.join(",") ); } void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) @@ -398,6 +397,8 @@ void KOEditorGeneral::alarmDisable(bool disable) void KOEditorGeneral::setCategories(const QString &str) { + QString tt = str; + QToolTip::add( mCategoriesLabel, i18n("<b>Click here to edit categories: </b>") +"<em>"+tt.replace( QRegExp(","),", ")+"</em>"); mCategoriesLabel->setText(str); } diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 0c1ac7a..8f17e6e 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -667,7 +667,12 @@ void KOListView::saveDescriptionToFile() while ( incidence ) { if ( incidence->typeID() == journalID ) { text += "\n************************************\n"; - text += i18n("Journal from: ") +incidence->dtStartDateStr( false ); + if ( !incidence->summary().isEmpty() ) + text += i18n("Journal: %1 from ").arg( incidence->summary() ) +incidence->dtStartDateStr( false ); + else + text += i18n("Journal from: ") +incidence->dtStartDateStr( false ); + if ( !incidence->location().isEmpty() ) + text +="\n(" + i18n("Location: ") + incidence->location()+ ")"; text +="\n" + i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); text +="\n" + i18n("Description: ") + "\n"+ incidence->description(); ++icount; @@ -678,11 +683,11 @@ void KOListView::saveDescriptionToFile() if ( incidence->typeID() == todoID ) text += i18n("To-Do: "); text += incidence->summary(); + if ( !incidence->location().isEmpty() ) + text +="\n(" + i18n("Location: ") + incidence->location()+ ")"; if ( incidence->hasStartDate() ) text +="\n"+ i18n("Start Date: ") + incidence->dtStartStr( false ); text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); - if ( !incidence->location().isEmpty() ) - text += "\n" +i18n("Location: ") + incidence->location(); text += "\n" + i18n("Description: ") + "\n" + incidence->description(); ++icount; |