Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/hexwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/hexwindow.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/logwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/logwindow.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 10 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 4 |
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 @@ -26,5 +26,5 @@ 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 @@ -33,3 +33,7 @@ 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 @@ -29,4 +29,5 @@ class MHexWindow: public QVBox void log( QString text ); + void clear(); protected: 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 @@ -37,4 +37,9 @@ 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 @@ -30,4 +30,5 @@ class MLogWindow: public QVBox void log( QString text ); const QString getLog() const; + void clear(); protected: 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 @@ -16,7 +16,7 @@ #include "configwindow.h" #include "logwindow.h" +#include "hexwindow.h" #include "mainwindow.h" #include "wellenreiter.h" - #include "scanlist.h" @@ -115,4 +115,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n QPopupMenu* file = new QPopupMenu( mb ); + file->insertItem( "&New", this, SLOT( fileNew() ) ); id = file->insertItem( "&Load", fileLoad ); file->insertItem( "&Save", fileSave ); @@ -300,4 +301,11 @@ 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 @@ -56,4 +56,5 @@ class WellenreiterMainWindow: public QMainWindow void fileSaveSession(); 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 @@ -29,6 +29,9 @@ class OPacket; class OPacketCapturer; class OWirelessNetworkInterface; + class ManufacturerDB; class WellenreiterConfigWindow; +class MLogWindow; +class MHexWindow; class Wellenreiter : public WellenreiterBase { @@ -42,4 +45,5 @@ class Wellenreiter : public WellenreiterBase { MScanListView* netView() const { return netview; }; MLogWindow* logWindow() const { return logwindow; }; + MHexWindow* hexWindow() const { return hexwindow; }; bool isDaemonRunning() const { return sniffing; }; |