rebased to new logging

1 files changed, 22 insertions, 2 deletions

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