fixxx

3 files changed, 9 insertions, 5 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 5a5b73e..8f63d1c 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1209,5 +1209,4 @@
 { "Select Week","Selektiere Woche" },
 { "Set alarm for selected...","Setze Alarm für Selekt..." },
-{ "Set reminder offset to:","Setze Alarm Offset auf:" },
 { "Set Alarm!","Setze Alarm!" },
 { "Canged alarm for %1 items","Alarm für %1 Items geändert" },
@@ -1217,5 +1216,5 @@
 { "Mail to all","Mail an Alle" },
 { "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" },
-{ "","" },
+{ "Set reminder ON with offset to:","Alarm AN mit Offset auf:" },
 { "","" },
 { "","" },
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index d4d9c0f..d0dbb47 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -357,6 +357,13 @@ void  KOListView::setAlarm()
     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();
     }
@@ -367,5 +374,4 @@ void  KOListView::setAlarm()
     while ( item ) {
         inc = item->data();
-        if ( inc->type() != "Journal" ) {
             ++count;
             if (kap.mAlarmButton->isChecked()) {
@@ -401,5 +407,4 @@ void  KOListView::setAlarm()
                 }
             }
-        }
         temp = item;
         item = sel.next();
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 78004fe..bd5bd12 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -69,5 +69,5 @@ class KOAlarmPrefs : public QDialog
         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  "  ) ;