<!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][14298] </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=14298">14298</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-18 20:36:33 -0500 (Sat, 18 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>* Small interface change
* Initialize eslConnection on consolePage constructor
* Fix message colors</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiresourcesconsolepageui">freeswitch/trunk/contrib/jmesquita/fsgui/resources/consolepage.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiresourcesfs_guiui">freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiresourcesresourcesqrc">freeswitch/trunk/contrib/jmesquita/fsgui/resources/resources.qrc</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiresourcesnetworkidlepng">freeswitch/trunk/contrib/jmesquita/fsgui/resources/network-idle.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguiresourcesconsolepageui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/resources/consolepage.ui (14297 => 14298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/consolepage.ui 2009-07-18 19:57:50 UTC (rev 14297)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/consolepage.ui 2009-07-19 01:36:33 UTC (rev 14298)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>570</width>
- <height>443</height>
</del><ins>+ <width>392</width>
+ <height>301</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="sizePolicy">
</span><span class="lines">@@ -19,98 +19,146 @@
</span><span class="cx"> <property name="windowTitle">
</span><span class="cx"> <string>consolePage</string>
</span><span class="cx"> </property>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_3">
</ins><span class="cx"> <item>
</span><del>- <widget class="QTextEdit" name="textConsole"/>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
</del><ins>+ <widget class="QTabWidget" name="serverTabs">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="tabPosition">
+ <enum>QTabWidget::West</enum>
+ </property>
+ <property name="tabShape">
+ <enum>QTabWidget::Triangular</enum>
+ </property>
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <property name="movable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="tabConsole">
+ <attribute name="icon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/preferences/images/utilities-terminal.svg</normaloff>:/preferences/images/utilities-terminal.svg</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>Console</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
</ins><span class="cx"> <item>
</span><del>- <widget class="QLineEdit" name="lineCmd"/>
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QTextEdit" name="textConsole"/>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="lineCmd"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnSend">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Send</string>
+ </property>
+ <property name="shortcut">
+ <string>Return</string>
+ </property>
+ <property name="autoDefault">
+ <bool>true</bool>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>LogLevel</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QComboBox" name="comboLogLevel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <item>
+ <property name="text">
+ <string>Console</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Alert</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Crit</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Err</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Warning</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Notice</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Info</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Debug</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</ins><span class="cx"> </item>
</span><del>- <item>
- <widget class="QPushButton" name="btnSend">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Send</string>
- </property>
- <property name="shortcut">
- <string>Return</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- </item>
</del><span class="cx"> </layout>
</span><del>- </item>
- <item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>LogLevel</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QComboBox" name="comboLogLevel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <item>
- <property name="text">
- <string>Console</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Alert</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Crit</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Err</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Warning</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Notice</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Info</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Debug</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
</del><ins>+ </widget>
+ <widget class="QWidget" name="tabExtensions">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <attribute name="icon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/preferences/network-idle.png</normaloff>:/preferences/network-idle.png</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>Extensions</string>
+ </attribute>
+ </widget>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><del>- <resources/>
</del><ins>+ <resources>
+ <include location="resources.qrc"/>
+ </resources>
</ins><span class="cx"> <connections/>
</span><span class="cx"> </ui>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguiresourcesfs_guiui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui (14297 => 14298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui 2009-07-18 19:57:50 UTC (rev 14297)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui 2009-07-19 01:36:33 UTC (rev 14298)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>296</width>
- <height>303</height>
</del><ins>+ <width>728</width>
+ <height>523</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="lines">@@ -25,23 +25,9 @@
</span><span class="cx"> </property>
</span><span class="cx"> <widget class="QWidget" name="tab">
</span><span class="cx"> <attribute name="title">
</span><del>- <string>Console</string>
</del><ins>+ <string>Server Name</string>
</ins><span class="cx"> </attribute>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QTextEdit" name="textConsole">
- <property name="undoRedoEnabled">
- <bool>false</bool>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
- </property>
- </widget>
- </item>
- </layout>
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout"/>
</ins><span class="cx"> </widget>
</span><span class="cx"> <widget class="QWidget" name="tab_2">
</span><span class="cx"> <property name="enabled">
</span><span class="lines">@@ -60,7 +46,7 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>296</width>
</del><ins>+ <width>728</width>
</ins><span class="cx"> <height>26</height>
</span><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="lines">@@ -147,7 +133,9 @@
</span><span class="cx"> </action>
</span><span class="cx"> </widget>
</span><span class="cx"> <layoutdefault spacing="6" margin="11"/>
</span><del>- <resources/>
</del><ins>+ <resources>
+ <include location="resources.qrc"/>
+ </resources>
</ins><span class="cx"> <connections>
</span><span class="cx"> <connection>
</span><span class="cx"> <sender>actionQuit</sender>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguiresourcesnetworkidlepng"></a>
<div class="binary"><h4>Added: freeswitch/trunk/contrib/jmesquita/fsgui/resources/network-idle.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: freeswitch/trunk/contrib/jmesquita/fsgui/resources/network-idle.png
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span><a id="freeswitchtrunkcontribjmesquitafsguiresourcesresourcesqrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/resources/resources.qrc (14297 => 14298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/resources.qrc 2009-07-18 19:57:50 UTC (rev 14297)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/resources.qrc 2009-07-19 01:36:33 UTC (rev 14298)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> <RCC>
</span><del>- <qresource prefix="/preferences" >
- <file>images/utilities-terminal.svg</file>
- </qresource>
</del><ins>+ <qresource prefix="/preferences" >
+ <file>network-idle.png</file>
+ <file>images/utilities-terminal.svg</file>
+ </qresource>
</ins><span class="cx"> </RCC>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp (14297 => 14298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-18 19:57:50 UTC (rev 14297)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-19 01:36:33 UTC (rev 14298)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> consolePage::consolePage(QWidget *parent) :
</span><span class="cx"> QWidget(parent),
</span><span class="cx"> m_ui(new Ui::consolePage),
</span><ins>+ eslConnection(NULL),
</ins><span class="cx"> histCompleter(new cmdHistory),
</span><span class="cx"> lineCmdEventFilter(new keyPressEventFilter(histCompleter))
</span><span class="cx"> {
</span><span class="lines">@@ -54,7 +55,9 @@
</span><span class="cx"> this, SLOT(loglevelChanged(int)));
</span><span class="cx"> setConsoleBackground();
</span><span class="cx"> m_ui->lineCmd->installEventFilter(lineCmdEventFilter);
</span><del>- eslConnection = NULL;
</del><ins>+
+ /* Just for now */
+ m_ui->serverTabs->removeTab(1);
</ins><span class="cx"> }
</span><span class="cx"> consolePage::~consolePage()
</span><span class="cx"> {
</span><span class="lines">@@ -161,6 +164,9 @@
</span><span class="cx"> }
</span><span class="cx"> void consolePage::gotConnectedSlot()
</span><span class="cx"> {
</span><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
+ m_ui->textConsole->setTextColor(settings.value(QString("Log-Level-0-Color"), Qt::black).value<QColor>());
+
</ins><span class="cx"> appendConsoleText(tr("Connected!"));
</span><span class="cx"> m_ui->lineCmd->setEnabled(eslConnection->connected());
</span><span class="cx"> m_ui->comboLogLevel->setEnabled(eslConnection->connected());
</span><span class="lines">@@ -171,6 +177,9 @@
</span><span class="cx"> }
</span><span class="cx"> void consolePage::gotDisconnectedSlot()
</span><span class="cx"> {
</span><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
+ m_ui->textConsole->setTextColor(settings.value(QString("Log-Level-0-Color"), Qt::black).value<QColor>());
+
</ins><span class="cx"> appendConsoleText(tr("Disconnected!"));
</span><span class="cx"> m_ui->lineCmd->setEnabled(eslConnection->connected());
</span><span class="cx"> m_ui->comboLogLevel->setEnabled(eslConnection->connected());
</span><span class="lines">@@ -178,6 +187,9 @@
</span><span class="cx"> }
</span><span class="cx"> void consolePage::connectionFailedSlot(QString msg)
</span><span class="cx"> {
</span><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
+ m_ui->textConsole->setTextColor(settings.value(QString("Log-Level-0-Color"), Qt::black).value<QColor>());
+
</ins><span class="cx"> appendConsoleText("Connection Failed: "+msg);
</span><span class="cx"> m_ui->lineCmd->setEnabled(eslConnection->connected());
</span><span class="cx"> m_ui->comboLogLevel->setEnabled(eslConnection->connected());
</span><span class="lines">@@ -185,7 +197,8 @@
</span><span class="cx"> }
</span><span class="cx"> void consolePage::gotEventSlot(ESLevent * event)
</span><span class="cx"> {
</span><del>- m_ui->textConsole->setTextColor(Qt::black);
</del><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
+ m_ui->textConsole->setTextColor(settings.value(QString("Log-Level-0-Color"), Qt::black).value<QColor>());
</ins><span class="cx"> if (event->getBody())
</span><span class="cx"> {
</span><span class="cx"> QString text = event->getBody();
</span><span class="lines">@@ -201,9 +214,9 @@
</span><span class="cx"> }
</span><span class="cx"> void consolePage::gotConsoleEventSlot(ESLeventLog * event)
</span><span class="cx"> {
</span><del>- m_ui->textConsole->setTextColor(event->getConsoleColor());
</del><span class="cx"> if (event->getBody())
</span><span class="cx"> {
</span><ins>+ m_ui->textConsole->setTextColor(event->getConsoleColor());
</ins><span class="cx"> QString text = event->getBody();
</span><span class="cx">
</span><span class="cx"> if (text.endsWith("\r\n"))
</span><span class="lines">@@ -217,6 +230,8 @@
</span><span class="cx"> }
</span><span class="cx"> void consolePage::loglevelChanged(int loglevel)
</span><span class="cx"> {
</span><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
+ m_ui->textConsole->setTextColor(settings.value(QString("Log-Level-0-Color"), Qt::black).value<QColor>());
</ins><span class="cx"> if (!eslConnection->connected())
</span><span class="cx"> {
</span><span class="cx"> appendConsoleText(QString("Cannot change loglevel if not connected."));
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>