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) (unidiff)
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
@@ -158,9 +158,8 @@ void KOEditorGeneral::showCatPopup()
158 } 158 }
159} 159}
160void KOEditorGeneral::selectedCatPopup( int index ) 160void KOEditorGeneral::selectedCatPopup( int index )
161{ 161{
162 qDebug("i %d c %d ", index, KOPrefs::instance()->mCustomCategories.count());
163 QStringList categories = QStringList::split (",", mCategoriesLabel->text()); 162 QStringList categories = QStringList::split (",", mCategoriesLabel->text());
164 QString colcat = categories.first(); 163 QString colcat = categories.first();
165 if (categories.find (KOPrefs::instance()->mCustomCategories[index]) != categories.end ()) 164 if (categories.find (KOPrefs::instance()->mCustomCategories[index]) != categories.end ())
166 categories.remove (KOPrefs::instance()->mCustomCategories[index]); 165 categories.remove (KOPrefs::instance()->mCustomCategories[index]);
@@ -172,9 +171,9 @@ void KOEditorGeneral::selectedCatPopup( int index )
172 categories.remove( colcat ); 171 categories.remove( colcat );
173 categories.prepend( colcat ); 172 categories.prepend( colcat );
174 } 173 }
175 } 174 }
176 mCategoriesLabel->setText( categories.join(",") ); 175 setCategories( categories.join(",") );
177} 176}
178 177
179void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) 178void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
180{ 179{
@@ -397,8 +396,10 @@ void KOEditorGeneral::alarmDisable(bool disable)
397} 396}
398 397
399void KOEditorGeneral::setCategories(const QString &str) 398void KOEditorGeneral::setCategories(const QString &str)
400{ 399{
400 QString tt = str;
401 QToolTip::add( mCategoriesLabel, i18n("<b>Click here to edit categories: </b>") +"<em>"+tt.replace( QRegExp(","),", ")+"</em>");
401 mCategoriesLabel->setText(str); 402 mCategoriesLabel->setText(str);
402} 403}
403 404
404void KOEditorGeneral::setDefaults(bool allDay) 405void KOEditorGeneral::setDefaults(bool allDay)
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 0c1ac7a..8f17e6e 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -666,9 +666,14 @@ void KOListView::saveDescriptionToFile()
666 icount = 0; 666 icount = 0;
667 while ( incidence ) { 667 while ( incidence ) {
668 if ( incidence->typeID() == journalID ) { 668 if ( incidence->typeID() == journalID ) {
669 text += "\n************************************\n"; 669 text += "\n************************************\n";
670 text += i18n("Journal from: ") +incidence->dtStartDateStr( false ); 670 if ( !incidence->summary().isEmpty() )
671 text += i18n("Journal: %1 from ").arg( incidence->summary() ) +incidence->dtStartDateStr( false );
672 else
673 text += i18n("Journal from: ") +incidence->dtStartDateStr( false );
674 if ( !incidence->location().isEmpty() )
675 text +="\n(" + i18n("Location: ") + incidence->location()+ ")";
671 text +="\n" + i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); 676 text +="\n" + i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
672 text +="\n" + i18n("Description: ") + "\n"+ incidence->description(); 677 text +="\n" + i18n("Description: ") + "\n"+ incidence->description();
673 ++icount; 678 ++icount;
674 679
@@ -677,13 +682,13 @@ void KOListView::saveDescriptionToFile()
677 text += "\n************************************\n"; 682 text += "\n************************************\n";
678 if ( incidence->typeID() == todoID ) 683 if ( incidence->typeID() == todoID )
679 text += i18n("To-Do: "); 684 text += i18n("To-Do: ");
680 text += incidence->summary(); 685 text += incidence->summary();
686 if ( !incidence->location().isEmpty() )
687 text +="\n(" + i18n("Location: ") + incidence->location()+ ")";
681 if ( incidence->hasStartDate() ) 688 if ( incidence->hasStartDate() )
682 text +="\n"+ i18n("Start Date: ") + incidence->dtStartStr( false ); 689 text +="\n"+ i18n("Start Date: ") + incidence->dtStartStr( false );
683 text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); 690 text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
684 if ( !incidence->location().isEmpty() )
685 text += "\n" +i18n("Location: ") + incidence->location();
686 text += "\n" + i18n("Description: ") + "\n" + incidence->description(); 691 text += "\n" + i18n("Description: ") + "\n" + incidence->description();
687 ++icount; 692 ++icount;
688 693
689 } 694 }