Changeset 54a377c in confclerk_git for src

Timestamp:

04/02/13 23:28:06 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

b261e79

Parents:

cdf0332

Message:

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

Location:

src

Files:

• gui/eventdialog.cpp (modified) (1 diff)
• gui/mainwindow.cpp (modified) (4 diffs)
• gui/mainwindow.h (modified) (3 diffs)
• mvc/delegate.cpp (modified) (6 diffs)

src/gui/eventdialog.cpp

@@ -32 +32 @@
 #ifdef MAEMO
     showFullScreen();
-#else
-    alarmButton->hide();
 #endif
 

src/gui/mainwindow.cpp

@@ -64 +64 @@
     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();
 
@@ -101 +105 @@
     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());
@@ -115 +124 @@
     connect(mXmlParser, SIGNAL(parsingScheduleEnd(int)), conferenceModel, SLOT(newConferenceEnd(int)));
 }
+
 
 void MainWindow::on_aboutAction_triggered()
@@ -204 +214 @@
     // No results were found
     searchTabContainer->redisplayDate(dayNavigator->curDate());
+}
+
+
+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();
+    */
 }
 

src/gui/mainwindow.h

@@ -50 +50 @@
     void onEventChanged(int aEventId, bool favouriteChanged);
     void onSearchResultChanged();
+
     // TODO: remove
     void networkQueryFinished(QNetworkReply*);
@@ -56 +57 @@
     void removeConference(int);
     void changeConferenceUrl(int, const QString&);
+    void onSystemTrayMessageClicked();
+    void onAlarmTimerTimeout();
 
     void useConference(int conferenceId);
@@ -72 +75 @@
     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
 };
 

src/mvc/delegate.cpp

@@ -110 +110 @@
         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);
-#endif
+
         if(event->hasTimeConflict())
             mControls[WarningControl]->paint(painter, option.rect);
@@ -164 +164 @@
     {
         int numFav = numberOfFavourities(index);
-#ifdef MAEMO
         int numAlarm = numberOfAlarms(index);
-#endif
 
         QStyleOptionButton styleOptionButton;
@@ -200 +198 @@
         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();
@@ -206 +204 @@
         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("/");
@@ -314 +312 @@
     mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/favourite-off.png"), NULL));
 
-#ifdef MAEMO
     // ALARM ICONs
     // on
@@ -325 +322 @@
     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