Alarm dbus connection added

diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp
index 333ed34ea7dc09922d35358eee58616ec84ad6d8..73d505613277f98a5c1b685bb18d7a87b348d9b4 100644 (file)
--- a/src/alarm/alarm.cpp
+++ b/src/alarm/alarm.cpp
@@ -4,7 +4,7 @@
 
 #include <QApplication>
 #include <QDir>
-#include <QDebug>
+#include <QFileInfo>
 
 #include <dbus-1.0/dbus/dbus-protocol.h>
 
@@ -29,18 +29,28 @@ int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
     act = alarm_event_add_actions(eve, 1);
     alarm_action_set_label(act, "FOSDEM'10");
 
-    // setup this action to be a "DBus command"
-    act->flags |= ALARM_ACTION_WHEN_RESPONDED;
-    act->flags |= ALARM_ACTION_TYPE_DBUS;
-
-    // DBus params for this action
-    alarm_action_set_dbus_interface(act, "org.fosdem.schedule.AlarmInterface");
-    alarm_action_set_dbus_service(act, "org.fosdem.schedule");
-    alarm_action_set_dbus_path(act, "/Fosdem");
-    alarm_action_set_dbus_name(act, "Alarm");
+    QFileInfo fi(*qApp->argv());
+    QString name(fi.fileName());
 
-    // DBus arguments for the action
-    alarm_action_set_dbus_args(act,  DBUS_TYPE_INT32, &aEventId, DBUS_TYPE_INVALID);
+    QString command = QDir::currentPath() + "/" + name + QString(" %1").arg(QString::number(aEventId));
+    //QString command =  *qApp->argv() + QString(" %1").arg(QString::number(aEventId));
+    alarm_action_set_exec_command(act, command.toLocal8Bit().data());
+    act->flags |= ALARM_ACTION_TYPE_EXEC;
+    act->flags |= ALARM_ACTION_WHEN_RESPONDED;
+    act->flags |= ALARM_ACTION_EXEC_ADD_COOKIE; // adds assigned cookie at the end of command string
+
+//    // setup this action to be a "DBus command"
+//    act->flags |= ALARM_ACTION_WHEN_RESPONDED;
+//    act->flags |= ALARM_ACTION_TYPE_DBUS;
+//
+//    // DBus params for this action
+//    alarm_action_set_dbus_interface(act, "org.fosdem.schedule.AlarmInterface");
+//    alarm_action_set_dbus_service(act, "org.fosdem.schedule");
+//    alarm_action_set_dbus_path(act, "/Fosdem");
+//    alarm_action_set_dbus_name(act, "Alarm");
+//
+//    // DBus arguments for the action
+//    alarm_action_set_dbus_args(act,  DBUS_TYPE_INT32, &aEventId, DBUS_TYPE_INVALID);
 
     //    act->flags |= ALARM_ACTION_TYPE_EXEC;
     //     alarm_action_set_exec_command(act, command.toLocal8Bit().data());

diff --git a/src/alarm/alarm.pro b/src/alarm/alarm.pro
index 94838c88960ab8d07b897629e48175b939496dbc..0db75aa0610cb7deac47d03be72aa3764b7e3fc7 100644 (file)
--- a/src/alarm/alarm.pro
+++ b/src/alarm/alarm.pro
@@ -9,12 +9,8 @@ LIBS += -lalarm
 DEPENDPATH += .
 
 HEADERS += alarm.h \
-                  alarmdbus.h \
-                  alarmdbusadaptorp.h
 
 SOURCES += alarm.cpp \
-                  alarmdbus.cpp \
-                  alarmdbusadaptor.cpp
 
 INCLUDEPATH += ../gui \
     ../mvc \ 

diff --git a/src/alarm/alarmdbus.cpp b/src/alarm/alarmdbus.cpp
deleted file mode 100644 (file)
index 286b851..0000000
--- a/src/alarm/alarmdbus.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#include "alarmdbus.h"
-#include "eventdialog.h"
-
-
-
-
-CAlarmDBus::CAlarmDBus(QWidget * aParent)
-    : QObject(),
-    mParent(aParent)
-{
-    // constructor
-    //setAutoRelaySignals(true);
-}
-
-CAlarmDBus::~CAlarmDBus()
-{
-    // destructor
-}
-
-void CAlarmDBus::Alarm(int aEventId)
-{
-       EventDialog dialog(aEventId,mParent);
-       dialog.exec();
-
-}

diff --git a/src/alarm/alarmdbus.h b/src/alarm/alarmdbus.h
deleted file mode 100644 (file)
index 6363b95..0000000
--- a/src/alarm/alarmdbus.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef SINGLE_INSTANCE_H
-#define SINGLE_INSTANCE_H
-
-#include <QObject>
-#include <QtDBus/QtDBus>
-
-class CAlarmDBus: public QObject
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.fosdem.schedule")
-
-public:
-       CAlarmDBus(QWidget * aParent);
-    virtual ~CAlarmDBus();
-
-public: // PROPERTIES
-public Q_SLOTS: // METHODS
-    void Alarm(int aEventId);
-private:
-       QWidget * mParent;
-};
-
-
-#endif // SINGLE_INSTANCE_H

diff --git a/src/alarm/alarmdbusadaptor.cpp b/src/alarm/alarmdbusadaptor.cpp
deleted file mode 100644 (file)
index c0c903a..0000000
--- a/src/alarm/alarmdbusadaptor.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file was generated by dbusxml2cpp version 0.6
- * Command line was: dbusxml2cpp -c CarAdaptor -a car_adaptor_p.h:car_adaptor.cpp car.xml
- *
- * dbusxml2cpp is Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "alarmdbusadaptorp.h"
-#include <QtCore/QMetaObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-
-/*
- * Implementation of adaptor class CarAdaptor
- */
-
-AlarmDBusAdaptor::AlarmDBusAdaptor(QObject *parent)
-    : QDBusAbstractAdaptor(parent)
-{
-    // constructor
-    setAutoRelaySignals(true);
-}
-
-AlarmDBusAdaptor::~AlarmDBusAdaptor()
-{
-    // destructor
-}
-
-void AlarmDBusAdaptor::Alarm(int aEventId)
-{
-    // handle method call com.trolltech.Examples.CarInterface.accelerate
-    QMetaObject::invokeMethod(parent(), "Alarm",Q_ARG(int, aEventId));
-}
-
-

diff --git a/src/alarm/alarmdbusadaptorp.h b/src/alarm/alarmdbusadaptorp.h
deleted file mode 100644 (file)
index cf22b17..0000000
--- a/src/alarm/alarmdbusadaptorp.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file was generated by dbusxml2cpp version 0.6
- * Command line was: dbusxml2cpp -c CarAdaptor -a car_adaptor_p.h:car_adaptor.cpp car.xml
- *
- * dbusxml2cpp is Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#ifndef ALARM_DBUS_ADAPTOR_P_H
-#define ALARM_DBUS_ADAPTOR_P_H
-
-#include <QtCore/QObject>
-#include <QtDBus/QtDBus>
-
-QT_BEGIN_NAMESPACE
-class QByteArray;
-template<class T> class QList;
-template<class Key, class Value> class QMap;
-class QString;
-class QStringList;
-class QVariant;
-QT_END_NAMESPACE
-
-/*
- * Adaptor class for interface com.trolltech.Examples.CarInterface
- */
-class AlarmDBusAdaptor: public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.fosdem.schedule.AlarmInterface")
-    Q_CLASSINFO("D-Bus Introspection", ""
-"  <interface name=\"org.fosdem.schedule.AlarmInterface\" >\n"
-"  <method name=\"Alarm\">\n"
-"        <arg name=\"aEventId\" type=\"i\" direction=\"in\"/>\n"
-"  </method>\n"
-"  </interface>\n"
-        "")
-public:
-       AlarmDBusAdaptor(QObject *parent);
-    virtual ~AlarmDBusAdaptor();
-
-public: // PROPERTIES
-public Q_SLOTS: // METHODS
-       void Alarm(int aEventId);
-};
-
-#endif

diff --git a/src/app/alarmdbus.cpp b/src/app/alarmdbus.cpp
new file mode 100644 (file)
index 0000000..286b851
--- /dev/null
+++ b/src/app/alarmdbus.cpp
@@ -0,0 +1,26 @@
+
+#include "alarmdbus.h"
+#include "eventdialog.h"
+
+
+
+
+CAlarmDBus::CAlarmDBus(QWidget * aParent)
+    : QObject(),
+    mParent(aParent)
+{
+    // constructor
+    //setAutoRelaySignals(true);
+}
+
+CAlarmDBus::~CAlarmDBus()
+{
+    // destructor
+}
+
+void CAlarmDBus::Alarm(int aEventId)
+{
+       EventDialog dialog(aEventId,mParent);
+       dialog.exec();
+
+}

diff --git a/src/app/alarmdbus.h b/src/app/alarmdbus.h
new file mode 100644 (file)
index 0000000..6363b95
--- /dev/null
+++ b/src/app/alarmdbus.h
@@ -0,0 +1,24 @@
+#ifndef SINGLE_INSTANCE_H
+#define SINGLE_INSTANCE_H
+
+#include <QObject>
+#include <QtDBus/QtDBus>
+
+class CAlarmDBus: public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.fosdem.schedule")
+
+public:
+       CAlarmDBus(QWidget * aParent);
+    virtual ~CAlarmDBus();
+
+public: // PROPERTIES
+public Q_SLOTS: // METHODS
+    void Alarm(int aEventId);
+private:
+       QWidget * mParent;
+};
+
+
+#endif // SINGLE_INSTANCE_H

diff --git a/src/app/alarmdbusadaptor.cpp b/src/app/alarmdbusadaptor.cpp
new file mode 100644 (file)
index 0000000..c0c903a
--- /dev/null
+++ b/src/app/alarmdbusadaptor.cpp
@@ -0,0 +1,42 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -c CarAdaptor -a car_adaptor_p.h:car_adaptor.cpp car.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#include "alarmdbusadaptorp.h"
+#include <QtCore/QMetaObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+/*
+ * Implementation of adaptor class CarAdaptor
+ */
+
+AlarmDBusAdaptor::AlarmDBusAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+    // constructor
+    setAutoRelaySignals(true);
+}
+
+AlarmDBusAdaptor::~AlarmDBusAdaptor()
+{
+    // destructor
+}
+
+void AlarmDBusAdaptor::Alarm(int aEventId)
+{
+    // handle method call com.trolltech.Examples.CarInterface.accelerate
+    QMetaObject::invokeMethod(parent(), "Alarm",Q_ARG(int, aEventId));
+}
+
+

diff --git a/src/app/alarmdbusadaptorp.h b/src/app/alarmdbusadaptorp.h
new file mode 100644 (file)
index 0000000..cf22b17
--- /dev/null
+++ b/src/app/alarmdbusadaptorp.h
@@ -0,0 +1,50 @@
+/*
+ * This file was generated by dbusxml2cpp version 0.6
+ * Command line was: dbusxml2cpp -c CarAdaptor -a car_adaptor_p.h:car_adaptor.cpp car.xml
+ *
+ * dbusxml2cpp is Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#ifndef ALARM_DBUS_ADAPTOR_P_H
+#define ALARM_DBUS_ADAPTOR_P_H
+
+#include <QtCore/QObject>
+#include <QtDBus/QtDBus>
+
+QT_BEGIN_NAMESPACE
+class QByteArray;
+template<class T> class QList;
+template<class Key, class Value> class QMap;
+class QString;
+class QStringList;
+class QVariant;
+QT_END_NAMESPACE
+
+/*
+ * Adaptor class for interface com.trolltech.Examples.CarInterface
+ */
+class AlarmDBusAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.fosdem.schedule.AlarmInterface")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"org.fosdem.schedule.AlarmInterface\" >\n"
+"  <method name=\"Alarm\">\n"
+"        <arg name=\"aEventId\" type=\"i\" direction=\"in\"/>\n"
+"  </method>\n"
+"  </interface>\n"
+        "")
+public:
+       AlarmDBusAdaptor(QObject *parent);
+    virtual ~AlarmDBusAdaptor();
+
+public: // PROPERTIES
+public Q_SLOTS: // METHODS
+       void Alarm(int aEventId);
+};
+
+#endif

diff --git a/src/app/app.pro b/src/app/app.pro
index dfcd95b60fd0faedffdc882b8fd7e2033e1c88c1..7d2d4791844dd9d320d20170a668137a33926f33 100644 (file)
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -2,7 +2,7 @@ include(../global.pri)
 TEMPLATE = app
 TARGET = fosdem-schedule
 DESTDIR = ../bin
-QT += sql xml network dbus
+QT += sql xml network dbus 
 
 # module dependencies
 LIBS += -L$$DESTDIR -lgui -lmvc -lsql
@@ -16,10 +16,14 @@ maemo {
     TARGETDEPS += $$DESTDIR/libqalarm.a
 }
 
-HEADERS += appsettings.h
+HEADERS += appsettings.h \
+    alarmdbus.h \
+       alarmdbusadaptorp.h
 
 SOURCES += main.cpp \
-           appsettings.cpp
+           appsettings.cpp \
+    alarmdbus.cpp \
+       alarmdbusadaptor.cpp
 
 RESOURCES += ../icons.qrc \
              ../maps.qrc \

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 791add41a003b665d73a95d049ef16c36efef396..acd5e06e66b241a044b06b19af79f2f2529f9616 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,14 +1,16 @@
 #include <mainwindow.h>
 
 #include <QtGui/QApplication>
+#include <sqlengine.h>
+
+#include "eventdialog.h"
+
 #ifdef MAEMO
 //#include <alarmdialog.h>
 #include <alarmdbus.h>
 #include <alarmdbusadaptorp.h>
 #endif /* MAEMO */
 
-#include <sqlengine.h>
-
 
 int main(int argc, char *argv[])
 {
@@ -22,38 +24,41 @@ int main(int argc, char *argv[])
     SqlEngine::initialize(); // creates "SQLITE" DB connection
 
     QWidget *window;
-#ifdef MAEMO
-    // if the app is run with two cmd-line arguments
-    // an alarm dialog is to be displayed
-    // Usage: $ ./fosdem eventId alarmId
-    // Example: $ ./fosdem 521 13
-//    if(argc==3)
-//        window = new AlarmDialog(argc,argv);
-//    else if(argc==2) // display Event dialog automatically
-//        window = new MainWindow(atoi(argv[1])); // eventId = argv[1]
-//    else
-        window = new MainWindow;
-#else
+
     window = new MainWindow;
-#endif /* MAEMO */
-    window->show();
+
 
 #ifdef MAEMO
     // Alarm Dbus
     CAlarmDBus *alarmDBus = new CAlarmDBus(window);
     new AlarmDBusAdaptor(alarmDBus);
-    //QDBusConnection connection = QDBusConnection::sessionBus();
     QDBusConnection connection = QDBusConnection::sessionBus();
 
     if(connection.registerObject("/Fosdem", alarmDBus) == true)
     {
        if( connection.registerService("org.fosdem.schedule") == false)
        {
-               qDebug() << "dbus register service failed";
+               if(argc>1)
+               {
+                       QDBusInterface *interface = new QDBusInterface("org.fosdem.schedule",
+                                                                      "/Fosdem",
+                                                                      "org.fosdem.schedule.AlarmInterface",
+                                                                      connection);
+                       interface->call("Alarm",atoi(argv[1]));
+                       return 0;
+               }
        }
     }
+
+    if(argc > 1)
+    {
+        EventDialog dialog(atoi(argv[1]),window);
+        dialog.exec();
+    }
 #endif
 
+    window->show();
+
     return a.exec();
 }
 

diff --git a/src/mvc/mvc.pro b/src/mvc/mvc.pro
index 03cea46369f83a6ca4e89bf06e2e2b89ac66ab28..53c0973dd2d72af275bfe73293aad0e65c382658 100644 (file)
--- a/src/mvc/mvc.pro
+++ b/src/mvc/mvc.pro
@@ -3,7 +3,7 @@ TEMPLATE = lib
 TARGET = mvc
 DESTDIR = ../bin
 CONFIG += static
-QT += sql
+QT += sql 
 
 # module dependencies
 LIBS += -L$$DESTDIR \
@@ -26,11 +26,11 @@ HEADERS += event.h \
     delegate.h \
     eventmodel.h \
     treeview.h \
-    room.h
+    room.h 
 SOURCES += event.cpp \
     conference.cpp \
     track.cpp \
     delegate.cpp \
     eventmodel.cpp \
     treeview.cpp \
-    room.cpp
+    room.cpp 

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 5fd63ee091a183305c2c6d2a6cc54b4e6642076e..f0d8aab68d5498eec8266e663c1b6446466978eb 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -97,8 +97,8 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
 #ifdef MAEMO
                     // add alarm to the 'alarmd'
                     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(),QDateTime::currentDateTime().addSecs(10)); // testing
+                    //int cookie = alarm.addAlarm(event.id(),event.start().addSecs(-15*60)); // 15 minutes before real start
                     qDebug() << "cookie: " << cookie;
 #endif /* MAEMO */
                 }

diff --git a/src/src.pro b/src/src.pro
index 1aa5f8f8362fabaa7cfaecf79e7109c3cec6b924..dd3c6157d0ad77bbaf94135e3d292799fd68a28d 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,8 +1,7 @@
 include(global.pri)
 TEMPLATE = subdirs
-SUBDIRS  += orm mvc sql gui
 maemo : SUBDIRS += alarm
-SUBDIRS += app
+SUBDIRS  += orm sql mvc gui app 
 #SUBDIRS += test
 CONFIG += ordered