Revision
14256
Author
jmesquita
Date
2009-07-14 21:14:33 -0500 (Tue, 14 Jul 2009)

Log Message

Added the About dialog and fixed a couple of conceptual mistakes.

Modified Paths

Diff

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui (14255 => 14256)


--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui	2009-07-14 23:39:57 UTC (rev 14255)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/fs_gui.ui	2009-07-15 02:14:33 UTC (rev 14256)
@@ -91,7 +91,7 @@
      <x>0</x>
      <y>0</y>
      <width>600</width>
-     <height>22</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/resources/server_manager.ui (14255 => 14256)


--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/server_manager.ui	2009-07-14 23:39:57 UTC (rev 14255)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/server_manager.ui	2009-07-15 02:14:33 UTC (rev 14256)
@@ -104,6 +104,15 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>host</tabstop>
+  <tabstop>pass</tabstop>
+  <tabstop>port</tabstop>
+  <tabstop>treeView</tabstop>
+  <tabstop>pushButton</tabstop>
+  <tabstop>pushButton_2</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp (14255 => 14256)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp	2009-07-14 23:39:57 UTC (rev 14255)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fs_gui.cpp	2009-07-15 02:14:33 UTC (rev 14256)
@@ -41,11 +41,10 @@
 #include "esl_connection.h"
 #include "esl.h"
 
-CserverManager *Cfsgui::serverDialog = NULL;
-
 Cfsgui::Cfsgui(QWidget *parent) :
     QMainWindow(parent),
-    m_ui(new Ui::Cfsgui)
+    m_ui(new Ui::Cfsgui),
+    serverDialog(NULL)
 {
     m_ui->setupUi(this);
 
@@ -54,6 +53,8 @@
 
     connect(m_ui->actionConnect, SIGNAL(triggered()),
             this, SLOT(newConnectionFromDialog()));
+    connect(m_ui->actionAbout, SIGNAL(triggered()),
+            this, SLOT(showAbout()));
     connect(m_ui->lineCmd, SIGNAL(textChanged(QString)),
             this, SLOT(typedCommand()));
     connect(m_ui->btnSend, SIGNAL(clicked()),
@@ -62,7 +63,6 @@
     /* Why QtDesigner does not allow me to delete this? */
     m_ui->tabWidget->removeTab(1);
     delete m_ui->tab_2;
-
 }
 Cfsgui::~Cfsgui()
 {
@@ -73,6 +73,14 @@
 {
     m_ui->textConsole->append(text);
 }
+void Cfsgui::showAbout()
+{
+    QMessageBox::about(this, tr("About FSGui"),
+                       tr("<h2>FSGui - The console for humans</h2>"
+                          "<p>Author: Jo&atilde;o Mesquita &lt;jmesquita@gmail.com>"
+                          "<p>This is small application that will help you connect "
+                          "to your FreeSWITCH&copy; installation."));
+}
 void Cfsgui::getDisconnectedSlot()
 {
     eslConnection->disconnect();

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h (14255 => 14256)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h	2009-07-14 23:39:57 UTC (rev 14255)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/fs_gui.h	2009-07-15 02:14:33 UTC (rev 14256)
@@ -63,6 +63,7 @@
     void appendConsoleText(const QString);
 
 private slots:
+    void showAbout();
     void newConnectionFromDialog();
     void gotConnectedSlot();
     void gotDisconnectedSlot();
@@ -74,8 +75,7 @@
 
 private:
     Ui::Cfsgui *m_ui;
-    /*! Has to be static cos will be used by all server tabs */
-    static CserverManager *serverDialog;
+    CserverManager *serverDialog;
     ESLconnection *eslConnection;
 };