#6372 Remove log levels that can break log reader behavior
This commit is contained in:
parent
89cc8a8daa
commit
60c0df5984
|
@ -38,9 +38,6 @@ const ElevateMode defaultElevateMode = ElevateAsNeeded;
|
||||||
|
|
||||||
static const char* logLevelNames[] =
|
static const char* logLevelNames[] =
|
||||||
{
|
{
|
||||||
"ERROR",
|
|
||||||
"WARNING",
|
|
||||||
"NOTE",
|
|
||||||
"INFO",
|
"INFO",
|
||||||
"DEBUG",
|
"DEBUG",
|
||||||
"DEBUG1",
|
"DEBUG1",
|
||||||
|
@ -137,7 +134,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("logLevel2", 0).toInt(); // level 0: 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();
|
||||||
|
@ -166,7 +163,7 @@ void AppConfig::saveSettings()
|
||||||
settings().setValue("screenName", m_ScreenName);
|
settings().setValue("screenName", m_ScreenName);
|
||||||
settings().setValue("port", m_Port);
|
settings().setValue("port", m_Port);
|
||||||
settings().setValue("interface", m_Interface);
|
settings().setValue("interface", m_Interface);
|
||||||
settings().setValue("logLevel", m_LogLevel);
|
settings().setValue("logLevel2", m_LogLevel);
|
||||||
settings().setValue("logToFile", m_LogToFile);
|
settings().setValue("logToFile", m_LogToFile);
|
||||||
settings().setValue("logFilename", m_LogFilename);
|
settings().setValue("logFilename", m_LogFilename);
|
||||||
settings().setValue("wizardLastRun", kWizardVersion);
|
settings().setValue("wizardLastRun", kWizardVersion);
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>368</width>
|
<width>368</width>
|
||||||
<height>380</height>
|
<height>446</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -236,21 +236,6 @@
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1" colspan="2">
|
<item row="0" column="1" colspan="2">
|
||||||
<widget class="QComboBox" name="m_pComboLogLevel">
|
<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>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Info</string>
|
<string>Info</string>
|
||||||
|
|
Loading…
Reference in New Issue