author | mickeyl <mickeyl> | 2003-09-26 12:24:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-09-26 12:24:21 (UTC) |
commit | d1a11b45e805fe7771ea05944757d767c3c4c8ea (patch) (unidiff) | |
tree | f270fea2d1d05c9fc8db1d57542ef7a01870750c /noncore/net/wellenreiter | |
parent | a88328daa117bdb3bd72cef6ca6e5e2b9d619a13 (diff) | |
download | opie-d1a11b45e805fe7771ea05944757d767c3c4c8ea.zip opie-d1a11b45e805fe7771ea05944757d767c3c4c8ea.tar.gz opie-d1a11b45e805fe7771ea05944757d767c3c4c8ea.tar.bz2 |
more work on persistent configuration
version bump to 1.0.1-snap
-rw-r--r-- | noncore/net/wellenreiter/README | 12 | ||||
-rw-r--r-- | noncore/net/wellenreiter/TODO | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 67 | ||||
-rw-r--r-- | noncore/net/wellenreiter/opie-wellenreiter.control | 4 |
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 @@ | |||
2 | /* W e l l e n r e i t e r I I | 2 | /* W e l l e n r e i t e r I I |
3 | /* =============================== | 3 | /* =============================== |
4 | /* | 4 | /* |
5 | /* Version: 1.0-rc2 | 5 | /* Version: 1.0.2 |
6 | /************************************************************************ | 6 | /************************************************************************ |
7 | 7 | ||
8 | ---------------------------------------------------- | 8 | ---------------------------------------------------- |
9 | Release Notes for Wellenreiter II / July 2003 | 9 | Release Notes for Wellenreiter II / October 2003 |
10 | ---------------------------------------------------- | 10 | ---------------------------------------------------- |
11 | 11 | ||
12 | ===================== | 12 | ===================== |
@@ -17,7 +17,7 @@ Release Notes for Wellenreiter II / July 2003 | |||
17 | - PRISM2 chipset [ orinoco or hostap ], e.g. D-Link, Buffallo, ... | 17 | - PRISM2 chipset [ orinoco or hostap ], e.g. D-Link, Buffallo, ... |
18 | - SYMBOL/SPECTRUM chipset [ orinoco ], e.g. Symbol Spectrum 24, Socket Lowpower CF, ... | 18 | - SYMBOL/SPECTRUM chipset [ orinoco ], e.g. Symbol Spectrum 24, Socket Lowpower CF, ... |
19 | - CISCO chipset | 19 | - CISCO chipset |
20 | - wlan-ng supported chipsets | 20 | - WLAN-NG supported chipsets, e.g. D-Link USB cards |
21 | 21 | ||
22 | ===================== | 22 | ===================== |
23 | = Build | 23 | = Build |
@@ -29,7 +29,7 @@ packages for Qt3, e.g. libqt3-devel. | |||
29 | * Set $QTDIR to the appropriate directory (e.g. /usr/lib/qt3) | 29 | * Set $QTDIR to the appropriate directory (e.g. /usr/lib/qt3) |
30 | * './build make' | 30 | * './build make' |
31 | * as root, './build install' | 31 | * as root, './build install' |
32 | * Wellenreiter will be installed in /usr/local | 32 | * Wellenreiter will be installed in /usr/local (sorry, no relocation possible yet) |
33 | 33 | ||
34 | ===================== | 34 | ===================== |
35 | = Precompiled Binaries | 35 | = Precompiled Binaries |
@@ -37,7 +37,7 @@ packages for Qt3, e.g. libqt3-devel. | |||
37 | 37 | ||
38 | Precompiled binaries are available for the PDA-Version. | 38 | Precompiled binaries are available for the PDA-Version. |
39 | Get them from http://opie.net.wox.org/wellenreiter/ | 39 | Get them from http://opie.net.wox.org/wellenreiter/ |
40 | Sorry, RPMS are not yet available but will follow soon. | 40 | Sorry, no RPMS available. Volunteers? |
41 | 41 | ||
42 | ===================== | 42 | ===================== |
43 | = Run | 43 | = Run |
@@ -53,9 +53,9 @@ if your device has been properly configured. | |||
53 | 53 | ||
54 | Wellenreiter II is (C) 2002-2003 M-M-M | 54 | Wellenreiter II is (C) 2002-2003 M-M-M |
55 | 55 | ||
56 | Michael Lauer <mickeyl@handhelds.org> | ||
56 | Max Moser <max@remote-exploit.org> | 57 | Max Moser <max@remote-exploit.org> |
57 | Martin J. Muench <mjm@remote-exploit.org> | 58 | Martin J. Muench <mjm@remote-exploit.org> |
58 | Michael Lauer <mickeyl@handhelds.org> | ||
59 | 59 | ||
60 | ===================== | 60 | ===================== |
61 | = Links = | 61 | = 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 @@ | |||
1 | - save configuration settings | 1 | - save configuration settings |
2 | - GPS | ||
3 | - beep over headphone / customizable | 2 | - beep over headphone / customizable |
4 | - autoshow new nets - maybe in other color or more contrast | 3 | - autoshow new nets - maybe in other color or more contrast |
5 | 4 | ||
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 @@ | |||
32 | 32 | ||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <opie2/onetwork.h> | 34 | #include <opie2/onetwork.h> |
35 | #include <opie2/oapplication.h> | ||
36 | #include <opie2/oconfig.h> | ||
35 | 37 | ||
36 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; | 38 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; |
37 | 39 | ||
@@ -126,7 +128,7 @@ int WellenreiterConfigWindow::hoppingInterval() const | |||
126 | 128 | ||
127 | bool WellenreiterConfigWindow::usePrismHeader() const | 129 | bool WellenreiterConfigWindow::usePrismHeader() const |
128 | { | 130 | { |
129 | return prismHeader->isOn(); | 131 | return prismHeader->isChecked(); |
130 | } | 132 | } |
131 | 133 | ||
132 | 134 | ||
@@ -226,7 +228,40 @@ bool WellenreiterConfigWindow::load() | |||
226 | return false; | 228 | return false; |
227 | #else | 229 | #else |
228 | qDebug( "loading configuration settings..." ); | 230 | qDebug( "loading configuration settings..." ); |
229 | return true; | 231 | |
232 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ | ||
233 | |||
234 | OConfig* c = oApp->config(); | ||
235 | |||
236 | c->setGroup( "Interface" ); | ||
237 | //interfaceName->setCurrentText( c->readEntry( "name" ) ); | ||
238 | //deviceType->setCurrentText( c->readEntry( "type", "<select>" ) ); | ||
239 | prismHeader->setChecked( c->readBoolEntry( "prism", false ) ); | ||
240 | hopChannels->setChecked( c->readBoolEntry( "hop", true ) ); | ||
241 | hopInterval->setValue( c->readNumEntry( "interval", 100 ) ); | ||
242 | adaptiveHopping->setChecked( c->readBoolEntry( "adaptive", true ) ); | ||
243 | |||
244 | c->setGroup( "Capture" ); | ||
245 | captureFileName->setText( c->readEntry( "filename", "/tmp/capture" ) ); | ||
246 | |||
247 | c->setGroup( "UI" ); | ||
248 | lookupVendor->setChecked( c->readBoolEntry( "lookupVendor", true ) ); | ||
249 | openTree->setChecked( c->readBoolEntry( "openTree", true ) ); | ||
250 | disablePM->setChecked( c->readBoolEntry( "disablePM", true ) ); | ||
251 | |||
252 | c->setGroup( "GPS" ); | ||
253 | enableGPS->setChecked( c->readBoolEntry( "use", false ) ); | ||
254 | #if QT_VERSION < 300 | ||
255 | gpsdHost->insertItem( c->readEntry( "host", "localhost" ), 0 ); | ||
256 | gpsdHost->setCurrentItem( 0 ); | ||
257 | #else | ||
258 | gpsdHost->setCurrentText( c->readEntry( "host", "localhost" ) ); | ||
259 | #endif | ||
260 | gpsdPort->setValue( c->readNumEntry( "port", 2947 ) ); | ||
261 | startGPS->setChecked( c->readBoolEntry( "start", false ) ); | ||
262 | commandGPS->setText( c->readEntry( "command", "gpsd -p /dev/ttyS3 -s 57600" ) ); | ||
263 | |||
264 | return false; // false = perform autodetection; true = use config settings | ||
230 | #endif | 265 | #endif |
231 | } | 266 | } |
232 | 267 | ||
@@ -237,5 +272,33 @@ void WellenreiterConfigWindow::save() | |||
237 | #warning Persistent Configuration not yet implemented for standalone X11 build | 272 | #warning Persistent Configuration not yet implemented for standalone X11 build |
238 | #else | 273 | #else |
239 | qDebug( "saving configuration settings..." ); | 274 | qDebug( "saving configuration settings..." ); |
275 | |||
276 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ | ||
277 | |||
278 | OConfig* c = oApp->config(); | ||
279 | |||
280 | c->setGroup( "Interface" ); | ||
281 | c->writeEntry( "name", interfaceName->currentText() ); | ||
282 | c->writeEntry( "type", deviceType->currentText() ); | ||
283 | c->writeEntry( "prism", prismHeader->isChecked() ); | ||
284 | c->writeEntry( "hop", hopChannels->isChecked() ); | ||
285 | c->writeEntry( "interval", hopInterval->value() ); | ||
286 | c->writeEntry( "adaptive", adaptiveHopping->isChecked() ); | ||
287 | |||
288 | c->setGroup( "Capture" ); | ||
289 | c->writeEntry( "filename", captureFileName->text() ); | ||
290 | |||
291 | c->setGroup( "UI" ); | ||
292 | c->writeEntry( "lookupVendor", lookupVendor->isChecked() ); | ||
293 | c->writeEntry( "openTree", openTree->isChecked() ); | ||
294 | c->writeEntry( "disablePM", disablePM->isChecked() ); | ||
295 | |||
296 | c->setGroup( "GPS" ); | ||
297 | c->writeEntry( "use", enableGPS->isChecked() ); | ||
298 | c->writeEntry( "host", gpsdHost->currentText() ); | ||
299 | c->writeEntry( "port", gpsdPort->value() ); | ||
300 | c->writeEntry( "start", startGPS->isChecked() ); | ||
301 | c->writeEntry( "command", commandGPS->text() ); | ||
302 | |||
240 | #endif | 303 | #endif |
241 | } | 304 | } |
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 | |||
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> | 5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 0.9.9-$SUB_VERSION | 7 | Version: 1.0.1-$SUB_VERSION |
8 | Depends: task-opie-minimal, libpcap0 (0.7.2), libopie2 (1.8.1) | 8 | Depends: libqpe, libpcap0 (0.7.2), libopie2 (1.8.1) |
9 | Description: A WaveLAN Network Monitor | 9 | Description: A WaveLAN Network Monitor |
10 | A WaveLAN Network Monitor/Sniffer for the Opie Environment. | 10 | A WaveLAN Network Monitor/Sniffer for the Opie Environment. |