-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 3 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 11 | ||||
-rw-r--r-- | korganizer/kolistview.h | 2 |
3 files changed, 10 insertions, 6 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 @@ -1207,17 +1207,16 @@ { "Default todo done color:","Standard Todo erledigt Farbe" }, { "Select week %1-%2","Selektiere Woche %1-%2" }, { "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" }, { " and "," und " }, { "<IMG src="%1"> only )","nur <IMG src="%1"> )" }, { "Mail to selected","Mail an Ausgewählte" }, { "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 @@ -355,9 +355,16 @@ void KOListView::setAlarm() QPtrList<KOListViewItem> sel ; QListViewItem *qitem = mListView->firstChild (); while ( qitem ) { if ( qitem->isSelected() ) { - sel.append(((KOListViewItem *)qitem)); + 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; @@ -365,9 +372,8 @@ void KOListView::setAlarm() 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(); @@ -399,9 +405,8 @@ void KOListView::setAlarm() alarm->setEnabled(false); alarm->setType(Alarm::Invalid); } } - } temp = item; item = sel.next(); mUidDict.remove( inc->uid() ); delete temp;; diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index 78004fe..bd5bd12 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h @@ -67,9 +67,9 @@ class KOAlarmPrefs : public QDialog 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); |