summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -25,7 +25,7 @@ SOURCES = main.cpp \
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -L. -lwellenreiter -lopiecore2 -lopieui2 -lopienet2
+LIBS += -lopiecore2 -lopieui2 -lopienet2
INTERFACES = configbase.ui
TARGET = wellenreiter
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
@@ -32,4 +32,8 @@ 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
@@ -28,6 +28,7 @@ class MHexWindow: public QVBox
MHexWindow( QWidget * parent = 0, const char * name = "MHexWindow", WFlags f = 0 );
void log( QString text );
+ void clear();
protected:
QMultiLineEdit* ledit;
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
@@ -36,6 +36,11 @@ void MLogWindow::log( QString text )
}
+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
@@ -29,6 +29,7 @@ class MLogWindow: public QVBox
void log( QString text );
const QString getLog() const;
+ void clear();
protected:
QMultiLineEdit* ledit;
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
@@ -15,9 +15,9 @@
#include "configwindow.h"
#include "logwindow.h"
+#include "hexwindow.h"
#include "mainwindow.h"
#include "wellenreiter.h"
-
#include "scanlist.h"
#include <qcombobox.h>
@@ -114,6 +114,7 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
//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();
@@ -299,6 +300,13 @@ void WellenreiterMainWindow::fileLoadSession()
}
}
+void WellenreiterMainWindow::fileNew()
+{
+ mw->netView()->clear();
+ mw->logWindow()->clear();
+ mw->hexWindow()->clear();
+}
+
void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
{
if ( mw->isDaemonRunning() )
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
@@ -55,6 +55,7 @@ class WellenreiterMainWindow: public QMainWindow
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
@@ -28,8 +28,11 @@ class QPixmap;
class OPacket;
class OPacketCapturer;
class OWirelessNetworkInterface;
+
class ManufacturerDB;
class WellenreiterConfigWindow;
+class MLogWindow;
+class MHexWindow;
class Wellenreiter : public WellenreiterBase {
Q_OBJECT
@@ -41,6 +44,7 @@ class Wellenreiter : public WellenreiterBase {
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: