| -rw-r--r-- | korganizer/koagenda.cpp | 1 | ||||
| -rw-r--r-- | korganizer/koagendaview.cpp | 3 | ||||
| -rw-r--r-- | libkcal/calendarlocal.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index de964da..b5d52d2 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -387,6 +387,7 @@ void KOAgenda::popupMenu() } mLeftMouseDown = false; // no more leftMouse computation if (mPopupItem) { + //mClickedItem = mPopupItem; selectItem(mPopupItem); if ( mAllAgendaPopup ) mAllAgendaPopup->installEventFilter( this ); diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 6d1e6d5..20a5b74 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -464,11 +464,12 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : // Create event context menu for agenda mAllAgendaPopup = eventPopup(); +#if 0 mAllAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")), i18n("Toggle Alarm"),mAgenda, SLOT(popupAlarm()),true); - +#endif connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), mAllAgendaPopup,SLOT(showIncidencePopup(Incidence *))); diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 5c889c3..00a43e5 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -298,7 +298,6 @@ void CalendarLocal::checkAlarmForIncidence( Incidence * incidence, bool deleted QDateTime nextA; // QString nextSum; //QDateTime nextEvent; - mNextAlarmEventDateTime = QDateTime(); if ( mNextAlarmIncidence == 0 || incidence == 0 ) { computeNextAlarm = true; } else { @@ -374,6 +373,7 @@ void CalendarLocal::deRegisterAlarm() //qDebug("-- deregister Alarm %s ", mLastAlarmNotificationString.latin1() ); emit removeAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString ); + mNextAlarmEventDateTime = QDateTime(); // #ifndef DESKTOP_VERSION // AlarmServer::deleteAlarm (mNextAlarmDateTime ,"koalarm" ,mLastAlarmNotificationString.latin1() ); // #endif |