Changeset 11d3189 in confclerk_git for src/gui

Timestamp:

03/21/12 21:42:02 (11 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

a9eca6f

Parents:

9a896cc

Message:

Hopefully fixed bug #38: As the alarm message was used to identify the event by setting it to the eventId and in r1359 the alarm message was changed to show the event title, alarms could not be deleted anymore. Therefore, two alarm attributes (int values) were introduced with this commit: "conferenceId" and "eventId" to identify the event and therefore, deleting alarms should work again. Additionally a second (not reported) bug was fixed: Activating an alarm in the treeview set the alarm to the current time plus 10 seconds.

However, I don't know for sure whether this commit fixed bug #38 becaus I don't have a maemo device to test it.

Location:

src/gui

Files:

• conflictdialogcontainer.cpp (modified) (1 diff)
• eventdialog.cpp (modified) (3 diffs)

src/gui/conflictdialogcontainer.cpp

@@ -41 +41 @@
 void ConflictDialogContainer::loadEvents(const QDate &aDate, const int aConferenceId) {
     Q_UNUSED(aDate);
+    Q_UNUSED(aConferenceId);
     Q_ASSERT(aConferenceId == mConferenceId);
     Q_ASSERT(mConferenceId > 0);

src/gui/eventdialog.cpp

@@ -19 +19 @@
  */
 #include "eventdialog.h"
-#include <conference.h>
+#include "conference.h"
 
 #include <QScrollBar>
 
 #ifdef MAEMO
-#include <alarm.h>
+#include "alarm.h"
 #endif
 
@@ -107 +107 @@
         // remove alarm from the 'alarmd' alrms list
         Alarm alarm;
-        alarm.deleteAlarm(event.id());
+        alarm.deleteAlarm(event.conferenceId(), event.id());
         // TODO: test if removing was successfull
 #endif /* MAEMO */
@@ -118 +118 @@
         // add alarm to the 'alarmd'
         Alarm alarm;
-        int cookie = alarm.addAlarm(event.id(),event.title(),QDateTime::currentDateTime().addSecs(10));
+        alarm.addAlarm(event.conferenceId(), event.id(), event.title(), event.start().addSecs(PRE_EVENT_ALARM_SEC));
 #endif /* MAEMO */
     }