author | zautrix <zautrix> | 2005-04-09 14:00:22 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-09 14:00:22 (UTC) |
commit | 16546abfab89df8dcf3168eaa7c0c346b8e400b4 (patch) (unidiff) | |
tree | c5bad46ec2ee88cb1f6b1035dbfe1e367ee0cb0e /korganizer/koeditorgeneralevent.cpp | |
parent | ab7957df1a71a392d71cb898b59a35c32461ec6a (diff) | |
download | kdepimpi-16546abfab89df8dcf3168eaa7c0c346b8e400b4.zip kdepimpi-16546abfab89df8dcf3168eaa7c0c346b8e400b4.tar.gz kdepimpi-16546abfab89df8dcf3168eaa7c0c346b8e400b4.tar.bz2 |
some fixes
Diffstat (limited to 'korganizer/koeditorgeneralevent.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koeditorgeneralevent.cpp | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 2a49528..d4aa78c 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp | |||
@@ -376,20 +376,27 @@ void KOEditorGeneralEvent::setDuration() | |||
376 | void KOEditorGeneralEvent::emitDateTimeStr() | 376 | void KOEditorGeneralEvent::emitDateTimeStr() |
377 | { | 377 | { |
378 | KLocale *l = KGlobal::locale(); | 378 | KLocale *l = KGlobal::locale(); |
379 | 379 | QString startString = ""; | |
380 | QString from,to; | 380 | if ( mCurrStartDateTime.date() < mCurrEndDateTime.date() ) { |
381 | if (mNoTimeButton->isChecked()) { | 381 | if ( mNoTimeButton->isChecked() ) { |
382 | from = l->formatDate(mCurrStartDateTime.date()); | 382 | startString = i18n("From: ") + l->formatDate(mCurrStartDateTime.date() ); |
383 | to = l->formatDate(mCurrEndDateTime.date()); | 383 | startString += "\n"+i18n("To: ")+ l->formatDate(mCurrEndDateTime.date()); |
384 | |||
385 | } else { | ||
386 | startString = i18n("From: ") +l->formatDateTime(mCurrStartDateTime, false); | ||
387 | startString += "\n"+i18n("To: ")+l->formatDateTime(mCurrEndDateTime, false); | ||
388 | } | ||
384 | } else { | 389 | } else { |
385 | from = l->formatDateTime(mCurrStartDateTime); | 390 | if ( mNoTimeButton->isChecked() ) { |
386 | to = l->formatDateTime(mCurrEndDateTime); | 391 | startString = i18n("On: ") + l->formatDate(mCurrStartDateTime.date() ); |
392 | } else { | ||
393 | startString = i18n("From: ") + KGlobal::locale()->formatTime(mCurrStartDateTime.time())+ | ||
394 | "-"+KGlobal::locale()->formatTime(mCurrEndDateTime.time()); | ||
395 | startString += i18n(" on ")+KGlobal::locale()->formatDate( mCurrStartDateTime.date(), true); | ||
396 | } | ||
387 | } | 397 | } |
388 | 398 | startString +="\n"+mDurationLabel->text(); | |
389 | QString str = i18n("From: %1 To: %2 %3").arg(from).arg(to) | 399 | emit dateTimeStrChanged(startString); |
390 | .arg(mDurationLabel->text()); | ||
391 | |||
392 | emit dateTimeStrChanged(str); | ||
393 | } | 400 | } |
394 | 401 | ||
395 | bool KOEditorGeneralEvent::validateInput() | 402 | bool KOEditorGeneralEvent::validateInput() |