summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/TODO2
-rw-r--r--noncore/net/wellenreiter/gui/gps.cpp34
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp15
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.h1
4 files changed, 32 insertions, 20 deletions
diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO
index fd70fc7..b6ec617 100644
--- a/noncore/net/wellenreiter/TODO
+++ b/noncore/net/wellenreiter/TODO
@@ -1,58 +1,60 @@
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.2
6/************************************************************************ 6/************************************************************************
7 7
8---------------------------------------------------- 8----------------------------------------------------
9 Ideas as of Wellenreiter II / December 2003 9 Ideas as of Wellenreiter II / December 2003
10---------------------------------------------------- 10----------------------------------------------------
11 11
12-------- 12--------
13ENGINE 13ENGINE
14-------- 14--------
15 15
16- enable multiple packet sources 16- enable multiple packet sources
17 - infrared 17 - infrared
18 - bluetooth 18 - bluetooth
19 - usb? 19 - usb?
20 20
21- define packet structure in a metalanguage and generate 21- define packet structure in a metalanguage and generate
22 the actual parsing code (hmmm) 22 the actual parsing code (hmmm)
23 23
24- pester the ethereal folks to settle for an application independant 24- pester the ethereal folks to settle for an application independant
25 packet dissection framework... (unlikely) 25 packet dissection framework... (unlikely)
26 26
27- adaptive hopping scheme ! 27- adaptive hopping scheme !
28 28
29- gather interface capabilities 29- gather interface capabilities
30 30
31- enable sniffing in wired networks 31- enable sniffing in wired networks
32 32
33- fix autodetection (interface name)
34
33--------- 35---------
34 UI 36 UI
35--------- 37---------
36 38
37- display interface capabilities (or rewrite networksettings?) 39- display interface capabilities (or rewrite networksettings?)
38 40
39- distinguish wireless bridges (WDS traffic) 41- distinguish wireless bridges (WDS traffic)
40 42
41- expand/collapse all 43- expand/collapse all
42 44
43- add configuration for scrollback buffer in hex window and log window 45- add configuration for scrollback buffer in hex window and log window
44 46
45- revamp hex window, make it more sophisticated than just a QMultiLineEdit 47- revamp hex window, make it more sophisticated than just a QMultiLineEdit
46 - tree view 48 - tree view
47 49
48- beep over headphone / customizable 50- beep over headphone / customizable
49 51
50--------- 52---------
51 FILES 53 FILES
52--------- 54---------
53 55
54- write kismet-like .network format and format to be importable into AutoRoute 56- write kismet-like .network format and format to be importable into AutoRoute
55 57
56- implement beacon stripping (the first beacon is enough to detect a 58- implement beacon stripping (the first beacon is enough to detect a
57 new network - further beacons just blow up the capture file) 59 new network - further beacons just blow up the capture file)
58 60
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp
index b814427..5b1b4a4 100644
--- a/noncore/net/wellenreiter/gui/gps.cpp
+++ b/noncore/net/wellenreiter/gui/gps.cpp
@@ -1,131 +1,127 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Opie Environment.
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 "gps.h" 16#include "gps.h"
17 17
18/* QT */ 18/* QT */
19#include <qtextstream.h> 19#include <qtextstream.h>
20 20
21/* STD */ 21/* STD */
22#include <stdlib.h> 22#include <stdlib.h>
23#include <unistd.h> 23#include <unistd.h>
24 24
25GPS::GPS( QObject* parent, const char * name ) 25GPS::GPS( QObject* parent, const char * name )
26 :QObject( parent, name ) 26 :QObject( parent, name )
27{ 27{
28 qDebug( "GPS::GPS()" ); 28 qDebug( "GPS::GPS()" );
29 _socket = new QSocket( this, "gpsd commsock" ); 29 _socket = new QSocket( this, "gpsd commsock" );
30} 30}
31 31
32 32
33GPS::~GPS() 33GPS::~GPS()
34{ 34{
35 qDebug( "GPS::~GPS()" ); 35 qDebug( "GPS::~GPS()" );
36} 36}
37 37
38 38
39bool GPS::open( const QString& host, int port ) 39bool GPS::open( const QString& host, int port )
40{ 40{
41 _socket->connectToHost( host, port ); 41 _socket->connectToHost( host, port );
42} 42}
43 43
44 44
45GpsLocation GPS::position() const 45GpsLocation GPS::position() const
46{ 46{
47 char buf[256]; 47 char buf[256];
48 double lat = -111.0;
49 double lon = -111.0;
48 50
49 int result = _socket->writeBlock( "p\r\n", 3 ); 51 int result = _socket->writeBlock( "p\r\n", 3 );
50 _socket->flush(); 52 _socket->flush();
51 if ( result ) 53 if ( result )
52 { 54 {
53 int numAvail = _socket->bytesAvailable(); 55 int numAvail = _socket->bytesAvailable();
54 qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail ); 56 qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail );
55 if ( numAvail ) 57 if ( numAvail )
56 { 58 {
57 QTextStream stream( _socket ); 59 int numRead = _socket->readBlock( &buf[0], sizeof buf );
58 60 int numScan = sscanf( &buf[0], "GPSD,P=%lg %lg", &lat, &lon);
59 QString str; 61
60 stream.readRawBytes( &buf[0], 7 ); 62 if ( numRead < 7 || numScan != 2 )
61 float lat = -111; 63 {
62 stream >> lat; 64 qDebug( "GPS read %d bytes succeeded, invalid response: '%s'", numRead, &buf[0] );
63 stream.skipWhiteSpace(); 65 return GpsLocation( -111, -111 );
64 float lon = -111; 66 }
65 stream >> lon; 67 else
66 stream.readRawBytes( &buf[0], 200 ); // read and discard the stuff until EOF 68 {
67 69 return GpsLocation( lat, lon );
68 return GpsLocation( lat, lon ); 70 }
69 } 71 }
70 } 72 }
71 return GpsLocation( -111, -111 ); 73 return GpsLocation( -111, -111 );
72} 74}
73 75
74 76
75QString GpsLocation::dmsPosition() const 77QString GpsLocation::dmsPosition() const
76{ 78{
77 if ( _latitude == -111 || _longitude == -111 ) 79 if ( _latitude == -111 || _longitude == -111 )
78 return "N/A"; 80 return "N/A";
79 if ( _latitude == 0.0 && _longitude == 0.0 ) 81 if ( _latitude == 0.0 && _longitude == 0.0 )
80 return "NULL"; 82 return "NULL";
81 83
82 /* compute latitude */ 84 /* compute latitude */
83 85
84 QString dms = "N"; 86 QString dms = "N";
85 if ( _latitude >= 0 ) dms.append( "+" ); 87 if ( _latitude >= 0 ) dms.append( "+" );
86 88
87 int trunc = int( _latitude ); 89 int trunc = int( _latitude );
88 float rest = _latitude - trunc; 90 float rest = _latitude - trunc;
89 91
90 float minf = rest * 60; 92 float minf = rest * 60;
91 int minutes = int( minf ); 93 int minutes = int( minf );
92 94
93 rest = minf - minutes; 95 rest = minf - minutes;
94 int seconds = int( rest * 60 ); 96 int seconds = int( rest * 60 );
95 97
96 dms.append( QString::number( trunc ) ); 98 dms.append( QString::number( trunc ) );
97 dms.append( "° " ); 99 dms.append( "° " );
98 dms.append( QString::number( ::abs( minutes ) ) ); 100 dms.append( QString::number( ::abs( minutes ) ) );
99 dms.append( "' " ); 101 dms.append( "' " );
100 dms.append( QString::number( ::abs( seconds ) ) ); 102 dms.append( QString::number( ::abs( seconds ) ) );
101 dms.append( "'' " ); 103 dms.append( "'' " );
102 104
103 /* compute longitude */ 105 /* compute longitude */
104 106
105 dms.append( " | W" ); 107 dms.append( " | W" );
106 if ( _longitude > 0 ) dms.append( "+" ); 108 if ( _longitude > 0 ) dms.append( "+" );
107 109
108 trunc = int( _longitude ); 110 trunc = int( _longitude );
109 rest = _longitude - trunc; 111 rest = _longitude - trunc;
110 112
111 minf = rest * 60; 113 minf = rest * 60;
112 minutes = int( minf ); 114 minutes = int( minf );
113 115
114 rest = minf - minutes; 116 rest = minf - minutes;
115 seconds = int( rest * 60 ); 117 seconds = int( rest * 60 );
116 118
117 dms.append( QString::number( trunc ) ); 119 dms.append( QString::number( trunc ) );
118 dms.append( "° " ); 120 dms.append( "° " );
119 dms.append( QString::number( ::abs( minutes ) ) ); 121 dms.append( QString::number( ::abs( minutes ) ) );
120 dms.append( "' " ); 122 dms.append( "' " );
121 dms.append( QString::number( ::abs( seconds ) ) ); 123 dms.append( QString::number( ::abs( seconds ) ) );
122 dms.append( "'' " ); 124 dms.append( "'' " );
123 125
124 return dms; 126 return dms;
125} 127}
126
127
128
129
130
131
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 05a8913..b462afd 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -1,363 +1,376 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Opie Environment.
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 "configwindow.h" 16#include "configwindow.h"
17#include "gps.h" 17#include "gps.h"
18#include "logwindow.h" 18#include "logwindow.h"
19#include "hexwindow.h" 19#include "hexwindow.h"
20#include "mainwindow.h" 20#include "mainwindow.h"
21#include "wellenreiter.h" 21#include "wellenreiter.h"
22#include "scanlist.h" 22#include "scanlist.h"
23 23
24#include <qcombobox.h> 24#include <qcombobox.h>
25#include <qdatastream.h> 25#include <qdatastream.h>
26#include <qfile.h> 26#include <qfile.h>
27#include <qfileinfo.h> 27#include <qfileinfo.h>
28#include <qlabel.h> 28#include <qlabel.h>
29#include <qlayout.h> 29#include <qlayout.h>
30#include <qlineedit.h> 30#include <qlineedit.h>
31#include <qiconset.h> 31#include <qiconset.h>
32#include <qmenubar.h> 32#include <qmenubar.h>
33#include <qmessagebox.h> 33#include <qmessagebox.h>
34#include <qpopupmenu.h> 34#include <qpopupmenu.h>
35#include <qpushbutton.h> 35#include <qpushbutton.h>
36#include <qstatusbar.h> 36#include <qstatusbar.h>
37#include <qspinbox.h>
37#include <qtextstream.h> 38#include <qtextstream.h>
38#include <qtoolbutton.h> 39#include <qtoolbutton.h>
39 40
40#ifdef QWS 41#ifdef QWS
41#include <qpe/resource.h> 42#include <qpe/resource.h>
42#include <opie2/ofiledialog.h> 43#include <opie2/ofiledialog.h>
43using namespace Opie; 44using namespace Opie;
44#else 45#else
45#include "resource.h" 46#include "resource.h"
46#include <qapplication.h> 47#include <qapplication.h>
47#include <qfiledialog.h> 48#include <qfiledialog.h>
48#endif 49#endif
49 50
50WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) 51WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
51 :QMainWindow( parent, name, f ) 52 :QMainWindow( parent, name, f )
52{ 53{
53 cw = new WellenreiterConfigWindow( this ); 54 cw = new WellenreiterConfigWindow( this );
54 mw = new Wellenreiter( this ); 55 mw = new Wellenreiter( this );
55 mw->setConfigWindow( cw ); 56 mw->setConfigWindow( cw );
56 setCentralWidget( mw ); 57 setCentralWidget( mw );
57 58
58 // setup application icon 59 // setup application icon
59 60
60 #ifndef QWS 61 #ifndef QWS
61 setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) ); 62 setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
62 setIconText( "Wellenreiter/X11" ); 63 setIconText( "Wellenreiter/X11" );
63 #endif 64 #endif
64 65
65 // setup tool buttons 66 // setup tool buttons
66 67
67 startButton = new QToolButton( 0 ); 68 startButton = new QToolButton( 0 );
68 #ifdef QWS 69 #ifdef QWS
69 startButton->setAutoRaise( true ); 70 startButton->setAutoRaise( true );
70 #endif 71 #endif
71 startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) ); 72 startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) );
72 startButton->setEnabled( false ); 73 startButton->setEnabled( false );
73 connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) ); 74 connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) );
74 75
75 stopButton = new QToolButton( 0 ); 76 stopButton = new QToolButton( 0 );
76 #ifdef QWS 77 #ifdef QWS
77 stopButton->setAutoRaise( true ); 78 stopButton->setAutoRaise( true );
78 #endif 79 #endif
79 stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) ); 80 stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) );
80 stopButton->setEnabled( false ); 81 stopButton->setEnabled( false );
81 connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) ); 82 connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
82 83
83 QToolButton* d = new QToolButton( 0 ); 84 QToolButton* d = new QToolButton( 0 );
84 #ifdef QWS 85 #ifdef QWS
85 d->setAutoRaise( true ); 86 d->setAutoRaise( true );
86 #endif 87 #endif
87 d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) ); 88 d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) );
88 connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); 89 connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
89 90
90 uploadButton = new QToolButton( 0 ); 91 uploadButton = new QToolButton( 0 );
91 #ifdef QWS 92 #ifdef QWS
92 uploadButton->setAutoRaise( true ); 93 uploadButton->setAutoRaise( true );
93 #endif 94 #endif
94 uploadButton->setIconSet( Resource::loadIconSet( "up" ) ); 95 uploadButton->setIconSet( Resource::loadIconSet( "up" ) );
95 uploadButton->setEnabled( false ); 96 uploadButton->setEnabled( false );
96 //uploadButton->setEnabled( true ); // DEBUGGING 97 //uploadButton->setEnabled( true ); // DEBUGGING
97 connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) ); 98 connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) );
98 99
99 // setup menu bar 100 // setup menu bar
100 101
101 int id; 102 int id;
102 103
103 QMenuBar* mb = menuBar(); 104 QMenuBar* mb = menuBar();
104 105
105 QPopupMenu* fileSave = new QPopupMenu( mb ); 106 QPopupMenu* fileSave = new QPopupMenu( mb );
106 fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) ); 107 fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) );
107 fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) ); 108 fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) );
108 fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) ); 109 fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) );
109 110
110 QPopupMenu* fileLoad = new QPopupMenu( mb ); 111 QPopupMenu* fileLoad = new QPopupMenu( mb );
111 fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) ); 112 fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) );
112 //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); 113 //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
113 114
114 QPopupMenu* file = new QPopupMenu( mb ); 115 QPopupMenu* file = new QPopupMenu( mb );
115 file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) ); 116 file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) );
116 id = file->insertItem( tr( "&Load" ), fileLoad ); 117 id = file->insertItem( tr( "&Load" ), fileLoad );
117 file->insertItem( tr( "&Save" ), fileSave ); 118 file->insertItem( tr( "&Save" ), fileSave );
118 file->insertSeparator(); 119 file->insertSeparator();
119 uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) ); 120 uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) );
120 file->insertSeparator(); 121 file->insertSeparator();
121 file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) ); 122 file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
122 123
123 QPopupMenu* view = new QPopupMenu( mb ); 124 QPopupMenu* view = new QPopupMenu( mb );
124 view->insertItem( tr( "&Configure..." ) ); 125 view->insertItem( tr( "&Configure..." ) );
125 126
126 QPopupMenu* sniffer = new QPopupMenu( mb ); 127 QPopupMenu* sniffer = new QPopupMenu( mb );
127 sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) ); 128 sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
128 sniffer->insertSeparator(); 129 sniffer->insertSeparator();
129 startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) ); 130 startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) );
130 sniffer->setItemEnabled( startID, false ); 131 sniffer->setItemEnabled( startID, false );
131 stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) ); 132 stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
132 sniffer->setItemEnabled( stopID, false ); 133 sniffer->setItemEnabled( stopID, false );
133 134
134 QPopupMenu* demo = new QPopupMenu( mb ); 135 QPopupMenu* demo = new QPopupMenu( mb );
135 demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); 136 demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
137 demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) );
136 138
137 id = mb->insertItem( tr( "&File" ), file ); 139 id = mb->insertItem( tr( "&File" ), file );
138 //id = mb->insertItem( tr( "&View" ), view ); 140 //id = mb->insertItem( tr( "&View" ), view );
139 //mb->setItemEnabled( id, false ); 141 //mb->setItemEnabled( id, false );
140 id = mb->insertItem( tr( "&Sniffer" ), sniffer ); 142 id = mb->insertItem( tr( "&Sniffer" ), sniffer );
141 143
142 id = mb->insertItem( tr( "&Demo" ), demo ); 144 id = mb->insertItem( tr( "&Demo" ), demo );
143 mb->setItemEnabled( id, true ); 145 mb->setItemEnabled( id, true );
144 mb->setItemEnabled( uploadID, false ); 146 mb->setItemEnabled( uploadID, false );
145 147
146 #ifdef QWS 148 #ifdef QWS
147 mb->insertItem( startButton ); 149 mb->insertItem( startButton );
148 mb->insertItem( stopButton ); 150 mb->insertItem( stopButton );
149 mb->insertItem( uploadButton ); 151 mb->insertItem( uploadButton );
150 mb->insertItem( d ); 152 mb->insertItem( d );
151 #else // Qt3 changed the insertion order. It's now totally random :( 153 #else // Qt3 changed the insertion order. It's now totally random :(
152 mb->insertItem( d ); 154 mb->insertItem( d );
153 mb->insertItem( uploadButton ); 155 mb->insertItem( uploadButton );
154 mb->insertItem( stopButton ); 156 mb->insertItem( stopButton );
155 mb->insertItem( startButton ); 157 mb->insertItem( startButton );
156 #endif 158 #endif
157 159
158 updateToolButtonState(); 160 updateToolButtonState();
159 161
160 // setup status bar (for now only on X11) 162 // setup status bar (for now only on X11)
161 163
162 #ifndef QWS 164 #ifndef QWS
163 statusBar()->message( tr( "Ready." ) ); 165 statusBar()->message( tr( "Ready." ) );
164 #endif 166 #endif
165 167
166 connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) ); 168 connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) );
167 connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) ); 169 connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) );
168}; 170};
169 171
170 172
171 173
172void WellenreiterMainWindow::showConfigure() 174void WellenreiterMainWindow::showConfigure()
173{ 175{
174 qDebug( "show configure..." ); 176 qDebug( "show configure..." );
175 cw->setCaption( tr( "Configure" ) ); 177 cw->setCaption( tr( "Configure" ) );
176 #ifdef QWS 178 #ifdef QWS
177 cw->showMaximized(); 179 cw->showMaximized();
178 #endif 180 #endif
179 int result = cw->exec(); 181 int result = cw->exec();
180 182
181 if ( result ) updateToolButtonState(); 183 if ( result ) updateToolButtonState();
182} 184}
183 185
184 186
185void WellenreiterMainWindow::updateToolButtonState() 187void WellenreiterMainWindow::updateToolButtonState()
186{ 188{
187 const QString& interface = cw->interfaceName->currentText(); 189 const QString& interface = cw->interfaceName->currentText();
188 const int cardtype = cw->driverType(); 190 const int cardtype = cw->driverType();
189 191
190 if ( ( interface != "<select>" ) && ( cardtype != 0 ) ) 192 if ( ( interface != "<select>" ) && ( cardtype != 0 ) )
191 { 193 {
192 startButton->setEnabled( true ); 194 startButton->setEnabled( true );
193 menuBar()->setItemEnabled( startID, true ); 195 menuBar()->setItemEnabled( startID, true );
194 } 196 }
195 else 197 else
196 { 198 {
197 startButton->setEnabled( false ); 199 startButton->setEnabled( false );
198 menuBar()->setItemEnabled( startID, false ); 200 menuBar()->setItemEnabled( startID, false );
199 } 201 }
200} 202}
201 203
202 204
203void WellenreiterMainWindow::changedSniffingState() 205void WellenreiterMainWindow::changedSniffingState()
204{ 206{
205 startButton->setEnabled( !mw->sniffing ); 207 startButton->setEnabled( !mw->sniffing );
206 menuBar()->setItemEnabled( startID, !mw->sniffing ); 208 menuBar()->setItemEnabled( startID, !mw->sniffing );
207 stopButton->setEnabled( mw->sniffing ); 209 stopButton->setEnabled( mw->sniffing );
208 menuBar()->setItemEnabled( stopID, mw->sniffing ); 210 menuBar()->setItemEnabled( stopID, mw->sniffing );
209 211
210 if ( !mw->sniffing ) 212 if ( !mw->sniffing )
211 { 213 {
212 menuBar()->setItemEnabled( uploadID, true ); 214 menuBar()->setItemEnabled( uploadID, true );
213 uploadButton->setEnabled( true ); 215 uploadButton->setEnabled( true );
214 } 216 }
215} 217}
216 218
217 219
218WellenreiterMainWindow::~WellenreiterMainWindow() 220WellenreiterMainWindow::~WellenreiterMainWindow()
219{ 221{
220 qDebug( "Wellenreiter:: bye." ); 222 qDebug( "Wellenreiter:: bye." );
221}; 223};
222 224
223 225
224void WellenreiterMainWindow::demoAddStations() 226void WellenreiterMainWindow::demoAddStations()
225{ 227{
226 //mw = 0; // test SIGSGV handling 228 //mw = 0; // test SIGSEGV handling
227 229
228 mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 39.8794, -94.0936) ); 230 mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 39.8794, -94.0936) );
229 mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10, GpsLocation( 0.0, 0.0 ) ); 231 mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10, GpsLocation( 0.0, 0.0 ) );
230 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:03:F8:E7:16:22"), false, 3, 10, GpsLocation( 5.5, 2.3 ) ); 232 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:03:F8:E7:16:22"), false, 3, 10, GpsLocation( 5.5, 2.3 ) );
231 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:04:01:E7:56:62"), false, 3, 15, GpsLocation( 2.3, 5.5 ) ); 233 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:04:01:E7:56:62"), false, 3, 15, GpsLocation( 2.3, 5.5 ) );
232 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:05:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.5 ) ); 234 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:05:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.5 ) );
233} 235}
234 236
235 237
238void WellenreiterMainWindow::demoReadFromGps()
239{
240 WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance();
241 GPS* gps = new GPS( this );
242 gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
243 GpsLocation loc = gps->position();
244
245 QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n$1" ).arg( loc.dmsPosition() ) );
246}
247
248
236QString WellenreiterMainWindow::getFileName( bool save ) 249QString WellenreiterMainWindow::getFileName( bool save )
237{ 250{
238 QMap<QString, QStringList> map; 251 QMap<QString, QStringList> map;
239 map.insert( tr("All"), QStringList() ); 252 map.insert( tr("All"), QStringList() );
240 QStringList text; 253 QStringList text;
241 text << "text/*"; 254 text << "text/*";
242 map.insert( tr("Text"), text ); 255 map.insert( tr("Text"), text );
243 text << "*"; 256 text << "*";
244 map.insert( tr("All"), text ); 257 map.insert( tr("All"), text );
245 258
246 QString str; 259 QString str;
247 if ( save ) 260 if ( save )
248 { 261 {
249 #ifdef QWS 262 #ifdef QWS
250 str = OFileDialog::getSaveFileName( 2, "/", QString::null, map ); 263 str = OFileDialog::getSaveFileName( 2, "/", QString::null, map );
251 #else 264 #else
252 str = QFileDialog::getSaveFileName(); 265 str = QFileDialog::getSaveFileName();
253 #endif 266 #endif
254 if ( str.isEmpty() /*|| QFileInfo(str).isDir()*/ ) 267 if ( str.isEmpty() /*|| QFileInfo(str).isDir()*/ )
255 return ""; 268 return "";
256 } 269 }
257 else 270 else
258 { 271 {
259 #ifdef QWS 272 #ifdef QWS
260 str = OFileDialog::getOpenFileName( 2, "/", QString::null, map ); 273 str = OFileDialog::getOpenFileName( 2, "/", QString::null, map );
261 #else 274 #else
262 str = QFileDialog::getOpenFileName(); 275 str = QFileDialog::getOpenFileName();
263 #endif 276 #endif
264 if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() ) 277 if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() )
265 return ""; 278 return "";
266 } 279 }
267 return str; 280 return str;
268} 281}
269 282
270 283
271void WellenreiterMainWindow::fileSaveLog() 284void WellenreiterMainWindow::fileSaveLog()
272{ 285{
273 QString fname = getFileName( true ); 286 QString fname = getFileName( true );
274 if ( !fname.isEmpty() ) 287 if ( !fname.isEmpty() )
275 { 288 {
276 QFile f( fname ); 289 QFile f( fname );
277 if ( f.open(IO_WriteOnly) ) 290 if ( f.open(IO_WriteOnly) )
278 { 291 {
279 QTextStream t( &f ); 292 QTextStream t( &f );
280 t << mw->logWindow()->getLog(); 293 t << mw->logWindow()->getLog();
281 f.close(); 294 f.close();
282 qDebug( "Saved log to file '%s'", (const char*) fname ); 295 qDebug( "Saved log to file '%s'", (const char*) fname );
283 } 296 }
284 else 297 else
285 { 298 {
286 qDebug( "Problem saving log to file '%s'", (const char*) fname ); 299 qDebug( "Problem saving log to file '%s'", (const char*) fname );
287 } 300 }
288 } 301 }
289} 302}
290 303
291void WellenreiterMainWindow::fileSaveSession() 304void WellenreiterMainWindow::fileSaveSession()
292{ 305{
293 QString fname = getFileName( true ); 306 QString fname = getFileName( true );
294 if ( !fname.isEmpty() ) 307 if ( !fname.isEmpty() )
295 { 308 {
296 309
297 QFile f( fname ); 310 QFile f( fname );
298 if ( f.open(IO_WriteOnly) ) 311 if ( f.open(IO_WriteOnly) )
299 { 312 {
300 QDataStream t( &f ); 313 QDataStream t( &f );
301 t << *mw->netView(); 314 t << *mw->netView();
302 f.close(); 315 f.close();
303 qDebug( "Saved session to file '%s'", (const char*) fname ); 316 qDebug( "Saved session to file '%s'", (const char*) fname );
304 } 317 }
305 else 318 else
306 { 319 {
307 qDebug( "Problem saving session to file '%s'", (const char*) fname ); 320 qDebug( "Problem saving session to file '%s'", (const char*) fname );
308 } 321 }
309 } 322 }
310} 323}
311 324
312void WellenreiterMainWindow::fileSaveHex() 325void WellenreiterMainWindow::fileSaveHex()
313{ 326{
314 QString fname = getFileName( true ); 327 QString fname = getFileName( true );
315 if ( !fname.isEmpty() ) 328 if ( !fname.isEmpty() )
316 { 329 {
317 QFile f( fname ); 330 QFile f( fname );
318 if ( f.open(IO_WriteOnly) ) 331 if ( f.open(IO_WriteOnly) )
319 { 332 {
320 QTextStream t( &f ); 333 QTextStream t( &f );
321 t << mw->hexWindow()->getLog(); 334 t << mw->hexWindow()->getLog();
322 f.close(); 335 f.close();
323 qDebug( "Saved hex log to file '%s'", (const char*) fname ); 336 qDebug( "Saved hex log to file '%s'", (const char*) fname );
324 } 337 }
325 else 338 else
326 { 339 {
327 qDebug( "Problem saving hex log to file '%s'", (const char*) fname ); 340 qDebug( "Problem saving hex log to file '%s'", (const char*) fname );
328 } 341 }
329 } 342 }
330} 343}
331 344
332void WellenreiterMainWindow::fileLoadSession() 345void WellenreiterMainWindow::fileLoadSession()
333{ 346{
334 QString fname = getFileName( false ); 347 QString fname = getFileName( false );
335 if ( !fname.isEmpty() ) 348 if ( !fname.isEmpty() )
336 { 349 {
337 QFile f( fname ); 350 QFile f( fname );
338 if ( f.open(IO_ReadOnly) ) 351 if ( f.open(IO_ReadOnly) )
339 { 352 {
340 QDataStream t( &f ); 353 QDataStream t( &f );
341 t >> *mw->netView(); 354 t >> *mw->netView();
342 f.close(); 355 f.close();
343 qDebug( "Loaded session from file '%s'", (const char*) fname ); 356 qDebug( "Loaded session from file '%s'", (const char*) fname );
344 } 357 }
345 else 358 else
346 { 359 {
347 qDebug( "Problem loading session from file '%s'", (const char*) fname ); 360 qDebug( "Problem loading session from file '%s'", (const char*) fname );
348 } 361 }
349 } 362 }
350} 363}
351 364
352 365
353void WellenreiterMainWindow::fileNew() 366void WellenreiterMainWindow::fileNew()
354{ 367{
355 mw->netView()->clear(); 368 mw->netView()->clear();
356 mw->logWindow()->clear(); 369 mw->logWindow()->clear();
357 mw->hexWindow()->clear(); 370 mw->hexWindow()->clear();
358} 371}
359 372
360 373
361void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) 374void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
362{ 375{
363 if ( mw->isDaemonRunning() ) 376 if ( mw->isDaemonRunning() )
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index 8d4e768..a5cb7a5 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -1,62 +1,63 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Opie Environment.
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#ifndef MAINWINDOW_H 16#ifndef MAINWINDOW_H
17#define MAINWINDOW_H 17#define MAINWINDOW_H
18 18
19#include <qmainwindow.h> 19#include <qmainwindow.h>
20 20
21class Wellenreiter; 21class Wellenreiter;
22class WellenreiterConfigWindow; 22class WellenreiterConfigWindow;
23class QIconSet; 23class QIconSet;
24class QToolButton; 24class QToolButton;
25 25
26class WellenreiterMainWindow: public QMainWindow 26class WellenreiterMainWindow: public QMainWindow
27{ 27{
28 Q_OBJECT 28 Q_OBJECT
29 29
30 public: 30 public:
31 WellenreiterMainWindow( QWidget * parent = 0, const char * name = "mainwindow", WFlags f = 0 ); 31 WellenreiterMainWindow( QWidget * parent = 0, const char * name = "mainwindow", WFlags f = 0 );
32 ~WellenreiterMainWindow(); 32 ~WellenreiterMainWindow();
33 QString getFileName( bool save ); 33 QString getFileName( bool save );
34 34
35 protected: 35 protected:
36 Wellenreiter* mw; 36 Wellenreiter* mw;
37 WellenreiterConfigWindow* cw; 37 WellenreiterConfigWindow* cw;
38 38
39 QToolButton* startButton; 39 QToolButton* startButton;
40 QToolButton* stopButton; 40 QToolButton* stopButton;
41 QToolButton* uploadButton; 41 QToolButton* uploadButton;
42 int startID; 42 int startID;
43 int stopID; 43 int stopID;
44 int uploadID; 44 int uploadID;
45 45
46 protected: 46 protected:
47 virtual void closeEvent( QCloseEvent* ); 47 virtual void closeEvent( QCloseEvent* );
48 void updateToolButtonState(); 48 void updateToolButtonState();
49 49
50 public slots: 50 public slots:
51 void showConfigure(); 51 void showConfigure();
52 void demoAddStations(); 52 void demoAddStations();
53 void demoReadFromGps();
53 void fileSaveLog(); 54 void fileSaveLog();
54 void fileSaveHex(); 55 void fileSaveHex();
55 void fileSaveSession(); 56 void fileSaveSession();
56 void fileLoadSession(); 57 void fileLoadSession();
57 void fileNew(); 58 void fileNew();
58 void uploadSession(); 59 void uploadSession();
59 void changedSniffingState(); 60 void changedSniffingState();
60}; 61};
61 62
62#endif 63#endif