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
@@ -1,6 +1,8 @@
         2004-??-??      Michael Lauer   <mickey@Vanille.de>
 
+        * 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.
         * Added parsing of named ProbeRequests. Display only-probed-yet SSIDs in a different network color.
         * Rewrote the simple actions on new {Network, Client, Station}. Besides playing a sound or
           blinking a LED, a user customizable script can now be executed, if something has been
@@ -8,9 +10,9 @@
         * Added decloaking of cloaked ESSIDs (length != 0, but essid[0] == \0).
         * Hided the 'Parse' Tab in the configuration window. Not functional now and may come later
         * Added parsing of control frames. Display stations sending them SSID "<unknown>" for now.
         * 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.
 
         2003-12-18      Michael Lauer   <mickey@Vanille.de>
 
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
@@ -39,10 +39,8 @@ ENGINE
 - display interface capabilities (or rewrite networksettings?)
 
 - distinguish wireless bridges (WDS traffic)
 
-- expand/collapse all
-
 - add configuration for scrollback buffer in hex window and log window
 
 - revamp hex window, make it more sophisticated than just a QMultiLineEdit
   - tree view
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
@@ -10,9 +10,9 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>250</width>
+            <width>246</width>
             <height>371</height>
         </rect>
     </property>
     <property stdset="1">
@@ -45,8 +45,12 @@
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
+            <property>
+                <name>whatsThis</name>
+                <string></string>
+            </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
@@ -226,8 +230,12 @@
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Perform Autodetection</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Retrigger the autodetection algorithm</string>
+                                </property>
                             </widget>
                         </hbox>
                     </widget>
                     <widget>
@@ -239,8 +247,12 @@
                         <property stdset="1">
                             <name>text</name>
                             <string>Use additional PRISM header</string>
                         </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string>Use additional PRISM headers, if available.</string>
+                        </property>
                     </widget>
                     <spacer>
                         <property>
                             <name>name</name>
@@ -290,8 +302,12 @@
                                 <property stdset="1">
                                     <name>checked</name>
                                     <bool>true</bool>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Check this, if you want to start a channel hopper.</string>
+                                </property>
                             </widget>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
@@ -353,8 +369,12 @@
                         <property stdset="1">
                             <name>text</name>
                             <string>Use Adaptive(TM) Hop Scheme</string>
                         </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>
                     <widget>
                         <class>QGroupBox</class>
                         <property stdset="1">
@@ -374,8 +394,12 @@
                         </property>
                         <property>
                             <name>layoutSpacing</name>
                         </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>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>4</number>
@@ -603,8 +627,12 @@
                         <property stdset="1">
                             <name>text</name>
                             <string>/tmp/capture</string>
                         </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string>Configure the name of the capture file.</string>
+                        </property>
                     </widget>
                     <widget row="0"  column="2" >
                         <class>QToolButton</class>
                         <property stdset="1">
@@ -618,8 +646,12 @@
                         <property stdset="1">
                             <name>text</name>
                             <string>Browse</string>
                         </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string>Click to open a file requester to choose a capture file name.</string>
+                        </property>
                     </widget>
                     <spacer row="0"  column="1" >
                         <property>
                             <name>name</name>
@@ -654,8 +686,12 @@
                         <property stdset="1">
                             <name>text</name>
                             <string>Write Capture Files To</string>
                         </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string>Check this to write an ethereal compatible capture file.</string>
+                        </property>
                     </widget>
                 </grid>
             </widget>
             <widget>
@@ -721,8 +757,12 @@
                         <property stdset="1">
                             <name>text</name>
                             <string>Lookup MAC vendor names</string>
                         </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string>Check this to lookup MAC vendor names.</string>
+                        </property>
                     </widget>
                     <widget>
                         <class>QCheckBox</class>
                         <property stdset="1">
@@ -732,8 +772,12 @@
                         <property stdset="1">
                             <name>text</name>
                             <string>Open Tree On New Station</string>
                         </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string>Check this to automatically make a tree visible when a new station is detected.</string>
+                        </property>
                     </widget>
                     <widget>
                         <class>QCheckBox</class>
                         <property stdset="1">
@@ -743,8 +787,12 @@
                         <property stdset="1">
                             <name>text</name>
                             <string>Disable Power Management</string>
                         </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string>Check this to disable power management while scanning.</string>
+                        </property>
                     </widget>
                     <spacer>
                         <property>
                             <name>name</name>
@@ -880,8 +928,12 @@
                                                 <hsizetype>7</hsizetype>
                                                 <vsizetype>0</vsizetype>
                                             </sizepolicy>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>Choose an action to perform when a new wireless station is detected.</string>
+                                        </property>
                                     </widget>
                                     <widget row="3"  column="0"  rowspan="1"  colspan="2" >
                                         <class>QLineEdit</class>
                                         <property stdset="1">
@@ -891,8 +943,12 @@
                                         <property stdset="1">
                                             <name>enabled</name>
                                             <bool>true</bool>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>The command line to execute when a script action is performed.</string>
+                                        </property>
                                     </widget>
                                     <widget row="2"  column="0" >
                                         <class>QLabel</class>
                                         <property stdset="1">
@@ -946,8 +1002,12 @@
                                                 <hsizetype>7</hsizetype>
                                                 <vsizetype>0</vsizetype>
                                             </sizepolicy>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>Choose the action to perform when a new wired station is detected.</string>
+                                        </property>
                                     </widget>
                                     <widget row="0"  column="1" >
                                         <class>QComboBox</class>
                                         <item>
@@ -994,8 +1054,12 @@
                                         <property stdset="1">
                                             <name>editable</name>
                                             <bool>false</bool>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>Choose an action to perform when a new network is detected.</string>
+                                        </property>
                                     </widget>
                                     <widget row="1"  column="0"  rowspan="1"  colspan="2" >
                                         <class>QLineEdit</class>
                                         <property stdset="1">
@@ -1005,8 +1069,12 @@
                                         <property stdset="1">
                                             <name>enabled</name>
                                             <bool>true</bool>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>The command line to execute when a script action is performed.</string>
+                                        </property>
                                     </widget>
                                     <widget row="5"  column="0"  rowspan="1"  colspan="2" >
                                         <class>QLineEdit</class>
                                         <property stdset="1">
@@ -1016,8 +1084,12 @@
                                         <property stdset="1">
                                             <name>enabled</name>
                                             <bool>true</bool>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>Choose an action to perform when a new wireless station is detected.</string>
+                                        </property>
                                     </widget>
                                 </grid>
                             </widget>
                         </grid>
@@ -1280,8 +1352,12 @@
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Enable GPS logging w/ gpsd</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Check this to log GPS coordinates.</string>
+                                </property>
                             </widget>
                             <widget>
                                 <class>QLayoutWidget</class>
                                 <property stdset="1">
@@ -1331,8 +1407,12 @@
                                         <property stdset="1">
                                             <name>currentItem</name>
                                             <number>0</number>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>Hostadress where the gps daemon listens on.</string>
+                                        </property>
                                     </widget>
                                     <widget>
                                         <class>QLabel</class>
                                         <property stdset="1">
@@ -1365,8 +1445,12 @@
                                         <property stdset="1">
                                             <name>value</name>
                                             <number>2947</number>
                                         </property>
+                                        <property>
+                                            <name>whatsThis</name>
+                                            <string>Port number where the gps daemon listens on.</string>
+                                        </property>
                                     </widget>
                                 </hbox>
                             </widget>
                             <widget>
@@ -1378,8 +1462,12 @@
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Start gpsd on localhost</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Check to start the GPS daemon on localhost.</string>
+                                </property>
                             </widget>
                             <widget>
                                 <class>QLineEdit</class>
                                 <property stdset="1">
@@ -1393,8 +1481,12 @@
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>gpsd -p /dev/ttyS3 -s 4800</string>
                                 </property>
+                                <property>
+                                    <name>whatsThis</name>
+                                    <string>Command line to start the gps daemon.</string>
+                                </property>
                             </widget>
                             <spacer>
                                 <property>
                                     <name>name</name>
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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
@@ -1,8 +1,8 @@
 /**********************************************************************
 ** Copyright (C) 2003 Michael 'Mickey' Lauer.  All rights reserved.
 **
-** This file is part of Opie Environment.
+** This file is part of Wellenreiter II.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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
@@ -1,8 +1,8 @@
 /**********************************************************************
 ** Copyright (C) 2003 Michael 'Mickey' Lauer.  All rights reserved.
 **
-** This file is part of Opie Environment.
+** This file is part of Wellenreiter II.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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
@@ -10,8 +10,9 @@ HEADERS         = wellenreiterbase.h \
                   hexwindow.h \
                   statwindow.h \
                   configwindow.h \
                   graphwindow.h \
+                  packetview.h \
                   protolistview.h \
                   gps.h
 
 SOURCES         = main.cpp \
@@ -23,8 +24,9 @@ SOURCES         = main.cpp \
                   hexwindow.cpp \
                   statwindow.cpp \
                   configwindow.cpp \
                   graphwindow.cpp \
+                  packetview.cpp \
                   protolistview.cpp \
                   gps.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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
@@ -1,8 +1,8 @@
 /**********************************************************************
 ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
-** This file is part of Opie Environment.
+** This file is part of Wellenreiter II.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -36,8 +36,9 @@
 #include <qstatusbar.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 #include <qtoolbutton.h>
+#include <qwhatsthis.h>
 
 #ifdef QWS
 #include <qpe/resource.h>
 #include <opie2/ofiledialog.h>
@@ -59,39 +60,43 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     setCentralWidget( mw );
 
     // setup application icon
 
-    #ifndef QWS
     setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
+    #ifndef QWS
     setIconText( "Wellenreiter/X11" );
     #endif
 
     // setup tool buttons
 
     startButton = new QToolButton( 0 );
+    QWhatsThis::add( startButton, tr( "Click here to start scanning." ) );
     #ifdef QWS
     startButton->setAutoRaise( true );
     #endif
     startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) );
     startButton->setEnabled( false );
     connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) );
 
     stopButton = new QToolButton( 0 );
+    QWhatsThis::add( stopButton, tr( "Click here to stop scanning." ) );
     #ifdef QWS
     stopButton->setAutoRaise( true );
     #endif
     stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) );
     stopButton->setEnabled( false );
     connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
 
     QToolButton* d = new QToolButton( 0 );
+    QWhatsThis::add( d, tr( "Click here to open the configure dialog." ) ),
     #ifdef QWS
     d->setAutoRaise( true );
     #endif
     d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) );
     connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
 
     uploadButton = new QToolButton( 0 );
+    QWhatsThis::add( uploadButton, tr( "Click here to upload a capture session." ) );
     #ifdef QWS
     uploadButton->setAutoRaise( true );
     #endif
     uploadButton->setIconSet( Resource::loadIconSet( "up" ) );
@@ -122,26 +127,29 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) );
     file->insertSeparator();
     file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
 
-    QPopupMenu* view = new QPopupMenu( mb );
-    view->insertItem( tr( "&Configure..." ) );
-
     QPopupMenu* sniffer = new QPopupMenu( mb );
     sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
     sniffer->insertSeparator();
     startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) );
     sniffer->setItemEnabled( startID, false );
     stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
     sniffer->setItemEnabled( stopID, false );
 
+    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 );
     demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
     //demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) );
 
     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 );
 
     id = mb->insertItem( tr( "&Demo" ), demo );
     mb->setItemEnabled( id, true );
@@ -552,4 +560,14 @@ void WellenreiterMainWindow::uploadSession()
     QMessageBox::warning( 0, tr( "Error" ),
                           QString ( "<p>%1</p>" ).arg ( tr( "Connection to %1 failed" ) ).arg( CAP_hostname ) );
 }
 
+
+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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -57,7 +57,10 @@ class WellenreiterMainWindow: public QMainWindow
     void fileLoadSession();
     void fileNew();
     void uploadSession();
     void changedSniffingState();
+
+    void viewExpandAll();
+    void viewCollapseAll();
 };
 
 #endif
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -48,9 +48,8 @@ const int col_location = 10;
 
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name )
 {
-
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
 
     addColumn( tr( "Net/Station" ) );
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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
@@ -511,9 +511,17 @@ void Wellenreiter::startClicked()
     ONetwork* net = ONetwork::instance();
 
     // TODO: check if interface is wireless and support sniffing for non-wireless interfaces
 
+    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 );
 
     // bring device UP
     if ( cardtype != DEVTYPE_FILE )
     {
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
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,8 +1,8 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the