<!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][14470] </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=14470">14470</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-09 00:21:08 -0500 (Sun, 09 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Connect and disconnect controls and closing tabs now work.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfsguiappmanagercpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoleplugincpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginh">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfsguiappmanagercpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14469 => 14470)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-09 04:06:18 UTC (rev 14469)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-09 05:21:08 UTC (rev 14470)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> bool help_exists = false;
</span><span class="cx"> QList<QAction *> list = menu_bar->actions();
</span><span class="cx"> for (int i = 0; i < list.size(); ++i) {
</span><del>- qDebug() << "I am trying";
</del><span class="cx"> if (QString::compare(list.at(i)->text(), tr("&File"), Qt::CaseInsensitive) == 0)
</span><span class="cx"> {
</span><span class="cx"> list.at(i)->menu()->addAction(action_exit);
</span><span class="lines">@@ -69,7 +68,6 @@
</span><span class="cx"> }
</span><span class="cx"> if (QString::compare(list.at(i)->text(), tr("&Preferences"), Qt::CaseInsensitive) == 0)
</span><span class="cx"> {
</span><del>- qDebug() << "Teste!";
</del><span class="cx"> list.at(i)->menu()->addAction(action_preferences);
</span><span class="cx"> edit_exists = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoleplugincpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp (14469 => 14470)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-09 04:06:18 UTC (rev 14469)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-09 05:21:08 UTC (rev 14470)
</span><span class="lines">@@ -15,6 +15,16 @@
</span><span class="cx"> {
</span><span class="cx"> consoleWindow->setupUi(this);
</span><span class="cx"> consoleWindow->tabConsole->clear();
</span><ins>+
+ QObject::connect(consoleWindow->tabConsole, SIGNAL(tabCloseRequested(int)),
+ this, SLOT(tabClose(int)));
+ QObject::connect(consoleWindow->tabConsole, SIGNAL(currentChanged(int)),
+ this, SLOT(tabChanged(int)));
+
+ QObject::connect(consoleWindow->action_Connect, SIGNAL(triggered()),
+ this, SLOT(connect()));
+ QObject::connect(consoleWindow->action_Disconnect, SIGNAL(triggered()),
+ this, SLOT(disconnect()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ConsolePlugin::~ConsolePlugin(){}
</span><span class="lines">@@ -92,51 +102,49 @@
</span><span class="cx"> this, SLOT(newConnection()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsolePlugin::connected()
-{
- consoleWindow->action_Connect->setEnabled(false);
- consoleWindow->action_Disconnect->setEnabled(true);
-}
-
-void ConsolePlugin::disconnected()
-{
- consoleWindow->action_Connect->setEnabled(true);
- consoleWindow->action_Disconnect->setEnabled(false);
-}
-
-void ConsolePlugin::connectionFailed(QString /*reason*/)
-{
-}
-
</del><span class="cx"> void ConsolePlugin::newConnection()
</span><span class="cx"> {
</span><span class="cx"> if (serverManager->exec())
</span><span class="cx"> {
</span><span class="cx"> ESLconnection *esl = serverManager->getESLconnection();
</span><del>- consoleWindow->tabConsole->addTab(new ConsoleTabWidget(this, esl), esl->getName());
</del><ins>+
</ins><span class="cx"> if (hashESL.contains(esl->getName()))
</span><span class="cx"> {
</span><del>- esl->disconnect();
- esl->wait();
- hashESL.remove(esl->getName());
- delete esl;
</del><ins>+ for (int i = 0; i < consoleWindow->tabConsole->count(); i++)
+ {
+ if (consoleWindow->tabConsole->tabText(i) == esl->getName())
+ {
+ consoleWindow->tabConsole->setCurrentIndex(i);
+ delete esl;
+ return;
+ }
+ }
</ins><span class="cx"> }
</span><ins>+
+ ConsoleTabWidget *newTab = new ConsoleTabWidget(this, esl);
+ consoleWindow->tabConsole->addTab(newTab, esl->getName());
+ consoleWindow->tabConsole->setCurrentWidget(newTab);
</ins><span class="cx"> hashESL.insert(esl->getName(), esl);
</span><span class="cx"> QObject::connect(esl, SIGNAL(connected()),
</span><del>- this, SLOT(connected()));
</del><ins>+ this, SLOT(connectionStateChanged()));
+ QObject::connect(esl, SIGNAL(disconnected()),
+ this, SLOT(connectionStateChanged()));
</ins><span class="cx"> QObject::connect(esl, SIGNAL(connectionFailed(QString)),
</span><del>- this, SLOT(connectionFailed(QString)));
- QObject::connect(esl, SIGNAL(disconnected()),
- this, SLOT(disconnected()));
</del><ins>+ this, SLOT(connectionStateChanged()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ConsolePlugin::connectionStateChanged()
+{
+ tabChanged(consoleWindow->tabConsole->currentIndex());
+}
+
</ins><span class="cx"> void ConsolePlugin::setPalette(QLineEdit *control, QString key)
</span><span class="cx"> {
</span><del>- QSettings settings;
- if (settings.contains(key)) {
- control->setPalette(settings.value(key).value<QPalette>());
- }
</del><ins>+ QSettings settings;
+ if (settings.contains(key)) {
+ control->setPalette(settings.value(key).value<QPalette>());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConsolePlugin::readSettings()
</span><span class="lines">@@ -356,4 +364,52 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ConsolePlugin::tabClose(int index)
+{
+ QWidget *tab = consoleWindow->tabConsole->widget(index);
+ ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(index), NULL);
+ if (esl)
+ {
+ hashESL.remove(consoleWindow->tabConsole->tabText(index));
+ esl->disconnect();
+ esl->wait();
+ delete esl;
+ }
+ consoleWindow->tabConsole->removeTab(index);
+ delete tab;
+ if (consoleWindow->tabConsole->count() == 0)
+ {
+ consoleWindow->action_Connect->setEnabled(false);
+ consoleWindow->action_Disconnect->setEnabled(false);
+ }
+}
+
+void ConsolePlugin::tabChanged(int index)
+{
+ ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(index), NULL);
+ if (esl)
+ {
+ consoleWindow->action_Connect->setDisabled(esl->isConnected());
+ consoleWindow->action_Disconnect->setEnabled(esl->isConnected());
+ }
+}
+
+void ConsolePlugin::connect()
+{
+ ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(consoleWindow->tabConsole->currentIndex()), NULL);
+ if (esl)
+ {
+ esl->connect();
+ }
+}
+
+void ConsolePlugin::disconnect()
+{
+ ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(consoleWindow->tabConsole->currentIndex()), NULL);
+ if (esl)
+ {
+ esl->disconnect();
+ }
+}
+
</ins><span class="cx"> Q_EXPORT_PLUGIN2(consoleplugin, ConsolePlugin)
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h (14469 => 14470)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-09 04:06:18 UTC (rev 14469)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-09 05:21:08 UTC (rev 14470)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx"> void setServerManager(ServerManager *manager);
</span><span class="cx">
</span><span class="cx"> private slots:
</span><del>- void connected();
- void disconnected();
- void connectionFailed(QString);
</del><ins>+ void connectionStateChanged();
+ void connect();
+ void disconnect();
</ins><span class="cx"> void newConnection();
</span><span class="cx"> void changeConsoleBackgroundColor();
</span><span class="cx"> void changeAlertBackgroundColor();
</span><span class="lines">@@ -48,6 +48,8 @@
</span><span class="cx"> void changeNoticeForegroundColor();
</span><span class="cx"> void changeInfoForegroundColor();
</span><span class="cx"> void changeDebugForegroundColor();
</span><ins>+ void tabClose(int index);
+ void tabChanged(int index);
</ins><span class="cx"> void readSettings();
</span><span class="cx"> void writeSettings();
</span><span class="cx">
</span><span class="lines">@@ -57,7 +59,7 @@
</span><span class="cx"> ServerManager *serverManager;
</span><span class="cx"> QHash<QString, ESLconnection *> hashESL;
</span><span class="cx">
</span><del>- void setPalette(QLineEdit *control, QString key);
</del><ins>+ void setPalette(QLineEdit *control, QString key);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // CONSOLEPLUGIN_H
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>