Changeset 6831c6a in confclerk_git

Timestamp:

02/01/10 14:05:49 (13 years ago)

Author:

hanzes <hanzes@…>

Branches:

master, qt5

Children:

927eac4

Parents:

8c4d4f7

Message:

Alarm dbus connection added

Location:

src

Files:

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

src/alarm/alarm.cpp

@@ -5 +5 @@
 #include <QApplication>
 #include <QDir>
+#include <QDebug>
+
+#include <dbus-1.0/dbus/dbus-protocol.h>
 
 int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
@@ -17 +20 @@
 
     /* for Deleting purposes */
-    alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data()); 
+    alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data());
 
     /* Use absolute time triggering */
     eve->alarm_time = time(0) + 5; //aDateTime.toTime_t();
     eve->flags = ALARM_EVENT_BOOT;
-
-    QString command = QDir::currentPath() + "/" + *qApp->argv() + 
-      QString(" %1").arg(QString::number(aEventId));
 
     /* Add exec command action */
@@ -33 +33 @@
     act->flags |= ALARM_ACTION_WHEN_RESPONDED;
     act->flags |= ALARM_ACTION_TYPE_DBUS;
-    
-    // DBus params for this action 
-    alarm_action_set_dbus_interface(act, "org.freedesktop.Notifications");
-    alarm_action_set_dbus_service(act, "org.freedesktop.Notifications");
-    alarm_action_set_dbus_path(act, "/org/freedesktop/Notifications");
-    alarm_action_set_dbus_name(act, "SystemNoteDialog");
-    
+
+    // 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, aEventId);
+    alarm_action_set_dbus_args(act,  DBUS_TYPE_INT32, &aEventId, DBUS_TYPE_INVALID);
 
     //    act->flags |= ALARM_ACTION_TYPE_EXEC;
@@ -47 +47 @@
     //    alarm_event_set_icon(eve, "fosdem");
     //    alarm_event_set_title(eve, "FOSDEM'10");
-    // adds assigned cookie at the end of command string 
-    //    act->flags |= ALARM_ACTION_EXEC_ADD_COOKIE; 
+    // adds assigned cookie at the end of command string
+    //    act->flags |= ALARM_ACTION_EXEC_ADD_COOKIE;
 
     /* Add stop button action */
@@ -56 +56 @@
     act->flags |= ALARM_ACTION_WHEN_RESPONDED;
     act->flags |= ALARM_ACTION_TYPE_NOP;
-  
+
     /* Add snooze button action */
     act = alarm_event_add_actions(eve, 1);

src/alarm/alarm.pro

@@ -2 +2 @@
 TARGET = qalarm
 DESTDIR = ../bin
-CONFIG += static
+CONFIG += static qdbus 
+QT += sql dbus
 
 # module dependencies
@@ -8 +9 @@
 DEPENDPATH += .
 
-HEADERS += alarm.h
+HEADERS += alarm.h \
+                   alarmdbus.h \
+                   alarmdbusadaptorp.h
 
-SOURCES += alarm.cpp 
+SOURCES += alarm.cpp \
+                   alarmdbus.cpp \
+                   alarmdbusadaptor.cpp
 
+INCLUDEPATH += ../gui \
+    ../mvc \ 
+    ../orm \
+    ../sql
+    
+
+

src/app/app.pro

@@ -3 +3 @@
 TARGET = fosdem-schedule
 DESTDIR = ../bin
-QT += sql xml network
+QT += sql xml network dbus
 
 # module dependencies

src/app/main.cpp

@@ -2 +2 @@
 
 #include <QtGui/QApplication>
-#ifdef MAEMO
-#include <alarmdialog.h>
-#endif /* MAEMO */
+//#ifdef MAEMO
+//#include <alarmdialog.h>
+//#endif /* MAEMO */
 
 #include <sqlengine.h>
+
+#include "alarmdbus.h"
+#include "alarmdbusadaptorp.h"
 
 int main(int argc, char *argv[])
@@ -25 +28 @@
     // 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
+//    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
@@ -35 +38 @@
 #endif /* MAEMO */
     window->show();
+
+    // 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";
+        }
+    }
+
     return a.exec();
 }

src/gui/gui.pro

@@ -84 +84 @@
     proxysettingsdialog.cpp
 
-maemo { 
-    FORMS += alarmdialog.ui
-    HEADERS += alarmdialog.h
-    SOURCES += alarmdialog.cpp
-}
+#maemo { 
+#    FORMS += alarmdialog.ui
+#    HEADERS += alarmdialog.h
+#    SOURCES += alarmdialog.cpp
+#}

src/mvc/treeview.cpp

@@ -33 +33 @@
 
 // returns bool if some Control was clicked
-bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint) 
+bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint)
 {
     bool handled = false;
@@ -69 +69 @@
                 for(int i=0; i<conflicts.count(); i++)
                     emit(eventHasChanged(conflicts[i].id()));
-                
+
                 // since the Favourite icon has changed, update TreeViews accordingly
                 // all TreeViews have to listen on this signal
@@ -142 +142 @@
     if(!index.parent().isValid()) // time-group
     {
-        if(isExpanded(index)) 
+        if(isExpanded(index))
             setExpanded(index, false);
         else

src/src.pro

@@ -1 +1 @@
 include(global.pri)
 TEMPLATE = subdirs
+SUBDIRS  += orm mvc sql gui app
 maemo : SUBDIRS += alarm
-SUBDIRS  += orm mvc sql gui app
 #SUBDIRS += test
 CONFIG += ordered