start work on graph window

7 files changed, 299 insertions, 4 deletions

diff --git a/noncore/net/wellenreiter/gui/graphwindow.cpp b/noncore/net/wellenreiter/gui/graphwindow.cpp
new file mode 100644
index 0000000..c620fe2
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/graphwindow.cpp
@@ -0,0 +1,159 @@
+/**********************************************************************
+** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
+**
+** This file is part of Opie Environment.
+**
+** 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
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
+
+#include "graphwindow.h"
+
+#include <qpainter.h>
+#include <qpixmap.h>
+#include <qtimer.h>
+
+MFrequencySpectrum::MFrequencySpectrum( int channels, QWidget* parent, const char* name, WFlags f)
+                   :QWidget( parent, name,f ), _channels( channels )
+{
+    _values = new int[_channels];
+    _dirty = new bool[_channels];
+    for ( int i = 0; i < channels; ++i )
+    {   _values[i] = 0;
+        _dirty[i] = true;
+    }
+
+    // we draw everything alone
+    setBackgroundMode( QWidget::NoBackground );
+}
+
+
+void MFrequencySpectrum::drawLine( QPainter* p, int x, int y, int width, const QColor& c )
+{
+    p->setPen( c.light() );
+    p->drawPoint( x++, y );
+    p->setPen( c );
+    p->drawLine( x, y, x+width-2, y );
+    p->setPen( c.dark() );
+    p->drawPoint( x+width-1, y );
+}
+
+
+void MFrequencySpectrum::drawBar( QPainter* p, int x, int y, int width, int height, int maxheight )
+{
+/*    int h1 = 133; int h2 = 0;
+    int s1 = 200; int s2 = 255;
+    int v1 = 140; int v2 = 255; */
+
+    int h1 = 196; int h2 = 194;
+    int s1 = 85; int s2 = 15;
+    int v1 = 95; int v2 = 237;
+
+    QColor c( 120, 60, 200 );
+    for ( int i = 0; i < height; ++i )
+    {
+        int h = (h2-h1)*i/maxheight + h1;
+        int s = (s2-s1)*i/maxheight + s1;
+        int v = (v2-v1)*i/maxheight + v1;
+        drawLine( p, x, y-i, width, QColor( h,s,v, QColor::Hsv ) );
+    }
+
+    /*for ( int i = height; i < maxheight; ++i )
+        drawLine( p, x, y-i, width, QColor( 47, 68, 76 ) );*/
+
+}
+
+
+void MFrequencySpectrum::paintEvent( QPaintEvent* e )
+{
+    QPixmap pm( size() );
+    QPainter p;
+    p.begin( &pm );
+    p.drawTiledPixmap( 0, 0, size().width(), size().height(), QPixmap( (const char**) &background ) );
+
+    int xmargin = 5;
+    int ymargin = 2;
+    int y = size().height() - 2 * ymargin;
+    int x = 0;
+    int width = ( size().width() - 2 * xmargin ) / _channels;
+
+    for ( int i = 0; i < _channels; ++i )
+    {
+        if ( _dirty[i] )
+        {
+            drawBar( &p, xmargin + x, y - ymargin, width-3, _values[i]*y/100, y );
+            _dirty[i] = false;
+        }
+        x+= width;
+    }
+
+    p.end();
+    bitBlt( this, 0, 0, &pm );
+}
+
+
+Legende::Legende( int channels, QWidget* parent, const char* name, WFlags f )
+        :QFrame( parent, name, f ), _channels( channels )
+{
+    setLineWidth( 2 );
+    setFrameStyle( Panel + Sunken );
+    setFixedHeight( 16 );
+
+}
+
+
+void Legende::drawContents( QPainter* p )
+{
+    int xmargin = 5;
+    int ymargin = 2;
+    int x = 0;
+    int width = ( contentsRect().width() - 2 * xmargin ) / _channels;
+
+    for ( int i = 0; i < _channels; ++i )
+        p->drawText( xmargin + (width*i), 12, QString().sprintf( "%02d", i+1 ) );
+}
+
+
+MGraphWindow::MGraphWindow( QWidget* parent, const char* name, WFlags f )
+             :QVBox( parent, name, f )
+{
+    spectrum = new MFrequencySpectrum( 14, this );
+    legende = new Legende( 14, this );
+    startTimer( 50 );
+
+    //testGraph();
+
+};
+
+
+void MGraphWindow::testGraph()
+{
+    static int i = 0;
+    spectrum->setValue( i++, 100 );
+    if ( i == 14 ) i = 0;
+    QTimer::singleShot( 2000, this, SLOT( testGraph() ) );
+
+}
+
+
+void MGraphWindow::timerEvent( QTimerEvent* e )
+{
+    for ( int i = 0; i < 14; i++ )
+    {
+        spectrum->decrease( i, 4 );
+    }
+    spectrum->repaint();
+}
+
+
+void MGraphWindow::traffic( int channel, int signal )
+{
+    spectrum->setValue( channel-1, signal );
+}
+
diff --git a/noncore/net/wellenreiter/gui/graphwindow.h b/noncore/net/wellenreiter/gui/graphwindow.h
new file mode 100644
index 0000000..4050065
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/graphwindow.h
@@ -0,0 +1,118 @@
+/**********************************************************************
+** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
+**
+** This file is part of Opie Environment.
+**
+** 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
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+**********************************************************************/
+
+#ifndef GRAPHWINDOW_H
+#define GRAPHWINDOW_H
+
+#include <qwidget.h>
+#include <qvbox.h>
+
+class MFrequencySpectrum : public QWidget
+{
+  public:
+    MFrequencySpectrum( int channels, QWidget* parent = 0, const char* name = "MFrequencySpectrum", WFlags f = 0 );
+    int value( int channel ) const { return _values[channel]; };
+    void setValue( int channel, int value )
+    {
+        if ( value > _values[channel] )
+        {
+            _values[channel] = value;
+            _dirty[channel] = true;
+        }
+    };
+    void decrease( int channel, int amount )
+    {
+        if ( _values[channel] >= amount )
+        {
+            _values[channel] -= amount;
+            _dirty[channel] = true;
+        }
+    };
+
+  protected:
+    virtual void paintEvent( QPaintEvent* );
+
+    void drawLine( QPainter* p, int x, int y, int width, const QColor& c );
+    void MFrequencySpectrum::drawBar( QPainter* p, int x, int y, int width, int height, int maxheight );
+
+  private:
+    int _channels;
+    int* _values;
+    bool* _dirty;
+};
+
+
+class Legende : public QFrame
+{
+  public:
+    Legende( int channels, QWidget* parent = 0, const char* name = "Legende", WFlags f = 0 );
+
+  protected:
+    virtual void drawContents( QPainter* );
+
+  private:
+    int _channels;
+};
+
+
+class MGraphWindow : public QVBox
+{
+  Q_OBJECT
+
+  public:
+    MGraphWindow( QWidget* parent = 0, const char* name = "MGraphWindow", WFlags f = 0 );
+    void traffic( int channel, int signal );
+
+  protected:
+    virtual void timerEvent( QTimerEvent* e );
+
+  protected slots:
+    virtual void testGraph();
+
+  protected:
+    MFrequencySpectrum* spectrum;
+    Legende* legende;
+
+};
+
+/* XPM */
+static char * background[] = {
+"16 16 6 1",
+" 	c None",
+".	c #52676E",
+"+	c #3F545B",
+"@	c #394E56",
+"#	c #2F454C",
+"$	c #364B52",
+".+++++++++++++++",
+"@###############",
+"+$$$$$$$$$$$$$$$",
+"@###############",
+"+$$$$$$$$$$$$$$$",
+"@###############",
+"+$$$$$$$$$$$$$$$",
+"@###############",
+"+$$$$$$$$$$$$$$$",
+"@###############",
+"+$$$$$$$$$$$$$$$",
+"@###############",
+"+$$$$$$$$$$$$$$$",
+"@###############",
+"+$$$$$$$$$$$$$$$",
+"@###############"};
+
+
+#endif
+
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 476518a..927f4b7 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,45 +1,47 @@
 MOC_DIR         = ./tmp
 OBJECTS_DIR     = ./tmp
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 
 HEADERS         = wellenreiterbase.h \
                   mainwindow.h \
                   wellenreiter.h \
                   scanlist.h \
                   logwindow.h \
                   hexwindow.h \
                   statwindow.h \
                   configwindow.h \
-                  manufacturers.h
+                  manufacturers.h \
+                  graphwindow.h
 
 SOURCES         = main.cpp \
                   mainwindow.cpp \
                   wellenreiterbase.cpp \
                   wellenreiter.cpp \
                   scanlist.cpp \
                   logwindow.cpp \
                   hexwindow.cpp \
                   statwindow.cpp \
                   configwindow.cpp \
-                  manufacturers.cpp
+                  manufacturers.cpp \
+                  graphwindow.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
 
 !contains( platform, x11 ) {
   message( qws )
   include ( $(OPIEDIR)/include.pro )
   LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 -lstdc++
 }
 
 contains( platform, x11 ) {
   LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
   SOURCES += resource.cpp
   HEADERS += resource.h
   DESTDIR = $(OPIEDIR)/output/bin
 }
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 4b82c9a..c061319 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -1,232 +1,239 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** 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
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ***********************************************************************/
 
 // Opie
 
 #ifdef QWS
 #include <opie/odevice.h>
 using namespace Opie;
 #endif
 
 #ifdef QWS
 #include <opie2/oapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include <opie2/onetwork.h>
 #include <opie2/opcap.h>
 
 // Qt
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qtoolbutton.h>
 #include <qmainwindow.h>
 
 // Standard
 
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 
 // Local
 
 #include "wellenreiter.h"
 #include "scanlist.h"
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "configwindow.h"
 #include "statwindow.h"
+#include "graphwindow.h"
 #include "manufacturers.h"
 
 Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
       sniffing( false ), iface( 0 ), manufacturerdb( 0 ), configwindow( 0 )
 {
 
     //
     // construct manufacturer database
     //
 
     QString manufile;
     #ifdef QWS
     manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) QPEApplication::qpeDir() );
     #else
     manufile.sprintf( "/usr/local/share/wellenreiter/manufacturers.dat" );
     #endif
     manufacturerdb = new ManufacturerDB( manufile );
 
     logwindow->log( "(i) Wellenreiter has been started." );
 
     //
     // detect operating system
     //
 
     #ifdef QWS
     QString sys;
     sys.sprintf( "(i) Running on '%s'.", (const char*) ODevice::inst()->systemString() );
     _system = ODevice::inst()->system();
     logwindow->log( sys );
     #endif
 
     // setup GUI
     netview->setColumnWidthMode( 1, QListView::Manual );
 
     if ( manufacturerdb )
         netview->setManufacturerDB( manufacturerdb );
 
     pcap = new OPacketCapturer();
 
 }
 
 
 Wellenreiter::~Wellenreiter()
 {
     // no need to delete child widgets, Qt does it all for us
 
     delete manufacturerdb;
     delete pcap;
 }
 
 
 void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
     configwindow = cw;
 }
 
 
 void Wellenreiter::channelHopped(int c)
 {
     QString title = "Wellenreiter II -scan- [";
     QString left;
     if ( c > 1 ) left.fill( '.', c-1 );
     title.append( left );
     title.append( '|' );
     if ( c < iface->channels() )
     {
         QString right;
         right.fill( '.', iface->channels()-c );
         title.append( right );
     }
     title.append( "]" );
     //title.append( QString().sprintf( " %02d", c ) );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( title );
 }
 
 
 void Wellenreiter::receivePacket(OPacket* p)
 {
     hexWindow()->log( p->dump( 8 ) );
 
     // check if we received a beacon frame
     OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) );
     if ( beacon && beacon->managementType() == "Beacon" )
     {
         QString type;
         if ( beacon->canIBSS() )
         {
             type = "adhoc";
         }
         else if ( beacon->canESS() )
         {
             type = "managed";
         }
         else
         {
             qDebug( "Wellenreiter::invalid frame detected: '%s'", (const char*) p->dump( 16 ) );
             return;
         }
 
         OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
         QString essid = ssid ? ssid->ID() : QString("<unknown>");
         OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
         int channel = ds ? ds->channel() : -1;
 
         OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
         netView()->addNewItem( type, essid, header->macAddress2().toString(), beacon->canPrivacy(), channel, 0 );
+
+        // do we have a prism header?
+        OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
+        if ( ds && prism )
+            graphwindow->traffic( ds->channel(), prism->signalStrength() );
+
         return;
     }
 
     // check for a data frame
     OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) );
     if ( data )
     {
         OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" );
         if ( wlan->fromDS() && !wlan->toDS() )
         {
             qDebug( "FromDS traffic: '%s' -> '%s' via '%s'",
                 (const char*) wlan->macAddress3().toString(true),
                 (const char*) wlan->macAddress1().toString(true),
                 (const char*) wlan->macAddress2().toString(true) );
             netView()->fromDStraffic( wlan->macAddress3().toString(),
                                       wlan->macAddress1().toString(),
                                       wlan->macAddress2().toString() );
         }
         else
         if ( !wlan->fromDS() && wlan->toDS() )
         {
             qDebug( "ToDS traffic: '%s' -> '%s' via '%s'",
                 (const char*) wlan->macAddress2().toString(true),
                 (const char*) wlan->macAddress3().toString(true),
                 (const char*) wlan->macAddress1().toString(true) );
             netView()->toDStraffic( wlan->macAddress2().toString(),
                                     wlan->macAddress3().toString(),
                                     wlan->macAddress1().toString() );
         }
         else
         if ( wlan->fromDS() && wlan->toDS() )
         {
             qDebug( "WDS(bridge) traffic: '%s' -> '%s' via '%s' and '%s'",
                 (const char*) wlan->macAddress4().toString(true),
                 (const char*) wlan->macAddress3().toString(true),
                 (const char*) wlan->macAddress1().toString(true),
                 (const char*) wlan->macAddress2().toString(true) );
             netView()->WDStraffic( wlan->macAddress4().toString(),
                                    wlan->macAddress3().toString(),
                                    wlan->macAddress1().toString(),
                                    wlan->macAddress2().toString() );
         }
         else
         {
             qDebug( "IBSS(AdHoc) traffic: '%s' -> '%s' (Cell: '%s')'",
                 (const char*) wlan->macAddress2().toString(true),
                 (const char*) wlan->macAddress1().toString(true),
                 (const char*) wlan->macAddress3().toString(true) );
             netView()->IBSStraffic( wlan->macAddress2().toString(),
                                     wlan->macAddress1().toString(),
                                     wlan->macAddress3().toString() );
         }
         return;
     }
 }
 
 
 void Wellenreiter::stopClicked()
 {
     if ( iface )
     {
         disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
         disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
         iface->setChannelHopping(); // stop hopping channels
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index 9745069..36fbb9a 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -1,178 +1,185 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** 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
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ***********************************************************************/
 
 #include "wellenreiterbase.h"
 
 #include <qheader.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
 
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "scanlist.h"
 #include "statwindow.h"
+#include "graphwindow.h"
 
 #ifdef QWS
 #include <qpe/resource.h>
 #include <opie/otabwidget.h>
 #else
 #include "resource.h"
 #include <qtabwidget.h>
 #endif
 
 
 /*
  *  Constructs a WellenreiterBase which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f' 
  */
 WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) );
     //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) );
     //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) );
     //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) );
     
     if ( !name )
         setName( "WellenreiterBase" );
     resize( 191, 294 );
 #ifdef QWS
     setCaption( tr( "Wellenreiter/Opie" ) );
 #else
     setCaption( tr( "Wellenreiter/X11" ) );
 #endif
     WellenreiterBaseLayout = new QVBoxLayout( this );
     WellenreiterBaseLayout->setSpacing( 2 );
     WellenreiterBaseLayout->setMargin( 0 );
 #ifdef QWS
     TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global );
 #else
     TabWidget = new QTabWidget( this, "TabWidget" );
 #endif
     ap = new QWidget( TabWidget, "ap" );
     apLayout = new QVBoxLayout( ap );
     apLayout->setSpacing( 2 );
     apLayout->setMargin( 2 );
 
     //--------- NETVIEW TAB --------------
 
     netview = new MScanListView( ap );
     apLayout->addWidget( netview );
 
+    //--------- GRAPH TAB --------------
+
+    graphwindow = new MGraphWindow( TabWidget, "Graph" );
+
     //--------- LOG TAB --------------
 
     logwindow = new MLogWindow( TabWidget, "Log" );
 
     //--------- HEX TAB --------------
 
     hexwindow = new MHexWindow( TabWidget, "Hex" );
 
     //--------- STAT TAB --------------
 
     statwindow = new MStatWindow( TabWidget, "Stat" );
 
     //--------- ABOUT TAB --------------
 
     about = new QWidget( TabWidget, "about" );
     aboutLayout = new QGridLayout( about );
     aboutLayout->setSpacing( 6 );
     aboutLayout->setMargin( 11 );
 
     PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" );
     PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) );
     PixmapLabel1_3_2->setFrameShape( QLabel::Panel );
     PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken );
     PixmapLabel1_3_2->setLineWidth( 2 );
     PixmapLabel1_3_2->setMargin( 0 );
     PixmapLabel1_3_2->setMidLineWidth( 0 );
     PixmapLabel1_3_2->setPixmap(  Resource::loadPixmap( "wellenreiter/logo" ) );
     PixmapLabel1_3_2->setScaledContents( TRUE );
     PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) );
 
     aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 );
 
     TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" );
     QFont TextLabel1_4_2_font(  TextLabel1_4_2->font() );
     TextLabel1_4_2_font.setFamily( "adobe-helvetica" );
     TextLabel1_4_2_font.setPointSize( 10 );
     TextLabel1_4_2->setFont( TextLabel1_4_2_font );
     TextLabel1_4_2->setText( tr( "<p align=center>\n"
 "<hr>\n"
 "Max Moser<br>\n"
 "Martin J. Muench<br>\n"
 "Michael Lauer<br><hr>\n"
 "<b>www.remote-exploit.org</b>\n"
 "</p>" ) );
     TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) );
 
     aboutLayout->addWidget( TextLabel1_4_2, 1, 0 );
 
 #ifdef QWS
     TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) );
+    TabWidget->addTab( graphwindow, "wellenreiter/graph", tr( "Graph" ) );
     TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) );
     TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
     TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) );
     TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) );
 #else
     TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) );
+    TabWidget->addTab( graphwindow, /* "wellenreiter/graph", */ tr( "Graph" ) );
     TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) );
     TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) );
     TabWidget->addTab( statwindow, /* "wellenreiter/hex", */ tr( "Stat" ) );
     TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) );
 #endif
     WellenreiterBaseLayout->addWidget( TabWidget );
 
 #ifdef QWS
     TabWidget->setCurrentTab( tr( "Nets" ) );
 #endif
 
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 WellenreiterBase::~WellenreiterBase()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 /*  
  *  Main event handler. Reimplemented to handle application
  *  font changes
  */
 bool WellenreiterBase::event( QEvent* ev )
 {
     bool ret = QWidget::event( ev ); 
     if ( ev->type() == QEvent::ApplicationFontChange ) {
 	//QFont Log_2_font(  Log_2->font() );
 	//Log_2_font.setFamily( "adobe-courier" );
 	//Log_2_font.setPointSize( 8 );
 	//Log_2->setFont( Log_2_font ); 
 	QFont TextLabel1_4_2_font(  TextLabel1_4_2->font() );
 	TextLabel1_4_2_font.setFamily( "adobe-helvetica" );
 	TextLabel1_4_2_font.setPointSize( 10 );
-	TextLabel1_4_2->setFont( TextLabel1_4_2_font ); 
+	TextLabel1_4_2->setFont( TextLabel1_4_2_font );
     }
     return ret;
 }
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h
index ad2e96c..e8dc924 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.h
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h
@@ -1,74 +1,76 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** 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
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef WELLENREITERBASE_H
 #define WELLENREITERBASE_H
 
 #include <qvariant.h>
 #include <qwidget.h>
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QLabel;
 class MScanListView;
 class MScanListItem;
 class QPushButton;
 class MLogWindow;
 class MHexWindow;
 class MStatWindow;
+class MGraphWindow;
 
 #ifdef QWS
 class OTabWidget;
 #else
 class QTabWidget;
 #endif
 
 class WellenreiterBase : public QWidget
 {
     Q_OBJECT
 
 public:
     WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~WellenreiterBase();
 
 #ifdef QWS
     OTabWidget* TabWidget;
 #else
     QTabWidget* TabWidget;
 #endif
     QWidget* ap;
     MScanListView* netview;
     MLogWindow* logwindow;
     MHexWindow* hexwindow;
     MStatWindow* statwindow;
+    MGraphWindow* graphwindow;
     QWidget* about;
     QLabel* PixmapLabel1_3_2;
     QLabel* TextLabel1_4_2;
 
 protected:
     QVBoxLayout* WellenreiterBaseLayout;
     QVBoxLayout* apLayout;
     QGridLayout* aboutLayout;
     bool event( QEvent* );
 
     QPixmap* ani1;
     QPixmap* ani2;
     QPixmap* ani3;
     QPixmap* ani4;
 
 
 };
 
 #endif // WELLENREITERBASE_H
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control
index f7267b4..8bb5b1c 100644
--- a/noncore/net/wellenreiter/opie-wellenreiter.control
+++ b/noncore/net/wellenreiter/opie-wellenreiter.control
@@ -1,10 +1,10 @@
 Package: opie-wellenreiter
 Files: bin/wellenreiter share/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> 
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Version: 0.9.9-$SUB_VERSION
 Depends: task-opie-minimal, libpcap0, libopie2 (1.8.1)
 Description: A WaveLAN Network Monitor
  A WaveLAN Network Monitor/Sniffer for the Opie Environment.