rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed warning and error logging level in GUI #4745

This commit is contained in:
Jerry (Xinyu Hou) 2015-06-08 14:44:31 -07:00
parent a21e4cd73b
commit 756000d8a9
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/res/SettingsDialogBase.ui
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>SettingsDialogBase</class> <class>SettingsDialogBase</class>
<widget class="QDialog" name="SettingsDialogBase"> <widget class="QDialog" name="SettingsDialogBase">
@ -210,17 +210,7 @@
<widget class="QComboBox" name="m_pComboLogLevel"> <widget class="QComboBox" name="m_pComboLogLevel">
<item> <item>
<property name="text"> <property name="text">
<string>Error</string> <string>Notify</string>
</property>
</item>
<item>
<property name="text">
<string>Warning</string>
</property>
</item>
<item>
<property name="text">
<string>Note</string>
</property> </property>
</item> </item>
<item> <item>

16
src/gui/src/AppConfig.cpp
View File

@ -37,9 +37,7 @@ const char AppConfig::m_SynergyLogDir[] = "/var/log/";
static const char* logLevelNames[] = static const char* logLevelNames[] =
{ {
"ERROR", "NOTIFY",
"WARNING",
"NOTE",
"INFO", "INFO",
"DEBUG", "DEBUG",
"DEBUG1", "DEBUG1",
@ -58,7 +56,8 @@ AppConfig::AppConfig(QSettings* settings) :
m_ElevateMode(false), m_ElevateMode(false),
m_AutoConfigPrompted(false), m_AutoConfigPrompted(false),
m_CryptoEnabled(false), m_CryptoEnabled(false),
m_AutoHide(false) m_AutoHide(false),
m_ResetLogLevel(true)
{ {
Q_ASSERT(m_pSettings); Q_ASSERT(m_pSettings);
@ -118,7 +117,7 @@ void AppConfig::loadSettings()
m_ScreenName = settings().value("screenName", QHostInfo::localHostName()).toString(); m_ScreenName = settings().value("screenName", QHostInfo::localHostName()).toString();
m_Port = settings().value("port", 24800).toInt(); m_Port = settings().value("port", 24800).toInt();
m_Interface = settings().value("interface").toString(); m_Interface = settings().value("interface").toString();
m_LogLevel = settings().value("logLevel", 3).toInt(); // level 3: INFO m_LogLevel = settings().value("logLevel", 1).toInt(); // level 1: INFO
m_LogToFile = settings().value("logToFile", false).toBool(); m_LogToFile = settings().value("logToFile", false).toBool();
m_LogFilename = settings().value("logFilename", synergyLogDir() + "synergy.log").toString(); m_LogFilename = settings().value("logFilename", synergyLogDir() + "synergy.log").toString();
m_WizardLastRun = settings().value("wizardLastRun", 0).toInt(); m_WizardLastRun = settings().value("wizardLastRun", 0).toInt();
@ -132,6 +131,12 @@ void AppConfig::loadSettings()
m_UserToken = settings().value("userToken", "").toString(); m_UserToken = settings().value("userToken", "").toString();
m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool(); m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool();
m_AutoHide = settings().value("autoHide", false).toBool(); m_AutoHide = settings().value("autoHide", false).toBool();
m_ResetLogLevel = settings().value("resetLogLevel", true).toBool();
if (m_ResetLogLevel) {
m_LogLevel = 1;
m_ResetLogLevel = false;
}
} }
void AppConfig::saveSettings() void AppConfig::saveSettings()
@ -153,6 +158,7 @@ void AppConfig::saveSettings()
settings().setValue("userToken", m_UserToken); settings().setValue("userToken", m_UserToken);
settings().setValue("cryptoEnabled", m_CryptoEnabled); settings().setValue("cryptoEnabled", m_CryptoEnabled);
settings().setValue("autoHide", m_AutoHide); settings().setValue("autoHide", m_AutoHide);
settings().setValue("resetLogLevel", m_ResetLogLevel);
} }
void AppConfig::setAutoConfig(bool autoConfig) void AppConfig::setAutoConfig(bool autoConfig)

1
src/gui/src/AppConfig.h
View File

@ -128,6 +128,7 @@ class AppConfig
QString m_UserToken; QString m_UserToken;
bool m_CryptoEnabled; bool m_CryptoEnabled;
bool m_AutoHide; bool m_AutoHide;
bool m_ResetLogLevel;
static const char m_SynergysName[]; static const char m_SynergysName[];
static const char m_SynergycName[]; static const char m_SynergycName[];

4
src/gui/src/MainWindow.cpp
View File

@ -374,7 +374,7 @@ void MainWindow::appendLogNote(const QString& text)
} }
void MainWindow::appendLogDebug(const QString& text) { void MainWindow::appendLogDebug(const QString& text) {
if (appConfig().logLevel() >= 4) { if (appConfig().logLevel() >= 2) {
appendLogRaw("DEBUG: " + text); appendLogRaw("DEBUG: " + text);
} }
} }
@ -588,7 +588,7 @@ void MainWindow::startSynergy()
qDebug() << args; qDebug() << args;
// show command if debug log level... // show command if debug log level...
if (appConfig().logLevel() >= 4) { if (appConfig().logLevel() >= 2) {
appendLogNote(QString("command: %1 %2").arg(app, args.join(" "))); appendLogNote(QString("command: %1 %2").arg(app, args.join(" ")));
} }