summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro2
-rw-r--r--noncore/net/wellenreiter/gui/hexwindow.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/hexwindow.h1
-rw-r--r--noncore/net/wellenreiter/gui/logwindow.cpp5
-rw-r--r--noncore/net/wellenreiter/gui/logwindow.h1
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp10
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.h1
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h4
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
@@ -27,3 +27,3 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -L. -lwellenreiter -lopiecore2 -lopieui2 -lopienet2
+LIBS += -lopiecore2 -lopieui2 -lopienet2
INTERFACES = configbase.ui
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
@@ -34,2 +34,6 @@ void MHexWindow::log( QString 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
@@ -30,2 +30,3 @@ class MHexWindow: public QVBox
void log( QString text );
+ void clear();
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
@@ -38,2 +38,7 @@ void MLogWindow::log( QString text )
+void MLogWindow::clear()
+{
+ ledit->clear();
+}
+
const QString MLogWindow::getLog() const
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
@@ -31,2 +31,3 @@ class MLogWindow: public QVBox
const QString getLog() const;
+ void clear();
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
@@ -17,5 +17,5 @@
#include "logwindow.h"
+#include "hexwindow.h"
#include "mainwindow.h"
#include "wellenreiter.h"
-
#include "scanlist.h"
@@ -116,2 +116,3 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
QPopupMenu* file = new QPopupMenu( mb );
+ file->insertItem( "&New", this, SLOT( fileNew() ) );
id = file->insertItem( "&Load", fileLoad );
@@ -301,2 +302,9 @@ void WellenreiterMainWindow::fileLoadSession()
+void WellenreiterMainWindow::fileNew()
+{
+ mw->netView()->clear();
+ mw->logWindow()->clear();
+ mw->hexWindow()->clear();
+}
+
void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
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
@@ -57,2 +57,3 @@ class WellenreiterMainWindow: public QMainWindow
void fileLoadSession();
+ void fileNew();
};
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
@@ -30,4 +30,7 @@ class OPacketCapturer;
class OWirelessNetworkInterface;
+
class ManufacturerDB;
class WellenreiterConfigWindow;
+class MLogWindow;
+class MHexWindow;
@@ -43,2 +46,3 @@ class Wellenreiter : public WellenreiterBase {
MLogWindow* logWindow() const { return logwindow; };
+ MHexWindow* hexWindow() const { return hexwindow; };
bool isDaemonRunning() const { return sniffing; };