Diff
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14463 => 14464)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-08 23:33:24 UTC (rev 14463)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-09 00:29:26 UTC (rev 14464)
@@ -118,10 +118,10 @@
list_available_monitor_plugins.append(loader);
interface_window->setWindowTitle(QString("FsGui - ") + interface_window->windowTitle());
interface_window->setAttribute(Qt::WA_QuitOnClose);
- interface->addConfigItens(settings);
+ interface->addConfigItems(settings);
interface->setServerManager(serverManager);
createMenus(interface_window->menuBar());
- pluginConfigPage->listWidget->addItem(QString("%1 - %2").arg(interface->appName(),
+ pluginConfigPage->listWidget->addItem(QString("%1\n %2").arg(interface->appName(),
interface->appDescription()));
}
else
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.h (14463 => 14464)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.h 2009-08-08 23:33:24 UTC (rev 14463)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.h 2009-08-09 00:29:26 UTC (rev 14464)
@@ -31,7 +31,7 @@
/*!
\brief Add a new configuration item to the settings dialog
*/
- virtual void addConfigItens(SettingsDialog *settings) = 0;
+ virtual void addConfigItems(SettingsDialog *settings) = 0;
/*!
\brief Sets a pointer to ServerManager object
*/
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.ui (14463 => 14464)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.ui 2009-08-08 23:33:24 UTC (rev 14463)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.ui 2009-08-09 00:29:26 UTC (rev 14464)
@@ -6,15 +6,15 @@
<rect>
<x>0</x>
<y>0</y>
- <width>333</width>
- <height>248</height>
+ <width>661</width>
+ <height>269</height>
</rect>
</property>
<property name="windowTitle">
<string>General Settings</string>
</property>
<property name="windowIcon">
- <iconset resource="resources.qrc">
+ <iconset resource="../resources/resources.qrc">
<normaloff>:/icons/fsgui_logo.png</normaloff>:/icons/fsgui_logo.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -97,7 +97,9 @@
</layout>
</widget>
<resources>
- <include location="resources.qrc"/>
+ <include location="../resources/resources.qrc"/>
+ <include location="../resources/resources.qrc"/>
+ <include location="../resources/resources.qrc"/>
</resources>
<connections>
<connection>
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui (14463 => 14464)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui 2009-08-08 23:33:24 UTC (rev 14463)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui 2009-08-09 00:29:26 UTC (rev 14464)
@@ -70,11 +70,17 @@
</widget>
<widget class="QStatusBar" name="statusbar"/>
<action name="action_Connect">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>&Connect</string>
</property>
</action>
<action name="action_Disconnect">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>&Disconnect</string>
</property>
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp (14463 => 14464)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-08 23:33:24 UTC (rev 14463)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-09 00:29:26 UTC (rev 14464)
@@ -34,7 +34,7 @@
return tr("This application will do the same as fs_cli does.");
}
-void ConsolePlugin::addConfigItens(SettingsDialog *settings)
+void ConsolePlugin::addConfigItems(SettingsDialog *settings)
{
consoleConfigPage = new Ui::configPage;
QWidget *base = new QWidget;
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h (14463 => 14464)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-08 23:33:24 UTC (rev 14463)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-09 00:29:26 UTC (rev 14464)
@@ -23,7 +23,7 @@
QObject *getMonitorInterfaceObject();
QString appName();
QString appDescription();
- void addConfigItens(SettingsDialog *);
+ void addConfigItems(SettingsDialog *);
void newInstance();
void setServerManager(ServerManager *manager);