summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-09-26 12:24:21 (UTC)
committer mickeyl <mickeyl>2003-09-26 12:24:21 (UTC)
commitd1a11b45e805fe7771ea05944757d767c3c4c8ea (patch) (side-by-side diff)
treef270fea2d1d05c9fc8db1d57542ef7a01870750c
parenta88328daa117bdb3bd72cef6ca6e5e2b9d619a13 (diff)
downloadopie-d1a11b45e805fe7771ea05944757d767c3c4c8ea.zip
opie-d1a11b45e805fe7771ea05944757d767c3c4c8ea.tar.gz
opie-d1a11b45e805fe7771ea05944757d767c3c4c8ea.tar.bz2
more work on persistent configuration
version bump to 1.0.1-snap
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/README12
-rw-r--r--noncore/net/wellenreiter/TODO1
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp67
-rw-r--r--noncore/net/wellenreiter/opie-wellenreiter.control4
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
@@ -3,9 +3,9 @@
/* ===============================
/*
-/* Version: 1.0-rc2
+/* Version: 1.0.2
/************************************************************************
----------------------------------------------------
-Release Notes for Wellenreiter II / July 2003
+Release Notes for Wellenreiter II / October 2003
----------------------------------------------------
@@ -18,5 +18,5 @@ Release Notes for Wellenreiter II / July 2003
- 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
=====================
@@ -30,5 +30,5 @@ packages for Qt3, e.g. libqt3-devel.
* './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)
=====================
@@ -38,5 +38,5 @@ 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?
=====================
@@ -54,7 +54,7 @@ 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>
=====================
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,4 +1,3 @@
- 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
@@ -33,4 +33,6 @@
/* OPIE */
#include <opie2/onetwork.h>
+#include <opie2/oapplication.h>
+#include <opie2/oconfig.h>
WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
@@ -127,5 +129,5 @@ int WellenreiterConfigWindow::hoppingInterval() const
bool WellenreiterConfigWindow::usePrismHeader() const
{
- return prismHeader->isOn();
+ return prismHeader->isChecked();
}
@@ -227,5 +229,38 @@ bool WellenreiterConfigWindow::load()
#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
}
@@ -238,4 +273,32 @@ void WellenreiterConfigWindow::save()
#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
@@ -5,6 +5,6 @@ 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.