<!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][14210] </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=14210">14210</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-12 23:21:31 -0500 (Sun, 12 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Yay! We got something simple working.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiesl_connectioncpp">freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp</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 (14209 => 14210)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp 2009-07-13 03:19:40 UTC (rev 14209)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp 2009-07-13 04:21:31 UTC (rev 14210)
</span><span class="lines">@@ -37,26 +37,23 @@
</span><span class="cx"> ESLevent * event = connection->recvEventTimed(10);
</span><span class="cx"> if (event)
</span><span class="cx"> {
</span><del>- std::cout << "We received and event!" << std::endl;
- emit gotEvent(event);
</del><ins>+ ESLevent * e = new ESLevent(event);
+ emit gotEvent(e);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> else if (!connection->connected() && isConnected)
</span><span class="cx"> {
</span><del>- std::cout << "We just got disconnected." << std::endl;
</del><span class="cx"> isConnected = false;
</span><span class="cx"> emit gotDisconnected();
</span><span class="cx"> }
</span><span class="cx"> else if (connection->connected() && !isConnected)
</span><span class="cx"> {
</span><del>- std::cout << "We just got connected." << std::endl;
</del><span class="cx"> isConnected = true;
</span><span class="cx"> connection->sendRecv("log 7");
</span><span class="cx"> emit gotConnected();
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- std::cout << "We are disconnected and should stop this." << std::endl;
</del><span class="cx"> doDisconnect();
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguifs_guicpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp (14209 => 14210)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp 2009-07-13 03:19:40 UTC (rev 14209)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp 2009-07-13 04:21:31 UTC (rev 14210)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> #include "fs_gui.h"
</span><span class="cx"> #include "ui_fs_gui.h"
</span><ins>+#include "esl_oop.h"
</ins><span class="cx"> #include <iostream>
</span><span class="cx">
</span><span class="cx"> Cfsgui::Cfsgui(QWidget *parent) :
</span><span class="lines">@@ -8,32 +9,54 @@
</span><span class="cx"> serverDialog(new CserverManager)
</span><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><ins>+
+ // Set the default status bar message
+ m_ui->statusBar->addPermanentWidget(new QLabel(tr("Ready")),true);
+
</ins><span class="cx"> connect(m_ui->actionConnect, SIGNAL(triggered())
</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><span class="cx">
</span><del>- /*connect(eslConnection, SIGNAL(gotConnected(void)),
- this, SLOT(gotConnectedSlot(void)));
- connect(eslConnection, SIGNAL(gotDisconnected(void)),
- this, SLOT(gotDisconnectedSlot(void)));*/
-}
</del><ins>+ }
</ins><span class="cx"> Cfsgui::~Cfsgui()
</span><span class="cx"> {
</span><span class="cx"> delete m_ui;
</span><span class="cx"> delete serverDialog;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Cfsgui::appendConsoleText(const QString text)
+{
+ m_ui->textConsole->append(text);
+}
+
</ins><span class="cx"> void Cfsgui::gotConnectedSlot()
</span><span class="cx"> {
</span><del>- m_ui->textConsole->append("Conneted!");
</del><span class="cx"> m_ui->statusBar->showMessage("Connected");
</span><ins>+ appendConsoleText("Conneted!");
</ins><span class="cx"> }
</span><span class="cx"> void Cfsgui::gotDisconnectedSlot()
</span><span class="cx"> {
</span><del>- m_ui->statusBar->showMessage("Disconnected");
</del><ins>+ appendConsoleText("Disconnected!");
</ins><span class="cx"> m_ui->textConsole->append("Conneted!");
</span><span class="cx"> }
</span><ins>+
+void Cfsgui::gotEventSlot(ESLevent * event)
+{
+ if (event->getBody())
+ {
+ QString text = event->getBody();
+
+ if (text.endsWith("\r\n"))
+ text.chop(2);
+ if (text.endsWith("\n"))
+ text.chop(1);
+
+ appendConsoleText(text);
+ }
+ delete event;
+}
+
</ins><span class="cx"> void Cfsgui::changeEvent(QEvent *e)
</span><span class="cx"> {
</span><span class="cx"> QMainWindow::changeEvent(e);
</span><span class="lines">@@ -57,4 +80,12 @@
</span><span class="cx"> {
</span><span class="cx"> m_ui->statusBar->showMessage("Connecting...");
</span><span class="cx"> eslConnection = new eslConnectionManager(host, pass, port);
</span><ins>+
+ /* Connect signals from eslConnection */
+ connect(eslConnection, SIGNAL(gotConnected(void)),
+ this, SLOT(gotConnectedSlot(void)));
+ connect(eslConnection, SIGNAL(gotDisconnected(void)),
+ this, SLOT(gotDisconnectedSlot(void)));
+ connect(eslConnection, SIGNAL(gotEvent(ESLevent*)),
+ this, SLOT(gotEventSlot(ESLevent*)));
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguifs_guih"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h (14209 => 14210)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h 2009-07-13 03:19:40 UTC (rev 14209)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h 2009-07-13 04:21:31 UTC (rev 14210)
</span><span class="lines">@@ -9,6 +9,8 @@
</span><span class="cx"> class Cfsgui;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class ESLevent;
+
</ins><span class="cx"> class Cfsgui : public QMainWindow {
</span><span class="cx"> Q_OBJECT
</span><span class="cx"> Q_DISABLE_COPY(Cfsgui)
</span><span class="lines">@@ -19,11 +21,13 @@
</span><span class="cx"> protected:
</span><span class="cx"> virtual void changeEvent(QEvent *e);
</span><span class="cx"> void closeEvent(QCloseEvent *e);
</span><ins>+ void appendConsoleText(const QString);
</ins><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> void newConnectionFromDialog(QString,QString,QString);
</span><span class="cx"> void gotConnectedSlot();
</span><span class="cx"> void gotDisconnectedSlot();
</span><ins>+ void gotEventSlot(ESLevent *);
</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 (14209 => 14210)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.ui 2009-07-13 03:19:40 UTC (rev 14209)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.ui 2009-07-13 04:21:31 UTC (rev 14210)
</span><span class="lines">@@ -78,7 +78,11 @@
</span><span class="cx"> <addaction name="menuFile"/>
</span><span class="cx"> <addaction name="menuHelp"/>
</span><span class="cx"> </widget>
</span><del>- <widget class="QStatusBar" name="statusBar"/>
</del><ins>+ <widget class="QStatusBar" name="statusBar">
+ <property name="sizeGripEnabled">
+ <bool>false</bool>
+ </property>
+ </widget>
</ins><span class="cx"> <action name="actionQuit">
</span><span class="cx"> <property name="text">
</span><span class="cx"> <string>&amp;Quit</string>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>