<!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][14503] </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=14503">14503</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-13 02:05:53 -0500 (Thu, 13 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Major refactor on how we keep track of monitor plugins.</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="#freeswitchtrunkcontribjmesquitafsguisrcfsguiconfig_plugin_widgetui">freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/config_plugin_widget.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesinterfacesh">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacessettingsdialogcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacessettingsdialogh">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.h</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 (14502 => 14503)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-13 00:34:30 UTC (rev 14502)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-13 07:05:53 UTC (rev 14503)
</span><span class="lines">@@ -16,13 +16,18 @@
</span><span class="cx">
</span><span class="cx"> QCoreApplication::setOrganizationName("FreeSWITCH");
</span><span class="cx"> QCoreApplication::setApplicationName("FsGui");
</span><del>- settings = new SettingsDialog();
</del><ins>+
+ settingsDialog = new SettingsDialog();
</ins><span class="cx"> QWidget *base = new QWidget;
</span><span class="cx"> pluginConfigPage = new Ui::pluginConfigPage();
</span><span class="cx"> pluginConfigPage->setupUi(base);
</span><del>- settings->addConfigItem("Plugins", base);
</del><ins>+ settingsDialog->addConfigItem(new QListWidgetItem("Plugins"), base);
</ins><span class="cx"> QObject::connect(pluginConfigPage->btnRun, SIGNAL(clicked()),
</span><span class="cx"> this, SLOT(runPlugin()));
</span><ins>+ QObject::connect(pluginConfigPage->btnChangePluginDir, SIGNAL(clicked()),
+ this, SLOT(changePluginDir()));
+ QObject::connect(settingsDialog, SIGNAL(accepted()),
+ this, SLOT(writeSettings()));
</ins><span class="cx"> QObject::connect(pluginConfigPage->listWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
</span><span class="cx"> this, SLOT(pluginSelected(QListWidgetItem*, QListWidgetItem*)));
</span><span class="cx">
</span><span class="lines">@@ -30,11 +35,27 @@
</span><span class="cx">
</span><span class="cx"> qApp->setWindowIcon(QIcon(":/icons/fsgui_logo.png"));
</span><span class="cx">
</span><ins>+ readSettings();
</ins><span class="cx"> createActions();
</span><span class="cx"> loadPlugins();
</span><del>- settings->show();
</del><ins>+ settingsDialog->show();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void AppManager::changePluginDir()
+{
+ QString dir = QFileDialog::getExistingDirectory(settingsDialog, tr("Plugin Location"),
+ pluginsDir->currentPath(),
+ QFileDialog::ShowDirsOnly
+ | QFileDialog::DontResolveSymlinks);
+ if(!dir.isEmpty())
+ {
+ pluginConfigPage->linePluginDir->setText(dir);
+ pluginsDir->setCurrent(dir);
+ writeSettings();
+ unloadPlugins();
+ loadPlugins();
+ }
+}
</ins><span class="cx">
</span><span class="cx"> void AppManager::createActions()
</span><span class="cx"> {
</span><span class="lines">@@ -46,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> action_preferences = new QAction(tr("&Preferences"), this);
</span><span class="cx"> QObject::connect(action_preferences, SIGNAL(triggered()),
</span><del>- settings, SLOT(show()));
</del><ins>+ settingsDialog, SLOT(show()));
</ins><span class="cx">
</span><span class="cx"> action_about = new QAction(tr("&About"), this);
</span><span class="cx"> action_about->setShortcut(QKeySequence::HelpContents);
</span><span class="lines">@@ -97,31 +118,80 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AppManager::loadPlugins()
</del><ins>+void AppManager::readSettings()
</ins><span class="cx"> {
</span><del>- QDir pluginsDir = QDir(qApp->applicationDirPath());
</del><ins>+ pluginsDir = new QDir;
+ QSettings settings;
+ QString dir = settings.value("PluginDir").toString();
+ if (dir.isEmpty())
+ {
+ pluginsDir->setCurrent(qApp->applicationDirPath());
</ins><span class="cx"> #if defined(Q_OS_WIN)
</span><del>- if (pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release")
- pluginsDir.cdUp();
</del><ins>+ if (pluginsDir->dirName().toLower() == "debug" || pluginsDir->dirName().toLower() == "release")
+ pluginsDir->cdUp();
</ins><span class="cx"> #elif defined(Q_OS_MAC)
</span><del>- if (pluginsDir.dirName() == "MacOS") {
- pluginsDir.cdUp();
- pluginsDir.cdUp();
- pluginsDir.cdUp();
</del><ins>+ if (pluginsDir->dirName() == "MacOS") {
+ pluginsDir->cdUp();
+ pluginsDir->cdUp();
+ pluginsDir->cdUp();
+ }
+#endif
+ pluginsDir->cd("plugins");
</ins><span class="cx"> }
</span><del>-#endif
- pluginsDir.cd("plugins");
- foreach (QString fileName, pluginsDir.entryList(QDir::Files))
</del><ins>+ else
</ins><span class="cx"> {
</span><del>- QPluginLoader *loader = new QPluginLoader(pluginsDir.absoluteFilePath(fileName));
</del><ins>+ pluginsDir->setCurrent(dir);
+ }
+ pluginConfigPage->linePluginDir->setText(pluginsDir->absolutePath());
+}
+
+void AppManager::writeSettings()
+{
+ QSettings settings;
+ settings.setValue("PluginDir", pluginConfigPage->linePluginDir->text());
+}
+
+void AppManager::unloadPlugins()
+{
+ /* Pop and unload all plugins doing proper cleanup */
+ for (int i = 0; i < list_available_monitor_plugins.size(); i++)
+ {
+ QMapIterator<QListWidgetItem*, QWidget*> j(*list_available_monitor_plugins.at(i)->_configItems);
+ while(j.hasNext())
+ {
+ j.next();
+ settingsDialog->removeConfigItem(j.key(), j.value());
+ }
+ list_available_monitor_plugins.at(i)->_loader->unload();
+ delete list_available_monitor_plugins.takeAt(i);
+ }
+}
+
+void AppManager::loadPlugins()
+{
+ pluginConfigPage->listWidget->clear();
+
+ foreach (QString fileName, pluginsDir->entryList(QDir::Files))
+ {
+ QPluginLoader *loader = new QPluginLoader(pluginsDir->absoluteFilePath(fileName));
</ins><span class="cx"> if (MonitorInterface *interface = qobject_cast<MonitorInterface *>(loader->instance()))
</span><span class="cx"> {
</span><span class="cx"> if(QMainWindow *interface_window = qobject_cast<QMainWindow *>(loader->instance()))
</span><span class="cx"> {
</span><del>- list_available_monitor_plugins.append(loader);
</del><ins>+ MonitorPlugin *plugin = new MonitorPlugin(loader);
+ list_available_monitor_plugins.append(plugin);
</ins><span class="cx"> interface_window->setWindowTitle(QString("FsGui - ") + interface_window->windowTitle());
</span><span class="cx"> interface_window->setAttribute(Qt::WA_QuitOnClose);
</span><del>- interface->addConfigItems(settings);
</del><ins>+ interface->addConfigItems(settingsDialog, *plugin->_configItems);
+
+ /* Add config items */
+ QMapIterator<QListWidgetItem*, QWidget*> i(*plugin->_configItems);
+ while(i.hasNext())
+ {
+ i.next();
+ settingsDialog->addConfigItem(i.key(), i.value());
+ }
+
</ins><span class="cx"> interface->setServerManager(serverManager);
</span><span class="cx"> createMenus(interface_window->menuBar());
</span><span class="cx"> pluginConfigPage->listWidget->addItem(QString("%1\n %2").arg(interface->appName(),
</span><span class="lines">@@ -138,17 +208,16 @@
</span><span class="cx"> {
</span><span class="cx"> QMessageBox::critical(0, tr("Error!"),
</span><span class="cx"> tr("No available plugins. Install compatible plugins before running FsGui."));
</span><del>- exit(1);
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AppManager::runPlugin()
</span><span class="cx"> {
</span><del>- if (list_available_monitor_plugins.at(pluginConfigPage->listWidget->currentRow())->isLoaded())
</del><ins>+ if (list_available_monitor_plugins.at(pluginConfigPage->listWidget->currentRow())->_loader->isLoaded())
</ins><span class="cx"> {
</span><del>- MonitorInterface * interface = qobject_cast<MonitorInterface *>(list_available_monitor_plugins.at(pluginConfigPage->listWidget->currentRow())->instance());
</del><ins>+ MonitorInterface * interface = qobject_cast<MonitorInterface *>(list_available_monitor_plugins.at(pluginConfigPage->listWidget->currentRow())->_loader->instance());
</ins><span class="cx"> interface->newInstance();
</span><del>- settings->hide();
</del><ins>+ settingsDialog->hide();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -166,17 +235,16 @@
</span><span class="cx"> {
</span><span class="cx"> for (int i = 0; i < list_available_monitor_plugins.size(); ++i)
</span><span class="cx"> {
</span><del>- list_available_monitor_plugins.at(i)->unload();
</del><ins>+ list_available_monitor_plugins.takeAt(i)->_loader->unload();
</ins><span class="cx"> }
</span><del>- exit(0);
</del><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> delete reallyClose;
</span><span class="cx"> reallyClose = NULL;
</span><del>- settings->show();
- settings->raise();
- settings->activateWindow();
</del><ins>+ settingsDialog->show();
+ settingsDialog->raise();
+ settingsDialog->activateWindow();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -191,7 +259,7 @@
</span><span class="cx">
</span><span class="cx"> void AppManager::about()
</span><span class="cx"> {
</span><del>- QMessageBox::about(qobject_cast<QMainWindow *>(list_available_monitor_plugins.first()),
</del><ins>+ /*QMessageBox::about(qobject_cast<QMainWindow *>(list_available_monitor_plugins.first()),
</ins><span class="cx"> tr("About FsGui"),
</span><del>- tr("Hey, this is FsGui!!!"));
</del><ins>+ tr("Hey, this is FsGui!!!"));*/
</ins><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 (14502 => 14503)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.h 2009-08-13 00:34:30 UTC (rev 14502)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.h 2009-08-13 07:05:53 UTC (rev 14503)
</span><span class="lines">@@ -18,6 +18,17 @@
</span><span class="cx"> class ServerManager;
</span><span class="cx">
</span><span class="cx"> /*!
</span><ins>+ \brief Represents a loaded monitor plugin
+ */
+class MonitorPlugin
+{
+public:
+ MonitorPlugin(QPluginLoader *loader) : _loader(loader), _configItems(new QMap<QListWidgetItem*, QWidget*>){}
+ QPluginLoader *_loader;
+ QMap<QListWidgetItem*, QWidget*> *_configItems;
+};
+
+/*!
</ins><span class="cx"> \brief This class will be the center of each installation
</span><span class="cx"> and will load some plugins.
</span><span class="cx"> */
</span><span class="lines">@@ -41,8 +52,12 @@
</span><span class="cx"> \brief Load all plugins populating each corresponding list
</span><span class="cx"> */
</span><span class="cx"> void loadPlugins();
</span><ins>+ /*!
+ \brief Unload all plugins cleaning up what is needed
+ */
+ void unloadPlugins();
</ins><span class="cx">
</span><del>- QList<QPluginLoader *> list_available_monitor_plugins; /*< List of available Monitor plugins */
</del><ins>+ QList<MonitorPlugin *> list_available_monitor_plugins; /*< List of available Monitor plugins */
</ins><span class="cx"> QAction *action_exit; /*< Exit the application */
</span><span class="cx"> QAction *action_preferences; /*< Show the preferences dialog */
</span><span class="cx"> QAction *action_about; /*< Calls the about dialog */
</span><span class="lines">@@ -50,9 +65,10 @@
</span><span class="cx"> QMenu *menu_edit; /*< The edit menu on menu bar */
</span><span class="cx"> QMenu *menu_help; /*< The help menu on menu bar */
</span><span class="cx"> ServerManager *serverManager; /*< The dialog that can fetch new esl connections from the config */
</span><del>- SettingsDialog *settings; /*< Settings dialog */
</del><ins>+ SettingsDialog *settingsDialog; /*< Settings dialog */
</ins><span class="cx"> Ui::pluginConfigPage *pluginConfigPage; /*< The plugin config page being used */
</span><del>- QMessageBox *reallyClose;
</del><ins>+ QMessageBox *reallyClose; /*< Dialog that will confirm closing the application */
+ QDir *pluginsDir; /*< Directory from where we search the plugins */
</ins><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> /*!
</span><span class="lines">@@ -60,6 +76,10 @@
</span><span class="cx"> */
</span><span class="cx"> void runPlugin();
</span><span class="cx"> /*!
</span><ins>+ \brief Change the plugin search directory
+ */
+ void changePluginDir();
+ /*!
</ins><span class="cx"> \brief Cleanup and give plugins a chance to clean for themselves.
</span><span class="cx"> */
</span><span class="cx"> void lastWindowClosed();
</span><span class="lines">@@ -71,6 +91,15 @@
</span><span class="cx"> \brief Show the about dialog.
</span><span class="cx"> */
</span><span class="cx"> void about();
</span><ins>+ /*!
+ \brief Write settings when convenient
+ */
+ void writeSettings();
+ /*!
+ \brief Read settings for the General section
+ */
+ void readSettings();
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // APPMANAGER_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfsguiconfig_plugin_widgetui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/config_plugin_widget.ui (14502 => 14503)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/config_plugin_widget.ui 2009-08-13 00:34:30 UTC (rev 14502)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/config_plugin_widget.ui 2009-08-13 07:05:53 UTC (rev 14503)
</span><span class="lines">@@ -6,41 +6,74 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>374</width>
- <height>210</height>
</del><ins>+ <width>369</width>
+ <height>282</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="cx"> <string>Form</string>
</span><span class="cx"> </property>
</span><del>- <layout class="QHBoxLayout" name="horizontalLayout">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_3">
</ins><span class="cx"> <item>
</span><del>- <widget class="QListWidget" name="listWidget"/>
</del><ins>+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Plugin Location</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="linePluginDir">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnChangePluginDir">
+ <property name="maximumSize">
+ <size>
+ <width>85</width>
+ <height>28</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>&amp;Change</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_2">
</ins><span class="cx"> <item>
</span><del>- <widget class="QPushButton" name="btnRun">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>&amp;Run</string>
- </property>
- </widget>
</del><ins>+ <widget class="QListWidget" name="listWidget"/>
</ins><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QPushButton" name="btnRun">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>&amp;Run</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </item>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesinterfacesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.h (14502 => 14503)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.h 2009-08-13 00:34:30 UTC (rev 14502)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.h 2009-08-13 07:05:53 UTC (rev 14503)
</span><span class="lines">@@ -3,6 +3,8 @@
</span><span class="cx">
</span><span class="cx"> #include <QtPlugin>
</span><span class="cx">
</span><ins>+class QListWidgetItem;
+class QWidget;
</ins><span class="cx"> class ESLevent;
</span><span class="cx"> class SettingsDialog;
</span><span class="cx"> class ServerManager;
</span><span class="lines">@@ -30,8 +32,10 @@
</span><span class="cx"> virtual QString appDescription() = 0;
</span><span class="cx"> /*!
</span><span class="cx"> \brief Add a new configuration item to the settings dialog
</span><ins>+ \param[in] SettingsDialog A pointer to the settings dialog
+ \param[out] QMap<QListWidgetItem *, QWidget *> A QMap that has a items associated to config pages.
</ins><span class="cx"> */
</span><del>- virtual void addConfigItems(SettingsDialog *settings) = 0;
</del><ins>+ virtual void addConfigItems(SettingsDialog *, QMap<QListWidgetItem *, QWidget *>&) = 0;
</ins><span class="cx"> /*!
</span><span class="cx"> \brief Sets a pointer to ServerManager object
</span><span class="cx"> */
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacessettingsdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.cpp (14502 => 14503)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.cpp 2009-08-13 00:34:30 UTC (rev 14502)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.cpp 2009-08-13 07:05:53 UTC (rev 14503)
</span><span class="lines">@@ -29,12 +29,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SettingsDialog::addConfigItem(QString item, QWidget *page)
-{
- QListWidgetItem *item_widget = new QListWidgetItem(item);
- addConfigItem(item_widget, page);
-}
-
</del><span class="cx"> void SettingsDialog::addConfigItem(QListWidgetItem *item, QWidget *page)
</span><span class="cx"> {
</span><span class="cx"> m_ui->listConfig->addItem(item);
</span><span class="lines">@@ -49,3 +43,10 @@
</span><span class="cx"> m_ui->configPages->setCurrentIndex(m_ui->listConfig->row(current));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SettingsDialog::removeConfigItem(QListWidgetItem *item, QWidget *page)
+{
+ m_ui->listConfig->removeItemWidget(item);
+ m_ui->configPages->removeWidget(page);
+ delete item;
+ delete page;
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacessettingsdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.h (14502 => 14503)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.h 2009-08-13 00:34:30 UTC (rev 14502)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.h 2009-08-13 07:05:53 UTC (rev 14503)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> SettingsDialog(QWidget *parent = 0);
</span><span class="cx"> ~SettingsDialog();
</span><span class="cx"> void addConfigItem(QListWidgetItem *item, QWidget *page);
</span><del>- void addConfigItem(QString item, QWidget *page);
</del><ins>+ void removeConfigItem(QListWidgetItem *item, QWidget *page);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void changeEvent(QEvent *e);
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoleplugincpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp (14502 => 14503)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-13 00:34:30 UTC (rev 14502)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-13 07:05:53 UTC (rev 14503)
</span><span class="lines">@@ -48,13 +48,14 @@
</span><span class="cx"> return tr("This application will do the same as fs_cli does.");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsolePlugin::addConfigItems(SettingsDialog *settings)
</del><ins>+void ConsolePlugin::addConfigItems(SettingsDialog *settings, QMap<QListWidgetItem *, QWidget *>&configItems)
</ins><span class="cx"> {
</span><ins>+ settingsDialog = settings;
+
</ins><span class="cx"> consoleConfigPage = new Ui::configPage();
</span><span class="cx"> QWidget *base = new QWidget(this);
</span><span class="cx">
</span><span class="cx"> consoleConfigPage->setupUi(base);
</span><del>- settings->addConfigItem("Console", base);
</del><span class="cx">
</span><span class="cx"> QObject::connect(consoleConfigPage->btnBackgroundConsole, SIGNAL(clicked()),
</span><span class="cx"> this, SLOT(changeConsoleBackgroundColor()));
</span><span class="lines">@@ -91,6 +92,7 @@
</span><span class="cx"> readSettings();
</span><span class="cx"> QObject::connect(settings, SIGNAL(accepted()),
</span><span class="cx"> this, SLOT(writeSettings()));
</span><ins>+ configItems.insert(new QListWidgetItem("Console"), base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConsolePlugin::newInstance()
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h (14502 => 14503)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-13 00:34:30 UTC (rev 14502)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-13 07:05:53 UTC (rev 14503)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> class configPage;
</span><span class="cx"> }
</span><span class="cx"> class ESLconnection;
</span><ins>+class SettingsDialog;
</ins><span class="cx">
</span><span class="cx"> class ConsolePlugin : public QMainWindow, public MonitorInterface
</span><span class="cx"> {
</span><span class="lines">@@ -23,7 +24,7 @@
</span><span class="cx"> QObject *getMonitorInterfaceObject();
</span><span class="cx"> QString appName();
</span><span class="cx"> QString appDescription();
</span><del>- void addConfigItems(SettingsDialog *);
</del><ins>+ void addConfigItems(SettingsDialog *, QMap<QListWidgetItem *, QWidget *>&);
</ins><span class="cx"> void newInstance();
</span><span class="cx"> void setServerManager(ServerManager *manager);
</span><span class="cx">
</span><span class="lines">@@ -60,6 +61,7 @@
</span><span class="cx"> Ui::configPage *consoleConfigPage;
</span><span class="cx"> ServerManager *serverManager;
</span><span class="cx"> QHash<QString, ESLconnection *> hashESL;
</span><ins>+ SettingsDialog *settingsDialog;
</ins><span class="cx">
</span><span class="cx"> void setPalette(QLineEdit *control, QString key);
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>