summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt4
-rw-r--r--korganizer/koeditorgeneral.cpp5
-rw-r--r--korganizer/kolistview.cpp11
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
@@ -1461,12 +1461,12 @@
1461{ "Cancel - do not start"," Abbrechen - Todo nicht starten" }, 1461{ "Cancel - do not start"," Abbrechen - Todo nicht starten" },
1462{ "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?"" }, 1462{ "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?"" },
1463{ "Reload","Neu laden" }, 1463{ "Reload","Neu laden" },
1464{ "Timezone settings","Zeitzoneneinstellung" }, 1464{ "Timezone settings","Zeitzoneneinstellung" },
1465{ "Title: ","Titel: " }, 1465{ "Title: ","Titel: " },
1466{ "Journal from: ","Journal vom: " }, 1466{ "Journal from: ","Journal vom: " },
1467{ "","" }, 1467{ "Journal: %1 from ","Journal: %1 vom " },
1468{ "","" }, 1468{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" },
1469{ "","" }, 1469{ "","" },
1470{ "","" }, 1470{ "","" },
1471{ "","" }, 1471{ "","" },
1472{ "","" }, \ No newline at end of file 1472{ "","" }, \ 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()
156 if (checkedCategories.find (*it) != checkedCategories.end ()) mCatPopup->setItemChecked (index, true); 156 if (checkedCategories.find (*it) != checkedCategories.end ()) mCatPopup->setItemChecked (index, true);
157 ++index; 157 ++index;
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]);
167 else 166 else
168 categories.insert (categories.end(), KOPrefs::instance()->mCustomCategories[index]); 167 categories.insert (categories.end(), KOPrefs::instance()->mCustomCategories[index]);
@@ -170,13 +169,13 @@ void KOEditorGeneral::selectedCatPopup( int index )
170 if ( !colcat.isEmpty() ) { 169 if ( !colcat.isEmpty() ) {
171 if ( categories.find ( colcat ) != categories.end () ) { 170 if ( categories.find ( colcat ) != categories.end () ) {
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{
181 QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout ); 180 QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout );
182 mCatPopup = new QPopupMenu ( parent ); 181 mCatPopup = new QPopupMenu ( parent );
@@ -395,12 +394,14 @@ void KOEditorGeneral::alarmDisable(bool disable)
395 mAlarmIncrCombo->setEnabled(false); 394 mAlarmIncrCombo->setEnabled(false);
396 } 395 }
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)
405{ 406{
406#if 0 407#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()
664 KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), false); 664 KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), false);
665 Incidence *incidence = delSel.first(); 665 Incidence *incidence = delSel.first();
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
675 } else { 680 } else {
676 if ( !incidence->description().isEmpty() ) { 681 if ( !incidence->description().isEmpty() ) {
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 }
690 } 695 }
691 incidence = delSel.next(); 696 incidence = delSel.next();