author | mickeyl <mickeyl> | 2003-03-30 02:08:00 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-03-30 02:08:00 (UTC) |
commit | 21a9eae2190754c6a807ae47f6aad80aa4f53728 (patch) (side-by-side diff) | |
tree | d56760049ee7f48b7aa7ee8c7ea3eaf0b7e5d803 /noncore/net | |
parent | d11a0154e2d9732854c9a3d598857bc20f359849 (diff) | |
download | opie-21a9eae2190754c6a807ae47f6aad80aa4f53728.zip opie-21a9eae2190754c6a807ae47f6aad80aa4f53728.tar.gz opie-21a9eae2190754c6a807ae47f6aad80aa4f53728.tar.bz2 |
- add file->new
-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 @@ -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: |