Use queue time instead of local time when setting up refresh timer

[evehomescreen] / src / widget.cpp

diff --git a/src/widget.cpp b/src/widget.cpp
index 3a6f0bd..8af1ba5 100644 (file)
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -9,28 +9,40 @@
 #include "skilltree.h"
 #include <QtDebug>
 #include <QNetworkConfigurationManager>
+#include <QSettings>
+#include <QTimer>
+#include <QDateTime>
 
 QTM_USE_NAMESPACE
 
 Widget::Widget(QWidget *parent)
     : QLabel(parent),
-    m_character(NULL),
     m_settings(new EveSettingsDialog(this)),
     m_training(NULL),
     m_net(new QNetworkConfigurationManager(this)),
     m_skills(new SkillTree(this)),
-    m_model(NULL)
+    m_model(new EveModel),
+    m_timer(new QTimer(this))
 {
     setAlignment(Qt::AlignCenter);
     setAttribute(Qt::WA_TranslucentBackground);
     setGeometry(0,0,150,180);
     connect(m_net,SIGNAL(onlineStateChanged(bool)),this,SLOT(onlineStateChanged(bool)));
+    connect(m_skills,SIGNAL(skillsLoaded()),this,SLOT(update()));
     m_skills->loadSkills();
+    m_model->loadSettings();
+    m_settings->setModel(m_model);
+    EveCharacter *c = m_model->selectedCharacter();
+    if (c != NULL) {
+        loadTraining();
+    }
+    m_timer->setSingleShot(true);
+    connect(m_timer,SIGNAL(timeout()),this,SLOT(loadTraining()));
 }
 
 Widget::~Widget()
 {
-    delete m_character;
+
 }
 
 
@@ -49,20 +61,26 @@ void Widget::paintEvent(QPaintEvent *event)
     QFont dFont(p.font());
     dFont.setPixelSize(15);
     p.setFont(dFont);
-    if (m_character != NULL) {
+    EveCharacter *character = m_model->selectedCharacter();
+    if (character != NULL) {
         QPoint iconLoc((150-64)/2,(150-64)/2);
-        if (m_character->characterIcon) {
-            p.drawPixmap(iconLoc,*(m_character->characterIcon));
+        if (character->characterIcon) {
+            p.drawPixmap(iconLoc,*(character->characterIcon));
         }
         QRect nameLoc(0,10,150,20);
-        p.drawText(nameLoc,Qt::AlignCenter,m_character->name);
-        if (m_training) {
+        p.drawText(nameLoc,Qt::AlignCenter,character->name);
+        if (m_training && m_training->training) {
             QRect skillTitle(0,110,150,50);
             p.drawText(skillTitle,Qt::AlignCenter|Qt::TextWordWrap,
                        QString("%1 %2").arg(m_skills->skillName(m_training->typeId))
                                        .arg(m_training->level));
             QRect skillLoc(0,155,150,20);
             p.drawText(skillLoc,Qt::AlignCenter,m_training->endTime.toString(Qt::SystemLocaleShortDate));
+        } else {
+
+            QRect skillTitle(0,110,150,50);
+            p.drawText(skillTitle,Qt::AlignCenter|Qt::TextWordWrap,
+                       "No skill in training");
         }
 
     }
@@ -76,17 +94,33 @@ void Widget::showSettingsDialog()
 
     int result = m_settings->exec();
     if (result == QDialog::Accepted) {
-        m_character = m_settings->selectedCharacter();
-        m_model = m_settings->model();
-        qDebug() << "Got character " << m_character->name;
-        connect(m_character,SIGNAL(imageLoaded()),this,SLOT(skillReady()));
-        m_character->fetchImage();
+
+        m_model->setSelected(m_settings->selectedCharacter());
+        EveCharacter *character = m_model->selectedCharacter();
+        if (character != NULL) {
+            qDebug() << "Got character " << character->name;
+            connect(character,SIGNAL(imageLoaded()),this,SLOT(skillReady()));
+            character->fetchImage();
+
+            loadTraining();
+        }
+    }
+}
+
+void Widget::loadTraining()
+{
+    EveCharacter *character = m_model->selectedCharacter();
+    if (character != NULL) {
+
         qDebug() << "Fetch skills";
-        m_training = new EveSkillTraining(this);
+        if (m_training == NULL) {
+            m_training = new EveSkillTraining(this);
+            connect(m_training,SIGNAL(finished()),this,SLOT(trainingLoaded()));
+        }
         m_training->setAccount(m_settings->model().data());
-        m_training->setCharacter(m_character);
-        connect(m_training,SIGNAL(finished()),this,SLOT(update()));
+        m_training->setCharacter(character);
 
+        m_training->fetchInfo();
     }
 }
 
@@ -94,6 +128,7 @@ void Widget::skillReady()
 {
     update();
     m_training->fetchInfo();
+    m_model->saveSettings();
 }
 
 void Widget::onlineStateChanged(bool online)
@@ -104,14 +139,17 @@ void Widget::onlineStateChanged(bool online)
     }
 }
 
-// TODO
-void Widget::loadSettings()
+void Widget::trainingLoaded()
 {
-
-}
-
-// TODO
-void Widget::saveSettings()
-{
-
+    qDebug() << "Training loaded";
+    if (m_training != NULL && m_training->training) {
+        int interval = 1000 * (m_training->currentTime.secsTo(m_training->endTime) + 30);
+        qDebug() << "Timer interval" << interval;
+        if (m_timer->isActive()) {
+            m_timer->stop();
+        }
+        m_timer->setInterval( interval );
+        m_timer->start();
+    }
+    update();
 }