work on alarm

diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp
index 8355657094422ca882a4cd57fa6ca39b1a5b0d48..22c3060919f1596eb55a90adf09e860df55d7c24 100644 (file)
--- a/src/alarm/alarm.cpp
+++ b/src/alarm/alarm.cpp
@@ -18,7 +18,7 @@ int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
 
     /* Add exec command action */
     action = alarm_event_add_actions(event, 1);
 
     /* Add exec command action */
     action = alarm_event_add_actions(event, 1);

-    QString command = QString("/home/maemo/work/alarm/bin/alarmdialog %1").arg(QString::number(aEventId));
+    QString command = QString("/home/maemo/work/fosdem-maemo/bin/fosdem %1").arg(QString::number(aEventId));

     alarm_action_set_exec_command(action, command.toLocal8Bit().data());
     action->flags |= ALARM_ACTION_TYPE_EXEC;
     action->flags |= ALARM_ACTION_WHEN_TRIGGERED;
     alarm_action_set_exec_command(action, command.toLocal8Bit().data());
     action->flags |= ALARM_ACTION_TYPE_EXEC;
     action->flags |= ALARM_ACTION_WHEN_TRIGGERED;

diff --git a/src/app/app.pro b/src/app/app.pro
index 188b2da96416132e6d340c11bced8d33034a819b..a9420ed58effe03c3dac2addcfc4d4cfd6cb12c2 100644 (file)
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -1,3 +1,4 @@
+include(../global.pri)

 TEMPLATE = app
 TARGET = fosdem
 DESTDIR = ../bin
 TEMPLATE = app
 TARGET = fosdem
 DESTDIR = ../bin


@@ -8,6 +9,12 @@ LIBS += -L$$DESTDIR -lgui -lmvc -lsql
 INCLUDEPATH += ../gui
 DEPENDPATH += . ../gui
 TARGETDEPS += $$DESTDIR/libmvc.a $$DESTDIR/libgui.a $$DESTDIR/libsql.a
 INCLUDEPATH += ../gui
 DEPENDPATH += . ../gui
 TARGETDEPS += $$DESTDIR/libmvc.a $$DESTDIR/libgui.a $$DESTDIR/libsql.a

+maemo {
+    LIBS += -L$$DESTDIR -lqalarm -lalarm
+    INCLUDEPATH += ../alarm
+    DEPENDPATH +=  ../alarm
+    TARGETDEPS += $$DESTDIR/libqalarm.a
+}

 
 SOURCES += main.cpp
 
 
 SOURCES += main.cpp
 

diff --git a/src/app/main.cpp b/src/app/main.cpp
index f8ac9dadbe0996ff6bbd57ce29586971b019479b..9505799e0559ab9cae1410c9ba981421290995f0 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,6 +1,9 @@
 #include <mainwindow.h>
 
 #include <QtGui/QApplication>
 #include <mainwindow.h>
 
 #include <QtGui/QApplication>

+#ifdef MAEMO
+#include <alarmdialog.h>
+#endif /* MAEMO */

 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {


@@ -11,8 +14,20 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     QApplication::setWindowIcon(QIcon(":/icons/fosdem.png"));
 
     QApplication a(argc, argv);
     QApplication::setWindowIcon(QIcon(":/icons/fosdem.png"));
 

-    MainWindow w;
-    w.show();
+    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
+        window = new MainWindow;
+#else
+    window = new MainWindow;
+#endif /* MAEMO */
+    window->show();

     return a.exec();
 }
 
     return a.exec();
 }
 

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 72cd9592a70cf37d82c4bcd22ab0d9bdde91fd4c..a5389f2885eec6ab22fc8713119e6b3401e05ec0 100644 (file)
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -1,4 +1,4 @@
-include(global.pri)
+include(../global.pri)

 TEMPLATE = lib
 TARGET = gui
 DESTDIR = ../bin
 TEMPLATE = lib
 TARGET = gui
 DESTDIR = ../bin

diff --git a/src/mvc/mvc.pro b/src/mvc/mvc.pro
index 7ab7bb900cb5913e3ab4d328d04d82681aa6447f..98d9e9b6414b41200b1f2c32e51f21b5bb325759 100644 (file)
--- a/src/mvc/mvc.pro
+++ b/src/mvc/mvc.pro
@@ -1,3 +1,4 @@
+include(../global.pri)

 TEMPLATE = lib
 TARGET = mvc
 DESTDIR = ../bin
 TEMPLATE = lib
 TARGET = mvc
 DESTDIR = ../bin


@@ -9,6 +10,12 @@ LIBS += -L$$DESTDIR -lorm
 INCLUDEPATH += ../orm
 DEPENDPATH += . ../orm
 TARGETDEPS += $$DESTDIR/liborm.a
 INCLUDEPATH += ../orm
 DEPENDPATH += . ../orm
 TARGETDEPS += $$DESTDIR/liborm.a

+maemo {
+    LIBS += -L$$DESTDIR -lqalarm -lalarm
+    INCLUDEPATH += ../alarm
+    DEPENDPATH +=  ../alarm
+    TARGETDEPS += $$DESTDIR/libqalarm.a
+}

 
 HEADERS += \
     event.h \
 
 HEADERS += \
     event.h \

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 89a57fbb973c87d66acc845f2874dbfb7155eb51..20049733d023a41a4f9ebad331e67dd95ebe90f8 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -5,6 +5,10 @@
 #include "event.h"
 #include "eventmodel.h"
 
 #include "event.h"
 #include "eventmodel.h"
 

+#ifdef MAEMO
+#include <alarm.h>
+#endif
+

 #include <QDebug>
 
 TreeView::TreeView(QWidget *aParent)
 #include <QDebug>
 
 TreeView::TreeView(QWidget *aParent)


@@ -62,11 +66,23 @@ void TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 {
                     static_cast<Event*>(aIndex.internalPointer())->setHasAlarm(false); // list of events
                     event.setHasAlarm(false); // update DB
                 {
                     static_cast<Event*>(aIndex.internalPointer())->setHasAlarm(false); // list of events
                     event.setHasAlarm(false); // update DB

+#ifdef MAEMO
+                    // remove alarm from the 'alarmd' alrms list
+                    Alarm alarm;
+                    alarm.deleteAlarm(event.id());
+                    // TODO: test if removing was successfull
+#endif /* MAEMO */

                 }
                 else
                 {
                     static_cast<Event*>(aIndex.internalPointer())->setHasAlarm(true); // list of events
                     event.setHasAlarm(true);
                 }
                 else
                 {
                     static_cast<Event*>(aIndex.internalPointer())->setHasAlarm(true); // list of events
                     event.setHasAlarm(true);

+#ifdef MAEMO
+                    // add alarm to the 'alarmd'
+                    Alarm alarm;
+                    int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10));
+                    qDebug() << "cookie: " << cookie;
+#endif /* MAEMO */

                 }
                 qDebug() << " ALARM [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.hasAlarm();
                 event.update("alarm");
                 }
                 qDebug() << " ALARM [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.hasAlarm();
                 event.update("alarm");

diff --git a/src/schedule.en.xml b/src/schedule.en.xml
index 6f2b593f8b43c09c6a72a31d103d23e4f3ca7c0f..072ada89800256f7bad682f5918e5e8ed680cd1e 100755 (executable)
--- a/src/schedule.en.xml
+++ b/src/schedule.en.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schedule>
  <conference>
 <?xml version="1.0" encoding="UTF-8"?>
 <schedule>
  <conference>

-  <title>FOSDEM 2009</title>
+  <title>FOSDEM 2010</title>

   <subtitle>Free and Opensource Software Developers European Meeting</subtitle>
   <venue>ULB (Campus Solbosch)</venue>
   <city>Brussels</city>
   <subtitle>Free and Opensource Software Developers European Meeting</subtitle>
   <venue>ULB (Campus Solbosch)</venue>
   <city>Brussels</city>

-  <start>2009-02-07</start>
-  <end>2009-02-08</end>
+  <start>2010-02-07</start>
+  <end>2010-02-08</end>

   <days>2</days>
   <day_change>08:00</day_change>
   <timeslot_duration>00:15</timeslot_duration>
  </conference>
   <days>2</days>
   <day_change>08:00</day_change>
   <timeslot_duration>00:15</timeslot_duration>
  </conference>

- <day date="2009-02-07" index="1">
+ <day date="2010-02-07" index="1">

   <room name="Janson">
    <event id="528">
     <start>10:00</start>
   <room name="Janson">
    <event id="528">
     <start>10:00</start>


@@ -332,7 +332,7 @@ So we try to create:
     <type>Lightning-Talk</type>
     <language>English</language>
     <abstract>The talk will show the main results of the FLOSSMetrics project. In particular, it will show how to obtain data about the history of software development of more than 2,000 FLOSS projects, which kind of data it is and how it can  be used, and some results of using it in a research environment.</abstract>
     <type>Lightning-Talk</type>
     <language>English</language>
     <abstract>The talk will show the main results of the FLOSSMetrics project. In particular, it will show how to obtain data about the history of software development of more than 2,000 FLOSS projects, which kind of data it is and how it can  be used, and some results of using it in a research environment.</abstract>

-    <description>FLOSSMetrics is collecting data from the CVS/SVN repos, mailing lists and issue tracking systems of several thousands of FOSS projects, and collecting all of it into a database that is offerered to researchers and others for data mining. See http://melquiades.flossmetrics.org for the data currently been offered. The project will end in August 2009, and more data and more projects are expected in the meantime.</description>
+    <description>FLOSSMetrics is collecting data from the CVS/SVN repos, mailing lists and issue tracking systems of several thousands of FOSS projects, and collecting all of it into a database that is offerered to researchers and others for data mining. See http://melquiades.flossmetrics.org for the data currently been offered. The project will end in August 2010, and more data and more projects are expected in the meantime.</description>

     <persons>
      <person id="214">Jesus M. Gonzalez Barahona</person>
     </persons>
     <persons>
      <person id="214">Jesus M. Gonzalez Barahona</person>
     </persons>


@@ -422,7 +422,7 @@ Key Requirements and Functionality (2008.11 Release)
     <track>Lightning Talks</track>
     <type>Lightning-Talk</type>
     <language>English</language>
     <track>Lightning Talks</track>
     <type>Lightning-Talk</type>
     <language>English</language>

-    <abstract>The past, present and future of the project. This talk will coincide with Opsview v3.0 release scheduled for early February 2009.</abstract>
+    <abstract>The past, present and future of the project. This talk will coincide with Opsview v3.0 release scheduled for early February 2010.</abstract>

     <description>Opsview is network monitoring software that significantly extends the functionality of Nagios and integrates tools such as MRTG, NMIS, RANCID and Net-SNMP. Opsview is developed using Catalyst web framework and MySQL database.</description>
     <persons>
      <person id="532">James Peel</person>
     <description>Opsview is network monitoring software that significantly extends the functionality of Nagios and integrates tools such as MRTG, NMIS, RANCID and Net-SNMP. Opsview is developed using Catalyst web framework and MySQL database.</description>
     <persons>
      <person id="532">James Peel</person>


@@ -719,7 +719,7 @@ PTXdist is a "make your own distribution" build system, based on Bash, Kconfig a
     <track>KDE</track>
     <type>Other</type>
     <language>English</language>
     <track>KDE</track>
     <type>Other</type>
     <language>English</language>

-    <abstract>Welcome to the KDE developer room at FOSDEM 2009.</abstract>
+    <abstract>Welcome to the KDE developer room at FOSDEM 2010.</abstract>

     <description></description>
     <persons>
      <person id="95">Bart Coppens</person>
     <description></description>
     <persons>
      <person id="95">Bart Coppens</person>


@@ -869,7 +869,7 @@ What are the issues? What is a repository? Can anyone contribute to repository c
     <track>BSD+PostgreSQL</track>
     <type>Podium</type>
     <language>English</language>
     <track>BSD+PostgreSQL</track>
     <type>Podium</type>
     <language>English</language>

-    <abstract>Keynote and welcome to the PostgreSQL and *BSD developer room at FOSDEM 2009.</abstract>
+    <abstract>Keynote and welcome to the PostgreSQL and *BSD developer room at FOSDEM 2010.</abstract>

     <description></description>
     <persons>
      <person id="632">Marc Balmer</person>
     <description></description>
     <persons>
      <person id="632">Marc Balmer</person>


@@ -1000,7 +1000,7 @@ What are the issues? What is a repository? Can anyone contribute to repository c
     <track>GNOME</track>
     <type>Other</type>
     <language>English</language>
     <track>GNOME</track>
     <type>Other</type>
     <language>English</language>

-    <abstract>Welcome to the GNOME developer room at FOSDEM 2009.</abstract>
+    <abstract>Welcome to the GNOME developer room at FOSDEM 2010.</abstract>

     <description></description>
     <persons>
      <person id="130">Christophe Fergeau</person>
     <description></description>
     <persons>
      <person id="130">Christophe Fergeau</person>


@@ -1457,7 +1457,7 @@ AUGEAS takes great care to preserve comments and other formatting details across
     <track>openSUSE</track>
     <type>Other</type>
     <language>English</language>
     <track>openSUSE</track>
     <type>Other</type>
     <language>English</language>

-    <abstract>Welcome to the openSUSE developer room at FOSDEM 2009.</abstract>
+    <abstract>Welcome to the openSUSE developer room at FOSDEM 2010.</abstract>

     <description></description>
     <persons>
      <person id="131">Martin Lasarsch</person>
     <description></description>
     <persons>
      <person id="131">Martin Lasarsch</person>


@@ -2490,7 +2490,7 @@ And if possible some demonstrations.</description>
     <track>OpenOffice.org</track>
     <type>Other</type>
     <language>English</language>
     <track>OpenOffice.org</track>
     <type>Other</type>
     <language>English</language>

-    <abstract>Welcome to the OpenOffice.org developer room at FOSDEM 2009.</abstract>
+    <abstract>Welcome to the OpenOffice.org developer room at FOSDEM 2010.</abstract>

     <description></description>
     <persons>
      <person id="272">Jürgen Schmidt</person>
     <description></description>
     <persons>
      <person id="272">Jürgen Schmidt</person>


@@ -2635,7 +2635,7 @@ Canvas: the new OOo rendering subsystem, and what it can do; showing a prototype
    </event>
   </room>
  </day>
    </event>
   </room>
  </day>

- <day date="2009-02-08" index="2">
+ <day date="2010-02-08" index="2">

   <room name="Janson">
    <event id="786">
     <start>10:00</start>
   <room name="Janson">
    <event id="786">
     <start>10:00</start>


@@ -2924,7 +2924,7 @@ changes that come with being an insanely popular user-written site. But
 the user interface hasn't changed much since 2003; if anything, packing \r
 in more features has made many aspects of the wiki harder to use over time.\r
 \r
 the user interface hasn't changed much since 2003; if anything, packing \r
 in more features has made many aspects of the wiki harder to use over time.\r
 \r

-In 2009, MediaWiki developers are turning their eye towards usability \r
+In 2010, MediaWiki developers are turning their eye towards usability \r

 and design issues. As with the scaling problems we've tackled before, we \r
 have to be able to target anything from a tiny personal or intranet wiki \r
 to the massive Wikipedia sites, making a range of different use cases \r
 and design issues. As with the scaling problems we've tackled before, we \r
 have to be able to target anything from a tiny personal or intranet wiki \r
 to the massive Wikipedia sites, making a range of different use cases \r


@@ -3112,7 +3112,7 @@ vde switches.</description>
 2.1.- Technologies involved\r
 2.2.- Procedures: instalaltion, management, update, etc.\r
 3.- ModularIT community project</abstract>
 2.1.- Technologies involved\r
 2.2.- Procedures: instalaltion, management, update, etc.\r
 3.- ModularIT community project</abstract>

-    <description>ModularIT is a virtuliced and distributed modular services architecture based on free software. This project has been released for the spanish community at the beginning of 2008 and by January 2009 it will be translated to english. Right now it is downloadable and before the end of the year we will begin to develop the project through a public SVN.\r
+    <description>ModularIT is a virtuliced and distributed modular services architecture based on free software. This project has been released for the spanish community at the beginning of 2008 and by January 2010 it will be translated to english. Right now it is downloadable and before the end of the year we will begin to develop the project through a public SVN.\r

 \r
 ModularIT is the result of 10 years of hard working from Grupo CPD (www.grupocpd.com) with free software systems and network services. we are a free software companies network from the Canary Islands, Spain. we are interested in presenting the project at FOSDEM.\r
 \r
 \r
 ModularIT is the result of 10 years of hard working from Grupo CPD (www.grupocpd.com) with free software systems and network services. we are a free software companies network from the Canary Islands, Spain. we are interested in presenting the project at FOSDEM.\r
 \r


@@ -3160,7 +3160,7 @@ The primary design goal of Puppet is that it have an expressive enough language
     <type>Podium</type>
     <language>English</language>
     <abstract>GPG/PGP and CAcert keysigning party</abstract>
     <type>Podium</type>
     <language>English</language>
     <abstract>GPG/PGP and CAcert keysigning party</abstract>

-    <description>See [http://fosdem.org/2009/keysigning] for details.</description>
+    <description>See [http://fosdem.org/2010/keysigning] for details.</description>

     <persons>
      <person id="486">Joost van Baal</person>
      <person id="484">Theus Hagen</person>
     <persons>
      <person id="486">Joost van Baal</person>
      <person id="484">Theus Hagen</person>


@@ -3494,7 +3494,7 @@ This talk covers the limitations of Crush, the practical difficulties inherent i
     <track>CrossDesktop</track>
     <type>Other</type>
     <language>English</language>
     <track>CrossDesktop</track>
     <type>Other</type>
     <language>English</language>

-    <abstract>Welcome to the Crossdesktop developer room at FOSDEM 2009.</abstract>
+    <abstract>Welcome to the Crossdesktop developer room at FOSDEM 2010.</abstract>

     <description></description>
     <persons>
      <person id="130">Christophe Fergeau</person>
     <description></description>
     <persons>
      <person id="130">Christophe Fergeau</person>


@@ -3861,7 +3861,7 @@ This talk covers the limitations of Crush, the practical difficulties inherent i
     <track>Drupal</track>
     <type>Other</type>
     <language>English</language>
     <track>Drupal</track>
     <type>Other</type>
     <language>English</language>

-    <abstract>Welcome to the Drupal developer room at FOSDEM 2009.</abstract>
+    <abstract>Welcome to the Drupal developer room at FOSDEM 2010.</abstract>

     <description></description>
     <persons>
      <person id="213">Dries Buytaert</person>
     <description></description>
     <persons>
      <person id="213">Dries Buytaert</person>


@@ -4869,7 +4869,7 @@ Anyone with an interest in Groupware protocols is invited to join and discuss.</
     <track>Ruby and Rails</track>
     <type>Other</type>
     <language>English</language>
     <track>Ruby and Rails</track>
     <type>Other</type>
     <language>English</language>

-    <abstract>Welcome to the Ruby and Rails developer room at FOSDEM 2009.</abstract>
+    <abstract>Welcome to the Ruby and Rails developer room at FOSDEM 2010.</abstract>

     <description></description>
     <persons>
      <person id="281">Peter Vandenabeele</person>
     <description></description>
     <persons>
      <person id="281">Peter Vandenabeele</person>