Fix character loading and typo in settings keys

[evehomescreen] / src / widget.cpp

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();