author | zautrix <zautrix> | 2005-02-09 13:22:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-09 13:22:06 (UTC) |
commit | c3dd5bfd446b893a8b39ddec425a6cf8deff2261 (patch) (unidiff) | |
tree | d0dd74c17fd6101da1d6c403c85924c58bc1ac9b /libkdepim/kdateedit.cpp | |
parent | 940cdd0fd1349e7f8e53adff0595c1d946322ef1 (diff) | |
download | kdepimpi-c3dd5bfd446b893a8b39ddec425a6cf8deff2261.zip kdepimpi-c3dd5bfd446b893a8b39ddec425a6cf8deff2261.tar.gz kdepimpi-c3dd5bfd446b893a8b39ddec425a6cf8deff2261.tar.bz2 |
fixes
-rw-r--r-- | libkdepim/kdateedit.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index c4c0081..2c78ea3 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp | |||
@@ -405,52 +405,53 @@ void KDateEdit::toggleDatePicker() | |||
405 | } | 405 | } |
406 | } | 406 | } |
407 | 407 | ||
408 | 408 | ||
409 | void KDateEdit::lineEnterPressed() | 409 | void KDateEdit::lineEnterPressed() |
410 | { | 410 | { |
411 | QDate date = readDate(); | 411 | QDate date = readDate(); |
412 | 412 | ||
413 | if(date.isValid()) | 413 | if(date.isValid()) |
414 | { | 414 | { |
415 | // Update the edit. This is needed if the user has entered a | 415 | // Update the edit. This is needed if the user has entered a |
416 | // word rather than the actual date. | 416 | // word rather than the actual date. |
417 | setDate(date); | 417 | setDate(date); |
418 | emit(dateChanged(date)); | 418 | emit(dateChanged(date)); |
419 | emit returnPressed(); | 419 | emit returnPressed(); |
420 | } | 420 | } |
421 | else | 421 | else |
422 | { | 422 | { |
423 | if ( withoutDp ) { | 423 | if ( withoutDp ) { |
424 | KNotifyClient::beep(); | 424 | KNotifyClient::beep(); |
425 | } else { | 425 | } else { |
426 | if ( !mDateEdit->text().isEmpty() ) { | 426 | if ( !mDateEdit->text().isEmpty() ) { |
427 | mTextChanged = false; | 427 | mTextChanged = false; |
428 | QString text = i18n( "You entered an invalid date!\n Will use current date instead." ); | 428 | QString text = i18n( "You entered an invalid date!\n Will use current date instead." ); |
429 | if ( KMessageBox::warningContinueCancel( 0, text ) == KMessageBox::Continue ) { | 429 | if ( isVisible() ) |
430 | setDate( QDate::currentDate() ); | 430 | if ( KMessageBox::warningContinueCancel( 0, text ) == KMessageBox::Continue ) { |
431 | emit dateChanged( QDate::currentDate() ); | 431 | setDate( QDate::currentDate() ); |
432 | } | 432 | emit dateChanged( QDate::currentDate() ); |
433 | } | ||
433 | } | 434 | } |
434 | } | 435 | } |
435 | } | 436 | } |
436 | } | 437 | } |
437 | 438 | ||
438 | bool KDateEdit::inputIsValid() | 439 | bool KDateEdit::inputIsValid() |
439 | { | 440 | { |
440 | return readDate().isValid(); | 441 | return readDate().isValid(); |
441 | } | 442 | } |
442 | 443 | ||
443 | QDate KDateEdit::readDate() const | 444 | QDate KDateEdit::readDate() const |
444 | { | 445 | { |
445 | QString text = mDateEdit->text(); | 446 | QString text = mDateEdit->text(); |
446 | QDate date; | 447 | QDate date; |
447 | 448 | ||
448 | if (mKeywordMap.contains(text.lower())) | 449 | if (mKeywordMap.contains(text.lower())) |
449 | { | 450 | { |
450 | date = QDate::currentDate().addDays(mKeywordMap[text.lower()]); | 451 | date = QDate::currentDate().addDays(mKeywordMap[text.lower()]); |
451 | } | 452 | } |
452 | else | 453 | else |
453 | { | 454 | { |
454 | date = KGlobal::locale()->readDate(text); | 455 | date = KGlobal::locale()->readDate(text); |
455 | } | 456 | } |
456 | 457 | ||