summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt1
-rw-r--r--korganizer/koeditorgeneraltodo.cpp6
2 files changed, 5 insertions, 2 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index ee37492..d52fad0 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1216,19 +1216,20 @@
1216{ "Mail to all","Mail an Alle" }, 1216{ "Mail to all","Mail an Alle" },
1217{ "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" }, 1217{ "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" },
1218{ "Set reminder ON with offset to:","Alarm AN mit Offset auf:" }, 1218{ "Set reminder ON with offset to:","Alarm AN mit Offset auf:" },
1219{ " on"," am" }, 1219{ " on"," am" },
1220{ " completed on "," erledigt am " }, 1220{ " completed on "," erledigt am " },
1221{ "Save as Event template","Speichere als Vorlage" }, 1221{ "Save as Event template","Speichere als Vorlage" },
1222{ "Load Event template","Lade Termin Vorlage" }, 1222{ "Load Event template","Lade Termin Vorlage" },
1223{ "Save as Journal template","Speichere als Journal Vorlage" }, 1223{ "Save as Journal template","Speichere als Journal Vorlage" },
1224{ "Insert Journal template","Füge Journal Vorlage ein" }, 1224{ "Insert Journal template","Füge Journal Vorlage ein" },
1225{ "Sub todos:<br>","Unter Todos:<br>" }, 1225{ "Sub todos:<br>","Unter Todos:<br>" },
1226{ "Parent todo:<br>","Über Todo:<br>" }, 1226{ "Parent todo:<br>","Über Todo:<br>" },
1227{ "Set current as color category","Setze Gewählte als Farbkategorie" }, 1227{ "Set current as color category","Setze Gewählte als Farbkategorie" },
1228{ " completed"," erledigt" },
1228{ "","" }, 1229{ "","" },
1229{ "","" }, 1230{ "","" },
1230{ "","" }, 1231{ "","" },
1231{ "","" }, 1232{ "","" },
1232{ "","" }, 1233{ "","" },
1233{ "","" }, 1234{ "","" },
1234{ "","" }, 1235{ "","" },
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index da5ef07..6370b54 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -224,26 +224,28 @@ void KOEditorGeneralTodo::setDefaults(QDateTime due,bool allDay)
224 alarmDisable(true); 224 alarmDisable(true);
225 225
226 mStartCheck->setChecked(false); 226 mStartCheck->setChecked(false);
227 enableStartEdit(false); 227 enableStartEdit(false);
228 228
229 mDueDateEdit->setDate(due.date()); 229 mDueDateEdit->setDate(due.date());
230 mDueTimeEdit->setTime(due.time()); 230 mDueTimeEdit->setTime(due.time());
231 due = due.addDays(-7); 231 due = due.addDays(-7);
232 mStartDateEdit->setDate(due.date()); 232 mStartDateEdit->setDate(due.date());
233 mStartTimeEdit->setTime(due.time()); 233 mStartTimeEdit->setTime(due.time());
234 234
235 mPriorityCombo->setCurrentItem(2); 235 mPriorityCombo->setCurrentItem(2);
236 mCompletedLabel->setText(i18n("completed"));; 236 mCompletedLabel->setText(i18n(" completed"));;
237 mCompletedCombo->setCurrentItem(0); 237 mCompletedCombo->setCurrentItem(0);
238 mCompleteDateEdit->hide();
239 mCompleteTimeEdit->hide();
238} 240}
239 241
240void KOEditorGeneralTodo::readTodo(Todo *todo) 242void KOEditorGeneralTodo::readTodo(Todo *todo)
241{ 243{
242 244
243 mSummaryEdit->load(KOLocationBox::SUMMARYTODO); 245 mSummaryEdit->load(KOLocationBox::SUMMARYTODO);
244 mLocationEdit->load(KOLocationBox::LOCATION); 246 mLocationEdit->load(KOLocationBox::LOCATION);
245 KOEditorGeneral::readIncidence(todo); 247 KOEditorGeneral::readIncidence(todo);
246 248
247 QDateTime dueDT; 249 QDateTime dueDT;
248 250
249 if (todo->hasDueDate()) { 251 if (todo->hasDueDate()) {
@@ -456,25 +458,25 @@ void KOEditorGeneralTodo::setCompletedDate()
456{ 458{
457 if (mCompletedCombo->currentItem() == 5 && mCompleted.isValid()) { 459 if (mCompletedCombo->currentItem() == 5 && mCompleted.isValid()) {
458 if ( QApplication::desktop()->width() < 480 ) { 460 if ( QApplication::desktop()->width() < 480 ) {
459 mCompletedLabel->setText(i18n(" on")); 461 mCompletedLabel->setText(i18n(" on"));
460 } 462 }
461 else 463 else
462 mCompletedLabel->setText(i18n(" completed on ")); 464 mCompletedLabel->setText(i18n(" completed on "));
463 mCompleteDateEdit->show(); 465 mCompleteDateEdit->show();
464 mCompleteTimeEdit->show(); 466 mCompleteTimeEdit->show();
465 mCompleteTimeEdit->setTime( mCompleted.time() ); 467 mCompleteTimeEdit->setTime( mCompleted.time() );
466 mCompleteDateEdit->setDate( mCompleted.date() ); 468 mCompleteDateEdit->setDate( mCompleted.date() );
467 } else { 469 } else {
468 mCompletedLabel->setText(i18n("completed")); 470 mCompletedLabel->setText(i18n(" completed"));
469 mCompleteDateEdit->hide(); 471 mCompleteDateEdit->hide();
470 mCompleteTimeEdit->hide(); 472 mCompleteTimeEdit->hide();
471 } 473 }
472} 474}
473 475
474void KOEditorGeneralTodo::modified (Todo* todo, int modification) 476void KOEditorGeneralTodo::modified (Todo* todo, int modification)
475{ 477{
476 switch (modification) { 478 switch (modification) {
477 case KOGlobals::PRIORITY_MODIFIED: 479 case KOGlobals::PRIORITY_MODIFIED:
478 mPriorityCombo->setCurrentItem(todo->priority()-1); 480 mPriorityCombo->setCurrentItem(todo->priority()-1);
479 break; 481 break;
480 case KOGlobals::COMPLETION_MODIFIED: 482 case KOGlobals::COMPLETION_MODIFIED: