We added the conferenceId to some alarm related methods (ticket #41).

diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp
index a5f051bbf6332e177603d9dd9f4d06858e985d77..5390ddd433bc1163406ddf2125b5b14a833aa9e5 100644 (file)
--- a/src/alarm/alarm.cpp
+++ b/src/alarm/alarm.cpp
@@ -57,7 +57,7 @@ int Alarm::addAlarm(int conferenceId, int eventId, QString eventTitle, const QDa
     alarmAction = alarm_event_add_actions(alarmEvent, 1);
     alarm_action_set_label(alarmAction, "ConfClerk");
 
-    QString command = QFileInfo(*qApp->argv()).absoluteFilePath() + QString(" %1").arg(QString::number(eventId));
+    QString command = QFileInfo(*qApp->argv()).absoluteFilePath() + QString(" %1 %2").arg(conferenceId, eventId);
     qDebug() << "Setting alarm: " << command;
     alarm_action_set_exec_command(alarmAction, command.toLocal8Bit().data());
     alarmAction->flags |= ALARM_ACTION_TYPE_EXEC;

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 29f36fbec9f3badf2f178a05050ad27de6fa2f55..cc749b6a623916d5433264ffef250fe2c1b856f0 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -44,10 +44,8 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationName("Toastfreeware");
     QCoreApplication::setApplicationName("ConfClerk");
     QCoreApplication::setApplicationVersion(VERSION);
- 
-    QWidget *window;
-    window = new MainWindow;
 
+    QWidget* window = new MainWindow;
 
 #ifdef MAEMO
     // Alarm Dbus
@@ -59,25 +57,26 @@ int main(int argc, char *argv[])
     {
        if( connection.registerService("at.priv.toastfreeware.confclerk") == false)
        {
-               if(argc>1)
+            if(argc==3)
                {
                        QDBusInterface *interface = new QDBusInterface("at.priv.toastfreeware.confclerk",
                                                                       "/ConfClerk",
                                                                       "at.priv.toastfreeware.confclerk.AlarmInterface",
                                                                       connection);
-                       interface->call("Alarm",atoi(argv[1]));
+                interface->call("Alarm",atoi(argv[2]));
                        return 0;
                }
        }
     }
+#endif
 
-    if(argc > 1)
-    {
-        EventDialog dialog(atoi(argv[1]), window);
+    // If we were started with the parameters confernceid and eventid, show the corresponding event (alarm)
+    if (argc == 3) {
+        QString conferenceIdStr = argv[1];
+        QString eventIdStr = argv[2];
+        EventDialog dialog(conferenceIdStr.toInt(), eventIdStr.toInt(), window);
         dialog.exec();
     }
-#endif
-
     window->show();
 
     return a.exec();

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index ff3ceccb13f35e3f933faaf132f354ef17737f43..fcd66ec5246b65a55a7b6da54e232e7977179ba4 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -26,10 +26,7 @@
 #include "alarm.h"
 #endif
 
-EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
-    : QDialog(aParent)
-    , mEventId(aEventId)
-{
+EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialog(parent), mConferenceId(conferenceId), mEventId(eventId) {
     setupUi(this);
 
 #ifdef MAEMO
@@ -38,7 +35,7 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
     alarmButton->hide();
 #endif
 
-    Event event = Event::getById(mEventId,Conference::activeConference());
+    Event event = Event::getById(mEventId, mConferenceId);
 
     title->setText(event.title());
     persons->setText(event.persons().join(" and "));
@@ -65,9 +62,9 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
 
 void EventDialog::favouriteClicked()
 {
-    Event event = Event::getById(mEventId,Conference::activeConference());
+    Event event = Event::getById(mEventId, mConferenceId);
 
-    QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
+    QList<Event> conflicts = Event::conflictEvents(event.id(), mConferenceId);
     if(event.isFavourite())
     {
         event.setFavourite(false);
@@ -83,7 +80,7 @@ void EventDialog::favouriteClicked()
     if(event.isFavourite())
     {
         // event has became 'favourite' and so 'conflicts' list may have changed
-        conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
+        conflicts = Event::conflictEvents(event.id(), mConferenceId);
     }
 
     // have to emit 'eventChanged' signal on all events in conflict
@@ -97,7 +94,7 @@ void EventDialog::favouriteClicked()
 
 void EventDialog::alarmClicked()
 {
-    Event event = Event::getById(mEventId,Conference::activeConference());
+    Event event = Event::getById(mEventId, mConferenceId);
 
     if(event.hasAlarm())
     {

diff --git a/src/gui/eventdialog.h b/src/gui/eventdialog.h
index cd7f1baca4d6d2e40dae7bdafe96bdcffa8617a7..54cda47d2de5b8d2a881c5f658b87c86035523bf 100644 (file)
--- a/src/gui/eventdialog.h
+++ b/src/gui/eventdialog.h
@@ -28,7 +28,7 @@ class EventDialog : public QDialog, Ui::EventDialog
 { 
     Q_OBJECT
 public:
-    EventDialog(const int &aEventId, QWidget *aParent = NULL);
+    EventDialog(int conferencdId, int eventId, QWidget *parent = 0);
     ~EventDialog() {}
 private slots:
     void favouriteClicked();
@@ -36,6 +36,7 @@ private slots:
 signals:
     void eventChanged(int aEventId, bool favouriteChanged); // emited when user changes some event details, eg. sets it Favourite
 private:
+    int mConferenceId;
     int mEventId;
 };
 

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index a0b7cec9c3b72addbd5e07c34d0409d4687ac0b7..3bd16551968c4182a694128fab5aee3aa9e36dac 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -50,7 +50,7 @@
 const QString PROXY_USERNAME;
 const QString PROXY_PASSWD;
 
-MainWindow::MainWindow(int aEventId, QWidget *aParent): QMainWindow(aParent) {
+MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) {
     setupUi(this);
 
     // Open database
@@ -75,12 +75,6 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent): QMainWindow(aParent) {
     if(!AppSettings::contains("proxyIsDirectConnection"))
         AppSettings::setDirectConnection(true);
 
-    /*
-    if(AppSettings::isDirectConnection())
-    {
-        qDebug() << "Setting-up proxy: " << AppSettings::proxyAddress() << ":" << AppSettings::proxyPort();
-    }
-    */
     QNetworkProxy proxy(
             AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
             AppSettings::proxyAddress(),
@@ -116,21 +110,7 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent): QMainWindow(aParent) {
         clearTabs();
     }
 
-    // open dialog for given Event ID
-    // this is used in case Alarm Dialog request application to start
-    if(aEventId)
-    {
-        try
-        {
-            EventDialog dialog(aEventId,this);
-            dialog.exec();
-        }
-        catch(OrmNoObjectException&) {} // just start application
-        catch(...) {} // just start application
-    }
-
     connect(mNetworkAccessManager, SIGNAL(finished(QNetworkReply*)), SLOT(networkQueryFinished(QNetworkReply*)));
-
     connect(mXmlParser, SIGNAL(parsingScheduleBegin()), conferenceModel, SLOT(newConferenceBegin()));
     connect(mXmlParser, SIGNAL(parsingScheduleEnd(int)), conferenceModel, SLOT(newConferenceEnd(int)));
 }
@@ -226,20 +206,22 @@ void MainWindow::onSearchResultChanged() {
 }
 
 
-void MainWindow::useConference(int id)
+void MainWindow::useConference(int conferenceId)
 {
-    if (id == -1)  // in case no conference is active
+    if (conferenceId == -1)  // in case no conference is active
     {
         unsetConference();
         return;
     }
     try {
-        Conference::getById(Conference::activeConference()).update("active",0);
-        Conference new_active = Conference::getById(id);
-        new_active.update("active",1);
+        int oldActiveConferenceId = Conference::activeConference();
+        bool switchActiveConference = conferenceId != oldActiveConferenceId;
+        if (switchActiveConference) Conference::getById(oldActiveConferenceId).update("active", 0);
+        Conference activeConference = Conference::getById(conferenceId);
+        if (switchActiveConference) activeConference.update("active",1);
 
         // looks like it does not work at n900
-        setWindowTitle(new_active.title());
+        setWindowTitle(activeConference.title());
 
         // optimization.
         // dont run initTabs() here

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index a063075323e9e6e0a5399ea16af0c248235e0d5e..674b4a7b0079cc96a5055635a307950ccaf3d4a9 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -34,10 +34,7 @@ class MainWindow : public QMainWindow, private Ui::MainWindow
 {
     Q_OBJECT
 public:
-    // aEventId is used to inform widget to automatically open
-    // Event dialog for given Event ID
-    MainWindow(int aEventId = 0, QWidget *aParent = NULL);
-    ~MainWindow() {}
+    MainWindow(QWidget *parent = 0);
 signals:
     void conferenceRemoved();
 private slots:
@@ -59,7 +56,7 @@ private slots:
     void removeConference(int);
     void changeConferenceUrl(int, const QString&);
 
-    void useConference(int id);
+    void useConference(int conferenceId);
     void unsetConference();
 
     void showError(const QString& message);

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index a6be8631dd4ab89a527e6c2bda454f94a5b537ca..a0e5090b22910e50de2daba78a0dad560b05b41a 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -65,7 +65,7 @@ void TabContainer::itemClicked(const QModelIndex &aIndex)
     if(!aIndex.parent().isValid()) // time-group
         return;
 
-    EventDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
+    EventDialog dialog(Conference::activeConference(), static_cast<Event*>(aIndex.internalPointer())->id(),this);
 #ifdef N810
     dialog.setFixedWidth(static_cast<QWidget*>(parent())->width());
 #endif

diff --git a/src/mvc/conference.cpp b/src/mvc/conference.cpp
index 655e5f210ea6ff2d4886e6d40173d7422c784550..3ae8914a41b8eadeb18649394f079b4a7e0d842d 100644 (file)
--- a/src/mvc/conference.cpp
+++ b/src/mvc/conference.cpp
@@ -51,25 +51,10 @@ QList<Conference> Conference::getAll()
     return load(query);
 }
 
-int Conference::activeConference()
-{
-    {
-        QSqlQuery query("SELECT id FROM conference WHERE active = 1");
-        query.exec();
-
-        // TODO: change it so that it will select somw existing ID
-
-        if (query.next()) {
-            return query.record().value("id").toInt();
-        }
-    }
-
-    QSqlQuery query2("SELECT id FROM conference ORDER BY id");
-    if (query2.next()) {
-        return query2.record().value("id").toInt();
-    }
-
-    return -1;
+int Conference::activeConference() {
+    QSqlQuery query("SELECT id FROM conference ORDER BY active DESC, id LIMIT 1");
+    if (!query.exec() || !query.first()) return -1;
+    return query.record().value("id").toInt();
 }
 
 

diff --git a/src/mvc/conference.h b/src/mvc/conference.h
index 1b3157f4340cec346d51ffb383c7a2893bc7a59b..4c7984a06ad0330dbc7097369dafabd56e754efd 100644 (file)
--- a/src/mvc/conference.h
+++ b/src/mvc/conference.h
@@ -35,7 +35,10 @@ public:
 public:
     static Conference getById(int id);
     static QList<Conference> getAll();
-    static int activeConference(); ///< returns -1 if no conference is active
+
+    /// Returns the active conference. If no active conference can be found, it returns the conference with the lowest id.
+    /// If no conference exists or database errors occur, it returns -1.
+    static int activeConference();
 
 public:
     int id() const { return value("id").toInt(); }