<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14279] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14279">14279</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-17 02:10:27 -0500 (Fri, 17 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>NEW FEATURE: Set the colors of different log levels according to preferences.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcesl_connectioncpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfs_guicpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludeconsolepageh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludeesl_connectionh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/esl_connection.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludefs_guih">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludepreferencesdialogh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/preferencesdialog.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpreferencesdialogcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/preferencesdialog.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp (14278 => 14279)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-17 06:11:29 UTC (rev 14278)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-17 07:10:27 UTC (rev 14279)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> m_ui(new Ui::consolePage)
</span><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><ins>+ setConsoleBackground();
</ins><span class="cx"> connect(m_ui->comboLogLevel, SIGNAL(currentIndexChanged(int)),
</span><span class="cx"> this, SLOT(loglevelChanged(int)));
</span><span class="cx"> }
</span><span class="lines">@@ -61,6 +62,11 @@
</span><span class="cx"> delete eslConnection;
</span><span class="cx"> delete m_ui;
</span><span class="cx"> }
</span><ins>+void consolePage::setConsoleBackground()
+{
+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
+ m_ui->textConsole->setPalette(settings.value("consoleBackgroundColor",QColor(Qt::white)).value<QColor>());
+}
</ins><span class="cx"> void consolePage::init(QString host)
</span><span class="cx"> {
</span><span class="cx"> this->host = host;
</span><span class="lines">@@ -173,7 +179,6 @@
</span><span class="cx"> void consolePage::gotConsoleEventSlot(ESLeventLog * event)
</span><span class="cx"> {
</span><span class="cx"> m_ui->textConsole->setTextColor(event->getConsoleColor());
</span><del>- qDebug() << event->getConsoleColor();
</del><span class="cx"> if (event->getBody())
</span><span class="cx"> {
</span><span class="cx"> QString text = event->getBody();
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcesl_connectioncpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp (14278 => 14279)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp 2009-07-17 06:11:29 UTC (rev 14278)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/esl_connection.cpp 2009-07-17 07:10:27 UTC (rev 14279)
</span><span class="lines">@@ -506,10 +506,9 @@
</span><span class="cx"> void ESLeventLog::readSettings()
</span><span class="cx"> {
</span><span class="cx"> QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</span><del>- QColor consoleColor = settings.value(QString("Log-Level-%1-Color").arg(ESLevent::getHeader("Log-Level")), QColor(Qt::black)).value<QColor>();
</del><ins>+ consoleColor = new QColor(settings.value(QString("Log-Level-%1-Color").arg(ESLevent::getHeader("Log-Level")), QColor(Qt::black)).value<QColor>());
</ins><span class="cx"> }
</span><span class="cx"> QColor ESLeventLog::getConsoleColor()
</span><span class="cx"> {
</span><del>- qDebug() << consoleColor;
- return consoleColor;
</del><ins>+ return QColor(*consoleColor);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfs_guicpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp (14278 => 14279)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-17 06:11:29 UTC (rev 14278)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-17 07:10:27 UTC (rev 14279)
</span><span class="lines">@@ -129,7 +129,13 @@
</span><span class="cx"> m_ui->tabWidget->removeTab(index);
</span><span class="cx"> delete tab;
</span><span class="cx"> }
</span><del>-void Cfsgui::backgroundColorChanged(QColor color)
</del><ins>+void Cfsgui::backgroundColorChanged()
</ins><span class="cx"> {
</span><del>- //TODO: Get tabs and set them all!
</del><ins>+ //TODO: Still don't know how to do it...
+ /*for (int i = 0; i < m_ui->tabWidget->count(); i++)
+ {
+ qDebug() << "Tab: " << i;
+ consolePage *tab = m_ui->tabWidget->widget(i);
+ tab->setConsoleBackground();
+ }*/
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludeconsolepageh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h (14278 => 14279)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h 2009-07-17 06:11:29 UTC (rev 14278)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h 2009-07-17 07:10:27 UTC (rev 14279)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> consolePage(QWidget *parent = 0);
</span><span class="cx"> ~consolePage();
</span><span class="cx"> void init(QString host);
</span><ins>+ void setConsoleBackground();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual void changeEvent(QEvent *e);
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludeesl_connectionh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/esl_connection.h (14278 => 14279)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/esl_connection.h 2009-07-17 06:11:29 UTC (rev 14278)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/esl_connection.h 2009-07-17 07:10:27 UTC (rev 14279)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> QColor getConsoleColor();
</span><span class="cx"> void readSettings();
</span><span class="cx"> private:
</span><del>- QColor consoleColor;
</del><ins>+ QColor *consoleColor;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ESLconnection : public QThread
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludefs_guih"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h (14278 => 14279)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h 2009-07-17 06:11:29 UTC (rev 14278)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h 2009-07-17 07:10:27 UTC (rev 14279)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> void showPreferences();
</span><span class="cx"> void newConnectionFromDialog();
</span><span class="cx"> void closeTab(int);
</span><del>- void backgroundColorChanged(QColor);
</del><ins>+ void backgroundColorChanged();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::Cfsgui *m_ui;
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludepreferencesdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/preferencesdialog.h (14278 => 14279)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/preferencesdialog.h 2009-07-17 06:11:29 UTC (rev 14278)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/preferencesdialog.h 2009-07-17 07:10:27 UTC (rev 14279)
</span><span class="lines">@@ -20,10 +20,17 @@
</span><span class="cx"> private slots:
</span><span class="cx"> void changePage(QListWidgetItem *current, QListWidgetItem *previous);
</span><span class="cx"> void changeBackgroundColor();
</span><ins>+ void changeConsoleLogLevelColor();
+ void changeCriticalLogLevelColor();
+ void changeDebugLogLevelColor();
+ void changeErrorLogLevelColor();
+ void changeInfoLogLevelColor();
+ void changeNoticeLogLevelColor();
+ void changeWarningLogLevelColor();
</ins><span class="cx"> void saveSettings();
</span><span class="cx"> void readSettings();
</span><span class="cx"> signals:
</span><del>- void backgroundColorChanged(QColor);
</del><ins>+ void backgroundColorChanged();
</ins><span class="cx"> private:
</span><span class="cx"> Ui::preferencesDialog *m_ui;
</span><span class="cx"> QColorDialog *colorChooser;
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpreferencesdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/preferencesdialog.cpp (14278 => 14279)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/preferencesdialog.cpp 2009-07-17 06:11:29 UTC (rev 14278)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/preferencesdialog.cpp 2009-07-17 07:10:27 UTC (rev 14279)
</span><span class="lines">@@ -13,8 +13,25 @@
</span><span class="cx">
</span><span class="cx"> connect(m_ui->listWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
</span><span class="cx"> this, SLOT(changePage(QListWidgetItem*,QListWidgetItem*)));
</span><ins>+
</ins><span class="cx"> connect(m_ui->btnChangeBackgroundColor, SIGNAL(clicked()),
</span><span class="cx"> this, SLOT(changeBackgroundColor()));
</span><ins>+
+ connect(m_ui->btnChangeConsoleLogLevelColor, SIGNAL(clicked()),
+ this, SLOT(changeConsoleLogLevelColor()));
+ connect(m_ui->btnChangeCriticalLogLevelColor, SIGNAL(clicked()),
+ this, SLOT(changeCriticalLogLevelColor()));
+ connect(m_ui->btnChangeDebugLogLevelColor, SIGNAL(clicked()),
+ this, SLOT(changeDebugLogLevelColor()));
+ connect(m_ui->btnChangeErrorLogLevelColor, SIGNAL(clicked()),
+ this, SLOT(changeErrorLogLevelColor()));
+ connect(m_ui->btnChangeInfoLogLevelColor, SIGNAL(clicked()),
+ this, SLOT(changeInfoLogLevelColor()));
+ connect(m_ui->btnChangeNoticeLogLevelColor, SIGNAL(clicked()),
+ this, SLOT(changeNoticeLogLevelColor()));
+ connect(m_ui->btnChangeWarningLogLevelColor, SIGNAL(clicked()),
+ this, SLOT(changeWarningLogLevelColor()));
+
</ins><span class="cx"> connect(this, SIGNAL(accepted()),
</span><span class="cx"> this, SLOT(saveSettings()));
</span><span class="cx"> connect(this, SIGNAL(rejected()),
</span><span class="lines">@@ -53,6 +70,62 @@
</span><span class="cx"> m_ui->frmBackgroundColor->setPalette(colorChooser->getColor(
</span><span class="cx"> m_ui->frmBackgroundColor->palette().color(QPalette::Background)));
</span><span class="cx"> }
</span><ins>+void preferencesDialog::changeConsoleLogLevelColor()
+{
+ if(!colorChooser)
+ colorChooser = new QColorDialog();
+
+ m_ui->frmConsoleLogLevelColor->setPalette(colorChooser->getColor(
+ m_ui->frmConsoleLogLevelColor->palette().color(QPalette::Background)));
+}
+void preferencesDialog::changeCriticalLogLevelColor()
+{
+ if(!colorChooser)
+ colorChooser = new QColorDialog();
+
+ m_ui->frmCriticalLogLevelColor->setPalette(colorChooser->getColor(
+ m_ui->frmCriticalLogLevelColor->palette().color(QPalette::Background)));
+}
+void preferencesDialog::changeDebugLogLevelColor()
+{
+ if(!colorChooser)
+ colorChooser = new QColorDialog();
+
+ m_ui->frmDebugLogLevelColor->setPalette(colorChooser->getColor(
+ m_ui->frmDebugLogLevelColor->palette().color(QPalette::Background)));
+}
+void preferencesDialog::changeErrorLogLevelColor()
+{
+ if(!colorChooser)
+ colorChooser = new QColorDialog();
+
+ m_ui->frmErrorLogLevelColor->setPalette(colorChooser->getColor(
+ m_ui->frmErrorLogLevelColor->palette().color(QPalette::Background)));
+}
+void preferencesDialog::changeInfoLogLevelColor()
+{
+ if(!colorChooser)
+ colorChooser = new QColorDialog();
+
+ m_ui->frmInfoLogLevelColor->setPalette(colorChooser->getColor(
+ m_ui->frmInfoLogLevelColor->palette().color(QPalette::Background)));
+}
+void preferencesDialog::changeNoticeLogLevelColor()
+{
+ if(!colorChooser)
+ colorChooser = new QColorDialog();
+
+ m_ui->frmNoticeLogLevelColor->setPalette(colorChooser->getColor(
+ m_ui->frmNoticeLogLevelColor->palette().color(QPalette::Background)));
+}
+void preferencesDialog::changeWarningLogLevelColor()
+{
+ if(!colorChooser)
+ colorChooser = new QColorDialog();
+
+ m_ui->frmWarningLogLevelColor->setPalette(colorChooser->getColor(
+ m_ui->frmWarningLogLevelColor->palette().color(QPalette::Background)));
+}
</ins><span class="cx"> void preferencesDialog::saveSettings()
</span><span class="cx"> {
</span><span class="cx"> QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</span><span class="lines">@@ -70,7 +143,7 @@
</span><span class="cx"> settings.setValue(QString("Log-Level-%1-Color").arg(ESL_LOG_LEVEL_WARNING), m_ui->frmWarningLogLevelColor->palette().color(QPalette::Background));
</span><span class="cx">
</span><span class="cx"> /* Make all tabs change their settings */
</span><del>- emit backgroundColorChanged(m_ui->frmBackgroundColor->palette().color(QPalette::Background));
</del><ins>+ emit backgroundColorChanged();
</ins><span class="cx"> }
</span><span class="cx"> void preferencesDialog::readSettings()
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>