From d8582d1093212990ab44e0616571189df187e137 Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Thu, 9 Jul 2015 13:26:31 -0700
Subject: [PATCH] Revert "Removed warning and error logging level in GUI #4745"

This reverts commit 756000d8a9577cb9a99bb27056348ecb385a2415.

Conflicts:
	src/gui/res/SettingsDialogBase.ui
	src/gui/src/AppConfig.cpp
	src/gui/src/MainWindow.cpp
---
 src/gui/res/SettingsDialogBase.ui | 15 +++++++++++++++
 src/gui/src/AppConfig.cpp         | 15 +++++----------
 src/gui/src/AppConfig.h           |  1 -
 src/gui/src/MainWindow.cpp        |  4 ++--
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/gui/res/SettingsDialogBase.ui b/src/gui/res/SettingsDialogBase.ui
index 666fc787..6b77b874 100644
--- a/src/gui/res/SettingsDialogBase.ui
+++ b/src/gui/res/SettingsDialogBase.ui
@@ -208,6 +208,21 @@
       </item>
       <item row="0" column="1" colspan="2">
        <widget class="QComboBox" name="m_pComboLogLevel">
+        <item>
+         <property name="text">
+          <string>Error</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Warning</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Note</string>
+         </property>
+        </item>
         <item>
          <property name="text">
           <string>Info</string>
diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index a795538e..f663a859 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -37,6 +37,9 @@ const char AppConfig::m_SynergyLogDir[] = "/var/log/";
 
 static const char* logLevelNames[] =
 {
+	"ERROR",
+	"WARNING",
+	"NOTE",
 	"INFO",
 	"DEBUG",
 	"DEBUG1",
@@ -55,8 +58,7 @@ AppConfig::AppConfig(QSettings* settings) :
 	m_ElevateMode(false),
 	m_AutoConfigPrompted(false),
 	m_CryptoEnabled(false),
-	m_AutoHide(false),
-	m_ResetLogLevel(true)
+	m_AutoHide(false)
 {
 	Q_ASSERT(m_pSettings);
 
@@ -116,7 +118,7 @@ void AppConfig::loadSettings()
 	m_ScreenName = settings().value("screenName", QHostInfo::localHostName()).toString();
 	m_Port = settings().value("port", 24800).toInt();
 	m_Interface = settings().value("interface").toString();
-	m_LogLevel = settings().value("logLevel", 0).toInt(); // level 0: INFO
+	m_LogLevel = settings().value("logLevel", 3).toInt(); // level 3: INFO
 	m_LogToFile = settings().value("logToFile", false).toBool();
 	m_LogFilename = settings().value("logFilename", synergyLogDir() + "synergy.log").toString();
 	m_WizardLastRun = settings().value("wizardLastRun", 0).toInt();
@@ -130,12 +132,6 @@ void AppConfig::loadSettings()
 	m_UserToken = settings().value("userToken", "").toString();
 	m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool();
 	m_AutoHide = settings().value("autoHide", false).toBool();
-	m_ResetLogLevel = settings().value("resetLogLevel", true).toBool();
-
-	if (m_ResetLogLevel) {
-		m_LogLevel = 0;
-		m_ResetLogLevel = false;
-	}
 }
 
 void AppConfig::saveSettings()
@@ -157,7 +153,6 @@ void AppConfig::saveSettings()
 	settings().setValue("userToken", m_UserToken);
 	settings().setValue("cryptoEnabled", m_CryptoEnabled);
 	settings().setValue("autoHide", m_AutoHide);
-	settings().setValue("resetLogLevel", m_ResetLogLevel);
 }
 
 void AppConfig::setAutoConfig(bool autoConfig)
diff --git a/src/gui/src/AppConfig.h b/src/gui/src/AppConfig.h
index 1090bad9..3a304b91 100644
--- a/src/gui/src/AppConfig.h
+++ b/src/gui/src/AppConfig.h
@@ -128,7 +128,6 @@ class AppConfig
 		QString m_UserToken;
 		bool m_CryptoEnabled;
 		bool m_AutoHide;
-		bool m_ResetLogLevel;
 
 		static const char m_SynergysName[];
 		static const char m_SynergycName[];
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 499e6af6..a4c8f0b3 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -374,7 +374,7 @@ void MainWindow::appendLogInfo(const QString& text)
 }
 
 void MainWindow::appendLogDebug(const QString& text) {
-	if (appConfig().logLevel() >= 1) {
+	if (appConfig().logLevel() >= 4) {
 		appendLogRaw(getTimeStamp() + " DEBUG: " + text);
 	}
 }
@@ -587,7 +587,7 @@ void MainWindow::startSynergy()
 	qDebug() << args;
 
 	// show command if debug log level...
-	if (appConfig().logLevel() >= 1) {
+	if (appConfig().logLevel() >= 4) {
 		appendLogInfo(QString("command: %1 %2").arg(app, args.join(" ")));
 	}