put endorsement state and first start in settings

3 files changed, 66 insertions, 17 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index bce92e48..f0e2fe56 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1225,7 +1225,7 @@ void MainWindow::showEvent(QShowEvent *event)
 
     hookUpWindowTutorials();
 
-    if (m_OrganizerCore.settings().directInterface().value("first_start", true).toBool()) {
+    if (m_OrganizerCore.settings().getFirstStart()) {
       QString firstStepsTutorial = ToQString(AppConfig::firstStepsTutorial());
       if (TutorialManager::instance().hasTutorial(firstStepsTutorial)) {
         if (QMessageBox::question(this, tr("Show tutorial?"),
@@ -1244,7 +1244,7 @@ void MainWindow::showEvent(QShowEvent *event)
             QObject::tr("Please use \"Help\" from the toolbar to get usage instructions to all elements"));
       }
 
-      m_OrganizerCore.settings().directInterface().setValue("first_start", false);
+      m_OrganizerCore.settings().setFirstStart(false);
     }
 
     m_OrganizerCore.settings().restoreIndex(ui->groupCombo);
@@ -5567,22 +5567,42 @@ void MainWindow::modUpdateCheck(std::multimap<QString, int> IDs)
 
 void MainWindow::toggleMO2EndorseState()
 {
-  if (Settings::instance().endorsementIntegration()) {
-    ui->actionEndorseMO->setVisible(true);
-    if (Settings::instance().directInterface().contains("endorse_state")) {
-      ui->actionEndorseMO->menu()->setEnabled(false);
-      if (Settings::instance().directInterface().value("endorse_state").toString() == "Endorsed") {
-        ui->actionEndorseMO->setToolTip(tr("Thank you for endorsing MO2! :)"));
-        ui->actionEndorseMO->setStatusTip(tr("Thank you for endorsing MO2! :)"));
-      } else if (Settings::instance().directInterface().value("endorse_state").toString() == "Abstained") {
-        ui->actionEndorseMO->setToolTip(tr("Please reconsider endorsing MO2 on Nexus!"));
-        ui->actionEndorseMO->setStatusTip(tr("Please reconsider endorsing MO2 on Nexus!"));
-      }
-    } else {
-      ui->actionEndorseMO->menu()->setEnabled(true);
-    }
-  } else
+  const auto& s = m_OrganizerCore.settings();
+
+  if (!s.endorsementIntegration()) {
     ui->actionEndorseMO->setVisible(false);
+    return;
+  }
+
+  ui->actionEndorseMO->setVisible(true);
+
+  bool enabled = false;
+  QString text;
+
+  switch (s.endorsementState())
+  {
+    case EndorsementState::Accepted:
+    {
+      text = tr("Thank you for endorsing MO2! :)");
+      break;
+    }
+
+    case EndorsementState::Refused:
+    {
+      text = tr("Please reconsider endorsing MO2 on Nexus!");
+      break;
+    }
+
+    case EndorsementState::NoDecision:
+    {
+      enabled = true;
+      break;
+    }
+  }
+
+  ui->actionEndorseMO->menu()->setEnabled(enabled);
+  ui->actionEndorseMO->setToolTip(text);
+  ui->actionEndorseMO->setStatusTip(text);
 }
 
 void MainWindow::nxmEndorsementsAvailable(QVariant userData, QVariant resultData, int)
diff --git a/src/settings.cpp b/src/settings.cpp
index 40f4dd95..882984f3 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -489,6 +489,11 @@ bool Settings::getFirstStart() const
   return getOptional<bool>(m_Settings, "first_start").value_or(true);
 }
 
+void Settings::setFirstStart(bool b)
+{
+  m_Settings.setValue("first_start", b);
+}
+
 std::optional<QColor> Settings::getPreviousSeparatorColor() const
 {
   const auto c = getOptional<QColor>(m_Settings, "previousSeparatorColor");
@@ -689,6 +694,19 @@ bool Settings::endorsementIntegration() const
   return m_Settings.value("Settings/endorsement_integration", true).toBool();
 }
 
+EndorsementState Settings::endorsementState() const
+{
+  const auto v = getOptional<QString>(m_Settings, "endorse_state");
+
+  if (!v) {
+    return EndorsementState::NoDecision;
+  } else if (*v == "Abstained") {
+    return EndorsementState::Refused;
+  } else {
+    return EndorsementState::Accepted;
+  }
+}
+
 bool Settings::hideAPICounter() const
 {
   return m_Settings.value("Settings/hide_api_counter", false).toBool();
diff --git a/src/settings.h b/src/settings.h
index 1b6616a0..167c74fc 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -91,6 +91,13 @@ private:
 };
 
 
+enum class EndorsementState
+{
+  Accepted = 1,
+  Refused,
+  NoDecision
+};
+
 /**
  * manages the settings for Mod Organizer. The settings are not cached
  * inside the class but read/written directly from/to disc
@@ -205,7 +212,9 @@ public:
   std::optional<bool> getUseProxy() const;
 
   std::optional<QVersionNumber> getVersion() const;
+
   bool getFirstStart() const;
+  void setFirstStart(bool b);
 
   std::optional<QColor> getPreviousSeparatorColor() const;
   void setPreviousSeparatorColor(const QColor& c) const;
@@ -354,6 +363,8 @@ public:
    */
   bool endorsementIntegration() const;
 
+  EndorsementState endorsementState() const;
+
   /**
    * @return true if the API counter should be hidden
    */