X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=mainwidget.cpp;h=545292ad87dfb17841e65634bff71e41262e32cb;hb=d15f3a4c10b00bdfff2807b624333c5ca195ecf0;hp=b3d43a57435deff3de87334532ec10796e0ed1ac;hpb=5ce4c1f253dc58e9aa02a48819a57a3b1603fad3;p=yandex-traffic

diff --git a/mainwidget.cpp b/mainwidget.cpp
index b3d43a5..545292a 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -1,7 +1,13 @@
 #include <QtGui>
 
+#include "globals.hpp"
 #include "mainwidget.hpp"
 #include "settingsDialog.hpp"
+#include "connection.hpp"
+#include "devstate.hpp"
+#include "settings.hpp"
+#include "log.hpp"
+#include "menudialog.hpp"
 
 
 // --------------------------------------------------
@@ -15,26 +21,24 @@ MainWidget::MainWidget ()
 #endif
     _light = new TrafficLight (this);
     _label = new QLabel (this);
+    _timer = new QTimer (this);
 
     _label->setAlignment (Qt::AlignHCenter | Qt::AlignVCenter);
 
     _traffic = new Traffic;
     _regions = new RegionsTable;
-    _settings = new Settings;
+    _settings = Settings::instance ();
 
     QHBoxLayout *layout = new QHBoxLayout;
     layout->addWidget (_light);
     layout->addWidget (_label);
     setLayout (layout);
 
-    _light->setVisible (_settings->check (Settings::C_ShowLight));
-
-    updateSize ();
+    applySettings ();
 
     connect (_traffic, SIGNAL (updated ()), SLOT (trafficUpdated ()));
-
-    // every 5 minutes (TODO, make option)
-    startTimer (5*60*1000);
+    connect (_timer, SIGNAL (timeout ()), SLOT (updateData ()));
+    connect (DeviceState::instance (), SIGNAL (lockChanged (bool)), SLOT (deviceLockChanged (bool)));
 
     updateData ();
 }
@@ -63,25 +67,19 @@ void MainWidget::paintEvent(QPaintEvent *event)
 }
 
 
-void MainWidget::timerEvent (QTimerEvent *)
-{
-    updateData ();
-}
-
-
-
 void MainWidget::trafficUpdated ()
 {
-    ExtendedTrafficInfo info = _traffic->lookup_ext ("1");
+    ExtendedTrafficInfo info = _traffic->lookup_ext (_settings->regionID ());
 
     if (info.valid ()) {
         QString data;
         bool first = true;
+        Log::instance ()->add ("trafficUpdated, info valid");
+        info.dump ();
         _light->setColor (info.color ());
 
         if (_settings->check (Settings::C_ShowRank)) {
-            data.append (QString::number (info.level ()));
-            data.append (info.level () > 1 ? tr (" points") : tr (" point"));
+            data.append (tr ("%n point(s)", "", info.level ()));
             first = false;
         }
 
@@ -100,15 +98,36 @@ void MainWidget::trafficUpdated ()
 
         _label->setText (data);
     }
-    else
+    else {
+        Log::instance ()->add ("trafficUpdated, but info not valid");
         _light->setColor (ExtendedTrafficInfo::Unknown);
+        _label->setText (tr ("No data"));
+    }
 }
 
 
 void MainWidget::updateData ()
 {
-    // Here we need to check for internet connection
-    _traffic->update ();
+    bool update = true;
+
+    Log::instance ()->add ("updateData called");
+
+#if CHECK_FOR_CONNECTION
+    update = ConnectionChecker::instance ()->checkConnection (_settings->check (Settings::C_UpdateOnGSM),
+                                                              _settings->check (Settings::C_UpdateOnWiFi));
+    Log::instance ()->add (QString ("checkConnection returned %1").arg (update ? "true" : "false"));
+    if (!_settings->check (Settings::C_UpdateWhenLocked)) {
+        Log::instance ()->add ("Check for device state");
+        update &= !DeviceState::instance ()->locked ();
+    }
+#endif
+
+    if (update) {
+        Log::instance ()->add ("Perform update");
+        _traffic->update ();
+    }
+    else
+        Log::instance ()->add ("Update not performed");
 }
 
 
@@ -118,10 +137,7 @@ void MainWidget::settingsDialog ()
 
     dlg.exec ();
 
-    // Handle settings
-    _light->setVisible (_settings->check (Settings::C_ShowLight));
-
-    updateSize ();
+    applySettings ();
     trafficUpdated ();
 }
 
@@ -143,3 +159,54 @@ void MainWidget::updateSize ()
 
     setFixedSize (minSize);
 }
+
+
+
+void MainWidget::applySettings ()
+{
+    _light->setVisible (_settings->check (Settings::C_ShowLight));
+
+    updateSize ();
+
+    Log::instance ()->add (QString ("applySettings: updateInterval is %1").arg (_settings->updateInterval ()));
+
+    if (_settings->updateInterval () < 0) {
+        _timer->stop ();
+        Log::instance ()->add ("Timer disabled");
+    }
+    else {
+        _timer->setInterval (1000 * 60 * _settings->updateInterval ());
+        _timer->start ();
+        Log::instance ()->add (QString ("Timer interval set to %1 ms").arg (1000 * 60 * _settings->updateInterval ()));
+    }
+}
+
+
+bool MainWidget::event (QEvent *event)
+{
+    if (event->type () != QEvent::WindowActivate)
+        return QWidget::event (event);
+
+    MenuDialog menu (tr ("Yandex.Traffic"));
+
+    menu.addEntry (tr ("Settings")).addEntry (tr ("Update"));
+
+    switch (menu.run ()) {
+        case 0:
+            settingsDialog ();
+            break;
+        case 1:
+            _traffic->update ();
+            break;
+    }
+
+    return QWidget::event (event);
+}
+
+
+void MainWidget::deviceLockChanged (bool locked)
+{
+    if (!_settings->check (Settings::C_UpdateWhenLocked))
+        if (!locked)
+            updateData ();
+}