From 4099efcb5bfd6932ed2a510aa0e4318fffff121b Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 2 Aug 2019 02:46:19 -0400
Subject: rebased to new logging

---
 src/settingsdialog.cpp            |  4 ++--
 src/settingsdialogdiagnostics.cpp | 24 ++++++++++++++++++++++--
 src/settingsdialogdiagnostics.h   |  1 +
 3 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index d870c192..fbd9ecd1 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -85,10 +85,10 @@ int SettingsDialog::exec()
       if (qsettings.value(k).toString() != before[k] && !k.contains("username") && !k.contains("password"))
       {
         if (first_update) {
-          qDebug("Changed settings:");
+          log::debug("Changed settings:");
           first_update = false;
         }
-        qDebug("  %s=%s", k.toUtf8().data(), qsettings.value(k).toString().toUtf8().data());
+        log::debug("  {}={}", k, qsettings.value(k).toString());
       }
     qsettings.endGroup();
   }
diff --git a/src/settingsdialogdiagnostics.cpp b/src/settingsdialogdiagnostics.cpp
index 2ea4d478..daf81d5c 100644
--- a/src/settingsdialogdiagnostics.cpp
+++ b/src/settingsdialogdiagnostics.cpp
@@ -2,11 +2,14 @@
 #include "ui_settingsdialog.h"
 #include "appconfig.h"
 #include "organizercore.h"
+#include <log.h>
+
+using namespace MOBase;
 
 DiagnosticsSettingsTab::DiagnosticsSettingsTab(Settings *m_parent, SettingsDialog &m_dialog)
   : SettingsTab(m_parent, m_dialog)
 {
-  ui->logLevelBox->setCurrentIndex(m_parent->logLevel());
+  setLevelsBox();
   ui->dumpsTypeBox->setCurrentIndex(m_parent->crashDumpsType());
   ui->dumpsMaxEdit->setValue(m_parent->crashDumpsMax());
   QString logsPath = qApp->property("dataPath").toString()
@@ -20,9 +23,26 @@ DiagnosticsSettingsTab::DiagnosticsSettingsTab(Settings *m_parent, SettingsDialo
   );
 }
 
+void DiagnosticsSettingsTab::setLevelsBox()
+{
+  ui->logLevelBox->clear();
+
+  ui->logLevelBox->addItem(QObject::tr("Debug"), log::Debug);
+  ui->logLevelBox->addItem(QObject::tr("Info (recommended)"), log::Info);
+  ui->logLevelBox->addItem(QObject::tr("Warning"), log::Warning);
+  ui->logLevelBox->addItem(QObject::tr("Error"), log::Error);
+
+  for (int i=0; i<ui->logLevelBox->count(); ++i) {
+    if (ui->logLevelBox->itemData(i) == m_parent->logLevel()) {
+      ui->logLevelBox->setCurrentIndex(i);
+      break;
+    }
+  }
+}
+
 void DiagnosticsSettingsTab::update()
 {
-  m_Settings.setValue("Settings/log_level", ui->logLevelBox->currentIndex());
+  m_Settings.setValue("Settings/log_level", ui->logLevelBox->currentData().toInt());
   m_Settings.setValue("Settings/crash_dumps_type", ui->dumpsTypeBox->currentIndex());
   m_Settings.setValue("Settings/crash_dumps_max", ui->dumpsMaxEdit->value());
 }
diff --git a/src/settingsdialogdiagnostics.h b/src/settingsdialogdiagnostics.h
index 2341c253..4c1805e2 100644
--- a/src/settingsdialogdiagnostics.h
+++ b/src/settingsdialogdiagnostics.h
@@ -12,6 +12,7 @@ public:
   void update();
 
 private:
+  void setLevelsBox();
 };
 
 #endif // SETTINGSDIALOGDIAGNOSTICS_H
-- 
cgit v1.3.1