fixx

3 files changed, 12 insertions, 6 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
@@ -1461,12 +1461,12 @@
 { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, 
 { "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?"" },
 { "Reload","Neu laden" },
 { "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>" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
\ No newline at end of file
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 50a04ea..5c94f62 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -156,13 +156,12 @@ void KOEditorGeneral::showCatPopup()
         if (checkedCategories.find (*it) != checkedCategories.end ()) mCatPopup->setItemChecked (index, true);
         ++index;
     }
 }
 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 ())
       categories.remove (KOPrefs::instance()->mCustomCategories[index]);
     else
         categories.insert (categories.end(), KOPrefs::instance()->mCustomCategories[index]);
@@ -170,13 +169,13 @@ void KOEditorGeneral::selectedCatPopup( int index )
     if ( !colcat.isEmpty() ) {
         if ( categories.find ( colcat ) != categories.end () ) {
             categories.remove( colcat );
             categories.prepend( colcat );
         }
     }
-    mCategoriesLabel->setText( categories.join(",") );
+    setCategories( categories.join(",") );
 }
 
 void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
 {
     QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout );
     mCatPopup = new QPopupMenu ( parent );
@@ -395,12 +394,14 @@ void KOEditorGeneral::alarmDisable(bool disable)
         mAlarmIncrCombo->setEnabled(false);
     }
 }
 
 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);
 }
 
 void KOEditorGeneral::setDefaults(bool allDay)
 {
 #if 0
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 0c1ac7a..8f17e6e 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -664,28 +664,33 @@ void KOListView::saveDescriptionToFile()
                 KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), false);
             Incidence *incidence = delSel.first();
             icount = 0;
             while ( incidence ) {
                 if ( incidence->typeID()  == journalID ) {
                     text += "\n************************************\n";
+                    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;
 
                 } else {
                     if ( !incidence->description().isEmpty() ) {
                         text += "\n************************************\n";
                         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;
 
                     }
                 }
                 incidence = delSel.next();