<!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][14471] </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=14471">14471</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-09 00:55:48 -0500 (Sun, 09 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Confirm application exit.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfsguiappmanagercpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfsguiappmanagerh">freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsoleplugincentralWidgetui">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui</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>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgeth">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.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 (14470 => 14471)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-09 05:21:08 UTC (rev 14470)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-09 05:55:48 UTC (rev 14471)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> AppManager::AppManager(QObject *parent)
</span><span class="cx"> : QObject(parent)
</span><span class="cx"> {
</span><ins>+ reallyClose = NULL;
</ins><span class="cx"> QObject::connect(qApp, SIGNAL(lastWindowClosed()),
</span><span class="cx"> this, SLOT(lastWindowClosed()));
</span><span class="cx">
</span><span class="lines">@@ -40,16 +41,16 @@
</span><span class="cx"> action_exit = new QAction(tr("E&xit"), this);
</span><span class="cx"> action_exit->setShortcut(tr("Ctrl+Q"));
</span><span class="cx"> action_exit->setToolTip(tr("Exit FsGui"));
</span><del>- QWidget::connect(action_exit, SIGNAL(triggered()),
</del><ins>+ QObject::connect(action_exit, SIGNAL(triggered()),
</ins><span class="cx"> qApp, SLOT(closeAllWindows()));
</span><span class="cx">
</span><span class="cx"> action_preferences = new QAction(tr("&Preferences"), this);
</span><del>- QWidget::connect(action_preferences, SIGNAL(triggered()),
</del><ins>+ QObject::connect(action_preferences, SIGNAL(triggered()),
</ins><span class="cx"> settings, SLOT(show()));
</span><span class="cx">
</span><span class="cx"> action_about = new QAction(tr("&About"), this);
</span><span class="cx"> action_about->setShortcut(QKeySequence::HelpContents);
</span><del>- QWidget::connect(action_about, SIGNAL(triggered()),
</del><ins>+ QObject::connect(action_about, SIGNAL(triggered()),
</ins><span class="cx"> this, SLOT(about()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx"> list.at(i)->menu()->addAction(action_exit);
</span><span class="cx"> file_exists = true;
</span><span class="cx"> }
</span><del>- if (QString::compare(list.at(i)->text(), tr("&Preferences"), Qt::CaseInsensitive) == 0)
</del><ins>+ if (QString::compare(list.at(i)->text(), tr("&Edit"), Qt::CaseInsensitive) == 0)
</ins><span class="cx"> {
</span><span class="cx"> list.at(i)->menu()->addAction(action_preferences);
</span><span class="cx"> edit_exists = true;
</span><span class="lines">@@ -153,9 +154,30 @@
</span><span class="cx">
</span><span class="cx"> void AppManager::lastWindowClosed()
</span><span class="cx"> {
</span><del>- for (int i = 0; i < list_available_monitor_plugins.size(); ++i)
</del><ins>+ if (!reallyClose)
</ins><span class="cx"> {
</span><del>- list_available_monitor_plugins.at(i)->unload();
</del><ins>+ reallyClose = new QMessageBox();
+ reallyClose->setText("Do you really want to close FsGui?");
+ reallyClose->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+ reallyClose->setDefaultButton(QMessageBox::Yes);
+ reallyClose->setIcon(QMessageBox::Warning);
+ int ret = reallyClose->exec();
+ if(ret == QMessageBox::Yes)
+ {
+ for (int i = 0; i < list_available_monitor_plugins.size(); ++i)
+ {
+ list_available_monitor_plugins.at(i)->unload();
+ }
+ exit(0);
+ }
+ else
+ {
+ delete reallyClose;
+ reallyClose = NULL;
+ settings->show();
+ settings->raise();
+ settings->activateWindow();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfsguiappmanagerh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.h (14470 => 14471)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.h 2009-08-09 05:21:08 UTC (rev 14470)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.h 2009-08-09 05:55:48 UTC (rev 14471)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> class QMenu;
</span><span class="cx"> class QMenuBar;
</span><span class="cx"> class QListWidgetItem;
</span><ins>+class QMessageBox;
</ins><span class="cx"> class MonitorInterface;
</span><span class="cx"> class SettingsDialog;
</span><span class="cx"> class ServerManager;
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx"> ServerManager *serverManager; /*< The dialog that can fetch new esl connections from the config */
</span><span class="cx"> SettingsDialog *settings; /*< Settings dialog */
</span><span class="cx"> Ui::pluginConfigPage *pluginConfigPage; /*< The plugin config page being used */
</span><ins>+ QMessageBox *reallyClose;
</ins><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> /*!
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsoleplugincentralWidgetui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui (14470 => 14471)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui 2009-08-09 05:21:08 UTC (rev 14470)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui 2009-08-09 05:55:48 UTC (rev 14471)
</span><span class="lines">@@ -65,7 +65,14 @@
</span><span class="cx"> </property>
</span><span class="cx"> <addaction name="action_Close"/>
</span><span class="cx"> </widget>
</span><ins>+ <widget class="QMenu" name="menu_Edit">
+ <property name="title">
+ <string>&amp;Edit</string>
+ </property>
+ <addaction name="action_Clear"/>
+ </widget>
</ins><span class="cx"> <addaction name="menu_File"/>
</span><ins>+ <addaction name="menu_Edit"/>
</ins><span class="cx"> <addaction name="menu_Server"/>
</span><span class="cx"> </widget>
</span><span class="cx"> <widget class="QStatusBar" name="statusbar"/>
</span><span class="lines">@@ -98,6 +105,11 @@
</span><span class="cx"> <string>&amp;Server Manager</string>
</span><span class="cx"> </property>
</span><span class="cx"> </action>
</span><ins>+ <action name="action_Clear">
+ <property name="text">
+ <string>&amp;Clear</string>
+ </property>
+ </action>
</ins><span class="cx"> </widget>
</span><span class="cx"> <resources>
</span><span class="cx"> <include location="../../resources/resources.qrc"/>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoleplugincpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp (14470 => 14471)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-09 05:21:08 UTC (rev 14470)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-09 05:55:48 UTC (rev 14471)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> this, SLOT(connect()));
</span><span class="cx"> QObject::connect(consoleWindow->action_Disconnect, SIGNAL(triggered()),
</span><span class="cx"> this, SLOT(disconnect()));
</span><ins>+ QObject::connect(consoleWindow->action_Clear, SIGNAL(triggered()),
+ this, SLOT(clearLogContents()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ConsolePlugin::~ConsolePlugin(){}
</span><span class="lines">@@ -134,6 +136,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ConsolePlugin::clearLogContents()
+{
+ ConsoleTabWidget *tab = qobject_cast<ConsoleTabWidget*>(consoleWindow->tabConsole->currentWidget());
+ if (tab)
+ tab->clearConsoleContents();
+}
+
</ins><span class="cx"> void ConsolePlugin::connectionStateChanged()
</span><span class="cx"> {
</span><span class="cx"> tabChanged(consoleWindow->tabConsole->currentIndex());
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h (14470 => 14471)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-09 05:21:08 UTC (rev 14470)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-09 05:55:48 UTC (rev 14471)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> void connect();
</span><span class="cx"> void disconnect();
</span><span class="cx"> void newConnection();
</span><ins>+ void clearLogContents();
</ins><span class="cx"> void changeConsoleBackgroundColor();
</span><span class="cx"> void changeAlertBackgroundColor();
</span><span class="cx"> void changeCriticalBackgroundColor();
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp (14470 => 14471)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-09 05:21:08 UTC (rev 14470)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-09 05:55:48 UTC (rev 14471)
</span><span class="lines">@@ -50,6 +50,11 @@
</span><span class="cx"> delete m_ui;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ConsoleTabWidget::clearConsoleContents()
+{
+ sourceModel->clear();
+}
+
</ins><span class="cx"> void ConsoleTabWidget::changeEvent(QEvent *e)
</span><span class="cx"> {
</span><span class="cx"> QWidget::changeEvent(e);
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgeth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h (14470 => 14471)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h 2009-08-09 05:21:08 UTC (rev 14470)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h 2009-08-09 05:55:48 UTC (rev 14471)
</span><span class="lines">@@ -19,6 +19,9 @@
</span><span class="cx"> ConsoleTabWidget(QWidget *parent, ESLconnection *eslconnection);
</span><span class="cx"> ~ConsoleTabWidget();
</span><span class="cx">
</span><ins>+public slots:
+ void clearConsoleContents();
+
</ins><span class="cx"> protected:
</span><span class="cx"> void changeEvent(QEvent *e);
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>