Changeset a7d8638 for src

Timestamp:

02/01/10 16:43:00 (12 years ago)

Author:

hanzes <hanzes@…>

Branches:

master, qt5

Children:

ba48d2f

Parents:

d7986a6

Message:

Alarm dbus connection added

Location:

src

Files:

• alarm/alarm.cpp (modified) (2 diffs)
• alarm/alarm.pro (modified) (1 diff)
• app/alarmdbus.cpp (moved) (moved from src/alarm/alarmdbus.cpp)
• app/alarmdbus.h (moved) (moved from src/alarm/alarmdbus.h)
• app/alarmdbusadaptor.cpp (moved) (moved from src/alarm/alarmdbusadaptor.cpp)
• app/alarmdbusadaptorp.h (moved) (moved from src/alarm/alarmdbusadaptorp.h)
• app/app.pro (modified) (2 diffs)
• app/main.cpp (modified) (5 diffs)
• mvc/mvc.pro (modified) (3 diffs)
• mvc/treeview.cpp (modified) (1 diff)
• src.pro (modified) (1 diff)

src/alarm/alarm.cpp

@@ -5 +5 @@
 #include <QApplication>
 #include <QDir>
-#include <QDebug>
+#include <QFileInfo>
 
 #include <dbus-1.0/dbus/dbus-protocol.h>
@@ -30 +30 @@
     alarm_action_set_label(act, "FOSDEM'10");
 
-    // setup this action to be a "DBus command"
+    QFileInfo fi(*qApp->argv());
+    QString name(fi.fileName());
+
+    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_TYPE_DBUS;
+    act->flags |= ALARM_ACTION_EXEC_ADD_COOKIE; // adds assigned cookie at the end of command string
 
-    // 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);
+//    // 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;

src/alarm/alarm.pro

@@ -10 +10 @@
 
 HEADERS += alarm.h \
-                   alarmdbus.h \
-                   alarmdbusadaptorp.h
 
 SOURCES += alarm.cpp \
-                   alarmdbus.cpp \
-                   alarmdbusadaptor.cpp
 
 INCLUDEPATH += ../gui \

src/app/app.pro

@@ -3 +3 @@
 TARGET = fosdem-schedule
 DESTDIR = ../bin
-QT += sql xml network dbus
+QT += sql xml network dbus 
 
 # module dependencies
@@ -17 +17 @@
 }
 
-HEADERS += appsettings.h
+HEADERS += appsettings.h \
+    alarmdbus.h \
+        alarmdbusadaptorp.h
 
 SOURCES += main.cpp \
-           appsettings.cpp
+           appsettings.cpp \
+    alarmdbus.cpp \
+        alarmdbusadaptor.cpp
 
 RESOURCES += ../icons.qrc \

src/app/main.cpp

@@ -2 +2 @@
 
 #include <QtGui/QApplication>
+#include <sqlengine.h>
+
+#include "eventdialog.h"
+
 #ifdef MAEMO
 //#include <alarmdialog.h>
@@ -7 +11 @@
 #include <alarmdbusadaptorp.h>
 #endif /* MAEMO */
-
-#include <sqlengine.h>
 
 
@@ -23 +25 @@
 
     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
@@ -43 +33 @@
     CAlarmDBus *alarmDBus = new CAlarmDBus(window);
     new AlarmDBusAdaptor(alarmDBus);
-    //QDBusConnection connection = QDBusConnection::sessionBus();
     QDBusConnection connection = QDBusConnection::sessionBus();
 
@@ -50 +39 @@
         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();

src/mvc/mvc.pro

@@ -4 +4 @@
 DESTDIR = ../bin
 CONFIG += static
-QT += sql
+QT += sql 
 
 # module dependencies
@@ -27 +27 @@
     eventmodel.h \
     treeview.h \
-    room.h
+    room.h 
 SOURCES += event.cpp \
     conference.cpp \
@@ -34 +34 @@
     eventmodel.cpp \
     treeview.cpp \
-    room.cpp
+    room.cpp 

src/mvc/treeview.cpp

@@ -98 +98 @@
                     // 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 */

src/src.pro

@@ -1 +1 @@
 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