Changeset ff9a2cb

Timestamp:

07/15/11 01:00:49 (12 years ago)

Author:

gregor herrmann <gregoa@…>

Branches:

master, qt5

Children:

d785a93

Parents:

664e8bd

Message:

Show event title instead of id in alarms.

Location:

src

Files:

• alarm/alarm.cpp (modified) (2 diffs)
• alarm/alarm.h (modified) (1 diff)
• gui/eventdialog.cpp (modified) (1 diff)
• mvc/treeview.cpp (modified) (1 diff)

src/alarm/alarm.cpp

@@ -30 +30 @@
 //#include <dbus-1.0/dbus/dbus-protocol.h>
 
-int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
+int Alarm::addAlarm(int aEventId, QString aEventTitle, const QDateTime &aDateTime)
 {
     cookie_t cookie = 0;
@@ -41 +41 @@
 
     /* for Deleting purposes */
-    alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data());
+    // ?!
+    //alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data());
+    alarm_event_set_message(eve, aEventTitle.toLocal8Bit().data());
 
     /* Use absolute time triggering */

src/alarm/alarm.h

@@ -37 +37 @@
         Alarm() {}
         ~Alarm() {}
-        int addAlarm(int aEventId, const QDateTime &aDateTime); 
+        int addAlarm(int aEventId, QString aEventTitle, const QDateTime &aDateTime); 
         void deleteAlarm(int aEventId);
         static bool hasEventAlarm(int aEventId);

src/gui/eventdialog.cpp

@@ -118 +118 @@
         // add alarm to the 'alarmd'
         Alarm alarm;
-        int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10));
+        int cookie = alarm.addAlarm(event.id(),event.title(),QDateTime::currentDateTime().addSecs(10));
 #endif /* MAEMO */
     }

src/mvc/treeview.cpp

@@ -116 +116 @@
                     Alarm alarm;
                     //int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10)); // testing
-                    int cookie = alarm.addAlarm(event.id(),event.start().addSecs(-15*60)); // 15 minutes before real start
+                    int cookie = alarm.addAlarm(event.id(),event.title(),event.start().addSecs(-15*60)); // 15 minutes before real start
 #endif /* MAEMO */
                 }