summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
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
@@ -25,7 +25,7 @@ SOURCES = main.cpp \
25 25
26INCLUDEPATH += $(OPIEDIR)/include 26INCLUDEPATH += $(OPIEDIR)/include
27DEPENDPATH += $(OPIEDIR)/include 27DEPENDPATH += $(OPIEDIR)/include
28LIBS += -L. -lwellenreiter -lopiecore2 -lopieui2 -lopienet2 28LIBS += -lopiecore2 -lopieui2 -lopienet2
29INTERFACES = configbase.ui 29INTERFACES = configbase.ui
30TARGET = wellenreiter 30TARGET = wellenreiter
31 31
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 )
32 32
33}; 33};
34 34
35void MHexWindow::clear()
36{
37 ledit->clear();
38}
35 39
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
28 MHexWindow( QWidget * parent = 0, const char * name = "MHexWindow", WFlags f = 0 ); 28 MHexWindow( QWidget * parent = 0, const char * name = "MHexWindow", WFlags f = 0 );
29 29
30 void log( QString text ); 30 void log( QString text );
31 void clear();
31 32
32 protected: 33 protected:
33 QMultiLineEdit* ledit; 34 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 )
36 36
37} 37}
38 38
39void MLogWindow::clear()
40{
41 ledit->clear();
42}
43
39const QString MLogWindow::getLog() const 44const QString MLogWindow::getLog() const
40{ 45{
41 return ledit->text(); 46 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
29 29
30 void log( QString text ); 30 void log( QString text );
31 const QString getLog() const; 31 const QString getLog() const;
32 void clear();
32 33
33 protected: 34 protected:
34 QMultiLineEdit* ledit; 35 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 @@
15 15
16#include "configwindow.h" 16#include "configwindow.h"
17#include "logwindow.h" 17#include "logwindow.h"
18#include "hexwindow.h"
18#include "mainwindow.h" 19#include "mainwindow.h"
19#include "wellenreiter.h" 20#include "wellenreiter.h"
20
21#include "scanlist.h" 21#include "scanlist.h"
22 22
23#include <qcombobox.h> 23#include <qcombobox.h>
@@ -114,6 +114,7 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
114 //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); 114 //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
115 115
116 QPopupMenu* file = new QPopupMenu( mb ); 116 QPopupMenu* file = new QPopupMenu( mb );
117 file->insertItem( "&New", this, SLOT( fileNew() ) );
117 id = file->insertItem( "&Load", fileLoad ); 118 id = file->insertItem( "&Load", fileLoad );
118 file->insertItem( "&Save", fileSave ); 119 file->insertItem( "&Save", fileSave );
119 file->insertSeparator(); 120 file->insertSeparator();
@@ -299,6 +300,13 @@ void WellenreiterMainWindow::fileLoadSession()
299 } 300 }
300} 301}
301 302
303void WellenreiterMainWindow::fileNew()
304{
305 mw->netView()->clear();
306 mw->logWindow()->clear();
307 mw->hexWindow()->clear();
308}
309
302void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) 310void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
303{ 311{
304 if ( mw->isDaemonRunning() ) 312 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
55 void fileSaveLog(); 55 void fileSaveLog();
56 void fileSaveSession(); 56 void fileSaveSession();
57 void fileLoadSession(); 57 void fileLoadSession();
58 void fileNew();
58}; 59};
59 60
60#endif 61#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;
28class OPacket; 28class OPacket;
29class OPacketCapturer; 29class OPacketCapturer;
30class OWirelessNetworkInterface; 30class OWirelessNetworkInterface;
31
31class ManufacturerDB; 32class ManufacturerDB;
32class WellenreiterConfigWindow; 33class WellenreiterConfigWindow;
34class MLogWindow;
35class MHexWindow;
33 36
34class Wellenreiter : public WellenreiterBase { 37class Wellenreiter : public WellenreiterBase {
35 Q_OBJECT 38 Q_OBJECT
@@ -41,6 +44,7 @@ class Wellenreiter : public WellenreiterBase {
41 void setConfigWindow( WellenreiterConfigWindow* cw ); 44 void setConfigWindow( WellenreiterConfigWindow* cw );
42 MScanListView* netView() const { return netview; }; 45 MScanListView* netView() const { return netview; };
43 MLogWindow* logWindow() const { return logwindow; }; 46 MLogWindow* logWindow() const { return logwindow; };
47 MHexWindow* hexWindow() const { return hexwindow; };
44 bool isDaemonRunning() const { return sniffing; }; 48 bool isDaemonRunning() const { return sniffing; };
45 49
46 public slots: 50 public slots: