8 files changed, 26 insertions, 2 deletions

diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 200bfc1..505d376 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -20,17 +20,17 @@ SOURCES         = main.cpp \
                   scanlist.cpp \
                   logwindow.cpp \
                   hexwindow.cpp \
                   configwindow.cpp \
                   manufacturers.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS            += -L. -lwellenreiter -lopiecore2 -lopieui2 -lopienet2
+LIBS            += -lopiecore2 -lopieui2 -lopienet2
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
 
 !contains( platform, x11 ) {
   message( qws )
   include ( $(OPIEDIR)/include.pro )
   LIBS += -lqpe -lopie
 }
diff --git a/noncore/net/wellenreiter/gui/hexwindow.cpp b/noncore/net/wellenreiter/gui/hexwindow.cpp
index 91aa6f7..a3022f4 100644
--- a/noncore/net/wellenreiter/gui/hexwindow.cpp
+++ b/noncore/net/wellenreiter/gui/hexwindow.cpp
@@ -27,9 +27,13 @@ MHexWindow::MHexWindow( QWidget * parent, const char * name, WFlags f )
 
 void MHexWindow::log( QString text )
 {
 
     ledit->append( text );
 
 };
 
+void MHexWindow::clear()
+{
+    ledit->clear();
+}
 
diff --git a/noncore/net/wellenreiter/gui/hexwindow.h b/noncore/net/wellenreiter/gui/hexwindow.h
index eec1be0..2618b8c 100644
--- a/noncore/net/wellenreiter/gui/hexwindow.h
+++ b/noncore/net/wellenreiter/gui/hexwindow.h
@@ -23,16 +23,17 @@ class QMultiLineEdit;
 
 class MHexWindow: public QVBox
 {
 
   public:
     MHexWindow( QWidget * parent = 0, const char * name = "MHexWindow", WFlags f = 0 );
   
     void log( QString text );
+    void clear();
     
   protected:
     QMultiLineEdit* ledit;
 
 };
 
 #endif
 
diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp
index f132f56..55e2ccb 100644
--- a/noncore/net/wellenreiter/gui/logwindow.cpp
+++ b/noncore/net/wellenreiter/gui/logwindow.cpp
@@ -31,12 +31,17 @@ void MLogWindow::log( QString text )
     QTime time = QTime::currentTime();
     QString line;
     line.sprintf( "[%s] %s", (const char*) time.toString(), (const char*) text );
     ledit->append( line );
     qDebug( line );
 
 }
 
+void MLogWindow::clear()
+{
+    ledit->clear();
+}
+
 const QString MLogWindow::getLog() const
 {
     return ledit->text();
 }
diff --git a/noncore/net/wellenreiter/gui/logwindow.h b/noncore/net/wellenreiter/gui/logwindow.h
index 253defa..6e0fe50 100644
--- a/noncore/net/wellenreiter/gui/logwindow.h
+++ b/noncore/net/wellenreiter/gui/logwindow.h
@@ -24,16 +24,17 @@ class QMultiLineEdit;
 class MLogWindow: public QVBox
 {
 
   public:
     MLogWindow( QWidget * parent = 0, const char * name = "MLogWindow", WFlags f = 0 );
 
     void log( QString text );
     const QString getLog() const;
+    void clear();
 
   protected:
     QMultiLineEdit* ledit;
 
 };
 
 #endif
 
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index d4988af..8e0164f 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -10,19 +10,19 @@
 **
 ** 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 "configwindow.h"
 #include "logwindow.h"
+#include "hexwindow.h"
 #include "mainwindow.h"
 #include "wellenreiter.h"
-
 #include "scanlist.h"
 
 #include <qcombobox.h>
 #include <qdatastream.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qiconset.h>
 #include <qmenubar.h>
@@ -109,16 +109,17 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) );
     fileSave->insertItem( "&Log...", this, SLOT( fileSaveLog() ) );
 
     QPopupMenu* fileLoad = new QPopupMenu( mb );
     fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) );
     //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
 
     QPopupMenu* file = new QPopupMenu( mb );
+    file->insertItem( "&New", this, SLOT( fileNew() ) );
     id = file->insertItem( "&Load", fileLoad );
     file->insertItem( "&Save", fileSave );
     file->insertSeparator();
     file->insertItem( "&Exit", qApp, SLOT( quit() ) );
 
     QPopupMenu* view = new QPopupMenu( mb );
     view->insertItem( "&Configure..." );
 
@@ -294,16 +295,23 @@ void WellenreiterMainWindow::fileLoadSession()
         }
         else
         {
             qDebug( "Problem loading session from file '%s'", (const char*) fname );
         }
     }
 }
 
+void WellenreiterMainWindow::fileNew()
+{
+    mw->netView()->clear();
+    mw->logWindow()->clear();
+    mw->hexWindow()->clear();
+}
+
 void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
 {
     if ( mw->isDaemonRunning() )
     {
         QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." );
         e->ignore();
     }
     else
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index 850a343..e06a60c 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -50,11 +50,12 @@ class WellenreiterMainWindow: public QMainWindow
     QString getFileName( bool save );
 
   public slots:
     void showConfigure();
     void demoAddStations();
     void fileSaveLog();
     void fileSaveSession();
     void fileLoadSession();
+    void fileNew();
 };
 
 #endif
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index 3ec4021..ff73dd4 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -23,29 +23,33 @@
 using namespace Opie;
 #endif
 
 class QTimerEvent;
 class QPixmap;
 class OPacket;
 class OPacketCapturer;
 class OWirelessNetworkInterface;
+
 class ManufacturerDB;
 class WellenreiterConfigWindow;
+class MLogWindow;
+class MHexWindow;
 
 class Wellenreiter : public WellenreiterBase {
     Q_OBJECT
 
   public:
     Wellenreiter( QWidget* parent = 0 );
     ~Wellenreiter();
 
     void setConfigWindow( WellenreiterConfigWindow* cw );
     MScanListView* netView() const { return netview; };
     MLogWindow* logWindow() const { return logwindow; };
+    MHexWindow* hexWindow() const { return hexwindow; };
     bool isDaemonRunning() const { return sniffing; };
 
   public slots:
     void receivePacket(OPacket*);
     void startStopClicked();
 
   private:
     #ifdef QWS