summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-06-30 11:54:09 (UTC)
committer zautrix <zautrix>2005-06-30 11:54:09 (UTC)
commit13eb32c82e736b033435e596111b7b0f3fe75608 (patch) (side-by-side diff)
treeeef906423ff08d368b6a803e6d8ae4b919936ca3 /korganizer
parentb03b54ce54c1391db8979db0df1369e1c68656fa (diff)
downloadkdepimpi-13eb32c82e736b033435e596111b7b0f3fe75608.zip
kdepimpi-13eb32c82e736b033435e596111b7b0f3fe75608.tar.gz
kdepimpi-13eb32c82e736b033435e596111b7b0f3fe75608.tar.bz2
fixx
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeditorgeneral.cpp5
-rw-r--r--korganizer/kolistview.cpp11
2 files changed, 11 insertions, 5 deletions
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 50a04ea..5c94f62 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -161,3 +161,2 @@ void KOEditorGeneral::selectedCatPopup( int index )
{
- qDebug("i %d c %d ", index, KOPrefs::instance()->mCustomCategories.count());
QStringList categories = QStringList::split (",", mCategoriesLabel->text());
@@ -175,3 +174,3 @@ void KOEditorGeneral::selectedCatPopup( int index )
}
- mCategoriesLabel->setText( categories.join(",") );
+ setCategories( categories.join(",") );
}
@@ -400,2 +399,4 @@ 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
@@ -669,3 +669,8 @@ void KOListView::saveDescriptionToFile()
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);
@@ -680,2 +685,4 @@ void KOListView::saveDescriptionToFile()
text += incidence->summary();
+ if ( !incidence->location().isEmpty() )
+ text +="\n(" + i18n("Location: ") + incidence->location()+ ")";
if ( incidence->hasStartDate() )
@@ -683,4 +690,2 @@ void KOListView::saveDescriptionToFile()
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();