1 files changed, 96 insertions, 7 deletions

diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index f536f4e..1341d03 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -19,2 +19,9 @@
 
+/* OPIE */
+#include <opie2/onetwork.h>
+#ifdef QWS
+#include <opie2/oapplication.h>
+#include <opie2/oconfig.h>
+#endif
+
 /* QT */
@@ -28,2 +35,3 @@
 #include <qpushbutton.h>
+#include <qtabwidget.h>
 #include <qtoolbutton.h>
@@ -32,9 +40,2 @@
 
-/* OPIE */
-#include <opie2/onetwork.h>
-
-#ifdef QWS
-#include <opie2/oapplication.h>
-#include <opie2/oconfig.h>
-#endif
 
@@ -74,2 +75,5 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
     connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) );
+    connect( newNetworkAction, SIGNAL( activated(int) ), this, SLOT( changedNetworkAction(int) ) );
+    connect( newClientAction, SIGNAL( activated(int) ), this, SLOT( changedClientAction(int) ) );
+    connect( newStationAction, SIGNAL( activated(int) ), this, SLOT( changedStationAction(int) ) );
     connect( getCaptureFileName, SIGNAL( clicked() ), this, SLOT( getCaptureFileNameClicked() ) );
@@ -80,2 +84,5 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
     connect( autodetect, SIGNAL( clicked() ), this, SLOT( performAutodetection() ) );
+
+    // hide tab4 (parse) until Wellenreiter 1.2
+    tab->removePage( tab_4 );
 };
@@ -187,2 +194,32 @@ void WellenreiterConfigWindow::changedDeviceType(int t)
 
+void WellenreiterConfigWindow::synchronizeActionsAndScripts()
+{
+    if ( newNetworkAction->currentItem() == 4 ) newNetworkScript->show(); else newNetworkScript->hide();
+    if ( newClientAction->currentItem() == 4 ) newClientScript->show(); else newClientScript->hide();
+    if ( newStationAction->currentItem() == 4 ) newStationScript->show(); else newStationScript->hide();
+
+    //newNetworkScript->setEnabled( newNetworkAction->currentItem() == 4 );
+    //newClientScript->setEnabled( newClientAction->currentItem() == 4 );
+    //newStationScript->setEnabled( newStationAction->currentItem() == 4 );
+}
+
+
+void WellenreiterConfigWindow::changedNetworkAction(int t)
+{
+    synchronizeActionsAndScripts();
+}
+
+
+void WellenreiterConfigWindow::changedClientAction(int t)
+{
+    synchronizeActionsAndScripts();
+}
+
+
+void WellenreiterConfigWindow::changedStationAction(int t)
+{
+    synchronizeActionsAndScripts();
+}
+
+
 void WellenreiterConfigWindow::getCaptureFileNameClicked()
@@ -237,2 +274,41 @@ int WellenreiterConfigWindow::gpsPort() const
 
+void WellenreiterConfigWindow::performAction( const QString& type )
+{
+    int action;
+    QString script;
+
+    if ( type == "network" )
+    {
+        action = newNetworkAction->currentItem();
+        script = newNetworkScript->text();
+    }
+    else if ( type == "managed" || type == "adhoc" )
+    {
+        action = newClientAction->currentItem();
+        script = newClientScript->text();
+    }
+    else if ( type == "station" )
+    {
+        action = newStationAction->currentItem();
+        script = newStationScript->text();
+    }
+    else
+    {
+        qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type ); 
+        return;
+    }
+
+    qDebug( "going to perform action %d (script='%s')", action, (const char*) script );
+
+    /*
+
+    if ( sound == "Ignore" ) return;
+    else if ( sound == "Touch" ) ODevice::inst()->touchSound();
+    else if ( sound == "Key" ) ODevice::inst()->keySound();
+    else if ( sound == "Alarm" ) ODevice::inst()->alarmSound();
+
+    */
+}
+
+
 void WellenreiterConfigWindow::load()
@@ -292,2 +368,9 @@ void WellenreiterConfigWindow::load()
     disablePM->setChecked( c->readBoolEntry( "disablePM", true ) );
+    newNetworkAction->setCurrentItem( c->readNumEntry( "newNetworkAction", 0 ) );
+    newNetworkScript->setText( c->readEntry( "newNetworkScript", "" ) );
+    newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 0 ) );
+    newClientScript->setText( c->readEntry( "newClientScript", "" ) );
+    newStationAction->setCurrentItem( c->readNumEntry( "newStationAction", 0 ) );
+    newStationScript->setText( c->readEntry( "newStationScript", "" ) );
+    synchronizeActionsAndScripts(); // needed for showing/hiding the script QLineEdit on demand
 
@@ -335,2 +418,8 @@ void WellenreiterConfigWindow::save()
     c->writeEntry( "disablePM", disablePM->isChecked() );
+    c->writeEntry( "newNetworkAction", newNetworkAction->currentItem() );
+    c->writeEntry( "newNetworkScript", newNetworkScript->text() );
+    c->writeEntry( "newClientAction", newClientAction->currentItem() );
+    c->writeEntry( "newClientScript", newClientScript->text() );
+    c->writeEntry( "newStationAction", newStationAction->currentItem() );
+    c->writeEntry( "newStationScript", newStationScript->text() );