<!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][14254] </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=14254">14254</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-14 17:55:48 -0500 (Tue, 14 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make some modifications to enable multiple servers on different tabs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiresourcesfs_guiui">freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfs_guicpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludefs_guih">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludeserver_managerh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/server_manager.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcserver_managercpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/server_manager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguiresourcesfs_guiui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui (14253 => 14254)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui 2009-07-14 20:56:09 UTC (rev 14253)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui 2009-07-14 22:55:48 UTC (rev 14254)
</span><span class="lines">@@ -14,43 +14,75 @@
</span><span class="cx"> <string>FSGui - The console for humans</string>
</span><span class="cx"> </property>
</span><span class="cx"> <widget class="QWidget" name="centralWidget">
</span><del>- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" colspan="2">
- <widget class="QTextEdit" name="textConsole">
- <property name="undoRedoEnabled">
- <bool>false</bool>
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>1</number>
</ins><span class="cx"> </property>
</span><del>- <property name="readOnly">
</del><ins>+ <property name="tabsClosable">
</ins><span class="cx"> <bool>true</bool>
</span><span class="cx"> </property>
</span><del>- <property name="textInteractionFlags">
- <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
- </property>
</del><ins>+ <widget class="QWidget" name="tab">
+ <attribute name="title">
+ <string>Console</string>
+ </attribute>
+ <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>
+ </widget>
+ <widget class="QWidget" name="tab_2">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <attribute name="title">
+ <string>Tab 2</string>
+ </attribute>
+ </widget>
</ins><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="1" column="0">
- <widget class="QLineEdit" name="lineCmd">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
</del><ins>+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="lineCmd">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </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>false</bool>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</ins><span class="cx"> </item>
</span><del>- <item row="1" column="1">
- <widget class="QPushButton" name="btnSend">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Send</string>
- </property>
- <property name="autoDefault">
- <bool>false</bool>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- </item>
</del><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="cx"> <widget class="QMenuBar" name="menuBar">
</span><span class="lines">@@ -59,7 +91,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>26</height>
</del><ins>+ <height>22</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <widget class="QMenu" name="menuFile">
</span><span class="lines">@@ -118,9 +150,25 @@
</span><span class="cx"> <layoutdefault spacing="6" margin="11"/>
</span><span class="cx"> <tabstops>
</span><span class="cx"> <tabstop>lineCmd</tabstop>
</span><del>- <tabstop>textConsole</tabstop>
</del><span class="cx"> <tabstop>btnSend</tabstop>
</span><span class="cx"> </tabstops>
</span><span class="cx"> <resources/>
</span><del>- <connections/>
</del><ins>+ <connections>
+ <connection>
+ <sender>actionQuit</sender>
+ <signal>triggered()</signal>
+ <receiver>Cfsgui</receiver>
+ <slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>299</x>
+ <y>199</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ins><span class="cx"> </ui>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfs_guicpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp (14253 => 14254)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-14 20:56:09 UTC (rev 14253)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-14 22:55:48 UTC (rev 14254)
</span><span class="lines">@@ -41,10 +41,11 @@
</span><span class="cx"> #include "esl_connection.h"
</span><span class="cx"> #include "esl.h"
</span><span class="cx">
</span><ins>+CserverManager *Cfsgui::serverDialog = NULL;
+
</ins><span class="cx"> Cfsgui::Cfsgui(QWidget *parent) :
</span><span class="cx"> QMainWindow(parent),
</span><del>- m_ui(new Ui::Cfsgui),
- serverDialog(new CserverManager)
</del><ins>+ m_ui(new Ui::Cfsgui)
</ins><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><span class="cx">
</span><span class="lines">@@ -52,36 +53,34 @@
</span><span class="cx"> m_ui->statusBar->showMessage(tr("Ready"));
</span><span class="cx">
</span><span class="cx"> connect(m_ui->actionConnect, SIGNAL(triggered()),
</span><del>- serverDialog, SLOT(show()));
- connect(serverDialog, SIGNAL(doConnect(QString,QString,QString)),
- this, SLOT(newConnectionFromDialog(QString,QString,QString)));
</del><ins>+ this, SLOT(newConnectionFromDialog()));
</ins><span class="cx"> connect(m_ui->lineCmd, SIGNAL(textChanged(QString)),
</span><span class="cx"> this, SLOT(typedCommand()));
</span><span class="cx"> connect(m_ui->btnSend, SIGNAL(clicked()),
</span><span class="cx"> this, SLOT(sendCommand()));
</span><ins>+
+ /* Why QtDesigner does not allow me to delete this? */
+ m_ui->tabWidget->removeTab(1);
+ delete m_ui->tab_2;
+
</ins><span class="cx"> }
</span><del>-
</del><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><del>-
</del><span class="cx"> void Cfsgui::appendConsoleText(const QString text)
</span><span class="cx"> {
</span><span class="cx"> m_ui->textConsole->append(text);
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> void Cfsgui::getDisconnectedSlot()
</span><span class="cx"> {
</span><span class="cx"> eslConnection->disconnect();
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> void Cfsgui::typedCommand()
</span><span class="cx"> {
</span><span class="cx"> m_ui->btnSend->setDisabled(m_ui->lineCmd->text().isEmpty());
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> void Cfsgui::sendCommand()
</span><span class="cx"> {
</span><span class="cx"> QStringList cmdList = m_ui->lineCmd->text().split(" ");
</span><span class="lines">@@ -96,7 +95,6 @@
</span><span class="cx"> gotEventSlot(e);
</span><span class="cx"> m_ui->lineCmd->clear();
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> void Cfsgui::gotConnectedSlot()
</span><span class="cx"> {
</span><span class="cx"> m_ui->statusBar->showMessage(tr("Connected"));
</span><span class="lines">@@ -115,7 +113,6 @@
</span><span class="cx"> m_ui->lineCmd->setDisabled(true);
</span><span class="cx"> delete eslConnection;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> void Cfsgui::connectionFailedSlot(QString msg)
</span><span class="cx"> {
</span><span class="cx"> qDebug() << msg;
</span><span class="lines">@@ -126,7 +123,6 @@
</span><span class="cx"> m_ui->lineCmd->setDisabled(true);
</span><span class="cx"> delete eslConnection;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> void Cfsgui::gotEventSlot(ESLevent * event)
</span><span class="cx"> {
</span><span class="cx"> QString type (event->getHeader("Content-Type"));
</span><span class="lines">@@ -186,7 +182,6 @@
</span><span class="cx"> }
</span><span class="cx"> delete event;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> void Cfsgui::changeEvent(QEvent *e)
</span><span class="cx"> {
</span><span class="cx"> QMainWindow::changeEvent(e);
</span><span class="lines">@@ -198,32 +193,41 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> void Cfsgui::closeEvent(QCloseEvent *e)
</span><span class="cx"> {
</span><span class="cx"> /* TODO: We have to stop threads and do cleanup */
</span><span class="cx"> e->accept();
</span><span class="cx"> }
</span><del>-
-void Cfsgui::newConnectionFromDialog(QString host, QString pass, QString port)
</del><ins>+void Cfsgui::newConnectionFromDialog()
</ins><span class="cx"> {
</span><del>- m_ui->statusBar->showMessage("Connecting...");
- eslConnection = new ESLconnection(host.toAscii(),
- port.toAscii(),
- pass.toAscii());
- /* 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(connectionFailed(QString)),
- this, SLOT(connectionFailedSlot(QString)));
- connect(eslConnection, SIGNAL(gotEvent(ESLevent*)),
- this, SLOT(gotEventSlot(ESLevent*)));
</del><ins>+ if (!serverDialog)
+ {
+ serverDialog = new CserverManager();
+ }
+ serverDialog->show();
+ serverDialog->raise();
+ serverDialog->activateWindow();
</ins><span class="cx">
</span><del>- /* Connect the disconnect menu */
- connect(m_ui->actionDisconnect, SIGNAL(triggered()),
- this, SLOT(getDisconnectedSlot()));
</del><ins>+ if (serverDialog->exec())
+ {
+ m_ui->statusBar->showMessage("Connecting...");
+ eslConnection = new ESLconnection(serverDialog->getHost().toAscii(),
+ serverDialog->getPort().toAscii(),
+ serverDialog->getPass().toAscii());
+ /* 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(connectionFailed(QString)),
+ this, SLOT(connectionFailedSlot(QString)));
+ connect(eslConnection, SIGNAL(gotEvent(ESLevent*)),
+ this, SLOT(gotEventSlot(ESLevent*)));
</ins><span class="cx">
</span><del>- eslConnection->doConnect();
</del><ins>+ /* Connect the disconnect menu */
+ connect(m_ui->actionDisconnect, SIGNAL(triggered()),
+ this, SLOT(getDisconnectedSlot()));
+
+ eslConnection->doConnect();
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludefs_guih"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h (14253 => 14254)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h 2009-07-14 20:56:09 UTC (rev 14253)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h 2009-07-14 22:55:48 UTC (rev 14254)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> void appendConsoleText(const QString);
</span><span class="cx">
</span><span class="cx"> private slots:
</span><del>- void newConnectionFromDialog(QString,QString,QString);
</del><ins>+ void newConnectionFromDialog();
</ins><span class="cx"> void gotConnectedSlot();
</span><span class="cx"> void gotDisconnectedSlot();
</span><span class="cx"> void connectionFailedSlot(QString);
</span><span class="lines">@@ -74,7 +74,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::Cfsgui *m_ui;
</span><del>- CserverManager *serverDialog;
</del><ins>+ /*! Has to be static cos will be used by all server tabs */
+ static CserverManager *serverDialog;
</ins><span class="cx"> ESLconnection *eslConnection;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludeserver_managerh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/server_manager.h (14253 => 14254)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/server_manager.h 2009-07-14 20:56:09 UTC (rev 14253)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/server_manager.h 2009-07-14 22:55:48 UTC (rev 14254)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #ifndef SERVER_MANAGER_H
</span><span class="cx"> #define SERVER_MANAGER_H
</span><span class="cx">
</span><del>-#include <QtGui/QDialog>
</del><ins>+#include <QtGui>
</ins><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="cx"> class CserverManager;
</span><span class="lines">@@ -51,12 +51,11 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit CserverManager(QWidget *parent = 0);
</span><span class="cx"> virtual ~CserverManager();
</span><del>-signals:
- void doConnect(QString, QString, QString);
</del><ins>+ QString getHost();
+ QString getPass();
+ QString getPort();
</ins><span class="cx"> protected:
</span><span class="cx"> virtual void changeEvent(QEvent *e);
</span><del>-private slots:
- void newConnection();
</del><span class="cx"> private:
</span><span class="cx"> Ui::CserverManager *m_ui;
</span><span class="cx"> };
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcserver_managercpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/server_manager.cpp (14253 => 14254)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/server_manager.cpp 2009-07-14 20:56:09 UTC (rev 14253)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/server_manager.cpp 2009-07-14 22:55:48 UTC (rev 14254)
</span><span class="lines">@@ -44,8 +44,6 @@
</span><span class="cx"> m_ui(new Ui::CserverManager)
</span><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><del>- connect(this, SIGNAL(accepted()),
- this, SLOT(newConnection()));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CserverManager::~CserverManager()
</span><span class="lines">@@ -65,10 +63,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CserverManager::newConnection()
</del><ins>+QString CserverManager::getHost()
</ins><span class="cx"> {
</span><del>- //TODO: Sanity checking needed.
- emit doConnect(m_ui->host->text(),
- m_ui->pass->text(),
- m_ui->port->text());
</del><ins>+ return m_ui->host->text();
</ins><span class="cx"> }
</span><ins>+QString CserverManager::getPort()
+{
+ return m_ui->port->text();
+}
+QString CserverManager::getPass()
+{
+ return m_ui->pass->text();
+}
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>