Diff
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro (14268 => 14269)
--- 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)
@@ -15,7 +15,8 @@
HEADERS += src/include/fs_gui.h \
src/include/server_manager.h \
src/include/esl_connection.h \
- src/include/consolepage.h
+ src/include/consolepage.h \
+ src/include/global_defines.h
FORMS += resources/fs_gui.ui \
resources/server_manager.ui \
resources/consolepage.ui
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp (14268 => 14269)
--- 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)
@@ -40,6 +40,7 @@
#include "ui_consolepage.h"
#include "esl_connection.h"
#include "esl.h"
+#include "global_defines.h"
consolePage::consolePage(QWidget *parent) :
QWidget(parent),
@@ -68,11 +69,8 @@
connect(m_ui->btnSend, SIGNAL(clicked()),
this, SLOT(sendCommand()));
- QString settingsApplication = "FSGui";
- QString settingsOrganization = "FreeSWITCH";
+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
- QSettings settings(settingsOrganization, settingsApplication);
-
settings.beginGroup("servers");
settings.beginGroup(host);
QString port = settings.value("port").toString();
@@ -231,15 +229,11 @@
}
void consolePage::readSettings()
{
- QString settingsApplication = "FSGui";
- QString settingsOrganization = "FreeSWITCH";
- QSettings settings(settingsOrganization, settingsApplication);
+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
m_ui->comboLogLevel->setCurrentIndex(settings.value(QString("servers/%1/loglevel").arg(host)).toInt());
}
void consolePage::writeSettings()
{
- QString settingsApplication = "FSGui";
- QString settingsOrganization = "FreeSWITCH";
- QSettings settings(settingsOrganization, settingsApplication);
+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
settings.setValue(QString("servers/%1/loglevel").arg(host), m_ui->comboLogLevel->currentIndex());
}
Added: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/global_defines.h (0 => 14269)
--- 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)
@@ -0,0 +1,7 @@
+#ifndef GLOBAL_DEFINES_H
+#define GLOBAL_DEFINES_H
+
+#define SETTINGS_ORGANIZATION "FreeSWITCH"
+#define SETTINGS_APPLICATION "FsGui"
+
+#endif // GLOBAL_DEFINES_H
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/server_manager.h (14268 => 14269)
--- 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)
@@ -61,8 +61,6 @@
virtual void changeEvent(QEvent *e);
private:
Ui::CserverManager *m_ui;
- QString settingsApplication;
- QString settingsOrganization;
private slots:
void addNewServer();
void deleteServer();
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/server_manager.cpp (14268 => 14269)
--- 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)
@@ -38,6 +38,7 @@
#include "server_manager.h"
#include "ui_server_manager.h"
+#include "global_defines.h"
CserverManager::CserverManager(QWidget *parent) :
QDialog(parent),
@@ -45,8 +46,6 @@
{
m_ui->setupUi(this);
- settingsApplication = "FSGui";
- settingsOrganization = "FreeSWITCH";
readSettings();
connect(m_ui->btnSave, SIGNAL(clicked()),
this, SLOT(addNewServer()));
@@ -86,7 +85,7 @@
}
void CserverManager::readSettings()
{
- QSettings settings(settingsOrganization, settingsApplication);
+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
m_ui->serverTreeWidget->clear();
m_ui->serverTreeWidget->setFocus();
addChildSettings(settings, 0, "servers");
@@ -113,7 +112,7 @@
}
void CserverManager::addNewServer()
{
- QSettings settings(settingsOrganization, settingsApplication);
+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
settings.beginGroup("servers");
settings.beginGroup(m_ui->host->text());
@@ -130,7 +129,7 @@
QTreeWidgetItem *item = m_ui->serverTreeWidget->currentItem();
if (item)
{
- QSettings settings(settingsOrganization, settingsApplication);
+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
settings.beginGroup("servers");
settings.remove(item->text(0));
settings.endGroup();
@@ -142,7 +141,7 @@
}
void CserverManager::serverSelected(QTreeWidgetItem *item, int col)
{
- QSettings settings(settingsOrganization, settingsApplication);
+ QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
settings.beginGroup("servers");
settings.beginGroup(item->text(col));