Revision
14477
Author
jmesquita
Date
2009-08-10 01:08:09 -0500 (Mon, 10 Aug 2009)

Log Message

Fix accept slot of settingsdialog.

Modified Paths

Diff

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.ui (14476 => 14477)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.ui	2009-08-10 05:05:22 UTC (rev 14476)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/settingsdialog.ui	2009-08-10 06:08:09 UTC (rev 14477)
@@ -72,13 +72,6 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="btnApply">
-       <property name="text">
-        <string>&amp;Apply</string>
-       </property>
-      </widget>
-     </item>
-     <item>
       <widget class="QPushButton" name="btnOk">
        <property name="text">
         <string>&amp;OK</string>
@@ -109,8 +102,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>279</x>
-     <y>226</y>
+     <x>650</x>
+     <y>258</y>
     </hint>
     <hint type="destinationlabel">
      <x>330</x>
@@ -118,5 +111,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>btnOk</sender>
+   <signal>clicked()</signal>
+   <receiver>SettingsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>503</x>
+     <y>252</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>480</x>
+     <y>262</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui (14476 => 14477)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui	2009-08-10 05:05:22 UTC (rev 14476)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui	2009-08-10 06:08:09 UTC (rev 14477)
@@ -69,7 +69,9 @@
     <property name="title">
      <string>&amp;Edit</string>
     </property>
+    <addaction name="action_Find"/>
     <addaction name="action_Clear"/>
+    <addaction name="separator"/>
    </widget>
    <addaction name="menu_File"/>
    <addaction name="menu_Edit"/>
@@ -110,6 +112,14 @@
     <string>&amp;Clear</string>
    </property>
   </action>
+  <action name="action_Find">
+   <property name="text">
+    <string>&amp;Find</string>
+   </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../../resources/resources.qrc"/>

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp (14476 => 14477)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp	2009-08-10 05:05:22 UTC (rev 14476)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp	2009-08-10 06:08:09 UTC (rev 14477)
@@ -25,6 +25,8 @@
                      this, SLOT(connect()));
     QObject::connect(consoleWindow->action_Disconnect, SIGNAL(triggered()),
                      this, SLOT(disconnect()));
+    QObject::connect(consoleWindow->action_Find, SIGNAL(triggered()),
+                     this, SLOT(find()));
     QObject::connect(consoleWindow->action_Clear, SIGNAL(triggered()),
                      this, SLOT(clearLogContents()));
 }
@@ -104,6 +106,12 @@
                      this, SLOT(newConnection()));
 }
 
+void ConsolePlugin::find()
+{
+   ConsoleTabWidget *tab = qobject_cast<ConsoleTabWidget*>(consoleWindow->tabConsole->currentWidget());
+   tab->find();
+}
+
 void ConsolePlugin::newConnection()
 {
     if (serverManager->exec())

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h (14476 => 14477)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h	2009-08-10 05:05:22 UTC (rev 14476)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h	2009-08-10 06:08:09 UTC (rev 14477)
@@ -28,6 +28,7 @@
     void setServerManager(ServerManager *manager);
 
 private slots:
+    void find();
     void connectionStateChanged();
     void connect();
     void disconnect();

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp (14476 => 14477)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp	2009-08-10 05:05:22 UTC (rev 14476)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp	2009-08-10 06:08:09 UTC (rev 14477)
@@ -67,6 +67,10 @@
     }
 }
 
+void ConsoleTabWidget::find()
+{
+}
+
 void ConsoleTabWidget::connected()
 {
     m_ui->btnSend->setEnabled(true);

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h (14476 => 14477)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h	2009-08-10 05:05:22 UTC (rev 14476)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h	2009-08-10 06:08:09 UTC (rev 14477)
@@ -18,6 +18,7 @@
 public:
     ConsoleTabWidget(QWidget *parent, ESLconnection *eslconnection);
     ~ConsoleTabWidget();
+    void find();
 
 public slots:
     void clearConsoleContents();

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp (14476 => 14477)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp	2009-08-10 05:05:22 UTC (rev 14476)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp	2009-08-10 06:08:09 UTC (rev 14477)
@@ -4,7 +4,6 @@
 SortFilterProxyModel::SortFilterProxyModel(QObject *parent)
         : QSortFilterProxyModel(parent)
 {
-    // Get from config?
     for(int i = 0; i < 8; i++)
         loglevels.insert(i, true);
 }