Prepared to show an alarm message via tray icon on non-MAEMO systems.

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 486d2d9873a674ede2ee24b61ceecd382dc6d96b..baaa1b5407522e1f252dff3e2b305a52d849b20f 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -31,8 +31,6 @@ EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialo
 
 #ifdef MAEMO
     showFullScreen();
 
 #ifdef MAEMO
     showFullScreen();

-#else
-    alarmButton->hide();

 #endif
 
     Event event = Event::getById(mEventId, mConferenceId);
 #endif
 
     Event event = Event::getById(mEventId, mConferenceId);

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index e055b6a573aaaa5cf4b9c4808a419b40cd09f266..ce54361390a4916ef6850ee6dafdec0a38685e47 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -63,7 +63,11 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) {
     conferenceModel = new ConferenceModel(this);
     mXmlParser = new ScheduleXmlParser(sqlEngine, this);
     mNetworkAccessManager = new QNetworkAccessManager(this);
     conferenceModel = new ConferenceModel(this);
     mXmlParser = new ScheduleXmlParser(sqlEngine, this);
     mNetworkAccessManager = new QNetworkAccessManager(this);

+    systemTrayIcon = new QSystemTrayIcon(qApp->windowIcon(), this);
+    alarmTimer = new QTimer(this);

 
 

+    alarmTimer->setInterval(60000);
+    alarmTimer->start();

     saved_title = windowTitle();
 
 #ifdef N810
     saved_title = windowTitle();
 
 #ifdef N810


@@ -100,6 +104,11 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) {
     // search result has changed
     connect(searchTabContainer, SIGNAL(searchResultChanged()), SLOT(onSearchResultChanged()));
 
     // search result has changed
     connect(searchTabContainer, SIGNAL(searchResultChanged()), SLOT(onSearchResultChanged()));
 

+    // systm tray icon
+    connect(systemTrayIcon, SIGNAL(messageClicked()), SLOT(onSystemTrayMessageClicked()));
+
+    // timer
+    connect(alarmTimer, SIGNAL(timeout()), SLOT(onAlarmTimerTimeout()));

 
     useConference(Conference::activeConference());
     // optimization, see useConference() code
 
     useConference(Conference::activeConference());
     // optimization, see useConference() code


@@ -115,6 +124,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) {
     connect(mXmlParser, SIGNAL(parsingScheduleEnd(int)), conferenceModel, SLOT(newConferenceEnd(int)));
 }
 
     connect(mXmlParser, SIGNAL(parsingScheduleEnd(int)), conferenceModel, SLOT(newConferenceEnd(int)));
 }
 

+

 void MainWindow::on_aboutAction_triggered()
 {
     QDialog dialog(this);
 void MainWindow::on_aboutAction_triggered()
 {
     QDialog dialog(this);


@@ -206,6 +216,22 @@ void MainWindow::onSearchResultChanged() {
 }
 
 
 }
 
 

+void MainWindow::onSystemTrayMessageClicked() {
+    // TODO: Hide icon
+}
+
+
+void MainWindow::onAlarmTimerTimeout() {
+    // TODO: Show Message if an alarm is set on an event that's starting soon and delete the corresponding alarm.
+    /* Example:
+    systemTrayIcon->show();
+    systemTrayIcon->showMessage("title", "message", QSystemTrayIcon::Information, 1000);
+    QApplication::alert(this);
+    QApplication::beep();
+    */
+}
+
+

 void MainWindow::useConference(int conferenceId)
 {
     if (conferenceId == -1)  // in case no conference is active
 void MainWindow::useConference(int conferenceId)
 {
     if (conferenceId == -1)  // in case no conference is active

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 336b9fe7adcf0b75b8258bde04a83011a0164938..613116c8cf79d154dca8d4f6110a1a8975f70e79 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -49,12 +49,15 @@ private slots:
 
     void onEventChanged(int aEventId, bool favouriteChanged);
     void onSearchResultChanged();
 
     void onEventChanged(int aEventId, bool favouriteChanged);
     void onSearchResultChanged();

+

     // TODO: remove
     void networkQueryFinished(QNetworkReply*);
     void importFromNetwork(const QString&, int conferenceId);
     void importFromFile(const QString&, int conferenceId);
     void removeConference(int);
     void changeConferenceUrl(int, const QString&);
     // TODO: remove
     void networkQueryFinished(QNetworkReply*);
     void importFromNetwork(const QString&, int conferenceId);
     void importFromFile(const QString&, int conferenceId);
     void removeConference(int);
     void changeConferenceUrl(int, const QString&);

+    void onSystemTrayMessageClicked();
+    void onAlarmTimerTimeout();

 
     void useConference(int conferenceId);
     void unsetConference();
 
     void useConference(int conferenceId);
     void unsetConference();


@@ -71,6 +74,8 @@ private:
     ConferenceModel* conferenceModel;
     ScheduleXmlParser *mXmlParser;
     QNetworkAccessManager *mNetworkAccessManager;
     ConferenceModel* conferenceModel;
     ScheduleXmlParser *mXmlParser;
     QNetworkAccessManager *mNetworkAccessManager;

+    QSystemTrayIcon* systemTrayIcon; ///< to be able to show notifications
+    QTimer* alarmTimer; ///< timer that triggers every minute to be able to show alarms

 };
 
 #endif /* MAINWINDOW_H */
 };
 
 #endif /* MAINWINDOW_H */

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 54da5549c42e0fac5d2e749a520f9f4071e2e190..93df5b447f3881d6a36d6b850e335eb2bb2f3878 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -109,12 +109,12 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
             mControls[FavouriteControlOn]->paint(painter, option.rect);
         else
             mControls[FavouriteControlOff]->paint(painter, option.rect);
             mControls[FavouriteControlOn]->paint(painter, option.rect);
         else
             mControls[FavouriteControlOff]->paint(painter, option.rect);

-#ifdef MAEMO
+

         if(event->hasAlarm())
             mControls[AlarmControlOn]->paint(painter, option.rect);
         else
             mControls[AlarmControlOff]->paint(painter, option.rect);
         if(event->hasAlarm())
             mControls[AlarmControlOn]->paint(painter, option.rect);
         else
             mControls[AlarmControlOff]->paint(painter, option.rect);

-#endif
+

         if(event->hasTimeConflict())
             mControls[WarningControl]->paint(painter, option.rect);
 
         if(event->hasTimeConflict())
             mControls[WarningControl]->paint(painter, option.rect);
 


@@ -163,9 +163,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
     else // doesn't have parent - time-groups' elements (top items)
     {
         int numFav = numberOfFavourities(index);
     else // doesn't have parent - time-groups' elements (top items)
     {
         int numFav = numberOfFavourities(index);

-#ifdef MAEMO

         int numAlarm = numberOfAlarms(index);
         int numAlarm = numberOfAlarms(index);

-#endif

 
         QStyleOptionButton styleOptionButton;
         styleOptionButton.rect = option.rect;
 
         QStyleOptionButton styleOptionButton;
         styleOptionButton.rect = option.rect;


@@ -199,13 +197,13 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         painter->drawImage(drawPoint,*image);
         painter->drawText(drawPoint+QPoint(image->width()+2, image->height() - 2),
                 QString::number(numFav));
         painter->drawImage(drawPoint,*image);
         painter->drawText(drawPoint+QPoint(image->width()+2, image->height() - 2),
                 QString::number(numFav));

-#ifdef MAEMO
+

         drawPoint.setX(drawPoint.x() - spacer - image->width());
         image = mControls[numAlarm ? AlarmControlOn : AlarmControlOff]->image();
         painter->drawImage(drawPoint,*image);
         painter->drawText(drawPoint+QPoint(image->width()+2, image->height() - 2),
                 QString::number(numAlarm));
         drawPoint.setX(drawPoint.x() - spacer - image->width());
         image = mControls[numAlarm ? AlarmControlOn : AlarmControlOff]->image();
         painter->drawImage(drawPoint,*image);
         painter->drawText(drawPoint+QPoint(image->width()+2, image->height() - 2),
                 QString::number(numAlarm));

-#endif
+

         // draw texts
         QString numEvents = QString::number(index.model()->rowCount(index)).append("/");
         drawPoint.setX(drawPoint.x() - spacer - fmSmall.boundingRect(numEvents).width());
         // draw texts
         QString numEvents = QString::number(index.model()->rowCount(index)).append("/");
         drawPoint.setX(drawPoint.x() - spacer - fmSmall.boundingRect(numEvents).width());


@@ -313,7 +311,6 @@ void Delegate::defineControls()
     // off
     mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/favourite-off.png"), NULL));
 
     // off
     mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/favourite-off.png"), NULL));
 

-#ifdef MAEMO

     // ALARM ICONs
     // on
     mControls.insert(AlarmControlOn,
     // ALARM ICONs
     // on
     mControls.insert(AlarmControlOn,


@@ -324,13 +321,7 @@ void Delegate::defineControls()
     // WARNING ICON
     mControls.insert(WarningControl,
                     new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[AlarmControlOff]));
     // WARNING ICON
     mControls.insert(WarningControl,
                     new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[AlarmControlOff]));

-#else
-    // WARNING ICON
-    mControls.insert(WarningControl,
-                    new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[FavouriteControlOn]));
-#endif
-
-}
+        }

 
 bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const
 {
 
 bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const
 {