author | mickeyl <mickeyl> | 2004-08-24 11:53:43 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-08-24 11:53:43 (UTC) |
commit | b06390cb17114692a9fd5233d77620b385252480 (patch) (unidiff) | |
tree | 91de2ed5b0eb6ed739eb6bd0126e2ad004d6a9bd | |
parent | 94611edc1942717faa15861adef25418e40ea626 (diff) | |
download | opie-b06390cb17114692a9fd5233d77620b385252480.zip opie-b06390cb17114692a9fd5233d77620b385252480.tar.gz opie-b06390cb17114692a9fd5233d77620b385252480.tar.bz2 |
apply megapatch courtesy Holger 'Zecke' Freyther:
- bump version to 1.0.3-cvs
- fix compile warnings
- fix PacketViewer not to scroll, when watching in "real time"
- fix appending text to log view
- update statistics when tab is getting activated
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 16 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/graphwindow.cpp | 34 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/graphwindow.h | 26 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/logwindow.cpp | 12 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 9 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/packetview.cpp | 16 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/protolistview.cpp | 10 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/resource.cpp | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 61 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 70 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 5 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/opie-wellenreiter.control | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/wellenreiter.pro | 1 |
14 files changed, 154 insertions, 118 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index ae149e2..1670f93 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -17,4 +17,5 @@ | |||
17 | #include "configwindow.h" | 17 | #include "configwindow.h" |
18 | #include "mainwindow.h" | 18 | #include "mainwindow.h" |
19 | #include "protolistview.h" | ||
19 | 20 | ||
20 | /* OPIE */ | 21 | /* OPIE */ |
@@ -185,5 +186,8 @@ bool WellenreiterConfigWindow::isChannelChecked( int channel ) const | |||
185 | case 13: return channel13->isOn(); | 186 | case 13: return channel13->isOn(); |
186 | case 14: return channel14->isOn(); | 187 | case 14: return channel14->isOn(); |
188 | default: return false; | ||
187 | } | 189 | } |
190 | |||
191 | |||
188 | } | 192 | } |
189 | 193 | ||
@@ -218,5 +222,5 @@ void WellenreiterConfigWindow::synchronizeActionsAndScripts() | |||
218 | 222 | ||
219 | 223 | ||
220 | void WellenreiterConfigWindow::changedNetworkAction(int t) | 224 | void WellenreiterConfigWindow::changedNetworkAction(int ) |
221 | { | 225 | { |
222 | synchronizeActionsAndScripts(); | 226 | synchronizeActionsAndScripts(); |
@@ -224,5 +228,5 @@ void WellenreiterConfigWindow::changedNetworkAction(int t) | |||
224 | 228 | ||
225 | 229 | ||
226 | void WellenreiterConfigWindow::changedClientAction(int t) | 230 | void WellenreiterConfigWindow::changedClientAction(int ) |
227 | { | 231 | { |
228 | synchronizeActionsAndScripts(); | 232 | synchronizeActionsAndScripts(); |
@@ -230,5 +234,5 @@ void WellenreiterConfigWindow::changedClientAction(int t) | |||
230 | 234 | ||
231 | 235 | ||
232 | void WellenreiterConfigWindow::changedStationAction(int t) | 236 | void WellenreiterConfigWindow::changedStationAction(int ) |
233 | { | 237 | { |
234 | synchronizeActionsAndScripts(); | 238 | synchronizeActionsAndScripts(); |
@@ -281,5 +285,4 @@ const QString WellenreiterConfigWindow::gpsHost() const | |||
281 | int WellenreiterConfigWindow::gpsPort() const | 285 | int WellenreiterConfigWindow::gpsPort() const |
282 | { | 286 | { |
283 | bool ok; | ||
284 | return useGPS() ? gpsdPort->value() : -1; | 287 | return useGPS() ? gpsdPort->value() : -1; |
285 | } | 288 | } |
@@ -291,5 +294,5 @@ void WellenreiterConfigWindow::performAction( const QString& type, | |||
291 | bool wep, | 294 | bool wep, |
292 | int channel, | 295 | int channel, |
293 | int signal | 296 | int /* signal */ |
294 | /* , const GpsLocation& loc */ ) | 297 | /* , const GpsLocation& loc */ ) |
295 | { | 298 | { |
@@ -318,5 +321,5 @@ void WellenreiterConfigWindow::performAction( const QString& type, | |||
318 | } | 321 | } |
319 | 322 | ||
320 | odebug << "for event '" << (const char*) type << "' I'm going to perform action " << action << " (script='" << script << "')" << oendl; | 323 | odebug << "for event '" << type << "' I'm going to perform action " << action << " (script='" << script << "')" << oendl; |
321 | 324 | ||
322 | switch( action ) | 325 | switch( action ) |
@@ -405,4 +408,5 @@ void WellenreiterConfigWindow::load() | |||
405 | captureFileName->setEnabled( writeCaptureFile->isChecked() ); | 408 | captureFileName->setEnabled( writeCaptureFile->isChecked() ); |
406 | getCaptureFileName->setEnabled( writeCaptureFile->isChecked() ); | 409 | getCaptureFileName->setEnabled( writeCaptureFile->isChecked() ); |
410 | parsePackets->setEnabled( writeCaptureFile->isChecked() ); | ||
407 | captureFileName->setText( c->readEntry( "filename", "/tmp/capture" ) ); | 411 | captureFileName->setText( c->readEntry( "filename", "/tmp/capture" ) ); |
408 | hexViewBufferUnlimited->setChecked( c->readBoolEntry( "hexViewBufferUnlimited", true ) ); | 412 | hexViewBufferUnlimited->setChecked( c->readBoolEntry( "hexViewBufferUnlimited", true ) ); |
diff --git a/noncore/net/wellenreiter/gui/graphwindow.cpp b/noncore/net/wellenreiter/gui/graphwindow.cpp index b4174d3..d53421c 100644 --- a/noncore/net/wellenreiter/gui/graphwindow.cpp +++ b/noncore/net/wellenreiter/gui/graphwindow.cpp | |||
@@ -20,4 +20,31 @@ | |||
20 | #include <qtimer.h> | 20 | #include <qtimer.h> |
21 | 21 | ||
22 | /* XPM */ | ||
23 | static char * background[] = { | ||
24 | "16 16 6 1", | ||
25 | " c None", | ||
26 | ".c #52676E", | ||
27 | "+c #3F545B", | ||
28 | "@c #394E56", | ||
29 | "#c #2F454C", | ||
30 | "$c #364B52", | ||
31 | ".+++++++++++++++", | ||
32 | "@###############", | ||
33 | "+$$$$$$$$$$$$$$$", | ||
34 | "@###############", | ||
35 | "+$$$$$$$$$$$$$$$", | ||
36 | "@###############", | ||
37 | "+$$$$$$$$$$$$$$$", | ||
38 | "@###############", | ||
39 | "+$$$$$$$$$$$$$$$", | ||
40 | "@###############", | ||
41 | "+$$$$$$$$$$$$$$$", | ||
42 | "@###############", | ||
43 | "+$$$$$$$$$$$$$$$", | ||
44 | "@###############", | ||
45 | "+$$$$$$$$$$$$$$$", | ||
46 | "@###############"}; | ||
47 | |||
48 | |||
22 | MFrequencySpectrum::MFrequencySpectrum( int channels, QWidget* parent, const char* name, WFlags f) | 49 | MFrequencySpectrum::MFrequencySpectrum( int channels, QWidget* parent, const char* name, WFlags f) |
23 | :QWidget( parent, name,f ), _channels( channels ) | 50 | :QWidget( parent, name,f ), _channels( channels ) |
@@ -86,5 +113,5 @@ void MFrequencySpectrum::drawBar( QPainter* p, int x, int y, int width, int heig | |||
86 | 113 | ||
87 | 114 | ||
88 | void MFrequencySpectrum::paintEvent( QPaintEvent* e ) | 115 | void MFrequencySpectrum::paintEvent( QPaintEvent* ) |
89 | { | 116 | { |
90 | QPixmap pm( size() ); | 117 | QPixmap pm( size() ); |
@@ -119,5 +146,4 @@ void MFrequencySpectrum::mousePressEvent( QMouseEvent* e ) | |||
119 | int ymargin = 2; | 146 | int ymargin = 2; |
120 | int y = size().height() - 2 * ymargin; | 147 | int y = size().height() - 2 * ymargin; |
121 | int x = 0; | ||
122 | int width = ( size().width() - 2 * xmargin ) / _channels; | 148 | int width = ( size().width() - 2 * xmargin ) / _channels; |
123 | 149 | ||
@@ -143,6 +169,4 @@ void Legende::drawContents( QPainter* p ) | |||
143 | { | 169 | { |
144 | int xmargin = 5; | 170 | int xmargin = 5; |
145 | int ymargin = 2; | ||
146 | int x = 0; | ||
147 | int width = ( contentsRect().width() - 2 * xmargin ) / _channels; | 171 | int width = ( contentsRect().width() - 2 * xmargin ) / _channels; |
148 | 172 | ||
@@ -171,5 +195,5 @@ void MGraphWindow::testGraph() | |||
171 | 195 | ||
172 | 196 | ||
173 | void MGraphWindow::timerEvent( QTimerEvent* e ) | 197 | void MGraphWindow::timerEvent( QTimerEvent* ) |
174 | { | 198 | { |
175 | for ( int i = 0; i < 14; i++ ) | 199 | for ( int i = 0; i < 14; i++ ) |
diff --git a/noncore/net/wellenreiter/gui/graphwindow.h b/noncore/net/wellenreiter/gui/graphwindow.h index fafcab1..392d85b 100644 --- a/noncore/net/wellenreiter/gui/graphwindow.h +++ b/noncore/net/wellenreiter/gui/graphwindow.h | |||
@@ -91,30 +91,4 @@ class MGraphWindow : public QVBox | |||
91 | }; | 91 | }; |
92 | 92 | ||
93 | /* XPM */ | ||
94 | static char * background[] = { | ||
95 | "16 16 6 1", | ||
96 | " c None", | ||
97 | ".c #52676E", | ||
98 | "+c #3F545B", | ||
99 | "@c #394E56", | ||
100 | "#c #2F454C", | ||
101 | "$c #364B52", | ||
102 | ".+++++++++++++++", | ||
103 | "@###############", | ||
104 | "+$$$$$$$$$$$$$$$", | ||
105 | "@###############", | ||
106 | "+$$$$$$$$$$$$$$$", | ||
107 | "@###############", | ||
108 | "+$$$$$$$$$$$$$$$", | ||
109 | "@###############", | ||
110 | "+$$$$$$$$$$$$$$$", | ||
111 | "@###############", | ||
112 | "+$$$$$$$$$$$$$$$", | ||
113 | "@###############", | ||
114 | "+$$$$$$$$$$$$$$$", | ||
115 | "@###############", | ||
116 | "+$$$$$$$$$$$$$$$", | ||
117 | "@###############"}; | ||
118 | |||
119 | 93 | ||
120 | #endif | 94 | #endif |
diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp index 714a9a9..a83f700 100644 --- a/noncore/net/wellenreiter/gui/logwindow.cpp +++ b/noncore/net/wellenreiter/gui/logwindow.cpp | |||
@@ -31,4 +31,6 @@ MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f ) | |||
31 | ledit = new QMultiLineEdit( this ); | 31 | ledit = new QMultiLineEdit( this ); |
32 | ledit->setReadOnly( true ); | 32 | ledit->setReadOnly( true ); |
33 | ledit->setUndoEnabled( false ); | ||
34 | |||
33 | 35 | ||
34 | MLogWindow::_instance = this; | 36 | MLogWindow::_instance = this; |
@@ -39,11 +41,7 @@ void MLogWindow::log( QString text ) | |||
39 | { | 41 | { |
40 | QTime time = QTime::currentTime(); | 42 | QTime time = QTime::currentTime(); |
41 | QString line; | 43 | QString line = QString( "[%1] %2\n" ).arg(time.toString() ).arg( text ); |
42 | line.sprintf( "[%s] %s\n", (const char*) time.toString(), (const char*) text ); | 44 | ledit->insertLine( line ); |
43 | int col; | 45 | odebug << line << oendl; |
44 | int row; | ||
45 | ledit->getCursorPosition( &col, &row ); | ||
46 | ledit->insertAt( line, col, row ); | ||
47 | odebug << line << oendl; | ||
48 | } | 46 | } |
49 | 47 | ||
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index ef7ffcf..3e18531 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -32,7 +32,4 @@ | |||
32 | #include <qfiledialog.h> | 32 | #include <qfiledialog.h> |
33 | #endif | 33 | #endif |
34 | using namespace Opie::Core; | ||
35 | using namespace Opie::Net; | ||
36 | using namespace Opie::Ui; | ||
37 | 34 | ||
38 | /* QT */ | 35 | /* QT */ |
@@ -58,4 +55,8 @@ using namespace Opie::Ui; | |||
58 | #include <unistd.h> | 55 | #include <unistd.h> |
59 | 56 | ||
57 | using namespace Opie::Core; | ||
58 | using namespace Opie::Net; | ||
59 | using namespace Opie::Ui; | ||
60 | |||
60 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) | 61 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) |
61 | :QMainWindow( parent, name, f ) | 62 | :QMainWindow( parent, name, f ) |
@@ -469,5 +470,5 @@ void WellenreiterMainWindow::uploadSession() | |||
469 | } | 470 | } |
470 | 471 | ||
471 | int content_length = f.size(); | 472 | // int content_length = f.size(); |
472 | 473 | ||
473 | ::memset( &raddr, 0, sizeof (struct sockaddr_in) ); | 474 | ::memset( &raddr, 0, sizeof (struct sockaddr_in) ); |
diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp index 69438fa..d71111f 100644 --- a/noncore/net/wellenreiter/gui/packetview.cpp +++ b/noncore/net/wellenreiter/gui/packetview.cpp | |||
@@ -72,4 +72,11 @@ PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) | |||
72 | void PacketView::add( const OPacket* p, int size ) | 72 | void PacketView::add( const OPacket* p, int size ) |
73 | { | 73 | { |
74 | /* | ||
75 | * don't scroll away when somebody views packages | ||
76 | * while scanning | ||
77 | */ | ||
78 | int value = _number->value(); | ||
79 | bool last = (value == static_cast<int>( _packets.count() ) ); | ||
80 | |||
74 | odebug << "PacketView::add() size = " << size << oendl; | 81 | odebug << "PacketView::add() size = " << size << oendl; |
75 | if ( size == -1 ) // unlimited buffer | 82 | if ( size == -1 ) // unlimited buffer |
@@ -79,8 +86,12 @@ void PacketView::add( const OPacket* p, int size ) | |||
79 | else | 86 | else |
80 | { // limited buffer, limit = size | 87 | { // limited buffer, limit = size |
81 | while ( _packets.count() >= size ) | 88 | while ( _packets.count() >= static_cast<uint>( size ) ) |
82 | { | 89 | { |
83 | _packets.removeFirst(); | 90 | _packets.removeFirst(); |
91 | --value; | ||
84 | } | 92 | } |
93 | |||
94 | /* check if we lost our packet */ | ||
95 | last = ( value < 1 ); | ||
85 | _packets.append( p ); | 96 | _packets.append( p ); |
86 | } | 97 | } |
@@ -88,5 +99,5 @@ void PacketView::add( const OPacket* p, int size ) | |||
88 | _number->setMinValue( 1 ); | 99 | _number->setMinValue( 1 ); |
89 | _number->setMaxValue( _packets.count() ); | 100 | _number->setMaxValue( _packets.count() ); |
90 | _number->setValue( _packets.count() ); | 101 | _number->setValue( last ? _packets.count() : value ); |
91 | } | 102 | } |
92 | 103 | ||
@@ -140,4 +151,5 @@ void PacketView::_doHexPacket( const OPacket* p ) | |||
140 | const QString PacketView::getLog() const | 151 | const QString PacketView::getLog() const |
141 | { | 152 | { |
153 | return QString::null; | ||
142 | } | 154 | } |
143 | 155 | ||
diff --git a/noncore/net/wellenreiter/gui/protolistview.cpp b/noncore/net/wellenreiter/gui/protolistview.cpp index 635e174..1e3d195 100644 --- a/noncore/net/wellenreiter/gui/protolistview.cpp +++ b/noncore/net/wellenreiter/gui/protolistview.cpp | |||
@@ -73,9 +73,9 @@ void ProtocolListView::addProtocol( const QString& name ) | |||
73 | { | 73 | { |
74 | QHBox* hbox = new QHBox( vbox ); | 74 | QHBox* hbox = new QHBox( vbox ); |
75 | new QCheckBox( name, hbox, (const char*) name ); | 75 | new QCheckBox( name, hbox, name.local8Bit() ); |
76 | 76 | ||
77 | if ( parse ) | 77 | if ( parse ) |
78 | { | 78 | { |
79 | QComboBox* combo = new QComboBox( hbox, (const char*) name ); | 79 | QComboBox* combo = new QComboBox( hbox, name.local8Bit() ); |
80 | #ifdef QWS | 80 | #ifdef QWS |
81 | combo->setFixedWidth( 75 ); | 81 | combo->setFixedWidth( 75 ); |
@@ -93,5 +93,5 @@ void ProtocolListView::addProtocol( const QString& name ) | |||
93 | else | 93 | else |
94 | { | 94 | { |
95 | QComboBox* combo = new QComboBox( hbox, (const char*) name ); | 95 | QComboBox* combo = new QComboBox( hbox, name.local8Bit() ); |
96 | #ifdef QWS | 96 | #ifdef QWS |
97 | combo->setFixedWidth( 75 ); | 97 | combo->setFixedWidth( 75 ); |
@@ -105,5 +105,5 @@ void ProtocolListView::addProtocol( const QString& name ) | |||
105 | bool ProtocolListView::isProtocolChecked( const QString& name ) | 105 | bool ProtocolListView::isProtocolChecked( const QString& name ) |
106 | { | 106 | { |
107 | QCheckBox* box = (QCheckBox*) child( (const char*) name ); | 107 | QCheckBox* box = (QCheckBox*) child( name.local8Bit() ); |
108 | return ( box && box->isOn() ); | 108 | return ( box && box->isOn() ); |
109 | } | 109 | } |
@@ -112,5 +112,5 @@ bool ProtocolListView::isProtocolChecked( const QString& name ) | |||
112 | QString ProtocolListView::protocolAction( const QString& name ) | 112 | QString ProtocolListView::protocolAction( const QString& name ) |
113 | { | 113 | { |
114 | QComboBox* combo = (QComboBox*) child( (const char*) name, "QComboBox" ); | 114 | QComboBox* combo = (QComboBox*) child( name.local8Bit(), "QComboBox" ); |
115 | if ( combo ) | 115 | if ( combo ) |
116 | return combo->currentText(); | 116 | return combo->currentText(); |
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp index cb17f51..13096f2 100644 --- a/noncore/net/wellenreiter/gui/resource.cpp +++ b/noncore/net/wellenreiter/gui/resource.cpp | |||
@@ -26,9 +26,9 @@ QPixmap loadPixmap( const QString& pix ) | |||
26 | { | 26 | { |
27 | QString filename; | 27 | QString filename; |
28 | filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); | 28 | filename.sprintf( "%s/%s.png", PIXMAPPATH, pix.local8Bit() ); |
29 | QPixmap pixmap( filename ); | 29 | QPixmap pixmap( filename ); |
30 | if ( pixmap.isNull() ) | 30 | if ( pixmap.isNull() ) |
31 | { | 31 | { |
32 | odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; | 32 | odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; |
33 | } | 33 | } |
34 | return pixmap; | 34 | return pixmap; |
@@ -38,9 +38,9 @@ QIconSet loadIconSet( const QString& pix ) | |||
38 | { | 38 | { |
39 | QString filename; | 39 | QString filename; |
40 | filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); | 40 | filename.sprintf( "%s/%s.png", PIXMAPPATH, pix.local8Bit() ); |
41 | QPixmap pixmap( filename ); | 41 | QPixmap pixmap( filename ); |
42 | if ( pixmap.isNull() ) | 42 | if ( pixmap.isNull() ) |
43 | { | 43 | { |
44 | odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; | 44 | odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; |
45 | } | 45 | } |
46 | return QIconSet( pixmap ); | 46 | return QIconSet( pixmap ); |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 9e907d8..fa1d724 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -26,7 +26,5 @@ | |||
26 | #include "resource.h" | 26 | #include "resource.h" |
27 | #endif | 27 | #endif |
28 | using namespace Opie::Core; | 28 | |
29 | using namespace Opie::Ui; | ||
30 | using namespace Opie::Net; | ||
31 | 29 | ||
32 | /* QT */ | 30 | /* QT */ |
@@ -39,4 +37,8 @@ using namespace Opie::Net; | |||
39 | #include <assert.h> | 37 | #include <assert.h> |
40 | 38 | ||
39 | using namespace Opie::Core; | ||
40 | using namespace Opie::Ui; | ||
41 | using namespace Opie::Net; | ||
42 | |||
41 | const int col_type = 0; | 43 | const int col_type = 0; |
42 | const int col_essid = 0; | 44 | const int col_essid = 0; |
@@ -52,4 +54,6 @@ const int col_lastseen = 9; | |||
52 | const int col_location = 10; | 54 | const int col_location = 10; |
53 | 55 | ||
56 | #define DEBUG | ||
57 | |||
54 | MScanListView::MScanListView( QWidget* parent, const char* name ) | 58 | MScanListView::MScanListView( QWidget* parent, const char* name ) |
55 | :OListView( parent, name ) | 59 | :OListView( parent, name ) |
@@ -177,5 +181,5 @@ void MScanListView::addNewItem( const QString& type, | |||
177 | else | 181 | else |
178 | { | 182 | { |
179 | s.sprintf( "(i) New network: ESSID '%s'", (const char*) essid ); | 183 | s = QString( "(i) New network: ESSID '%1'" ).arg( essid ); |
180 | MLogWindow::logwindow()->log( s ); | 184 | MLogWindow::logwindow()->log( s ); |
181 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0, probe ); | 185 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0, probe ); |
@@ -196,9 +200,9 @@ void MScanListView::addNewItem( const QString& type, | |||
196 | if ( type == "managed" ) | 200 | if ( type == "managed" ) |
197 | { | 201 | { |
198 | s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel ); | 202 | s = QString( "(i) New Access Point in '%1' [%2]" ).arg( essid ).arg( channel ); |
199 | } | 203 | } |
200 | else | 204 | else |
201 | { | 205 | { |
202 | s.sprintf( "(i) New AdHoc station in '%s' [%d]", (const char*) essid, channel ); | 206 | s = QString( "(i) New AdHoc station in '%1' [%2]" ).arg( essid ).arg( channel ); |
203 | } | 207 | } |
204 | MLogWindow::logwindow()->log( s ); | 208 | MLogWindow::logwindow()->log( s ); |
@@ -235,9 +239,9 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& | |||
235 | if ( type == "station" ) | 239 | if ( type == "station" ) |
236 | { | 240 | { |
237 | s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) ); | 241 | s = QString( "(i) New Station in '%1' [xx]" ).arg( network->text( col_essid ) ); |
238 | } | 242 | } |
239 | else | 243 | else |
240 | { | 244 | { |
241 | s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) ); | 245 | s = QString( "(i) New Wireless Station in '%1' [xx]" ).arg( network->text( col_essid ) ); |
242 | } | 246 | } |
243 | MLogWindow::logwindow()->log( s ); | 247 | MLogWindow::logwindow()->log( s ); |
@@ -247,7 +251,7 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& | |||
247 | void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) | 251 | void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) |
248 | { | 252 | { |
249 | odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << viaTo.toString() << " seem to form a WDS" << oendl; | 253 | odebug << "WDSTraffic: " << viaFrom.toString() << " and " << viaTo.toString() << " seem to form a WDS" << oendl; |
250 | QString s; | 254 | QString s; |
251 | MScanListItem* network; | 255 | // MScanListItem* network; |
252 | 256 | ||
253 | QListViewItemIterator it( this ); | 257 | QListViewItemIterator it( this ); |
@@ -271,8 +275,8 @@ void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, | |||
271 | 275 | ||
272 | 276 | ||
273 | void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ) | 277 | void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& /*to*/, const OMacAddress& via ) |
274 | { | 278 | { |
275 | QString s; | 279 | QString s; |
276 | MScanListItem* network; | 280 | // MScanListItem* network; |
277 | 281 | ||
278 | QListViewItemIterator it( this ); | 282 | QListViewItemIterator it( this ); |
@@ -294,8 +298,8 @@ void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to, | |||
294 | 298 | ||
295 | 299 | ||
296 | void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ) | 300 | void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& /*to*/, const OMacAddress& via ) |
297 | { | 301 | { |
298 | QString s; | 302 | QString s; |
299 | MScanListItem* network; | 303 | // MScanListItem* network; |
300 | 304 | ||
301 | QListViewItemIterator it( this ); | 305 | QListViewItemIterator it( this ); |
@@ -316,5 +320,5 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& t | |||
316 | 320 | ||
317 | 321 | ||
318 | void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ) | 322 | void MScanListView::IBSStraffic( const OMacAddress& /*from*/, const OMacAddress& /*to*/, const OMacAddress& /*via*/ ) |
319 | { | 323 | { |
320 | owarn << "D'oh! Not yet implemented..." << oendl; | 324 | owarn << "D'oh! Not yet implemented..." << oendl; |
@@ -325,5 +329,5 @@ void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, | |||
325 | void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) | 329 | void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) |
326 | { | 330 | { |
327 | odebug << "identify " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; | 331 | odebug << "identify " << macaddr.toString() << " = " << ip << "" << oendl; |
328 | 332 | ||
329 | QListViewItemIterator it( this ); | 333 | QListViewItemIterator it( this ); |
@@ -337,6 +341,6 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) | |||
337 | } | 341 | } |
338 | odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; | 342 | odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; |
339 | MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!", | 343 | MLogWindow::logwindow()->log( QString( "WARNING: Unhandled identification %1 = %2!" ) |
340 | (const char*) macaddr.toString(), (const char*) ip ) ); | 344 | .arg( macaddr.toString() ).arg( ip ) ); |
341 | } | 345 | } |
342 | 346 | ||
@@ -344,5 +348,5 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) | |||
344 | void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip ) | 348 | void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip ) |
345 | { | 349 | { |
346 | odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; | 350 | odebug << "addService '" << name << "', Server = " << macaddr.toString() << " = " << ip << "" << oendl; |
347 | 351 | ||
348 | //TODO: Refactor that out, we need it all over the place. | 352 | //TODO: Refactor that out, we need it all over the place. |
@@ -385,6 +389,6 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr, | |||
385 | } | 389 | } |
386 | odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; | 390 | odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; |
387 | MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled service addition %s = %s!", | 391 | MLogWindow::logwindow()->log( QString("WARNING: Unhandled service addition %s = %s!") |
388 | (const char*) macaddr.toString(), (const char*) ip ) ); | 392 | .arg( macaddr.toString() ).arg( ip ) ); |
389 | } | 393 | } |
390 | 394 | ||
@@ -396,10 +400,10 @@ void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, in | |||
396 | MScanListItem* itm = static_cast<MScanListItem*>( item ); | 400 | MScanListItem* itm = static_cast<MScanListItem*>( item ); |
397 | 401 | ||
398 | odebug << "contextMenuRequested on item '" << (const char*) itm->text(0) << "' (" | 402 | odebug << "contextMenuRequested on item '" << itm->text(0) << "' (" |
399 | << (const char*) itm->type << ") in column: '" << col << "'" << oendl; | 403 | << itm->type << ") in column: '" << col << "'" << oendl; |
400 | 404 | ||
401 | if ( itm->type == "adhoc" || itm->type == "managed" ) | 405 | if ( itm->type == "adhoc" || itm->type == "managed" ) |
402 | { | 406 | { |
403 | QString entry = QString().sprintf( "&Join %s Net '%s'...", (const char*) itm->type, (const char*) itm->essid() ); | 407 | QString entry = QString( "&Join %1 Net '%2'..." ).arg( itm->type ).arg( itm->essid() ); |
404 | 408 | ||
405 | QPopupMenu m( this ); | 409 | QPopupMenu m( this ); |
@@ -480,6 +484,5 @@ void MScanListItem::serializeFrom( QDataStream& s ) | |||
480 | _wep = (wep == 'y'); | 484 | _wep = (wep == 'y'); |
481 | 485 | ||
482 | QString name; | 486 | QString name = QString( "wellenreiter/"+ _type ); |
483 | name.sprintf( "wellenreiter/%s", (const char*) _type ); | ||
484 | setPixmap( col_type, Resource::loadPixmap( name ) ); | 487 | setPixmap( col_type, Resource::loadPixmap( name ) ); |
485 | if ( _wep ) | 488 | if ( _wep ) |
@@ -491,6 +494,6 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, | |||
491 | { | 494 | { |
492 | #ifdef DEBUG | 495 | #ifdef DEBUG |
493 | odebug << "decorating scanlist item " << (const char*) type << " / " | 496 | odebug << "decorating scanlist item " << type << " / " |
494 | << (const char*) essid << " / " << (const char*) macaddr | 497 | << essid << " / " << macaddr |
495 | << "[" << channel << "]" << oendl; | 498 | << "[" << channel << "]" << oendl; |
496 | #endif | 499 | #endif |
@@ -498,5 +501,5 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, | |||
498 | // set icon for managed or adhoc mode | 501 | // set icon for managed or adhoc mode |
499 | QString name; | 502 | QString name; |
500 | name.sprintf( "wellenreiter/%s", (const char*) type ); | 503 | name.sprintf( "wellenreiter/"+ type ); |
501 | setPixmap( col_type, Resource::loadPixmap( name ) ); | 504 | setPixmap( col_type, Resource::loadPixmap( name ) ); |
502 | 505 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index e801ce7..df8e9c3 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -34,7 +34,4 @@ | |||
34 | #include <opie2/opcap.h> | 34 | #include <opie2/opcap.h> |
35 | #include <qpe/qcopenvelope_qws.h> | 35 | #include <qpe/qcopenvelope_qws.h> |
36 | using namespace Opie::Core; | ||
37 | using namespace Opie::Net; | ||
38 | using namespace Opie::Ui; | ||
39 | 36 | ||
40 | /* QT */ | 37 | /* QT */ |
@@ -61,4 +58,9 @@ using namespace Opie::Ui; | |||
61 | #include <signal.h> | 58 | #include <signal.h> |
62 | 59 | ||
60 | |||
61 | using namespace Opie::Core; | ||
62 | using namespace Opie::Net; | ||
63 | using namespace Opie::Ui; | ||
64 | |||
63 | Wellenreiter* Wellenreiter::instance = 0; | 65 | Wellenreiter* Wellenreiter::instance = 0; |
64 | 66 | ||
@@ -75,6 +77,5 @@ Wellenreiter::Wellenreiter( QWidget* parent ) | |||
75 | 77 | ||
76 | #ifdef QWS | 78 | #ifdef QWS |
77 | QString sys; | 79 | QString sys = QString( "(i) Running on '%1'.").arg( ODevice::inst()->systemString() ); |
78 | sys.sprintf( "(i) Running on '%s'.", (const char*) ODevice::inst()->systemString() ); | ||
79 | _system = ODevice::inst()->system(); | 80 | _system = ODevice::inst()->system(); |
80 | logwindow->log( sys ); | 81 | logwindow->log( sys ); |
@@ -111,4 +112,5 @@ void Wellenreiter::initialTimer() | |||
111 | void Wellenreiter::signalHandler( int sig ) | 112 | void Wellenreiter::signalHandler( int sig ) |
112 | { | 113 | { |
114 | Q_UNUSED( sig ) | ||
113 | oerr << "Aye! Received SIGSEGV or SIGBUS! Trying to exit gracefully..." << oendl; | 115 | oerr << "Aye! Received SIGSEGV or SIGBUS! Trying to exit gracefully..." << oendl; |
114 | if ( Wellenreiter::instance->sniffing ) | 116 | if ( Wellenreiter::instance->sniffing ) |
@@ -177,5 +179,5 @@ void Wellenreiter::handleNotification( OPacket* p ) | |||
177 | { | 179 | { |
178 | QString action = configwindow->parsePackets->protocolAction( name ); | 180 | QString action = configwindow->parsePackets->protocolAction( name ); |
179 | odebug << "parsePacket-action for '" << (const char*) name << "' seems to be '" << action << "'" << oendl; | 181 | odebug << "parsePacket-action for '" << name << "' seems to be '" << action << "'" << oendl; |
180 | doAction( action, name, p ); | 182 | doAction( action, name, p ); |
181 | } | 183 | } |
@@ -198,10 +200,10 @@ void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket* | |||
198 | 200 | ||
199 | 201 | ||
200 | void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* request ) | 202 | void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* /* request */ ) |
201 | { | 203 | { |
202 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); | 204 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); |
203 | QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>"); | 205 | QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>"); |
204 | OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) ); | 206 | // OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) ); |
205 | int channel = ds ? ds->channel() : -1; | 207 | // int channel = ds ? ds->channel() : -1; |
206 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); | 208 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); |
207 | 209 | ||
@@ -221,10 +223,10 @@ void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManage | |||
221 | 223 | ||
222 | 224 | ||
223 | void Wellenreiter::handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* response ) | 225 | void Wellenreiter::handleManagementFrameProbeResponse( OPacket* /* p */, OWaveLanManagementPacket* /* response */ ) |
224 | { | 226 | { |
225 | } | 227 | } |
226 | 228 | ||
227 | 229 | ||
228 | void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* beacon ) | 230 | void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* beacon ) |
229 | { | 231 | { |
230 | QString type; | 232 | QString type; |
@@ -288,5 +290,5 @@ void Wellenreiter::handleControlFrame( OPacket* p, OWaveLanControlPacket* contro | |||
288 | 290 | ||
289 | 291 | ||
290 | void Wellenreiter::handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to ) | 292 | void Wellenreiter::handleWlanData( OPacket* p, OWaveLanDataPacket* /* data */ , OMacAddress& from, OMacAddress& to ) |
291 | { | 293 | { |
292 | OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" ); | 294 | OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" ); |
@@ -318,5 +320,5 @@ void Wellenreiter::handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAdd | |||
318 | 320 | ||
319 | 321 | ||
320 | void Wellenreiter::handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to ) | 322 | void Wellenreiter::handleEthernetData( OPacket* /* p */, OEthernetPacket* data, OMacAddress& from, OMacAddress& to ) |
321 | { | 323 | { |
322 | from = data->sourceAddress(); | 324 | from = data->sourceAddress(); |
@@ -327,5 +329,5 @@ void Wellenreiter::handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAd | |||
327 | 329 | ||
328 | 330 | ||
329 | void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source, OMacAddress& dest ) | 331 | void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& /* source */, OMacAddress& /* dest */ ) |
330 | { | 332 | { |
331 | OARPPacket* arp = (OARPPacket*) p->child( "ARP" ); | 333 | OARPPacket* arp = (OARPPacket*) p->child( "ARP" ); |
@@ -346,5 +348,5 @@ void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source, | |||
346 | 348 | ||
347 | 349 | ||
348 | void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, OMacAddress& dest ) | 350 | void Wellenreiter::handleIPData( OPacket* p, OIPPacket* /* ip */, OMacAddress& source, OMacAddress& /* dest */ ) |
349 | { | 351 | { |
350 | //TODO: Implement more IP based protocols | 352 | //TODO: Implement more IP based protocols |
@@ -356,5 +358,5 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, | |||
356 | if ( dhcp->type() == "OFFER" ) | 358 | if ( dhcp->type() == "OFFER" ) |
357 | { | 359 | { |
358 | odebug << "DHCP: '" << (const char*) source.toString() << "' ('" << dhcp->serverAddress().toString() << "') seems to be a DHCP server." << oendl; | 360 | odebug << "DHCP: '" << source.toString() << "' ('" << dhcp->serverAddress().toString() << "') seems to be a DHCP server." << oendl; |
359 | netView()->identify( source, dhcp->serverAddress().toString() ); | 361 | netView()->identify( source, dhcp->serverAddress().toString() ); |
360 | netView()->addService( "DHCP", source, dhcp->serverAddress().toString() ); | 362 | netView()->addService( "DHCP", source, dhcp->serverAddress().toString() ); |
@@ -362,5 +364,5 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, | |||
362 | else if ( dhcp->type() == "ACK" ) | 364 | else if ( dhcp->type() == "ACK" ) |
363 | { | 365 | { |
364 | odebug << "DHCP: '" << (const char*) dhcp->clientMacAddress().toString() << "' ('" << dhcp->yourAddress().toString() << "') accepted the offered DHCP address." << oendl; | 366 | odebug << "DHCP: '" << dhcp->clientMacAddress().toString() << "' ('" << dhcp->yourAddress().toString() << "') accepted the offered DHCP address." << oendl; |
365 | netView()->identify( dhcp->clientMacAddress(), dhcp->yourAddress().toString() ); | 367 | netView()->identify( dhcp->clientMacAddress(), dhcp->yourAddress().toString() ); |
366 | } | 368 | } |
@@ -396,8 +398,8 @@ bool Wellenreiter::checkDumpPacket( OPacket* p ) | |||
396 | { | 398 | { |
397 | QString action = configwindow->capturePackets->protocolAction( name ); | 399 | QString action = configwindow->capturePackets->protocolAction( name ); |
398 | odebug << "capturePackets-action for '" << (const char*) name << "' seems to be '" << action << "'" << oendl; | 400 | odebug << "capturePackets-action for '" << name << "' seems to be '" << action << "'" << oendl; |
399 | if ( action == "Discard" ) | 401 | if ( action == "Discard" ) |
400 | { | 402 | { |
401 | logwindow->log( QString().sprintf( "(i) dump-discarding of '%s' packet requested.", (const char*) name ) ); | 403 | logwindow->log( QString("(i) dump-discarding of '%1' packet requested." ).arg( name ) ); |
402 | return false; | 404 | return false; |
403 | } | 405 | } |
@@ -521,7 +523,5 @@ void Wellenreiter::stopClicked() | |||
521 | #endif | 523 | #endif |
522 | 524 | ||
523 | // print out statistics | 525 | updateStatistics(); |
524 | for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it ) | ||
525 | statwindow->updateCounter( it.key(), it.data() ); | ||
526 | } | 526 | } |
527 | 527 | ||
@@ -533,5 +533,5 @@ void Wellenreiter::startClicked() | |||
533 | const QString& interface = configwindow->interfaceName->currentText(); | 533 | const QString& interface = configwindow->interfaceName->currentText(); |
534 | const int cardtype = configwindow->driverType(); | 534 | const int cardtype = configwindow->driverType(); |
535 | const int interval = configwindow->hoppingInterval(); | 535 | // const int interval = configwindow->hoppingInterval(); |
536 | 536 | ||
537 | if ( ( interface == "" ) || ( cardtype == 0 ) ) | 537 | if ( ( interface == "" ) || ( cardtype == 0 ) ) |
@@ -705,5 +705,5 @@ void Wellenreiter::timerEvent( QTimerEvent* ) | |||
705 | 705 | ||
706 | 706 | ||
707 | void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p ) | 707 | void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* /* p */ ) |
708 | { | 708 | { |
709 | #ifdef QWS | 709 | #ifdef QWS |
@@ -719,8 +719,8 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa | |||
719 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); | 719 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); |
720 | else if ( action == "LogMessage" ) | 720 | else if ( action == "LogMessage" ) |
721 | logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); | 721 | logwindow->log( QString(tr("Got packet with protocol '%1'","Protocol Name" ) ).arg( protocol ) ); |
722 | else if ( action == "MessageBox" ) | 722 | else if ( action == "MessageBox" ) |
723 | QMessageBox::information( this, "Notification!", | 723 | QMessageBox::information( this, "Notification!", |
724 | QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); | 724 | QString(tr( "Got packet with protocol '%1'", "Protocol Name" ) ).arg( protocol ) ); |
725 | #else | 725 | #else |
726 | #warning Actions do not work with Qt/X11 yet | 726 | #warning Actions do not work with Qt/X11 yet |
@@ -743,7 +743,7 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch | |||
743 | } | 743 | } |
744 | 744 | ||
745 | odebug << "joinNetwork() with Interface " << (const char*) iface->name() | 745 | odebug << "joinNetwork() with Interface " << iface->name() |
746 | << ": " << (const char*) type << ", " << (const char*) essid | 746 | << ": " << type << ", " << essid |
747 | << ", " << channel << ", " << (const char*) macaddr << oendl; | 747 | << ", " << channel << ", " << macaddr << oendl; |
748 | 748 | ||
749 | QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" ); | 749 | QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" ); |
@@ -765,2 +765,14 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch | |||
765 | } | 765 | } |
766 | 766 | ||
767 | void Wellenreiter::updateStatistics() | ||
768 | { | ||
769 | // print out statistics | ||
770 | for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it ) | ||
771 | statwindow->updateCounter( it.key(), it.data() ); | ||
772 | } | ||
773 | |||
774 | void Wellenreiter::slotTabChanged( QWidget* wid ) | ||
775 | { | ||
776 | if ( wid == statwindow ) | ||
777 | updateStatistics(); | ||
778 | } | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index f582a5f..5ac389e 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -94,5 +94,10 @@ class Wellenreiter : public WellenreiterBase { | |||
94 | void registerSignalHandler(); | 94 | void registerSignalHandler(); |
95 | 95 | ||
96 | private slots: | ||
97 | void slotTabChanged( QWidget* ); | ||
98 | |||
96 | private: | 99 | private: |
100 | void updateStatistics(); | ||
101 | |||
97 | #ifdef QWS | 102 | #ifdef QWS |
98 | Opie::Core::OSystem _system; // Opie Operating System identifier | 103 | Opie::Core::OSystem _system; // Opie Operating System identifier |
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index a29d520..0ca0bd7 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -159,4 +159,6 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
159 | #endif | 159 | #endif |
160 | 160 | ||
161 | connect(TabWidget, SIGNAL(currentChanged(QWidget*)), | ||
162 | this, SLOT(slotTabChanged(QWidget*))); | ||
161 | } | 163 | } |
162 | 164 | ||
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control index cbc287a..e7bc25d 100644 --- a/noncore/net/wellenreiter/opie-wellenreiter.control +++ b/noncore/net/wellenreiter/opie-wellenreiter.control | |||
@@ -5,5 +5,5 @@ 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.3 | 7 | Version: 1.0.3-cvs |
8 | Depends: libqpe1, libpcap0 (>=0.7.2), libopiecore2, libopienet2, libopieui2 | 8 | Depends: libqpe1, libpcap0 (>=0.7.2), libopiecore2, libopienet2, libopieui2 |
9 | Description: A WaveLAN Network Monitor | 9 | Description: A WaveLAN Network Monitor |
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro index eb60c4a..53b762a 100644 --- a/noncore/net/wellenreiter/wellenreiter.pro +++ b/noncore/net/wellenreiter/wellenreiter.pro | |||
@@ -1,3 +1,4 @@ | |||
1 | TEMPLATE = subdirs | 1 | TEMPLATE = subdirs |
2 | VERSION = 1.0.3-cvs | ||
2 | 3 | ||
3 | !contains( platform, x11 ) { | 4 | !contains( platform, x11 ) { |