Revision

14468

Author

mrene

Date

2009-08-08 21:48:47 -0500 (Sat, 08 Aug 2009)

Log Message

fixes

Modified Paths

• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h
• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro

Diff

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp	2009-08-09 01:29:13 UTC (rev 14467)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp	2009-08-09 02:48:47 UTC (rev 14468)
@@ -38,6 +38,7 @@
 {
     consoleConfigPage = new Ui::configPage();
     QWidget *base = new QWidget(this);
+
     consoleConfigPage->setupUi(base);
     settings->addConfigItem("Console", base);
 
@@ -130,18 +131,28 @@
     }
 }
 
+void ConsolePlugin::setPalette(QLineEdit *control, QString key)
+{
+	QSettings settings;
+	if (settings.contains(key)) {
+		control->setPalette(settings.value(key).value<QPalette>());
+	}
+}
+
 void ConsolePlugin::readSettings()
 {
     QSettings settings;
     settings.beginGroup("Console");
-    consoleConfigPage->lineConsole->setPalette(settings.value(QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_EMERG)).value<QPalette>());
-    consoleConfigPage->lineAlert->setPalette(settings.value(QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_ALERT)).value<QPalette>());
-    consoleConfigPage->lineCritical->setPalette(settings.value(QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_CRIT)).value<QPalette>());
-    consoleConfigPage->lineError->setPalette(settings.value(QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_ERROR)).value<QPalette>());
-    consoleConfigPage->lineWarning->setPalette(settings.value(QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_WARNING)).value<QPalette>());
-    consoleConfigPage->lineNotice->setPalette(settings.value(QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_NOTICE)).value<QPalette>());
-    consoleConfigPage->lineInfo->setPalette(settings.value(QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_INFO)).value<QPalette>());
-    consoleConfigPage->lineDebug->setPalette(settings.value(QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_DEBUG)).value<QPalette>());
+
+	setPalette(consoleConfigPage->lineConsole, QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_EMERG));
+	setPalette(consoleConfigPage->lineAlert, QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_ALERT));
+	setPalette(consoleConfigPage->lineCritical, QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_CRIT));
+	setPalette(consoleConfigPage->lineError, QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_ERROR));
+	setPalette(consoleConfigPage->lineWarning, QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_WARNING));
+	setPalette(consoleConfigPage->lineNotice, QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_NOTICE));
+	setPalette(consoleConfigPage->lineInfo, QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_INFO));
+	setPalette(consoleConfigPage->lineDebug, QString("log-level-%1-palette").arg(ESL_LOG_LEVEL_DEBUG));
+
     settings.endGroup();
 }
 

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h	2009-08-09 01:29:13 UTC (rev 14467)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h	2009-08-09 02:48:47 UTC (rev 14468)
@@ -56,6 +56,8 @@
     Ui::configPage *consoleConfigPage;
     ServerManager *serverManager;
     QHash<QString, ESLconnection *> hashESL;
+
+	void setPalette(QLineEdit *control, QString key);
 };
 
 #endif // CONSOLEPLUGIN_H

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro	2009-08-09 01:29:13 UTC (rev 14467)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro	2009-08-09 02:48:47 UTC (rev 14468)
@@ -13,8 +13,7 @@
 FORMS += centralWidget.ui \
     console_settings.ui \
     consoletabwidget.ui
-LIBS += -L \
-    ../../interfaces \
+LIBS += -L../../interfaces \
     -linterfaces \
     -L../../../../../../libs/esl/ \
     -lesl