From 00734c15b11094c25819baef4ec3a6a69ce33f03 Mon Sep 17 00:00:00 2001
From: Xinyu Hou <xinyu@synergy-project.org>
Date: Tue, 30 Jun 2015 22:45:48 +0100
Subject: [PATCH] Removed notify log level in settings #4745

---
 src/gui/res/SettingsDialogBase.ui | 7 +------
 src/gui/src/AppConfig.cpp         | 5 ++---
 src/gui/src/MainWindow.cpp        | 9 ++-------
 src/gui/src/MainWindow.h          | 1 -
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/gui/res/SettingsDialogBase.ui b/src/gui/res/SettingsDialogBase.ui
index 1543a542..666fc787 100644
--- a/src/gui/res/SettingsDialogBase.ui
+++ b/src/gui/res/SettingsDialogBase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>368</width>
-    <height>377</height>
+    <height>439</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -208,11 +208,6 @@
       </item>
       <item row="0" column="1" colspan="2">
        <widget class="QComboBox" name="m_pComboLogLevel">
-        <item>
-         <property name="text">
-          <string>Notify</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 f5e727db..a795538e 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -37,7 +37,6 @@ const char AppConfig::m_SynergyLogDir[] = "/var/log/";
 
 static const char* logLevelNames[] =
 {
-	"NOTIFY",
 	"INFO",
 	"DEBUG",
 	"DEBUG1",
@@ -117,7 +116,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", 1).toInt(); // level 1: INFO
+	m_LogLevel = settings().value("logLevel", 0).toInt(); // level 0: INFO
 	m_LogToFile = settings().value("logToFile", false).toBool();
 	m_LogFilename = settings().value("logFilename", synergyLogDir() + "synergy.log").toString();
 	m_WizardLastRun = settings().value("wizardLastRun", 0).toInt();
@@ -134,7 +133,7 @@ void AppConfig::loadSettings()
 	m_ResetLogLevel = settings().value("resetLogLevel", true).toBool();
 
 	if (m_ResetLogLevel) {
-		m_LogLevel = 1;
+		m_LogLevel = 0;
 		m_ResetLogLevel = false;
 	}
 }
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index f526a8e4..292fe00f 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -373,13 +373,8 @@ void MainWindow::appendLogInfo(const QString& text)
 	appendLogRaw("INFO: " + text);
 }
 
-void MainWindow::appendLogNotify(const QString& text)
-{
-	appendLogRaw("NOTIFY: " + text);
-}
-
 void MainWindow::appendLogDebug(const QString& text) {
-	if (appConfig().logLevel() >= 2) {
+	if (appConfig().logLevel() >= 1) {
 		appendLogRaw("DEBUG: " + text);
 	}
 }
@@ -586,7 +581,7 @@ void MainWindow::startSynergy()
 	qDebug() << args;
 
 	// show command if debug log level...
-	if (appConfig().logLevel() >= 2) {
+	if (appConfig().logLevel() >= 1) {
 		appendLogInfo(QString("command: %1 %2").arg(app, args.join(" ")));
 	}
 
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 8b7aa0a3..c45c3225 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -112,7 +112,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 	public slots:
 		void appendLogRaw(const QString& text);
 		void appendLogInfo(const QString& text);
-		void appendLogNotify(const QString& text);
 		void appendLogDebug(const QString& text);
 		void appendLogError(const QString& text);
 		void startSynergy();