author | zautrix <zautrix> | 2005-08-22 10:49:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-22 10:49:00 (UTC) |
commit | f516a558e6d18982a54152b28ca3da78fe76e3fc (patch) (unidiff) | |
tree | 231fa0bd8fe72db6cdae319def362e07945b1e2c | |
parent | 4b60cc60255c64717a2d4011d561c72b6878cdb4 (diff) | |
download | kdepimpi-f516a558e6d18982a54152b28ca3da78fe76e3fc.zip kdepimpi-f516a558e6d18982a54152b28ca3da78fe76e3fc.tar.gz kdepimpi-f516a558e6d18982a54152b28ca3da78fe76e3fc.tar.bz2 |
recurrence default fix
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 1 | ||||
-rw-r--r-- | korganizer/koeditorrecurrence.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 37266bf..a864f1d 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,20 +1,21 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.2.3 ************ | 3 | ********** VERSION 2.2.3 ************ |
4 | 4 | ||
5 | Fixed a problem with (non empty) exception dates of recurring events for newly created events. | ||
5 | 6 | ||
6 | 7 | ||
7 | ********** VERSION 2.2.2 ************ | 8 | ********** VERSION 2.2.2 ************ |
8 | 9 | ||
9 | KO/Pi: | 10 | KO/Pi: |
10 | Fixed a problem with the sort order of last modified date in list view. | 11 | Fixed a problem with the sort order of last modified date in list view. |
11 | KA/Pi: | 12 | KA/Pi: |
12 | Fixed a resource config read problem on windows. | 13 | Fixed a resource config read problem on windows. |
13 | 14 | ||
14 | 15 | ||
15 | ********** VERSION 2.2.1 ************ | 16 | ********** VERSION 2.2.1 ************ |
16 | 17 | ||
17 | KO/Pi: | 18 | KO/Pi: |
18 | Fixed a problem displaying very long allday events in agenda view in single day mode. | 19 | Fixed a problem displaying very long allday events in agenda view in single day mode. |
19 | Fixed a problem with the default settings for new todos. | 20 | Fixed a problem with the default settings for new todos. |
20 | Added an error message dialog if saving of calendar files is not possible. | 21 | Added an error message dialog if saving of calendar files is not possible. |
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 0e74a99..e0380c4 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp | |||
@@ -412,32 +412,34 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) : | |||
412 | connect( addExceptionButton, SIGNAL( clicked() ), | 412 | connect( addExceptionButton, SIGNAL( clicked() ), |
413 | SLOT( addException() ) ); | 413 | SLOT( addException() ) ); |
414 | connect( changeExceptionButton, SIGNAL( clicked() ), | 414 | connect( changeExceptionButton, SIGNAL( clicked() ), |
415 | SLOT( changeException() ) ); | 415 | SLOT( changeException() ) ); |
416 | connect( deleteExceptionButton, SIGNAL( clicked() ), | 416 | connect( deleteExceptionButton, SIGNAL( clicked() ), |
417 | SLOT( deleteException() ) ); | 417 | SLOT( deleteException() ) ); |
418 | if ( QApplication::desktop()->width() < 480 ) { | 418 | if ( QApplication::desktop()->width() < 480 ) { |
419 | setMinimumWidth( 220 ); | 419 | setMinimumWidth( 220 ); |
420 | } else { | 420 | } else { |
421 | setMinimumWidth( 440 ); | 421 | setMinimumWidth( 440 ); |
422 | mExceptionDateEdit->setMinimumWidth( 200 ); | 422 | mExceptionDateEdit->setMinimumWidth( 200 ); |
423 | } | 423 | } |
424 | } | 424 | } |
425 | 425 | ||
426 | void ExceptionsWidget::setDefaults( const QDateTime &from ) | 426 | void ExceptionsWidget::setDefaults( const QDateTime &from ) |
427 | { | 427 | { |
428 | mExceptionList->clear(); | ||
429 | mExceptionDates.clear(); | ||
428 | mExceptionDateEdit->setDate( from.date() ); | 430 | mExceptionDateEdit->setDate( from.date() ); |
429 | } | 431 | } |
430 | 432 | ||
431 | void ExceptionsWidget::addException() | 433 | void ExceptionsWidget::addException() |
432 | { | 434 | { |
433 | QDate date = mExceptionDateEdit->date(); | 435 | QDate date = mExceptionDateEdit->date(); |
434 | QString dateStr = KGlobal::locale()->formatDate( date ); | 436 | QString dateStr = KGlobal::locale()->formatDate( date ); |
435 | if( !mExceptionList->findItem( dateStr ) ) { | 437 | if( !mExceptionList->findItem( dateStr ) ) { |
436 | mExceptionDates.append( date ); | 438 | mExceptionDates.append( date ); |
437 | mExceptionList->insertItem( dateStr ); | 439 | mExceptionList->insertItem( dateStr ); |
438 | } | 440 | } |
439 | } | 441 | } |
440 | 442 | ||
441 | void ExceptionsWidget::changeException() | 443 | void ExceptionsWidget::changeException() |
442 | { | 444 | { |
443 | int pos = mExceptionList->currentItem(); | 445 | int pos = mExceptionList->currentItem(); |