Changeset 8bd618c in confclerk_git for src

Timestamp:

10/17/12 20:49:16 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

908b4ce

Parents:

95257a6

Message:

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

Location:

src

Files:

• alarm/alarm.cpp (modified) (1 diff)
• app/main.cpp (modified) (3 diffs)
• gui/eventdialog.cpp (modified) (5 diffs)
• gui/eventdialog.h (modified) (2 diffs)
• gui/mainwindow.cpp (modified) (5 diffs)
• gui/mainwindow.h (modified) (2 diffs)
• gui/tabcontainer.cpp (modified) (1 diff)
• mvc/conference.cpp (modified) (1 diff)
• mvc/conference.h (modified) (1 diff)

src/alarm/alarm.cpp

@@ -58 +58 @@
     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());

src/app/main.cpp

@@ -45 +45 @@
     QCoreApplication::setApplicationName("ConfClerk");
     QCoreApplication::setApplicationVersion(VERSION);
- 
-    QWidget *window;
-    window = new MainWindow;
 
+    QWidget* window = new MainWindow;
 
 #ifdef MAEMO
@@ -60 +58 @@
         if( connection.registerService("at.priv.toastfreeware.confclerk") == false)
         {
-                if(argc>1)
+            if(argc==3)
                 {
                         QDBusInterface *interface = new QDBusInterface("at.priv.toastfreeware.confclerk",
@@ -66 +64 @@
                                                                        "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();
 

src/gui/eventdialog.cpp

@@ -27 +27 @@
 #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);
 
@@ -39 +36 @@
 #endif
 
-    Event event = Event::getById(mEventId,Conference::activeConference());
+    Event event = Event::getById(mEventId, mConferenceId);
 
     title->setText(event.title());
@@ -66 +63 @@
 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())
     {
@@ -84 +81 @@
     {
         // event has became 'favourite' and so 'conflicts' list may have changed
-        conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
+        conflicts = Event::conflictEvents(event.id(), mConferenceId);
     }
 
@@ -98 +95 @@
 void EventDialog::alarmClicked()
 {
-    Event event = Event::getById(mEventId,Conference::activeConference());
+    Event event = Event::getById(mEventId, mConferenceId);
 
     if(event.hasAlarm())

src/gui/eventdialog.h

@@ -29 +29 @@
     Q_OBJECT
 public:
-    EventDialog(const int &aEventId, QWidget *aParent = NULL);
+    EventDialog(int conferencdId, int eventId, QWidget *parent = 0);
     ~EventDialog() {}
 private slots:
@@ -37 +37 @@
     void eventChanged(int aEventId, bool favouriteChanged); // emited when user changes some event details, eg. sets it Favourite
 private:
+    int mConferenceId;
     int mEventId;
 };

src/gui/mainwindow.cpp

@@ -51 +51 @@
 const QString PROXY_PASSWD;
 
-MainWindow::MainWindow(int aEventId, QWidget *aParent): QMainWindow(aParent) {
+MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) {
     setupUi(this);
 
@@ -76 +76 @@
         AppSettings::setDirectConnection(true);
 
-    /*
-    if(AppSettings::isDirectConnection())
-    {
-        qDebug() << "Setting-up proxy: " << AppSettings::proxyAddress() << ":" << AppSettings::proxyPort();
-    }
-    */
     QNetworkProxy proxy(
             AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
@@ -117 +111 @@
     }
 
-    // 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)));
@@ -227 +207 @@
 
 
-void MainWindow::useConference(int id)
-{
-    if (id == -1)  // in case no conference is active
+void MainWindow::useConference(int conferenceId)
+{
+    if (conferenceId == -1)  // in case no conference is active
     {
         unsetConference();
@@ -235 +215 @@
     }
     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.

src/gui/mainwindow.h

@@ -35 +35 @@
     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();
@@ -60 +57 @@
     void changeConferenceUrl(int, const QString&);
 
-    void useConference(int id);
+    void useConference(int conferenceId);
     void unsetConference();
 

src/gui/tabcontainer.cpp

@@ -66 +66 @@
         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());

src/mvc/conference.cpp

@@ -52 +52 @@
 }
 
-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();
 }
 

src/mvc/conference.h

@@ -36 +36 @@
     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: