Fix character loading and typo in settings keys

diff --git a/src/evemodel.cpp b/src/evemodel.cpp
index e8e60c4..167d32e 100644 (file)
--- a/src/evemodel.cpp
+++ b/src/evemodel.cpp
@@ -84,7 +84,7 @@ void EveModel::replyReady()
         reader.readNextStartElement(); // start next row
     }
     m_reply->deleteLater();
-    saveSettings();
+
     emit accountsReady();
 }
 
@@ -123,7 +123,7 @@ bool EveModel::loadSettings()
         character.corpId = settings.value("corpId").toInt();
 
         if (settings.contains("characterIcon")) {
-            character.characterIcon = new QPixmap(settings.value("characerIcon").value<QPixmap>());
+            character.characterIcon = new QPixmap(settings.value("characterIcon").value<QPixmap>());
         }
         characters().append(character);
     }
@@ -135,6 +135,7 @@ bool EveModel::loadSettings()
 // TODO
 void EveModel::saveSettings()
 {
+    qDebug() << "Save";
     QSettings settings("net.korjaussarja","evehomescreen");
     settings.setValue("account/apiKey",apiKey());
     settings.setValue("account/userId",userId());
@@ -144,7 +145,7 @@ void EveModel::saveSettings()
 
     for (int i=0;i<characters().size();++i) {
         settings.setArrayIndex(i);
-        settings.setValue("characerName", characters().at(i).name);
+        settings.setValue("characterName", characters().at(i).name);
         settings.setValue("characterId", characters().at(i).characterId);
         settings.setValue("corpName", characters().at(i).corpName);
         settings.setValue("corpId", characters().at(i).corpId);

diff --git a/src/widget.cpp b/src/widget.cpp
index 9e304d2..7302d32 100644 (file)
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -25,9 +25,14 @@ Widget::Widget(QWidget *parent)
     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();
+    }
 }
 
 Widget::~Widget()
@@ -84,19 +89,28 @@ void Widget::showSettingsDialog()
         EveCharacter *character = m_model->selectedCharacter();
         if (character != NULL) {
             qDebug() << "Got character " << character->name;
-
             connect(character,SIGNAL(imageLoaded()),this,SLOT(skillReady()));
             character->fetchImage();
-            qDebug() << "Fetch skills";
-            m_training = new EveSkillTraining(this);
-            m_training->setAccount(m_settings->model().data());
-            m_training->setCharacter(character);
-            connect(m_training,SIGNAL(finished()),this,SLOT(update()));
-            m_training->fetchInfo();
+
+            loadTraining();
         }
     }
 }
 
+void Widget::loadTraining()
+{
+    EveCharacter *character = m_model->selectedCharacter();
+    if (character != NULL) {
+
+        qDebug() << "Fetch skills";
+        m_training = new EveSkillTraining(this);
+        m_training->setAccount(m_settings->model().data());
+        m_training->setCharacter(character);
+        connect(m_training,SIGNAL(finished()),this,SLOT(update()));
+        m_training->fetchInfo();
+    }
+}
+
 void Widget::skillReady()
 {
     update();

diff --git a/src/widget.h b/src/widget.h
index 967acf7..8f33c6d 100644 (file)
--- a/src/widget.h
+++ b/src/widget.h
@@ -24,12 +24,13 @@ public:
     Widget(QWidget *parent = 0);
     ~Widget();
     QSize sizeHint() const;
+
 public slots:
     void showSettingsDialog();
     void paintEvent(QPaintEvent *event);
     void skillReady();
     void onlineStateChanged(bool online);
-
+    void loadTraining();
 private:
     EveSettingsDialog *m_settings;
     EveSkillTraining *m_training;