Diff
Deleted: freeswitch/trunk/contrib/jmesquita/fsgui/conn_event_handler.cpp
Deleted: freeswitch/trunk/contrib/jmesquita/fsgui/conn_event_handler.h
Added: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp (0 => 14205)
--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp 2009-07-12 06:04:20 UTC (rev 14205)
@@ -0,0 +1,34 @@
+#include "fs_gui.h"
+#include "ui_fs_gui.h"
+
+Cfsgui::Cfsgui(QWidget *parent) :
+ QMainWindow(parent),
+ m_ui(new Ui::Cfsgui),
+ serverDialog(new CserverManager)
+{
+ m_ui->setupUi(this);
+}
+
+Cfsgui::~Cfsgui()
+{
+ delete m_ui;
+ delete serverDialog;
+}
+
+void Cfsgui::changeEvent(QEvent *e)
+{
+ QMainWindow::changeEvent(e);
+ switch (e->type()) {
+ case QEvent::LanguageChange:
+ m_ui->retranslateUi(this);
+ break;
+ default:
+ break;
+ }
+}
+
+void Cfsgui::closeEvent(QCloseEvent *e)
+{
+ /* TODO: We have to stop threads and do cleanup */
+ e->accept();
+}
Added: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h (0 => 14205)
--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.h 2009-07-12 06:04:20 UTC (rev 14205)
@@ -0,0 +1,27 @@
+#ifndef FS_GUI_H
+#define FS_GUI_H
+
+#include <QtGui>
+#include "server_manager.h"
+
+namespace Ui {
+ class Cfsgui;
+}
+
+class Cfsgui : public QMainWindow {
+ Q_OBJECT
+ Q_DISABLE_COPY(Cfsgui)
+public:
+ explicit Cfsgui (QWidget *parent = 0);
+ virtual ~Cfsgui();
+
+protected:
+ virtual void changeEvent(QEvent *e);
+ void closeEvent(QCloseEvent *e);
+
+private:
+ Ui::Cfsgui *m_ui;
+ CserverManager *serverDialog;
+};
+
+#endif // FS_GUI_H
Added: freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.ui (0 => 14205)
--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.ui (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.ui 2009-07-12 06:04:20 UTC (rev 14205)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Cfsgui</class>
+ <widget class="QMainWindow" name="Cfsgui">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>600</width>
+ <height>400</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>FSGui - The console for humans</string>
+ </property>
+ <widget class="QWidget" name="centralWidget">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" colspan="2">
+ <widget class="QTextEdit" name="textConsole">
+ <property name="undoRedoEnabled">
+ <bool>false</bool>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLineEdit" name="lineCmd"/>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="btnSend">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Send</string>
+ </property>
+ <property name="shortcut">
+ <string>Return</string>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
+ <property name="default">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QMenuBar" name="menuBar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>600</width>
+ <height>26</height>
+ </rect>
+ </property>
+ <widget class="QMenu" name="menuFile">
+ <property name="title">
+ <string>&File</string>
+ </property>
+ <addaction name="actionConnect"/>
+ <addaction name="separator"/>
+ <addaction name="actionQuit"/>
+ </widget>
+ <widget class="QMenu" name="menuHelp">
+ <property name="title">
+ <string>&Help</string>
+ </property>
+ <addaction name="actionAbout"/>
+ </widget>
+ <addaction name="menuFile"/>
+ <addaction name="menuHelp"/>
+ </widget>
+ <widget class="QStatusBar" name="statusBar"/>
+ <action name="actionQuit">
+ <property name="text">
+ <string>&Quit</string>
+ </property>
+ </action>
+ <action name="actionAbout">
+ <property name="text">
+ <string>&About</string>
+ </property>
+ </action>
+ <action name="actionConnect">
+ <property name="text">
+ <string>&Connect</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+C</string>
+ </property>
+ </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <tabstops>
+ <tabstop>lineCmd</tabstop>
+ <tabstop>textConsole</tabstop>
+ <tabstop>btnSend</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
Deleted: freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.cpp
Deleted: freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.h
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro (14204 => 14205)
--- freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro 2009-07-11 19:11:13 UTC (rev 14204)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro 2009-07-12 06:04:20 UTC (rev 14205)
@@ -3,22 +3,13 @@
# -------------------------------------------------
TARGET = fs_gui
TEMPLATE = app
-
SOURCES += main.cpp \
- fsgui.cpp \
- conn_event_handler.cpp \
- serverlogin.cpp
-
-INCLUDEPATH += ../../../../libs/esl/src/include
-
-HEADERS += fsgui.h \
- conn_event_handler.h \
- serverlogin.h \
- esl.h \
- esl_threadmutex.h \
- esl_config.h
-
-FORMS += fsgui.ui \
- serverlogin.ui
-
-LIBS += -L../../../../libs/esl -lesl
+ fs_gui.cpp \
+ server_manager.cpp
+INCLUDEPATH += ../../../libs/esl/src/include/
+HEADERS += fs_gui.h \
+ server_manager.h
+FORMS += fs_gui.ui \
+ server_manager.ui
+LIBS += -L../../../libs/esl \
+ -lesl
Deleted: freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.ui
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/main.cpp (14204 => 14205)
--- freeswitch/trunk/contrib/jmesquita/fsgui/main.cpp 2009-07-11 19:11:13 UTC (rev 14204)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/main.cpp 2009-07-12 06:04:20 UTC (rev 14205)
@@ -1,10 +1,10 @@
#include <QtGui/QApplication>
-#include "fsgui.h"
+#include "fs_gui.h"
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
- FSGui w;
+ Cfsgui w;
w.show();
return a.exec();
}
Added: freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.cpp (0 => 14205)
--- freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.cpp (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.cpp 2009-07-12 06:04:20 UTC (rev 14205)
@@ -0,0 +1,26 @@
+#include "server_manager.h"
+#include "ui_server_manager.h"
+
+CserverManager::CserverManager(QWidget *parent) :
+ QDialog(parent),
+ m_ui(new Ui::CserverManager)
+{
+ m_ui->setupUi(this);
+}
+
+CserverManager::~CserverManager()
+{
+ delete m_ui;
+}
+
+void CserverManager::changeEvent(QEvent *e)
+{
+ QDialog::changeEvent(e);
+ switch (e->type()) {
+ case QEvent::LanguageChange:
+ m_ui->retranslateUi(this);
+ break;
+ default:
+ break;
+ }
+}
Added: freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.h (0 => 14205)
--- freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.h (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.h 2009-07-12 06:04:20 UTC (rev 14205)
@@ -0,0 +1,24 @@
+#ifndef SERVER_MANAGER_H
+#define SERVER_MANAGER_H
+
+#include <QtGui/QDialog>
+
+namespace Ui {
+ class CserverManager;
+}
+
+class CserverManager : public QDialog {
+ Q_OBJECT
+ Q_DISABLE_COPY(CserverManager)
+public:
+ explicit CserverManager(QWidget *parent = 0);
+ virtual ~CserverManager();
+
+protected:
+ virtual void changeEvent(QEvent *e);
+
+private:
+ Ui::CserverManager *m_ui;
+};
+
+#endif // SERVER_MANAGER_H
Added: freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.ui (0 => 14205)
--- freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.ui (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/server_manager.ui 2009-07-12 06:04:20 UTC (rev 14205)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CserverManager</class>
+ <widget class="QDialog" name="CserverManager">
+ <property name="windowModality">
+ <enum>Qt::NonModal</enum>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>516</width>
+ <height>249</height>
+ </rect>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="windowTitle">
+ <string>Server Manager</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QTreeView" name="treeView"/>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Server Settings</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Host</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lineEdit"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lineEdit_2"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Port</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="lineEdit_3"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QPushButton" name="pushButton">
+ <property name="text">
+ <string>Save</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QPushButton" name="pushButton_2">
+ <property name="text">
+ <string>Delete</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>CserverManager</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>CserverManager</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
Deleted: freeswitch/trunk/contrib/jmesquita/fsgui/serverlogin.cpp
Deleted: freeswitch/trunk/contrib/jmesquita/fsgui/serverlogin.h
Deleted: freeswitch/trunk/contrib/jmesquita/fsgui/serverlogin.ui