<!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][14218] </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=14218">14218</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-13 02:27:49 -0500 (Mon, 13 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>We connect, disconnect, send and receive stuff. But not all of it, yet</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiesl_connectioncpp">freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiesl_connectionh">freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguifs_guicpp">freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguifs_guih">freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguifs_guiui">freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.ui</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguiesl_connectioncpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp (14217 => 14218)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp 2009-07-13 07:15:00 UTC (rev 14217)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp 2009-07-13 07:27:49 UTC (rev 14218)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+#include <QtGui>
</ins><span class="cx"> #include "esl_oop.h"
</span><span class="cx"> #include "esl_connection.h"
</span><span class="cx">
</span><span class="lines">@@ -12,7 +13,7 @@
</span><span class="cx"> void eslConnectionManager::doConnect(QString host, QString pass, QString port)
</span><span class="cx"> {
</span><span class="cx"> connection = new ESLconnection(host.toAscii(), port.toAscii(), pass.toAscii());
</span><del>- eslSetLogLevel(0);
</del><ins>+ eslSetLogLevel(7);
</ins><span class="cx"> isConnected = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -21,6 +22,23 @@
</span><span class="cx"> connection->disconnect();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void eslConnectionManager::sendCmd(QString string)
+{
+ if (connection->connected())
+ {
+ QStringList list = string.split(" ", QString::SkipEmptyParts, Qt::CaseSensitive);
+ QString cmd = list.takeFirst();
+ QString arg("");
+ for (int i=0; i < list.size(); i++)
+ {
+ arg.append(list[i]);
+ if (i != list.size()-1)
+ arg.append(" ");
+ }
+ connection->api(cmd.toAscii(), arg.toAscii());
+ }
+}
+
</ins><span class="cx"> void eslConnectionManager::run()
</span><span class="cx"> {
</span><span class="cx"> forever
</span><span class="lines">@@ -39,7 +57,6 @@
</span><span class="cx"> }
</span><span class="cx"> else if (connection->connected() && isConnected)
</span><span class="cx"> {
</span><del>- /* We should process our event queue here */
</del><span class="cx"> ESLevent * event = connection->recvEventTimed(10);
</span><span class="cx"> if (event)
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguiesl_connectionh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.h (14217 => 14218)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.h 2009-07-13 07:15:00 UTC (rev 14217)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.h 2009-07-13 07:27:49 UTC (rev 14218)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> eslConnectionManager(QString,QString,QString);
</span><span class="cx"> void doConnect(QString, QString, QString);
</span><span class="cx"> void doDisconnect();
</span><ins>+ void sendCmd(QString);
</ins><span class="cx"> signals:
</span><span class="cx"> void gotDisconnected();
</span><span class="cx"> void gotConnected();
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguifs_guicpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp (14217 => 14218)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp 2009-07-13 07:15:00 UTC (rev 14217)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp 2009-07-13 07:27:49 UTC (rev 14218)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><span class="cx"> #include "fs_gui.h"
</span><span class="cx"> #include "ui_fs_gui.h"
</span><span class="cx"> #include "esl_oop.h"
</span><del>-#include <iostream>
</del><span class="cx">
</span><span class="cx"> Cfsgui::Cfsgui(QWidget *parent) :
</span><span class="cx"> QMainWindow(parent),
</span><span class="lines">@@ -17,6 +16,10 @@
</span><span class="cx"> serverDialog, SLOT(show()));
</span><span class="cx"> connect(serverDialog, SIGNAL(doConnect(QString,QString,QString)),
</span><span class="cx"> this, SLOT(newConnectionFromDialog(QString,QString,QString)));
</span><ins>+ connect(m_ui->lineCmd, SIGNAL(textChanged(QString)),
+ this, SLOT(typedCommand()));
+ connect(m_ui->btnSend, SIGNAL(clicked()),
+ this, SLOT(sendCommand()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Cfsgui::~Cfsgui()
</span><span class="lines">@@ -35,12 +38,26 @@
</span><span class="cx"> eslConnection->doDisconnect();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Cfsgui::typedCommand()
+{
+ m_ui->btnSend->setDisabled(m_ui->lineCmd->text().isEmpty());
+}
+
+void Cfsgui::sendCommand()
+{
+ QString cmd = m_ui->lineCmd->text();
+ eslConnection->sendCmd(cmd);
+ m_ui->lineCmd->clear();
+}
+
</ins><span class="cx"> void Cfsgui::gotConnectedSlot()
</span><span class="cx"> {
</span><span class="cx"> m_ui->statusBar->showMessage("Connected");
</span><span class="cx"> appendConsoleText("Conneted!");
</span><span class="cx"> m_ui->actionConnect->setDisabled(true);
</span><span class="cx"> m_ui->actionDisconnect->setEnabled(true);
</span><ins>+ m_ui->lineCmd->setEnabled(true);
+ m_ui->lineCmd->setFocus();
</ins><span class="cx"> }
</span><span class="cx"> void Cfsgui::gotDisconnectedSlot()
</span><span class="cx"> {
</span><span class="lines">@@ -48,6 +65,7 @@
</span><span class="cx"> appendConsoleText("Disconnected!");
</span><span class="cx"> m_ui->actionConnect->setEnabled(true);
</span><span class="cx"> m_ui->actionDisconnect->setDisabled(true);
</span><ins>+ m_ui->lineCmd->setDisabled(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Cfsgui::gotEventSlot(ESLevent * event)
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguifs_guih"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h (14217 => 14218)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h 2009-07-13 07:15:00 UTC (rev 14217)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h 2009-07-13 07:27:49 UTC (rev 14218)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> void gotDisconnectedSlot();
</span><span class="cx"> void gotEventSlot(ESLevent *);
</span><span class="cx"> void getDisconnectedSlot();
</span><ins>+ void typedCommand();
+ void sendCommand();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::Cfsgui *m_ui;
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguifs_guiui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.ui (14217 => 14218)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.ui 2009-07-13 07:15:00 UTC (rev 14217)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.ui 2009-07-13 07:27:49 UTC (rev 14218)
</span><span class="lines">@@ -29,7 +29,11 @@
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="1" column="0">
</span><del>- <widget class="QLineEdit" name="lineCmd"/>
</del><ins>+ <widget class="QLineEdit" name="lineCmd">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item row="1" column="1">
</span><span class="cx"> <widget class="QPushButton" name="btnSend">
</span><span class="lines">@@ -39,14 +43,11 @@
</span><span class="cx"> <property name="text">
</span><span class="cx"> <string>Send</string>
</span><span class="cx"> </property>
</span><del>- <property name="shortcut">
- <string>Return</string>
- </property>
</del><span class="cx"> <property name="autoDefault">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="default">
</span><del>- <bool>false</bool>
</del><ins>+ <bool>true</bool>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><span class="cx"> <width>600</width>
</span><del>- <height>22</height>
</del><ins>+ <height>26</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <widget class="QMenu" name="menuFile">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>