<!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][14289] </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=14289">14289</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-17 19:02:51 -0500 (Fri, 17 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do proper connect/disconnect on tabs and add a Server manager entry to file menu</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="#freeswitchtrunkcontribjmesquitafsguisrccompleterscpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfs_guicpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludecompletersh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/completers.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludeconsolepageh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludefs_guih">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h</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 (14288 => 14289)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui 2009-07-17 23:26:14 UTC (rev 14288)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui 2009-07-18 00:02:51 UTC (rev 14289)
</span><span class="lines">@@ -68,6 +68,8 @@
</span><span class="cx"> <property name="title">
</span><span class="cx"> <string>&amp;File</string>
</span><span class="cx"> </property>
</span><ins>+ <addaction name="actionServerManager"/>
+ <addaction name="separator"/>
</ins><span class="cx"> <addaction name="actionConnect"/>
</span><span class="cx"> <addaction name="actionDisconnect"/>
</span><span class="cx"> <addaction name="separator"/>
</span><span class="lines">@@ -128,6 +130,14 @@
</span><span class="cx"> <string>&amp;Preferences</string>
</span><span class="cx"> </property>
</span><span class="cx"> </action>
</span><ins>+ <action name="actionServerManager">
+ <property name="text">
+ <string>&amp;Server Manager</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+M</string>
+ </property>
+ </action>
</ins><span class="cx"> </widget>
</span><span class="cx"> <layoutdefault spacing="6" margin="11"/>
</span><span class="cx"> <resources/>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrccompleterscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp (14288 => 14289)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp 2009-07-17 23:26:14 UTC (rev 14288)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp 2009-07-18 00:02:51 UTC (rev 14289)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+/*
+ * Copyright (c) 2007, Anthony Minessale II
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita (at) gmail.com>
+ *
+ */
</ins><span class="cx"> #include <QtGui>
</span><span class="cx"> #include "completers.h"
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp (14288 => 14289)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-17 23:26:14 UTC (rev 14288)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-18 00:02:51 UTC (rev 14289)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> lineCmdEventFilter(new keyPressEventFilter(histCompleter))
</span><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><del>- setConsoleBackground();
</del><span class="cx"> connect(m_ui->comboLogLevel, SIGNAL(currentIndexChanged(int)),
</span><span class="cx"> this, SLOT(loglevelChanged(int)));
</span><ins>+ setConsoleBackground();
</ins><span class="cx"> m_ui->lineCmd->installEventFilter(lineCmdEventFilter);
</span><span class="cx"> }
</span><span class="cx"> consolePage::~consolePage()
</span><span class="lines">@@ -72,6 +72,19 @@
</span><span class="cx"> QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</span><span class="cx"> m_ui->textConsole->setPalette(settings.value("consoleBackgroundColor",QColor(Qt::white)).value<QColor>());
</span><span class="cx"> }
</span><ins>+int consolePage::isConnected()
+{
+ if (eslConnection)
+ return eslConnection->connected();
+}
+void consolePage::doDisconnect()
+{
+ eslConnection->disconnect();
+}
+void consolePage::doConnect()
+{
+ eslConnection->doConnect();
+}
</ins><span class="cx"> void consolePage::init(QString host)
</span><span class="cx"> {
</span><span class="cx"> this->host = host;
</span><span class="lines">@@ -153,18 +166,21 @@
</span><span class="cx"> m_ui->lineCmd->setFocus();
</span><span class="cx"> readSettings();
</span><span class="cx"> eslConnection->sendRecv("event plain BACKGROUND_JOB");
</span><ins>+ emit gotConnected();
</ins><span class="cx"> }
</span><span class="cx"> void consolePage::gotDisconnectedSlot()
</span><span class="cx"> {
</span><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><ins>+ emit gotDisconnected();
</ins><span class="cx"> }
</span><span class="cx"> void consolePage::connectionFailedSlot(QString msg)
</span><span class="cx"> {
</span><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><ins>+ emit gotDisconnected();
</ins><span class="cx"> }
</span><span class="cx"> void consolePage::gotEventSlot(ESLevent * event)
</span><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 (14288 => 14289)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-17 23:26:14 UTC (rev 14288)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp 2009-07-18 00:02:51 UTC (rev 14289)
</span><span class="lines">@@ -52,12 +52,18 @@
</span><span class="cx"> // Set the default status bar message
</span><span class="cx"> m_ui->statusBar->showMessage(tr("Ready"));
</span><span class="cx">
</span><ins>+ connect(m_ui->actionServerManager, SIGNAL(triggered()),
+ this, SLOT(newConnectionFromDialog()));
</ins><span class="cx"> connect(m_ui->actionConnect, SIGNAL(triggered()),
</span><del>- this, SLOT(newConnectionFromDialog()));
</del><ins>+ this, SLOT(doConnect()));
+ connect(m_ui->actionDisconnect, SIGNAL(triggered()),
+ this, SLOT(doDisconnect()));
</ins><span class="cx"> connect(m_ui->actionAbout, SIGNAL(triggered()),
</span><span class="cx"> this, SLOT(showAbout()));
</span><span class="cx"> connect(m_ui->tabWidget, SIGNAL(tabCloseRequested(int)),
</span><span class="cx"> this, SLOT(closeTab(int)));
</span><ins>+ connect(m_ui->tabWidget, SIGNAL(currentChanged(int)),
+ this, SLOT(changeTab(int)));
</ins><span class="cx"> connect(m_ui->actionPreferences, SIGNAL(triggered()),
</span><span class="cx"> this, SLOT(showPreferences()));
</span><span class="cx">
</span><span class="lines">@@ -117,6 +123,10 @@
</span><span class="cx"> if (serverDialog->exec())
</span><span class="cx"> {
</span><span class="cx"> consolePage *page = new consolePage();
</span><ins>+ connect(page, SIGNAL(gotConnected()),
+ this, SLOT(gotConnected()));
+ connect(page, SIGNAL(gotDisconnected()),
+ this, SLOT(gotDisconnected()));
</ins><span class="cx"> m_ui->tabWidget->addTab(page, serverDialog->getHost());
</span><span class="cx"> page->init(serverDialog->getHost());
</span><span class="cx"> m_ui->tabWidget->setCurrentWidget(page);
</span><span class="lines">@@ -129,6 +139,31 @@
</span><span class="cx"> m_ui->tabWidget->removeTab(index);
</span><span class="cx"> delete tab;
</span><span class="cx"> }
</span><ins>+void Cfsgui::changeTab(int index)
+{
+ consolePage *tab = static_cast<consolePage *>(m_ui->tabWidget->widget(index));
+ if (tab)
+ {
+ if (tab->isConnected())
+ {
+ gotConnected();
+ }
+ else
+ {
+ gotDisconnected();
+ }
+ }
+}
+void Cfsgui::gotConnected()
+{
+ m_ui->actionConnect->setDisabled(true);
+ m_ui->actionDisconnect->setEnabled(true);
+}
+void Cfsgui::gotDisconnected()
+{
+ m_ui->actionConnect->setEnabled(true);
+ m_ui->actionDisconnect->setDisabled(true);
+}
</ins><span class="cx"> void Cfsgui::backgroundColorChanged()
</span><span class="cx"> {
</span><span class="cx"> for (int i = 0; i < m_ui->tabWidget->count(); i++)
</span><span class="lines">@@ -137,3 +172,13 @@
</span><span class="cx"> tab->setConsoleBackground();
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+void Cfsgui::doDisconnect()
+{
+ consolePage *tab = static_cast<consolePage *>(m_ui->tabWidget->widget(m_ui->tabWidget->currentIndex()));
+ tab->doDisconnect();
+}
+void Cfsgui::doConnect()
+{
+ consolePage *tab = static_cast<consolePage *>(m_ui->tabWidget->widget(m_ui->tabWidget->currentIndex()));
+ tab->doConnect();
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludecompletersh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/completers.h (14288 => 14289)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/completers.h 2009-07-17 23:26:14 UTC (rev 14288)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/completers.h 2009-07-18 00:02:51 UTC (rev 14289)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+/*
+ * Copyright (c) 2007, Anthony Minessale II
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributor(s):
+ *
+ * Joao Mesquita <jmesquita (at) gmail.com>
+ *
+ */
</ins><span class="cx"> #ifndef COMPLETERS_H
</span><span class="cx"> #define COMPLETERS_H
</span><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 (14288 => 14289)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h 2009-07-17 23:26:14 UTC (rev 14288)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h 2009-07-18 00:02:51 UTC (rev 14289)
</span><span class="lines">@@ -22,10 +22,16 @@
</span><span class="cx"> ~consolePage();
</span><span class="cx"> void init(QString host);
</span><span class="cx"> void setConsoleBackground();
</span><ins>+ int isConnected();
+ void doConnect();
+ void doDisconnect();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual void changeEvent(QEvent *e);
</span><span class="cx"> void appendConsoleText(const QString);
</span><ins>+signals:
+ void gotConnected();
+ void gotDisconnected();
</ins><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> void gotConnectedSlot();
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludefs_guih"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h (14288 => 14289)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h 2009-07-17 23:26:14 UTC (rev 14288)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h 2009-07-18 00:02:51 UTC (rev 14289)
</span><span class="lines">@@ -64,7 +64,12 @@
</span><span class="cx"> void showPreferences();
</span><span class="cx"> void newConnectionFromDialog();
</span><span class="cx"> void closeTab(int);
</span><ins>+ void changeTab(int);
</ins><span class="cx"> void backgroundColorChanged();
</span><ins>+ void doConnect();
+ void doDisconnect();
+ void gotDisconnected();
+ void gotConnected();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::Cfsgui *m_ui;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>