more work on persistent configuration

version bump to 1.0.1-snap

4 files changed, 73 insertions, 11 deletions

diff --git a/noncore/net/wellenreiter/README b/noncore/net/wellenreiter/README
index 53a337a..729d30f 100644
--- a/noncore/net/wellenreiter/README
+++ b/noncore/net/wellenreiter/README
@@ -2,11 +2,11 @@
 /*                W e l l e n r e i t e r   I I
 /*               ===============================
 /*
-/*                    Version: 1.0-rc2
+/*                    Version: 1.0.2
 /************************************************************************
 
 ----------------------------------------------------
-Release Notes for Wellenreiter II / July 2003
+Release Notes for Wellenreiter II / October 2003
 ----------------------------------------------------
 
 =====================
@@ -17,7 +17,7 @@ Release Notes for Wellenreiter II / July 2003
 - PRISM2 chipset [ orinoco or hostap ], e.g. D-Link, Buffallo, ...
 - SYMBOL/SPECTRUM chipset [ orinoco ], e.g. Symbol Spectrum 24, Socket Lowpower CF, ...
 - CISCO chipset
-- wlan-ng supported chipsets
+- WLAN-NG supported chipsets, e.g. D-Link USB cards
 
 =====================
 =        Build
@@ -29,7 +29,7 @@ packages for Qt3, e.g. libqt3-devel.
  * Set $QTDIR to the appropriate directory (e.g. /usr/lib/qt3)
  * './build make'
  * as root, './build install'
- * Wellenreiter will be installed in /usr/local
+ * Wellenreiter will be installed in /usr/local (sorry, no relocation possible yet)
 
 =====================
 = Precompiled Binaries
@@ -37,7 +37,7 @@ packages for Qt3, e.g. libqt3-devel.
 
 Precompiled binaries are available for the PDA-Version.
 Get them from http://opie.net.wox.org/wellenreiter/
-Sorry, RPMS are not yet available but will follow soon.
+Sorry, no RPMS available. Volunteers?
 
 =====================
 =       Run
@@ -53,9 +53,9 @@ if your device has been properly configured.
 
 Wellenreiter II is (C) 2002-2003 M-M-M
 
+Michael Lauer    <mickeyl@handhelds.org>
 Max Moser        <max@remote-exploit.org>
 Martin J. Muench <mjm@remote-exploit.org>
-Michael Lauer    <mickeyl@handhelds.org>
 
 =====================
 =      Links        =
diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO
index 983d160..a1d5bee 100644
--- a/noncore/net/wellenreiter/TODO
+++ b/noncore/net/wellenreiter/TODO
@@ -1,5 +1,4 @@
 - save configuration settings
-- GPS
 - beep over headphone / customizable
 - autoshow new nets - maybe in other color or more contrast
 
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
@@ -32,6 +32,8 @@
 
 /* OPIE */
 #include <opie2/onetwork.h>
+#include <opie2/oapplication.h>
+#include <opie2/oconfig.h>
 
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
 
@@ -126,7 +128,7 @@ int WellenreiterConfigWindow::hoppingInterval() const
 
 bool WellenreiterConfigWindow::usePrismHeader() const
 {
-    return prismHeader->isOn();
+    return prismHeader->isChecked();
 }
 
 
@@ -226,7 +228,40 @@ bool WellenreiterConfigWindow::load()
     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
 }
 
@@ -237,5 +272,33 @@ void WellenreiterConfigWindow::save()
     #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
 }
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control
index 95729e3..2cb0d2d 100644
--- a/noncore/net/wellenreiter/opie-wellenreiter.control
+++ b/noncore/net/wellenreiter/opie-wellenreiter.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/applications
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> 
 Architecture: arm
-Version: 0.9.9-$SUB_VERSION
-Depends: task-opie-minimal, libpcap0 (0.7.2), libopie2 (1.8.1)
+Version: 1.0.1-$SUB_VERSION
+Depends: libqpe, libpcap0 (0.7.2), libopie2 (1.8.1)
 Description: A WaveLAN Network Monitor
  A WaveLAN Network Monitor/Sniffer for the Opie Environment.