28 files changed, 175 insertions, 53 deletions
diff --git a/noncore/net/wellenreiter/ChangeLog b/noncore/net/wellenreiter/ChangeLog index 6c2e52b..fdc8aa7 100644 --- a/noncore/net/wellenreiter/ChangeLog +++ b/noncore/net/wellenreiter/ChangeLog @@ -2,2 +2,4 @@ + * Added sanity check isPresent(interface) before starting the engine. + * Added a View submenu. Added actions to expand and collapse all items. * Switched to a (hopefully) more reliable method reading from gpsd. @@ -11,3 +13,3 @@ * Added command line option "-nocheck" to skip non-root and dhcp tests. - * Improved the speed reading the manufacturer list. + * Improved the speed of and user feedback during reading the manufacturer list. * GPS coordinates are now presented in the DMS (as opposed to decimal) format. diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO index 01e731f..f3fd205 100644 --- a/noncore/net/wellenreiter/TODO +++ b/noncore/net/wellenreiter/TODO @@ -42,4 +42,2 @@ ENGINE -- expand/collapse all - - add configuration for scrollback buffer in hex window and log window diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui index 469effe..113e783 100644 --- a/noncore/net/wellenreiter/gui/configbase.ui +++ b/noncore/net/wellenreiter/gui/configbase.ui @@ -13,3 +13,3 @@ <y>0</y> - <width>250</width> + <width>246</width> <height>371</height> @@ -48,2 +48,6 @@ </property> + <property> + <name>whatsThis</name> + <string></string> + </property> <widget> @@ -229,2 +233,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Retrigger the autodetection algorithm</string> + </property> </widget> @@ -242,2 +250,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Use additional PRISM headers, if available.</string> + </property> </widget> @@ -293,2 +305,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Check this, if you want to start a channel hopper.</string> + </property> </widget> @@ -356,2 +372,6 @@ </property> + <property> + <name>whatsThis</name> + <string>An adaptive hopping interval dynamically changes the channel hopping parameters to listen longer on channels where traffic comes in.</string> + </property> </widget> @@ -377,2 +397,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Check the channels which should be included in the channel hopping scheme. Note that due to the 802.11 channel overlay scheme you may receive data on neighbour channels of channels, even if they're not checked here.</string> + </property> <grid> @@ -606,2 +630,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Configure the name of the capture file.</string> + </property> </widget> @@ -621,2 +649,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Click to open a file requester to choose a capture file name.</string> + </property> </widget> @@ -657,2 +689,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Check this to write an ethereal compatible capture file.</string> + </property> </widget> @@ -724,2 +760,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Check this to lookup MAC vendor names.</string> + </property> </widget> @@ -735,2 +775,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Check this to automatically make a tree visible when a new station is detected.</string> + </property> </widget> @@ -746,2 +790,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Check this to disable power management while scanning.</string> + </property> </widget> @@ -883,2 +931,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Choose an action to perform when a new wireless station is detected.</string> + </property> </widget> @@ -894,2 +946,6 @@ </property> + <property> + <name>whatsThis</name> + <string>The command line to execute when a script action is performed.</string> + </property> </widget> @@ -949,2 +1005,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Choose the action to perform when a new wired station is detected.</string> + </property> </widget> @@ -997,2 +1057,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Choose an action to perform when a new network is detected.</string> + </property> </widget> @@ -1008,2 +1072,6 @@ </property> + <property> + <name>whatsThis</name> + <string>The command line to execute when a script action is performed.</string> + </property> </widget> @@ -1019,2 +1087,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Choose an action to perform when a new wireless station is detected.</string> + </property> </widget> @@ -1283,2 +1355,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Check this to log GPS coordinates.</string> + </property> </widget> @@ -1334,2 +1410,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Hostadress where the gps daemon listens on.</string> + </property> </widget> @@ -1368,2 +1448,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Port number where the gps daemon listens on.</string> + </property> </widget> @@ -1381,2 +1465,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Check to start the GPS daemon on localhost.</string> + </property> </widget> @@ -1396,2 +1484,6 @@ </property> + <property> + <name>whatsThis</name> + <string>Command line to start the gps daemon.</string> + </property> </widget> diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 48fe89c..95b03d0 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h index d31d1e8..0a5b3bd 100644 --- a/noncore/net/wellenreiter/gui/configwindow.h +++ b/noncore/net/wellenreiter/gui/configwindow.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp index b845aa1..a47b4ec 100644 --- a/noncore/net/wellenreiter/gui/gps.cpp +++ b/noncore/net/wellenreiter/gui/gps.cpp @@ -3,3 +3,3 @@ ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/gps.h b/noncore/net/wellenreiter/gui/gps.h index cfe1cdb..5629fec 100644 --- a/noncore/net/wellenreiter/gui/gps.h +++ b/noncore/net/wellenreiter/gui/gps.h @@ -3,3 +3,3 @@ ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/graphwindow.cpp b/noncore/net/wellenreiter/gui/graphwindow.cpp index b116b91..b4174d3 100644 --- a/noncore/net/wellenreiter/gui/graphwindow.cpp +++ b/noncore/net/wellenreiter/gui/graphwindow.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/graphwindow.h b/noncore/net/wellenreiter/gui/graphwindow.h index 1e00ae7..fafcab1 100644 --- a/noncore/net/wellenreiter/gui/graphwindow.h +++ b/noncore/net/wellenreiter/gui/graphwindow.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 7957d4c..cfb9873 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro @@ -13,2 +13,3 @@ HEADERS = wellenreiterbase.h \ graphwindow.h \ + packetview.h \ protolistview.h \ @@ -26,2 +27,3 @@ SOURCES = main.cpp \ graphwindow.cpp \ + packetview.cpp \ protolistview.cpp \ diff --git a/noncore/net/wellenreiter/gui/hexwindow.cpp b/noncore/net/wellenreiter/gui/hexwindow.cpp index 2f011ca..cbf3217 100644 --- a/noncore/net/wellenreiter/gui/hexwindow.cpp +++ b/noncore/net/wellenreiter/gui/hexwindow.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/hexwindow.h b/noncore/net/wellenreiter/gui/hexwindow.h index 3d4ec0f..71c6f25 100644 --- a/noncore/net/wellenreiter/gui/hexwindow.h +++ b/noncore/net/wellenreiter/gui/hexwindow.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp index 6078fa2..1c72cf4 100644 --- a/noncore/net/wellenreiter/gui/logwindow.cpp +++ b/noncore/net/wellenreiter/gui/logwindow.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/logwindow.h b/noncore/net/wellenreiter/gui/logwindow.h index da8c274..7877003 100644 --- a/noncore/net/wellenreiter/gui/logwindow.h +++ b/noncore/net/wellenreiter/gui/logwindow.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index 8ef62e9..be7a528 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp @@ -3,3 +3,3 @@ ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 95a8294..6f57a7f 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** @@ -39,2 +39,3 @@ #include <qtoolbutton.h> +#include <qwhatsthis.h> @@ -62,4 +63,4 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n - #ifndef QWS setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) ); + #ifndef QWS setIconText( "Wellenreiter/X11" ); @@ -70,2 +71,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n startButton = new QToolButton( 0 ); + QWhatsThis::add( startButton, tr( "Click here to start scanning." ) ); #ifdef QWS @@ -78,2 +80,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n stopButton = new QToolButton( 0 ); + QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) ); #ifdef QWS @@ -86,2 +89,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n QToolButton* d = new QToolButton( 0 ); + QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ), #ifdef QWS @@ -93,2 +97,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n uploadButton = new QToolButton( 0 ); + QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) ); #ifdef QWS @@ -125,5 +130,2 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n - QPopupMenu* view = new QPopupMenu( mb ); - view->insertItem( tr( "&Configure..." ) ); - QPopupMenu* sniffer = new QPopupMenu( mb ); @@ -136,2 +138,6 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n + QPopupMenu* view = new QPopupMenu( mb ); + view->insertItem( tr( "&Expand All" ), this, SLOT( viewExpandAll() ) ); + view->insertItem( tr( "&Collapse All" ), this, SLOT( viewCollapseAll() ) ); + QPopupMenu* demo = new QPopupMenu( mb ); @@ -141,4 +147,6 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n id = mb->insertItem( tr( "&File" ), file ); - //id = mb->insertItem( tr( "&View" ), view ); + + id = mb->insertItem( tr( "&View" ), view ); //mb->setItemEnabled( id, false ); + id = mb->insertItem( tr( "&Sniffer" ), sniffer ); @@ -555 +563,11 @@ void WellenreiterMainWindow::uploadSession() + +void WellenreiterMainWindow::viewExpandAll() +{ + mw->netView()->expand(); +} + +void WellenreiterMainWindow::viewCollapseAll() +{ + mw->netView()->collapse(); +} diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h index a5cb7a5..9593241 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.h +++ b/noncore/net/wellenreiter/gui/mainwindow.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** @@ -60,2 +60,5 @@ class WellenreiterMainWindow: public QMainWindow void changedSniffingState(); + + void viewExpandAll(); + void viewCollapseAll(); }; diff --git a/noncore/net/wellenreiter/gui/protolistview.cpp b/noncore/net/wellenreiter/gui/protolistview.cpp index ed22bdd..635e174 100644 --- a/noncore/net/wellenreiter/gui/protolistview.cpp +++ b/noncore/net/wellenreiter/gui/protolistview.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/protolistview.h b/noncore/net/wellenreiter/gui/protolistview.h index 8b460cb..11f4375 100644 --- a/noncore/net/wellenreiter/gui/protolistview.h +++ b/noncore/net/wellenreiter/gui/protolistview.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp index 5e5ddc6..d98ef0b 100644 --- a/noncore/net/wellenreiter/gui/resource.cpp +++ b/noncore/net/wellenreiter/gui/resource.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/resource.h b/noncore/net/wellenreiter/gui/resource.h index 8788c6e..85490b3 100644 --- a/noncore/net/wellenreiter/gui/resource.h +++ b/noncore/net/wellenreiter/gui/resource.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index c75f9b1..6005818 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** @@ -51,3 +51,2 @@ MScanListView::MScanListView( QWidget* parent, const char* name ) { - setFrameShape( QListView::StyledPanel ); diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index cbacdee..ab870c2 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/statwindow.cpp b/noncore/net/wellenreiter/gui/statwindow.cpp index a9ae661..48e4847 100644 --- a/noncore/net/wellenreiter/gui/statwindow.cpp +++ b/noncore/net/wellenreiter/gui/statwindow.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/statwindow.h b/noncore/net/wellenreiter/gui/statwindow.h index 0ab4b50..b9057e7 100644 --- a/noncore/net/wellenreiter/gui/statwindow.h +++ b/noncore/net/wellenreiter/gui/statwindow.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index db68e5b..67e3940 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -514,3 +514,11 @@ void Wellenreiter::startClicked() + if ( !net->isPresent( interface ) ) + { + QMessageBox::information( this, "Wellenreiter II", + tr( "The configured device (%1)\nis not available on this system\n. Please reconfigure!" ).arg( interface ) ); + return; + } + iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless! + assert( iface ); diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index b8b6730..f57dba2 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h index 2cc273e..5e00ddc 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.h +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. +** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. ** -** This file is part of Opie Environment. +** This file is part of Wellenreiter II. ** |