work on alarm

diff --git a/src/alarm/alarm.h b/src/alarm/alarm.h
index c68b5548aece737a113d00e11dbc694d1bfc0c0c..61834e708382af39fc800fa3dee6ed42dba7e303 100644 (file)
--- a/src/alarm/alarm.h
+++ b/src/alarm/alarm.h
@@ -9,7 +9,7 @@ extern "C"
 #include <alarmd/libalarm.h>
 }
 
 #include <alarmd/libalarm.h>
 }
 

-#define APPID "alarm-example"
+#define APPID "fosdem-alarm"

 
 class Alarm : public QObject
 {
 
 class Alarm : public QObject
 {

diff --git a/src/gui/alarmdialog.cpp b/src/gui/alarmdialog.cpp
index 413ca8921191687d62bb8603063a6e0e51771ff6..d1411f97308b01364ab8a64c006f6f900b29522a 100644 (file)
--- a/src/gui/alarmdialog.cpp
+++ b/src/gui/alarmdialog.cpp
@@ -2,9 +2,14 @@
 
 #include <QApplication>
 #include <alarm.h>
 
 #include <QApplication>
 #include <alarm.h>

+#include <event.h>
+
+#include <QDir>

 
 const int SNOOZE_TIME = 5; // in minutes
 
 
 const int SNOOZE_TIME = 5; // in minutes
 

+const int confId = 1;
+

 AlarmDialog::AlarmDialog(int argc, char *argv[], QWidget *aParent)
     : QDialog(aParent)
     , mEventId(0)
 AlarmDialog::AlarmDialog(int argc, char *argv[], QWidget *aParent)
     : QDialog(aParent)
     , mEventId(0)


@@ -26,15 +31,23 @@ AlarmDialog::AlarmDialog(int argc, char *argv[], QWidget *aParent)
         mAlarmId = QString(argv[2]).toInt();
     }
 
         mAlarmId = QString(argv[2]).toInt();
     }
 

-    connect(stopPB, SIGNAL(clicked()), qApp, SLOT(quit()));
+    connect(stopPB, SIGNAL(clicked()), SLOT(closeDialog()));

     connect(appPB, SIGNAL(clicked()), SLOT(runApp()));
     connect(snoozePB, SIGNAL(clicked()), SLOT(snooze()));
 
     connect(appPB, SIGNAL(clicked()), SLOT(runApp()));
     connect(snoozePB, SIGNAL(clicked()), SLOT(snooze()));
 

+    QSqlDatabase database = QSqlDatabase::addDatabase("QSQLITE");
+    database.setDatabaseName(QDir::homePath() + "/.fosdem/fosdem.sqlite");
+    database.open();
+
+    Event event = Event::getById(mEventId,confId);

     message->setText(QString(argv[1]).append("-").append(QString(argv[2])));
     message->setText(QString(argv[1]).append("-").append(QString(argv[2])));

+    message->setText(event.title());
+    setWindowTitle(event.title());

 }
 
 void AlarmDialog::runApp()
 {
 }
 
 void AlarmDialog::runApp()
 {

+    qWarning("runApp(): NOT IMPLEMENTED YET");

 }
 
 void AlarmDialog::snooze()
 }
 
 void AlarmDialog::snooze()


@@ -47,3 +60,12 @@ void AlarmDialog::snooze()
     qApp->quit();
 }
 
     qApp->quit();
 }
 

+void AlarmDialog::closeDialog()
+{
+    // before closing the dialog, it is necessary to remove alarm flag from the DB
+    Event event = Event::getById(mEventId,confId);
+    event.setHasAlarm(false);
+    event.update("alarm");
+    qApp->quit();
+}
+

diff --git a/src/gui/alarmdialog.h b/src/gui/alarmdialog.h
index c77031aa70d1fdaf3b1b7a6ad0725f38626464fb..58d461e71fa48c205f8d6a443d15fa2b720e8582 100644 (file)
--- a/src/gui/alarmdialog.h
+++ b/src/gui/alarmdialog.h
@@ -13,6 +13,7 @@ class AlarmDialog : public QDialog, Ui::AlarmDialog
     private slots:
         void runApp();
         void snooze();
     private slots:
         void runApp();
         void snooze();

+        void closeDialog();

     private:
         int mEventId; // event ID obtained from 'schedule'
         int mAlarmId; // cookie assigned by alarmd
     private:
         int mEventId; // event ID obtained from 'schedule'
         int mAlarmId; // cookie assigned by alarmd

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 73c44976d391d33da3474a6a7776a757a8010771..e135f43f8790f1e40a6f63882b53709e6b0d1cc5 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -51,7 +51,6 @@ void SqlEngine::initialize()
     if(!QDir::home().exists(".fosdem"))
         QDir::home().mkdir(".fosdem");
     databaseName = QDir::homePath() + "/.fosdem/" + "fosdem.sqlite";
     if(!QDir::home().exists(".fosdem"))
         QDir::home().mkdir(".fosdem");
     databaseName = QDir::homePath() + "/.fosdem/" + "fosdem.sqlite";

-qDebug()<<databaseName;

     login("QSQLITE",databaseName);
 }
 
     login("QSQLITE",databaseName);
 }
 

diff --git a/src/src.pro b/src/src.pro
index 374b7b07d36982dad159475a81a190a9858002ff..fb46540155b8dd712df6ad8af2f537ce1ad9b2eb 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,5 +3,5 @@ TEMPLATE = subdirs
 SUBDIRS  = orm mvc sql gui app
 maemo : SUBDIRS += alarm
 #SUBDIRS += test
 SUBDIRS  = orm mvc sql gui app
 maemo : SUBDIRS += alarm
 #SUBDIRS += test

-CONFIG += ordered debug
+CONFIG += ordered