Yellow text color if training queue has room for more skills, adjust text location

[evehomescreen] / src / eveskilltraining.h

diff --git a/src/eveskilltraining.h b/src/eveskilltraining.h
index 1ddc9ce..4b76cf7 100644 (file)
--- a/src/eveskilltraining.h
+++ b/src/eveskilltraining.h
@@ -1,3 +1,6 @@
+// Copyright (C) 2010 Jaakko Kyro <jkyro@korjaussarja.net>
+// This file is licenced under GPL, see COPYING
+// for full licence information
 #ifndef EVESKILLTRAINING_H
 #define EVESKILLTRAINING_H
 
@@ -6,10 +9,23 @@
 #include <QString>
 #include <QXmlStreamReader>
 #include <QNetworkAccessManager>
+#include <QtDebug>
 
 class EveCharacter;
 class EveModel;
 
+class TrainingEntry {
+public:
+    QDateTime startTime;
+    QDateTime endTime;
+    int typeId;
+    int startSkillpoints;
+    int destSkillpoints;
+    int level;
+};
+
+QDebug operator<<(QDebug, const TrainingEntry &);
+
 class EveSkillTraining : public QObject
 {
     Q_OBJECT
@@ -18,26 +34,27 @@ public:
     bool fromXml(QXmlStreamReader &xml);
     void setCharacter(EveCharacter *character) { m_character = character; }
     void setAccount(EveModel *aModel) { m_account = aModel; }
+    bool isTraining() { return !m_trainingQueue.isEmpty(); }
+    const TrainingEntry &firstTraining() const { return m_trainingQueue.first(); }
+    const TrainingEntry &lastTraining() const { return m_trainingQueue.last(); }
 signals:
     void finished();
 
 public slots:
     void fetchInfo();
     void infoReady();
-
 public:
     bool training;
-    QDateTime startTime;
-    QDateTime endTime;
-    int typeId;
-    int startSkillpoints;
-    int destSkillpoints;
-    int level;
+    QDateTime cachedUntil;
+    QDateTime currentTime;
 private:
     EveCharacter *m_character;
     EveModel *m_account;
     QNetworkAccessManager m_mgr;
     QNetworkReply *m_reply;
+    QList<TrainingEntry> m_trainingQueue;
 };
 
+
+
 #endif // EVESKILLTRAINING_H