<!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][14269] </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=14269">14269</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-16 00:06:36 -0500 (Thu, 16 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Makes things a little bit more organized</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguifsguipro">freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludeglobal_definesh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/global_defines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguifsguipro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro (14268 => 14269)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro 2009-07-16 04:58:27 UTC (rev 14268)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro 2009-07-16 05:06:36 UTC (rev 14269)
</span><span class="lines">@@ -15,7 +15,8 @@
</span><span class="cx"> HEADERS += src/include/fs_gui.h \
</span><span class="cx"> src/include/server_manager.h \
</span><span class="cx"> src/include/esl_connection.h \
</span><del>- src/include/consolepage.h
</del><ins>+ src/include/consolepage.h \
+ src/include/global_defines.h
</ins><span class="cx"> FORMS += resources/fs_gui.ui \
</span><span class="cx"> resources/server_manager.ui \
</span><span class="cx"> resources/consolepage.ui
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp (14268 => 14269)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-16 04:58:27 UTC (rev 14268)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-16 05:06:36 UTC (rev 14269)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "ui_consolepage.h"
</span><span class="cx"> #include "esl_connection.h"
</span><span class="cx"> #include "esl.h"
</span><ins>+#include "global_defines.h"
</ins><span class="cx">
</span><span class="cx"> consolePage::consolePage(QWidget *parent) :
</span><span class="cx"> QWidget(parent),
</span><span class="lines">@@ -68,11 +69,8 @@
</span><span class="cx"> connect(m_ui->btnSend, SIGNAL(clicked()),
</span><span class="cx"> this, SLOT(sendCommand()));
</span><span class="cx">
</span><del>- QString settingsApplication = "FSGui";
- QString settingsOrganization = "FreeSWITCH";
</del><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</ins><span class="cx">
</span><del>- QSettings settings(settingsOrganization, settingsApplication);
-
</del><span class="cx"> settings.beginGroup("servers");
</span><span class="cx"> settings.beginGroup(host);
</span><span class="cx"> QString port = settings.value("port").toString();
</span><span class="lines">@@ -231,15 +229,11 @@
</span><span class="cx"> }
</span><span class="cx"> void consolePage::readSettings()
</span><span class="cx"> {
</span><del>- QString settingsApplication = "FSGui";
- QString settingsOrganization = "FreeSWITCH";
- QSettings settings(settingsOrganization, settingsApplication);
</del><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</ins><span class="cx"> m_ui->comboLogLevel->setCurrentIndex(settings.value(QString("servers/%1/loglevel").arg(host)).toInt());
</span><span class="cx"> }
</span><span class="cx"> void consolePage::writeSettings()
</span><span class="cx"> {
</span><del>- QString settingsApplication = "FSGui";
- QString settingsOrganization = "FreeSWITCH";
- QSettings settings(settingsOrganization, settingsApplication);
</del><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</ins><span class="cx"> settings.setValue(QString("servers/%1/loglevel").arg(host), m_ui->comboLogLevel->currentIndex());
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludeglobal_definesh"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/global_defines.h (0 => 14269)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/global_defines.h (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/global_defines.h 2009-07-16 05:06:36 UTC (rev 14269)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+#ifndef GLOBAL_DEFINES_H
+#define GLOBAL_DEFINES_H
+
+#define SETTINGS_ORGANIZATION "FreeSWITCH"
+#define SETTINGS_APPLICATION "FsGui"
+
+#endif // GLOBAL_DEFINES_H
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludeserver_managerh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/server_manager.h (14268 => 14269)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/server_manager.h 2009-07-16 04:58:27 UTC (rev 14268)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/server_manager.h 2009-07-16 05:06:36 UTC (rev 14269)
</span><span class="lines">@@ -61,8 +61,6 @@
</span><span class="cx"> virtual void changeEvent(QEvent *e);
</span><span class="cx"> private:
</span><span class="cx"> Ui::CserverManager *m_ui;
</span><del>- QString settingsApplication;
- QString settingsOrganization;
</del><span class="cx"> private slots:
</span><span class="cx"> void addNewServer();
</span><span class="cx"> void deleteServer();
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcserver_managercpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/server_manager.cpp (14268 => 14269)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/server_manager.cpp 2009-07-16 04:58:27 UTC (rev 14268)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/server_manager.cpp 2009-07-16 05:06:36 UTC (rev 14269)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">
</span><span class="cx"> #include "server_manager.h"
</span><span class="cx"> #include "ui_server_manager.h"
</span><ins>+#include "global_defines.h"
</ins><span class="cx">
</span><span class="cx"> CserverManager::CserverManager(QWidget *parent) :
</span><span class="cx"> QDialog(parent),
</span><span class="lines">@@ -45,8 +46,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><span class="cx">
</span><del>- settingsApplication = "FSGui";
- settingsOrganization = "FreeSWITCH";
</del><span class="cx"> readSettings();
</span><span class="cx"> connect(m_ui->btnSave, SIGNAL(clicked()),
</span><span class="cx"> this, SLOT(addNewServer()));
</span><span class="lines">@@ -86,7 +85,7 @@
</span><span class="cx"> }
</span><span class="cx"> void CserverManager::readSettings()
</span><span class="cx"> {
</span><del>- QSettings settings(settingsOrganization, settingsApplication);
</del><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</ins><span class="cx"> m_ui->serverTreeWidget->clear();
</span><span class="cx"> m_ui->serverTreeWidget->setFocus();
</span><span class="cx"> addChildSettings(settings, 0, "servers");
</span><span class="lines">@@ -113,7 +112,7 @@
</span><span class="cx"> }
</span><span class="cx"> void CserverManager::addNewServer()
</span><span class="cx"> {
</span><del>- QSettings settings(settingsOrganization, settingsApplication);
</del><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</ins><span class="cx">
</span><span class="cx"> settings.beginGroup("servers");
</span><span class="cx"> settings.beginGroup(m_ui->host->text());
</span><span class="lines">@@ -130,7 +129,7 @@
</span><span class="cx"> QTreeWidgetItem *item = m_ui->serverTreeWidget->currentItem();
</span><span class="cx"> if (item)
</span><span class="cx"> {
</span><del>- QSettings settings(settingsOrganization, settingsApplication);
</del><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</ins><span class="cx"> settings.beginGroup("servers");
</span><span class="cx"> settings.remove(item->text(0));
</span><span class="cx"> settings.endGroup();
</span><span class="lines">@@ -142,7 +141,7 @@
</span><span class="cx"> }
</span><span class="cx"> void CserverManager::serverSelected(QTreeWidgetItem *item, int col)
</span><span class="cx"> {
</span><del>- QSettings settings(settingsOrganization, settingsApplication);
</del><ins>+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</ins><span class="cx">
</span><span class="cx"> settings.beginGroup("servers");
</span><span class="cx"> settings.beginGroup(item->text(col));
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>