fixxx

2 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
@@ -353,23 +353,29 @@ void  KOListView::setAlarm()
 
     QStringList itemList;
     QPtrList<KOListViewItem> sel ;
     QListViewItem *qitem  = mListView->firstChild ();
     while ( qitem ) {
         if ( qitem->isSelected() ) {
+            Incidence* inc = ((KOListViewItem *) qitem)->data();
+            if ( inc->type() != "Journal" ) {
+                if ( inc->type() == "Todo" ) {
+                    if ( ((Todo*)inc)->hasDueDate() )
+                      sel.append(((KOListViewItem *)qitem));
+                } else
             sel.append(((KOListViewItem *)qitem));
         }
+        }
         qitem = qitem->nextSibling();
     }
     int count = 0;
     KOListViewItem * item, *temp;
     item = sel.first();
     Incidence* inc;
     while ( item ) {
         inc = item->data();
-        if ( inc->type() != "Journal" ) {
             ++count;
             if (kap.mAlarmButton->isChecked()) {
                 if (inc->alarms().count() == 0) 
                     inc->newAlarm();
                 QPtrList<Alarm> alarms = inc->alarms();
                 Alarm *alarm;
@@ -397,13 +403,12 @@ void  KOListView::setAlarm()
                 Alarm* alarm = inc->alarms().first();
                 if ( alarm ) {
                     alarm->setEnabled(false);
                     alarm->setType(Alarm::Invalid);
                 }
             }
-        }
         temp = item;
         item = sel.next();
         mUidDict.remove( inc->uid() ); 
         delete temp;;
         addIncidence( inc );
     }
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 78004fe..bd5bd12 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -65,13 +65,13 @@ class KOAlarmPrefs : public QDialog
     {
         setCaption( i18n("Alarm Options") );
         QVBoxLayout* alarmLayout = new QVBoxLayout( this );
         alarmLayout->setSpacing( 3 );
         alarmLayout->setMargin( 3 );
         QWidget *parent = this;
-        mAlarmButton = new QCheckBox(i18n("Set reminder offset to:"),parent);
+        mAlarmButton = new QCheckBox(i18n("Set reminder ON with offset to:"),parent);
         alarmLayout->addWidget(mAlarmButton);
         mAlarmTimeEdit = new QSpinBox ( 0, 9999, 1, parent, "mAlarmTimeEdit  "  ) ;
         mAlarmTimeEdit->setValue( 15 );
         alarmLayout->addWidget(mAlarmTimeEdit);
         mAlarmIncrCombo = new QComboBox(false, parent);
         mAlarmIncrCombo->insertItem(i18n("minute(s)"));