1 files changed, 65 insertions, 2 deletions

diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index d255c6a..84d4c63 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -23,24 +23,26 @@
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qmap.h>
 #include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 
 /* OPIE */
 #include <opie2/onetwork.h>
+#include <opie2/oapplication.h>
+#include <opie2/oconfig.h>
 
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
 
 WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
            :WellenreiterConfigBase( parent, name, true, f )
 {
     _devicetype[ "cisco" ] = DEVTYPE_CISCO;
     _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG;
     _devicetype[ "hostap" ] = DEVTYPE_HOSTAP;
     _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO;
     _devicetype[ "<manual>" ] = DEVTYPE_MANUAL;
     _devicetype[ "<file>" ] = DEVTYPE_FILE;
@@ -117,25 +119,25 @@ int WellenreiterConfigWindow::driverType() const
     }
 };
 
 
 int WellenreiterConfigWindow::hoppingInterval() const
 {
     return hopInterval->cleanText().toInt();
 }
 
 
 bool WellenreiterConfigWindow::usePrismHeader() const
 {
-    return prismHeader->isOn();
+    return prismHeader->isChecked();
 }
 
 
 bool WellenreiterConfigWindow::isChannelChecked( int channel ) const
 {
     switch ( channel )
     {
         case 1: return channel1->isOn();
         case 2: return channel2->isOn();
         case 3: return channel3->isOn();
         case 4: return channel4->isOn();
         case 5: return channel5->isOn();
@@ -217,25 +219,86 @@ int WellenreiterConfigWindow::gpsPort() const
     bool ok;
     return useGPS() ? gpsdPort->value() : -1;
 }
 
 
 bool WellenreiterConfigWindow::load()
 {
 #ifdef Q_WS_X11
     #warning Persistent Configuration not yet implemented for standalone X11 build
     return false;
 #else
     qDebug( "loading configuration settings..." );
-    return true;
+
+    /* This is dumb monkey typing stuff... We _need_ to do this automatically! */
+
+    OConfig* c = oApp->config();
+
+    c->setGroup( "Interface" );
+    //interfaceName->setCurrentText( c->readEntry( "name" ) );
+    //deviceType->setCurrentText( c->readEntry( "type", "<select>" ) );
+    prismHeader->setChecked( c->readBoolEntry( "prism", false ) );
+    hopChannels->setChecked( c->readBoolEntry( "hop", true ) );
+    hopInterval->setValue( c->readNumEntry( "interval", 100 ) );
+    adaptiveHopping->setChecked( c->readBoolEntry( "adaptive", true ) );
+
+    c->setGroup( "Capture" );
+    captureFileName->setText( c->readEntry( "filename", "/tmp/capture" ) );
+
+    c->setGroup( "UI" );
+    lookupVendor->setChecked( c->readBoolEntry( "lookupVendor", true ) );
+    openTree->setChecked( c->readBoolEntry( "openTree", true ) );
+    disablePM->setChecked( c->readBoolEntry( "disablePM", true ) );
+
+    c->setGroup( "GPS" );
+    enableGPS->setChecked( c->readBoolEntry( "use", false ) );
+#if QT_VERSION < 300
+    gpsdHost->insertItem( c->readEntry( "host", "localhost" ), 0 );
+    gpsdHost->setCurrentItem( 0 );
+#else
+    gpsdHost->setCurrentText( c->readEntry( "host", "localhost" ) );
+#endif
+    gpsdPort->setValue( c->readNumEntry( "port", 2947 ) );
+    startGPS->setChecked( c->readBoolEntry( "start", false ) );
+    commandGPS->setText( c->readEntry( "command", "gpsd -p /dev/ttyS3 -s 57600" ) );
+
+    return false; // false = perform autodetection; true = use config settings
 #endif
 }
 
 
 void WellenreiterConfigWindow::save()
 {
 #ifdef Q_WS_X11
     #warning Persistent Configuration not yet implemented for standalone X11 build
 #else
     qDebug( "saving configuration settings..." );
+
+    /* This is dumb monkey typing stuff... We _need_ to do this automatically! */
+
+    OConfig* c = oApp->config();
+
+    c->setGroup( "Interface" );
+    c->writeEntry( "name", interfaceName->currentText() );
+    c->writeEntry( "type", deviceType->currentText() );
+    c->writeEntry( "prism", prismHeader->isChecked() );
+    c->writeEntry( "hop", hopChannels->isChecked() );
+    c->writeEntry( "interval", hopInterval->value() );
+    c->writeEntry( "adaptive", adaptiveHopping->isChecked() );
+
+    c->setGroup( "Capture" );
+    c->writeEntry( "filename", captureFileName->text() );
+
+    c->setGroup( "UI" );
+    c->writeEntry( "lookupVendor", lookupVendor->isChecked() );
+    c->writeEntry( "openTree", openTree->isChecked() );
+    c->writeEntry( "disablePM", disablePM->isChecked() );
+
+    c->setGroup( "GPS" );
+    c->writeEntry( "use", enableGPS->isChecked() );
+    c->writeEntry( "host", gpsdHost->currentText() );
+    c->writeEntry( "port", gpsdPort->value() );
+    c->writeEntry( "start", startGPS->isChecked() );
+    c->writeEntry( "command", commandGPS->text() );
+
 #endif
 }