-rw-r--r-- | korganizer/kolistview.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index d4d9c0f..d0dbb47 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -355,9 +355,16 @@ void KOListView::setAlarm() | |||
355 | QPtrList<KOListViewItem> sel ; | 355 | QPtrList<KOListViewItem> sel ; |
356 | QListViewItem *qitem = mListView->firstChild (); | 356 | QListViewItem *qitem = mListView->firstChild (); |
357 | while ( qitem ) { | 357 | while ( qitem ) { |
358 | if ( qitem->isSelected() ) { | 358 | if ( qitem->isSelected() ) { |
359 | sel.append(((KOListViewItem *)qitem)); | 359 | Incidence* inc = ((KOListViewItem *) qitem)->data(); |
360 | if ( inc->type() != "Journal" ) { | ||
361 | if ( inc->type() == "Todo" ) { | ||
362 | if ( ((Todo*)inc)->hasDueDate() ) | ||
363 | sel.append(((KOListViewItem *)qitem)); | ||
364 | } else | ||
365 | sel.append(((KOListViewItem *)qitem)); | ||
366 | } | ||
360 | } | 367 | } |
361 | qitem = qitem->nextSibling(); | 368 | qitem = qitem->nextSibling(); |
362 | } | 369 | } |
363 | int count = 0; | 370 | int count = 0; |
@@ -365,9 +372,8 @@ void KOListView::setAlarm() | |||
365 | item = sel.first(); | 372 | item = sel.first(); |
366 | Incidence* inc; | 373 | Incidence* inc; |
367 | while ( item ) { | 374 | while ( item ) { |
368 | inc = item->data(); | 375 | inc = item->data(); |
369 | if ( inc->type() != "Journal" ) { | ||
370 | ++count; | 376 | ++count; |
371 | if (kap.mAlarmButton->isChecked()) { | 377 | if (kap.mAlarmButton->isChecked()) { |
372 | if (inc->alarms().count() == 0) | 378 | if (inc->alarms().count() == 0) |
373 | inc->newAlarm(); | 379 | inc->newAlarm(); |
@@ -399,9 +405,8 @@ void KOListView::setAlarm() | |||
399 | alarm->setEnabled(false); | 405 | alarm->setEnabled(false); |
400 | alarm->setType(Alarm::Invalid); | 406 | alarm->setType(Alarm::Invalid); |
401 | } | 407 | } |
402 | } | 408 | } |
403 | } | ||
404 | temp = item; | 409 | temp = item; |
405 | item = sel.next(); | 410 | item = sel.next(); |
406 | mUidDict.remove( inc->uid() ); | 411 | mUidDict.remove( inc->uid() ); |
407 | delete temp;; | 412 | delete temp;; |