author | mickeyl <mickeyl> | 2004-05-03 14:15:54 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-03 14:15:54 (UTC) |
commit | 1ca586e85263f06f0de2e58d174da34fee4bf937 (patch) (unidiff) | |
tree | 2852372b1f8c8a143a8b8bb37d41842891c8ff73 /noncore | |
parent | aad04cffe30ef133edcd5051ce7e486f27599d83 (diff) | |
download | opie-1ca586e85263f06f0de2e58d174da34fee4bf937.zip opie-1ca586e85263f06f0de2e58d174da34fee4bf937.tar.gz opie-1ca586e85263f06f0de2e58d174da34fee4bf937.tar.bz2 |
I hereby declare his Version 1.0.3.
-rw-r--r-- | noncore/net/wellenreiter/ChangeLog | 6 | ||||
-rw-r--r-- | noncore/net/wellenreiter/README | 6 | ||||
-rw-r--r-- | noncore/net/wellenreiter/TODO | 11 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 26 | ||||
-rw-r--r-- | noncore/net/wellenreiter/opie-wellenreiter.control | 4 |
5 files changed, 31 insertions, 22 deletions
diff --git a/noncore/net/wellenreiter/ChangeLog b/noncore/net/wellenreiter/ChangeLog index b59f9f9..4855e7d 100644 --- a/noncore/net/wellenreiter/ChangeLog +++ b/noncore/net/wellenreiter/ChangeLog | |||
@@ -1,50 +1,54 @@ | |||
1 | 2004-??-?? Michael Lauer <mickey@Vanille.de> | 1 | 2004-05-04 Michael Lauer <mickey@Vanille.de> |
2 | 2 | ||
3 | * Released as Version 1.0.3 | ||
4 | * Removed the dummy capture file which has always been written to if none was chosen. | ||
5 | * Removed the old dumb hex window tab and added a nice PackageViewer tab. | ||
6 | * Added configuration options for the PackageViewer buffer size. | ||
3 | * Registered a signal handler. We're now trying to gracefully exit and emergency close capture files. | 7 | * Registered a signal handler. We're now trying to gracefully exit and emergency close capture files. |
4 | This should allow reproducing failures. | 8 | This should allow reproducing failures. |
5 | * Added sanity check for compile time vs. run time Wireless Extension versions. | 9 | * Added sanity check for compile time vs. run time Wireless Extension versions. |
6 | * Added sanity check isPresent(interface) before starting the engine. | 10 | * Added sanity check isPresent(interface) before starting the engine. |
7 | * Added a View submenu. Added actions to expand and collapse all items. | 11 | * Added a View submenu. Added actions to expand and collapse all items. |
8 | * Switched to a (hopefully) more reliable method reading from gpsd. | 12 | * Switched to a (hopefully) more reliable method reading from gpsd. |
9 | * Added parsing of named ProbeRequests. Display only-probed-yet SSIDs in a different network color. | 13 | * Added parsing of named ProbeRequests. Display only-probed-yet SSIDs in a different network color. |
10 | * Rewrote the simple actions on new {Network, Client, Station}. Besides playing a sound or | 14 | * Rewrote the simple actions on new {Network, Client, Station}. Besides playing a sound or |
11 | blinking a LED, a user customizable script can now be executed, if something has been | 15 | blinking a LED, a user customizable script can now be executed, if something has been |
12 | detected. This opens up many possibilities, i.e. a qcop to qpegps or exec'ing flite (speech). | 16 | detected. This opens up many possibilities, i.e. a qcop to qpegps or exec'ing flite (speech). |
13 | * Added decloaking of cloaked ESSIDs (length != 0, but essid[0] == \0). | 17 | * Added decloaking of cloaked ESSIDs (length != 0, but essid[0] == \0). |
14 | * Hided the 'Parse' Tab in the configuration window. Not functional now and may come later | 18 | * Hided the 'Parse' Tab in the configuration window. Not functional now and may come later |
15 | * Added parsing of control frames. Display stations sending them SSID "<unknown>" for now. | 19 | * Added parsing of control frames. Display stations sending them SSID "<unknown>" for now. |
16 | * Added command line option "-nocheck" to skip non-root and dhcp tests. | 20 | * Added command line option "-nocheck" to skip non-root and dhcp tests. |
17 | * Improved the speed of and user feedback during reading the manufacturer list. | 21 | * Improved the speed of and user feedback during reading the manufacturer list. |
18 | * GPS coordinates are now presented in the DMS (as opposed to decimal) format. | 22 | * GPS coordinates are now presented in the DMS (as opposed to decimal) format. |
19 | 23 | ||
20 | 2003-12-18 Michael Lauer <mickey@Vanille.de> | 24 | 2003-12-18 Michael Lauer <mickey@Vanille.de> |
21 | 25 | ||
22 | * Released as Version 1.0.2 (Development Snapshot) | 26 | * Released as Version 1.0.2 (Development Snapshot) |
23 | * Added automatic uploading of capture files to "The Capture Dump" site at | 27 | * Added automatic uploading of capture files to "The Capture Dump" site at |
24 | http://www.Vanille.de/projects/capturedump.spy | 28 | http://www.Vanille.de/projects/capturedump.spy |
25 | * Initial reading of the manufacturer database happens now in background | 29 | * Initial reading of the manufacturer database happens now in background |
26 | * Removed deprecated setMonitorMode() API ==> Use setMode( "monitor" ) now. | 30 | * Removed deprecated setMonitorMode() API ==> Use setMode( "monitor" ) now. |
27 | The monitor mode now tries to use the standard IW_MODE_MONITOR first. If that | 31 | The monitor mode now tries to use the standard IW_MODE_MONITOR first. If that |
28 | doesn't work, it falls back to using the proprietary iwpriv commands | 32 | doesn't work, it falls back to using the proprietary iwpriv commands |
29 | 33 | ||
30 | 2003-11-30 Michael Lauer <mickey@Vanille.de> | 34 | 2003-11-30 Michael Lauer <mickey@Vanille.de> |
31 | 35 | ||
32 | * Released as Version 1.0.1 (Development Snapshot) | 36 | * Released as Version 1.0.1 (Development Snapshot) |
33 | * Fixed ARP decoding for wired networks. | 37 | * Fixed ARP decoding for wired networks. |
34 | Interestingly, 802.11 encapsulates these in IP packets, while wired ethernet just tags the type_of_protocol. | 38 | Interestingly, 802.11 encapsulates these in IP packets, while wired ethernet just tags the type_of_protocol. |
35 | * Added reading GPS data from a gps daemon. | 39 | * Added reading GPS data from a gps daemon. |
36 | * Started preparations for utilizing Wellenreiter II in wired networks. | 40 | * Started preparations for utilizing Wellenreiter II in wired networks. |
37 | * Implemented persistant configuration interface and retriggerable auto detection. | 41 | * Implemented persistant configuration interface and retriggerable auto detection. |
38 | * Added QCOP interface for talking to opie-networksettings. | 42 | * Added QCOP interface for talking to opie-networksettings. |
39 | * Added parsing of DHCP packets and detecting DHCP servers. | 43 | * Added parsing of DHCP packets and detecting DHCP servers. |
40 | * Overhauled the configuration window and started with the customizable event system. | 44 | * Overhauled the configuration window and started with the customizable event system. |
41 | * Added disabling the screensaver. | 45 | * Added disabling the screensaver. |
42 | * Added automatic opening and scrolling to the network tree if a new station appears. | 46 | * Added automatic opening and scrolling to the network tree if a new station appears. |
43 | 47 | ||
44 | 2003-05-10 Michael Lauer <mickey@Vanille.de> | 48 | 2003-05-10 Michael Lauer <mickey@Vanille.de> |
45 | 49 | ||
46 | * Released as Version 1.0 (Stable) | 50 | * Released as Version 1.0 (Stable) |
47 | * Added restarting the dhcp client if having killed it before. | 51 | * Added restarting the dhcp client if having killed it before. |
48 | * Decouple dump files from live capture to shift control over 'what' is dumped to applications. | 52 | * Decouple dump files from live capture to shift control over 'what' is dumped to applications. |
49 | 53 | ||
50 | 2003-05-05 Michael Lauer <mickey@Vanille.de> | 54 | 2003-05-05 Michael Lauer <mickey@Vanille.de> |
diff --git a/noncore/net/wellenreiter/README b/noncore/net/wellenreiter/README index 7607a74..59163b3 100644 --- a/noncore/net/wellenreiter/README +++ b/noncore/net/wellenreiter/README | |||
@@ -1,69 +1,69 @@ | |||
1 | /************************************************************************ | 1 | /************************************************************************ |
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.2 | 5 | /* Version: 1.0.3 |
6 | /************************************************************************ | 6 | /************************************************************************ |
7 | 7 | ||
8 | ---------------------------------------------------- | 8 | ---------------------------------------------------- |
9 | Release Notes for Wellenreiter II / December 2003 | 9 | Release Notes for Wellenreiter II / May 2004 |
10 | ---------------------------------------------------- | 10 | ---------------------------------------------------- |
11 | 11 | ||
12 | ===================== | 12 | ===================== |
13 | = Supported Devices | 13 | = Supported Devices |
14 | ===================== | 14 | ===================== |
15 | 15 | ||
16 | - HERMES chipset [ orinoco or hostap ], e.g. Lucent/Agere cards, Compaq, ... | 16 | - HERMES chipset [ orinoco or hostap ], e.g. Lucent/Agere cards, Compaq, ... |
17 | - PRISM2+PRISM3 chipset [ orinoco or hostap ], e.g. D-Link, Buffallo, NetGear, ... | 17 | - PRISM2+PRISM3 chipset [ orinoco or hostap ], e.g. D-Link, Buffallo, NetGear, ... |
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, e.g. D-Link USB cards | 20 | - WLAN-NG supported chipsets, e.g. D-Link USB cards |
21 | 21 | ||
22 | ===================== | 22 | ===================== |
23 | = Build | 23 | = Build |
24 | ===================== | 24 | ===================== |
25 | 25 | ||
26 | To compile a standalone Wellenreiter II for X11, you need Qt3/X11 and the development | 26 | To compile a standalone Wellenreiter II for X11, you need Qt3/X11 and the development |
27 | packages for Qt3/X11, depending on the distribution e.g. libqt3-devel, libqt3-dev, ... | 27 | packages for Qt3/X11, depending on the distribution e.g. libqt3-devel, libqt3-dev, ... |
28 | 28 | ||
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 (sorry, no relocation possible yet) | 32 | * Wellenreiter will be installed in /usr/local (sorry, no relocation possible yet) |
33 | 33 | ||
34 | The current CVS version of Wellenreiter II is _not_ X11 compatible. | 34 | NOTE: The current version of Wellenreiter II is _not_ X11 compatible. |
35 | 35 | ||
36 | ===================== | 36 | ===================== |
37 | = Precompiled Binaries | 37 | = Precompiled Binaries |
38 | ===================== | 38 | ===================== |
39 | 39 | ||
40 | Precompiled binaries are available for the PDA-Version. | 40 | Precompiled binaries are available for the PDA-Version. |
41 | Get them from http://vanille.de/feed | 41 | Get them from http://vanille.de/feed |
42 | Sorry, no .rpm oder .deb available at that time. Volunteers? | 42 | Sorry, no .rpm oder .deb available at that time. Volunteers? |
43 | 43 | ||
44 | ===================== | 44 | ===================== |
45 | = Run | 45 | = Run |
46 | ===================== | 46 | ===================== |
47 | 47 | ||
48 | * Configure your device by pressing the configure toolbutton (to the right) | 48 | * Configure your device by pressing the configure toolbutton (to the right) |
49 | * Start Sniffing by pressing the execute toolbutton which will be enabled, | 49 | * Start Sniffing by pressing the execute toolbutton which will be enabled, |
50 | if your device has been properly configured. | 50 | if your device has been properly configured. |
51 | 51 | ||
52 | ===================== | 52 | ===================== |
53 | = Credits = | 53 | = Credits = |
54 | ===================== | 54 | ===================== |
55 | 55 | ||
56 | Wellenreiter II is (C) 2002-2004 Michael 'Mickey' Lauer | 56 | Wellenreiter II is (C) 2002-2004 Michael 'Mickey' Lauer |
57 | 57 | ||
58 | Additional Ideas, the Name, and the Logo by | 58 | Additional Ideas, the Name, and the Logo by |
59 | Max Moser <max@remote-exploit.org> | 59 | Max Moser <max@remote-exploit.org> |
60 | Martin J. Muench <mjm@remote-exploit.org> | 60 | Martin J. Muench <mjm@remote-exploit.org> |
61 | 61 | ||
62 | ===================== | 62 | ===================== |
63 | = Links = | 63 | = Links = |
64 | ===================== | 64 | ===================== |
65 | 65 | ||
66 | Wellenreiter: http://www.wellenreiter.net | 66 | Wellenreiter: http://www.wellenreiter.net |
67 | Wellenreiter II: http://vanille.de/projects/wellenreiter.html | 67 | Wellenreiter II: http://vanille.de/projects/wellenreiter.html |
68 | Opie Project: http://opie.handhelds.org | 68 | Opie Project: http://opie.handhelds.org |
69 | OpenZaurus Project: http://openzaurus.org | 69 | OpenZaurus Project: http://openzaurus.org |
diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO index f0a193d..a3d0d3d 100644 --- a/noncore/net/wellenreiter/TODO +++ b/noncore/net/wellenreiter/TODO | |||
@@ -1,75 +1,72 @@ | |||
1 | /************************************************************************ | 1 | /************************************************************************ |
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.2 | 5 | /* Version: 1.0.3 |
6 | /************************************************************************ | 6 | /************************************************************************ |
7 | 7 | ||
8 | ---------------------------------------------------- | 8 | ---------------------------------------------------- |
9 | Ideas as of Wellenreiter II / April 2004 | 9 | Ideas as of Wellenreiter II / May 2004 |
10 | ---------------------------------------------------- | 10 | ---------------------------------------------------- |
11 | 11 | ||
12 | -------- | 12 | -------- |
13 | BUILD | 13 | BUILD |
14 | -------- | 14 | -------- |
15 | 15 | ||
16 | - fix building against X11 again | 16 | - fix building against X11 again |
17 | 17 | ||
18 | -------- | 18 | -------- |
19 | ENGINE | 19 | ENGINE |
20 | -------- | 20 | -------- |
21 | 21 | ||
22 | - enable multiple packet sources | 22 | - enable multiple packet sources |
23 | - infrared | 23 | - infrared |
24 | - bluetooth | 24 | - bluetooth |
25 | - usb | 25 | - usb |
26 | 26 | ||
27 | - define packet structure in a metalanguage and generate | 27 | - define packet structure in a metalanguage and generate |
28 | the actual parsing code (hmmm) | 28 | the actual parsing code (hmmm) |
29 | 29 | ||
30 | - pester the ethereal folks to settle for an application independant | 30 | - pester the ethereal folks to settle for an application independant |
31 | packet dissection framework... (unlikely) | 31 | packet dissection framework... (unlikely) |
32 | 32 | ||
33 | - adaptive hopping scheme ! | 33 | - implement the adaptive hopping scheme ! |
34 | 34 | ||
35 | - gather interface capabilities | 35 | - gather interface capabilities |
36 | 36 | ||
37 | - enable sniffing in wired networks | 37 | - enable sniffing in wired networks |
38 | 38 | ||
39 | - fix autodetection (the interface name is not selected correctly) | 39 | - fix autodetection (the interface name is not selected correctly) |
40 | 40 | ||
41 | - use ethtool IOCTLs (if present) | 41 | - use ethtool IOCTLs (if present) |
42 | 42 | ||
43 | --------- | 43 | --------- |
44 | UI | 44 | UI |
45 | --------- | 45 | --------- |
46 | 46 | ||
47 | - display interface capabilities (or rewrite networksettings?) | 47 | - display interface capabilities (or rewrite networksettings?) |
48 | 48 | ||
49 | - distinguish wireless bridges (WDS traffic) | 49 | - distinguish wireless bridges (WDS traffic) |
50 | 50 | ||
51 | - add configuration for scrollback buffer in hex window and log window | 51 | - add configuration for scrollback buffer in log window |
52 | |||
53 | - revamp hex window, make it more sophisticated than just a QMultiLineEdit | ||
54 | - tree view | ||
55 | 52 | ||
56 | - beep over headphone / customizable | 53 | - beep over headphone / customizable |
57 | 54 | ||
58 | - count/display number of wireless networks / APs since last start/stop | 55 | - count/display number of wireless networks / APs since last start/stop |
59 | 56 | ||
60 | --------- | 57 | --------- |
61 | FILES | 58 | FILES |
62 | --------- | 59 | --------- |
63 | 60 | ||
64 | - write kismet-like .network format and format to be importable into AutoRoute | 61 | - write kismet-like .network format and format to be importable into AutoRoute |
65 | 62 | ||
66 | - implement beacon stripping (the first beacon is enough to detect a | 63 | - implement beacon stripping (the first beacon is enough to detect a |
67 | new network - further beacons just blow up the capture file) | 64 | new network - further beacons just blow up the capture file) |
68 | 65 | ||
69 | - write wi-scan format like that: | 66 | - write wi-scan format like that: |
70 | # $Creator: Wellenreiter II Version 1.0.2 | 67 | # $Creator: Wellenreiter II Version 1.0.2 |
71 | # $Format: wi-scan | 68 | # $Format: wi-scan |
72 | # Latitude Longitude ( SSID ) Type ( BSSID ) Time (GMT) [ SNR Sig Noise ] | 69 | # Latitude Longitude ( SSID ) Type ( BSSID ) Time (GMT) [ SNR Sig Noise ] |
73 | # $DateGMT: 2004-02-07 | 70 | # $DateGMT: 2004-02-07 |
74 | N 41.1008009 W 8.3893034 ( Porceven ) BBS ( 00:a0:f8:41:91:63 ) 22:32:39 (GMT) [ 21 177 156 ] | 71 | N 41.1008009 W 8.3893034 ( Porceven ) BBS ( 00:a0:f8:41:91:63 ) 22:32:39 (GMT) [ 21 177 156 ] |
75 | 72 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index 9bdf3e0..a29d520 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -1,182 +1,190 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Wellenreiter II. | 4 | ** This file is part of Wellenreiter II. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ***********************************************************************/ | 14 | ***********************************************************************/ |
15 | 15 | ||
16 | #include "wellenreiterbase.h" | 16 | #include "wellenreiterbase.h" |
17 | 17 | ||
18 | #include <qlabel.h> | 18 | #include <qlabel.h> |
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | 20 | ||
21 | #include "logwindow.h" | 21 | #include "logwindow.h" |
22 | #include "packetview.h" | 22 | #include "packetview.h" |
23 | #include "scanlist.h" | 23 | #include "scanlist.h" |
24 | #include "statwindow.h" | 24 | #include "statwindow.h" |
25 | #include "graphwindow.h" | 25 | #include "graphwindow.h" |
26 | 26 | ||
27 | #ifdef QWS | 27 | #ifdef QWS |
28 | #include <qpe/resource.h> | 28 | #include <qpe/resource.h> |
29 | #include <opie2/otabwidget.h> | 29 | #include <opie2/otabwidget.h> |
30 | using namespace Opie; | 30 | using namespace Opie; |
31 | #else | 31 | #else |
32 | #include "resource.h" | 32 | #include "resource.h" |
33 | #include <qtabwidget.h> | 33 | #include <qtabwidget.h> |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #define WELLENREITER_VERSION "V1.0.3 (unofficial)" | ||
36 | 37 | ||
37 | /* | 38 | /* |
38 | * Constructs a WellenreiterBase which is a child of 'parent', with the | 39 | * Constructs a WellenreiterBase which is a child of 'parent', with the |
39 | * name 'name' and widget flags set to 'f' | 40 | * name 'name' and widget flags set to 'f' |
40 | */ | 41 | */ |
41 | using namespace Opie::Ui; | 42 | using namespace Opie::Ui; |
42 | using namespace Opie::Ui; | 43 | using namespace Opie::Ui; |
43 | using namespace Opie::Ui; | 44 | using namespace Opie::Ui; |
44 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) | 45 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) |
45 | : QWidget( parent, name, fl ) | 46 | : QWidget( parent, name, fl ) |
46 | { | 47 | { |
47 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); | 48 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); |
48 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); | 49 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); |
49 | //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); | 50 | //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); |
50 | //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); | 51 | //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); |
51 | 52 | ||
52 | if ( !name ) | 53 | if ( !name ) |
53 | setName( "WellenreiterBase" ); | 54 | setName( "WellenreiterBase" ); |
54 | resize( 191, 294 ); | 55 | resize( 191, 294 ); |
55 | #ifdef QWS | 56 | #ifdef QWS |
56 | setCaption( tr( "Wellenreiter/Opie" ) ); | 57 | setCaption( tr( "Wellenreiter/Opie" ) ); |
57 | #else | 58 | #else |
58 | setCaption( tr( "Wellenreiter/X11" ) ); | 59 | setCaption( tr( "Wellenreiter/X11" ) ); |
59 | #endif | 60 | #endif |
60 | WellenreiterBaseLayout = new QVBoxLayout( this ); | 61 | WellenreiterBaseLayout = new QVBoxLayout( this ); |
61 | WellenreiterBaseLayout->setSpacing( 2 ); | 62 | WellenreiterBaseLayout->setSpacing( 2 ); |
62 | WellenreiterBaseLayout->setMargin( 0 ); | 63 | WellenreiterBaseLayout->setMargin( 0 ); |
63 | #ifdef QWS | 64 | #ifdef QWS |
64 | TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global ); | 65 | TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global ); |
65 | #else | 66 | #else |
66 | TabWidget = new QTabWidget( this, "TabWidget" ); | 67 | TabWidget = new QTabWidget( this, "TabWidget" ); |
67 | #endif | 68 | #endif |
68 | ap = new QWidget( TabWidget, "ap" ); | 69 | ap = new QWidget( TabWidget, "ap" ); |
69 | apLayout = new QVBoxLayout( ap ); | 70 | apLayout = new QVBoxLayout( ap ); |
70 | apLayout->setSpacing( 2 ); | 71 | apLayout->setSpacing( 2 ); |
71 | apLayout->setMargin( 2 ); | 72 | apLayout->setMargin( 2 ); |
72 | 73 | ||
73 | //--------- NETVIEW TAB -------------- | 74 | //--------- NETVIEW TAB -------------- |
74 | 75 | ||
75 | netview = new MScanListView( ap ); | 76 | netview = new MScanListView( ap ); |
76 | apLayout->addWidget( netview ); | 77 | apLayout->addWidget( netview ); |
77 | 78 | ||
78 | //--------- GRAPH TAB -------------- | 79 | //--------- GRAPH TAB -------------- |
79 | 80 | ||
80 | graphwindow = new MGraphWindow( TabWidget, "Graph" ); | 81 | graphwindow = new MGraphWindow( TabWidget, "Graph" ); |
81 | 82 | ||
82 | //--------- LOG TAB -------------- | 83 | //--------- LOG TAB -------------- |
83 | 84 | ||
84 | logwindow = new MLogWindow( TabWidget, "Log" ); | 85 | logwindow = new MLogWindow( TabWidget, "Log" ); |
85 | 86 | ||
86 | //--------- HEX TAB -------------- | 87 | //--------- HEX TAB -------------- |
87 | 88 | ||
88 | hexwindow = new PacketView( TabWidget, "Hex" ); | 89 | hexwindow = new PacketView( TabWidget, "Hex" ); |
89 | 90 | ||
90 | //--------- STAT TAB -------------- | 91 | //--------- STAT TAB -------------- |
91 | 92 | ||
92 | statwindow = new MStatWindow( TabWidget, "Stat" ); | 93 | statwindow = new MStatWindow( TabWidget, "Stat" ); |
93 | 94 | ||
94 | //--------- ABOUT TAB -------------- | 95 | //--------- ABOUT TAB -------------- |
95 | 96 | ||
96 | about = new QWidget( TabWidget, "about" ); | 97 | about = new QWidget( TabWidget, "about" ); |
97 | aboutLayout = new QGridLayout( about ); | 98 | aboutLayout = new QGridLayout( about ); |
98 | aboutLayout->setSpacing( 6 ); | 99 | aboutLayout->setSpacing( 6 ); |
99 | aboutLayout->setMargin( 11 ); | 100 | aboutLayout->setMargin( 11 ); |
100 | 101 | ||
101 | PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" ); | 102 | PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" ); |
102 | PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) ); | 103 | PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) ); |
103 | PixmapLabel1_3_2->setFrameShape( QLabel::Panel ); | 104 | PixmapLabel1_3_2->setFrameShape( QLabel::Panel ); |
104 | PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken ); | 105 | PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken ); |
105 | PixmapLabel1_3_2->setLineWidth( 2 ); | 106 | PixmapLabel1_3_2->setLineWidth( 2 ); |
106 | PixmapLabel1_3_2->setMargin( 0 ); | 107 | PixmapLabel1_3_2->setMargin( 0 ); |
107 | PixmapLabel1_3_2->setMidLineWidth( 0 ); | 108 | PixmapLabel1_3_2->setMidLineWidth( 0 ); |
108 | PixmapLabel1_3_2->setPixmap( Resource::loadPixmap( "wellenreiter/logo" ) ); | 109 | |
110 | QPixmap logo = Resource::loadPixmap( "wellenreiter/logo" ); | ||
111 | QPainter draw( &logo ); | ||
112 | draw.setPen( Qt::black ); | ||
113 | draw.setFont( QFont( "Fixed", 8 ) ); | ||
114 | draw.drawText( 30, 10, WELLENREITER_VERSION ); | ||
115 | |||
116 | PixmapLabel1_3_2->setPixmap( logo ); | ||
109 | PixmapLabel1_3_2->setScaledContents( TRUE ); | 117 | PixmapLabel1_3_2->setScaledContents( TRUE ); |
110 | PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) ); | 118 | PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) ); |
111 | 119 | ||
112 | aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 ); | 120 | aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 ); |
113 | 121 | ||
114 | TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" ); | 122 | TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" ); |
115 | QFont TextLabel1_4_2_font( TextLabel1_4_2->font() ); | 123 | QFont TextLabel1_4_2_font( TextLabel1_4_2->font() ); |
116 | TextLabel1_4_2_font.setFamily( "adobe-helvetica" ); | 124 | TextLabel1_4_2_font.setFamily( "adobe-helvetica" ); |
117 | TextLabel1_4_2_font.setPointSize( 10 ); | 125 | TextLabel1_4_2_font.setPointSize( 10 ); |
118 | TextLabel1_4_2->setFont( TextLabel1_4_2_font ); | 126 | TextLabel1_4_2->setFont( TextLabel1_4_2_font ); |
119 | TextLabel1_4_2->setText( | 127 | TextLabel1_4_2->setText( |
120 | "<p align=center>" | 128 | "<p align=center>" |
121 | "<hr>" | 129 | "<hr>" |
122 | "<b>(C) Michael 'Mickey' Lauer</b><br>" | 130 | "<b>(C) Michael 'Mickey' Lauer</b><br>" |
123 | "<hr>" | 131 | "<hr>" |
124 | "mickey@Vanille.de<br>" | 132 | "mickey@Vanille.de<br>" |
125 | "www.Vanille.de/projects/wellenreiter.html<br>" | 133 | "www.Vanille.de/projects/wellenreiter.html<br>" |
126 | "www.wellenreiter.net" | 134 | "www.wellenreiter.net" |
127 | "</p>" ); | 135 | "</p>" ); |
128 | TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) ); | 136 | TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) ); |
129 | 137 | ||
130 | aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); | 138 | aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); |
131 | 139 | ||
132 | #ifdef QWS | 140 | #ifdef QWS |
133 | TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) ); | 141 | TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) ); |
134 | TabWidget->addTab( graphwindow, "wellenreiter/graph", tr( "Graph" ) ); | 142 | TabWidget->addTab( graphwindow, "wellenreiter/graph", tr( "Graph" ) ); |
135 | TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); | 143 | TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); |
136 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); | 144 | TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); |
137 | TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) ); | 145 | TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) ); |
138 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); | 146 | TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); |
139 | #else | 147 | #else |
140 | TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) ); | 148 | TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) ); |
141 | TabWidget->addTab( graphwindow, /* "wellenreiter/graph", */ tr( "Graph" ) ); | 149 | TabWidget->addTab( graphwindow, /* "wellenreiter/graph", */ tr( "Graph" ) ); |
142 | TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) ); | 150 | TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) ); |
143 | TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); | 151 | TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) ); |
144 | TabWidget->addTab( statwindow, /* "wellenreiter/hex", */ tr( "Stat" ) ); | 152 | TabWidget->addTab( statwindow, /* "wellenreiter/hex", */ tr( "Stat" ) ); |
145 | TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); | 153 | TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) ); |
146 | #endif | 154 | #endif |
147 | WellenreiterBaseLayout->addWidget( TabWidget ); | 155 | WellenreiterBaseLayout->addWidget( TabWidget ); |
148 | 156 | ||
149 | #ifdef QWS | 157 | #ifdef QWS |
150 | TabWidget->setCurrentTab( tr( "Nets" ) ); | 158 | TabWidget->setCurrentTab( tr( "Nets" ) ); |
151 | #endif | 159 | #endif |
152 | 160 | ||
153 | } | 161 | } |
154 | 162 | ||
155 | /* | 163 | /* |
156 | * Destroys the object and frees any allocated resources | 164 | * Destroys the object and frees any allocated resources |
157 | */ | 165 | */ |
158 | WellenreiterBase::~WellenreiterBase() | 166 | WellenreiterBase::~WellenreiterBase() |
159 | { | 167 | { |
160 | // no need to delete child widgets, Qt does it all for us | 168 | // no need to delete child widgets, Qt does it all for us |
161 | } | 169 | } |
162 | 170 | ||
163 | /* | 171 | /* |
164 | * Main event handler. Reimplemented to handle application | 172 | * Main event handler. Reimplemented to handle application |
165 | * font changes | 173 | * font changes |
166 | */ | 174 | */ |
167 | bool WellenreiterBase::event( QEvent* ev ) | 175 | bool WellenreiterBase::event( QEvent* ev ) |
168 | { | 176 | { |
169 | bool ret = QWidget::event( ev ); | 177 | bool ret = QWidget::event( ev ); |
170 | if ( ev->type() == QEvent::ApplicationFontChange ) { | 178 | if ( ev->type() == QEvent::ApplicationFontChange ) { |
171 | //QFont Log_2_font( Log_2->font() ); | 179 | //QFont Log_2_font( Log_2->font() ); |
172 | //Log_2_font.setFamily( "adobe-courier" ); | 180 | //Log_2_font.setFamily( "adobe-courier" ); |
173 | //Log_2_font.setPointSize( 8 ); | 181 | //Log_2_font.setPointSize( 8 ); |
174 | //Log_2->setFont( Log_2_font ); | 182 | //Log_2->setFont( Log_2_font ); |
175 | QFont TextLabel1_4_2_font( TextLabel1_4_2->font() ); | 183 | QFont TextLabel1_4_2_font( TextLabel1_4_2->font() ); |
176 | TextLabel1_4_2_font.setFamily( "adobe-helvetica" ); | 184 | TextLabel1_4_2_font.setFamily( "adobe-helvetica" ); |
177 | TextLabel1_4_2_font.setPointSize( 10 ); | 185 | TextLabel1_4_2_font.setPointSize( 10 ); |
178 | TextLabel1_4_2->setFont( TextLabel1_4_2_font ); | 186 | TextLabel1_4_2->setFont( TextLabel1_4_2_font ); |
179 | } | 187 | } |
180 | return ret; | 188 | return ret; |
181 | } | 189 | } |
182 | 190 | ||
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control index 1d8c482..cbc287a 100644 --- a/noncore/net/wellenreiter/opie-wellenreiter.control +++ b/noncore/net/wellenreiter/opie-wellenreiter.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-wellenreiter | 1 | Package: opie-wellenreiter |
2 | Files: bin/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop | 2 | Files: bin/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop |
3 | Priority: optional | 3 | 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: 1.0.2-$SUB_VERSION | 7 | Version: 1.0.3 |
8 | Depends: libqpe1, libpcap0 (0.7.2), libopiecore2, libopienet2 (>=1.8.3), libopieui2 | 8 | Depends: libqpe1, libpcap0 (>=0.7.2), libopiecore2, libopienet2, libopieui2 |
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. |