author | mickeyl <mickeyl> | 2003-03-30 02:08:00 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-03-30 02:08:00 (UTC) |
commit | 21a9eae2190754c6a807ae47f6aad80aa4f53728 (patch) (unidiff) | |
tree | d56760049ee7f48b7aa7ee8c7ea3eaf0b7e5d803 /noncore/net/wellenreiter/gui | |
parent | d11a0154e2d9732854c9a3d598857bc20f359849 (diff) | |
download | opie-21a9eae2190754c6a807ae47f6aad80aa4f53728.zip opie-21a9eae2190754c6a807ae47f6aad80aa4f53728.tar.gz opie-21a9eae2190754c6a807ae47f6aad80aa4f53728.tar.bz2 |
- add file->new
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 | |||
@@ -16,25 +16,25 @@ HEADERS = wellenreiterbase.h \ | |||
16 | SOURCES = main.cpp \ | 16 | SOURCES = main.cpp \ |
17 | mainwindow.cpp \ | 17 | mainwindow.cpp \ |
18 | wellenreiterbase.cpp \ | 18 | wellenreiterbase.cpp \ |
19 | wellenreiter.cpp \ | 19 | wellenreiter.cpp \ |
20 | scanlist.cpp \ | 20 | scanlist.cpp \ |
21 | logwindow.cpp \ | 21 | logwindow.cpp \ |
22 | hexwindow.cpp \ | 22 | hexwindow.cpp \ |
23 | configwindow.cpp \ | 23 | configwindow.cpp \ |
24 | manufacturers.cpp | 24 | manufacturers.cpp |
25 | 25 | ||
26 | INCLUDEPATH += $(OPIEDIR)/include | 26 | INCLUDEPATH += $(OPIEDIR)/include |
27 | DEPENDPATH += $(OPIEDIR)/include | 27 | DEPENDPATH += $(OPIEDIR)/include |
28 | LIBS += -L. -lwellenreiter -lopiecore2 -lopieui2 -lopienet2 | 28 | LIBS += -lopiecore2 -lopieui2 -lopienet2 |
29 | INTERFACES = configbase.ui | 29 | INTERFACES = configbase.ui |
30 | TARGET = wellenreiter | 30 | TARGET = wellenreiter |
31 | 31 | ||
32 | !contains( platform, x11 ) { | 32 | !contains( platform, x11 ) { |
33 | message( qws ) | 33 | message( qws ) |
34 | include ( $(OPIEDIR)/include.pro ) | 34 | include ( $(OPIEDIR)/include.pro ) |
35 | LIBS += -lqpe -lopie | 35 | LIBS += -lqpe -lopie |
36 | } | 36 | } |
37 | 37 | ||
38 | contains( platform, x11 ) { | 38 | contains( platform, x11 ) { |
39 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 39 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
40 | SOURCES += resource.cpp | 40 | SOURCES += resource.cpp |
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 | |||
@@ -23,13 +23,17 @@ MHexWindow::MHexWindow( QWidget * parent, const char * name, WFlags f ) | |||
23 | 23 | ||
24 | // FIXME: Set properties( font, read-only, etc...) | 24 | // FIXME: Set properties( font, read-only, etc...) |
25 | 25 | ||
26 | }; | 26 | }; |
27 | 27 | ||
28 | void MHexWindow::log( QString text ) | 28 | void MHexWindow::log( QString text ) |
29 | { | 29 | { |
30 | 30 | ||
31 | ledit->append( text ); | 31 | ledit->append( text ); |
32 | 32 | ||
33 | }; | 33 | }; |
34 | 34 | ||
35 | void 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 | |||
@@ -19,20 +19,21 @@ | |||
19 | #include <qvbox.h> | 19 | #include <qvbox.h> |
20 | 20 | ||
21 | class QString; | 21 | class QString; |
22 | class QMultiLineEdit; | 22 | class QMultiLineEdit; |
23 | 23 | ||
24 | class MHexWindow: public QVBox | 24 | class MHexWindow: public QVBox |
25 | { | 25 | { |
26 | 26 | ||
27 | public: | 27 | public: |
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; |
34 | 35 | ||
35 | }; | 36 | }; |
36 | 37 | ||
37 | #endif | 38 | #endif |
38 | 39 | ||
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 | |||
@@ -27,16 +27,21 @@ MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f ) | |||
27 | } | 27 | } |
28 | 28 | ||
29 | void MLogWindow::log( QString text ) | 29 | void MLogWindow::log( QString text ) |
30 | { | 30 | { |
31 | QTime time = QTime::currentTime(); | 31 | QTime time = QTime::currentTime(); |
32 | QString line; | 32 | QString line; |
33 | line.sprintf( "[%s] %s", (const char*) time.toString(), (const char*) text ); | 33 | line.sprintf( "[%s] %s", (const char*) time.toString(), (const char*) text ); |
34 | ledit->append( line ); | 34 | ledit->append( line ); |
35 | qDebug( line ); | 35 | qDebug( line ); |
36 | 36 | ||
37 | } | 37 | } |
38 | 38 | ||
39 | void MLogWindow::clear() | ||
40 | { | ||
41 | ledit->clear(); | ||
42 | } | ||
43 | |||
39 | const QString MLogWindow::getLog() const | 44 | const QString MLogWindow::getLog() const |
40 | { | 45 | { |
41 | return ledit->text(); | 46 | return ledit->text(); |
42 | } | 47 | } |
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 | |||
@@ -20,20 +20,21 @@ | |||
20 | 20 | ||
21 | class QString; | 21 | class QString; |
22 | class QMultiLineEdit; | 22 | class QMultiLineEdit; |
23 | 23 | ||
24 | class MLogWindow: public QVBox | 24 | class MLogWindow: public QVBox |
25 | { | 25 | { |
26 | 26 | ||
27 | public: | 27 | public: |
28 | MLogWindow( QWidget * parent = 0, const char * name = "MLogWindow", WFlags f = 0 ); | 28 | MLogWindow( QWidget * parent = 0, const char * name = "MLogWindow", WFlags f = 0 ); |
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; |
35 | 36 | ||
36 | }; | 37 | }; |
37 | 38 | ||
38 | #endif | 39 | #endif |
39 | 40 | ||
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 | |||
@@ -6,27 +6,27 @@ | |||
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
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> |
24 | #include <qdatastream.h> | 24 | #include <qdatastream.h> |
25 | #include <qfile.h> | 25 | #include <qfile.h> |
26 | #include <qfileinfo.h> | 26 | #include <qfileinfo.h> |
27 | #include <qiconset.h> | 27 | #include <qiconset.h> |
28 | #include <qmenubar.h> | 28 | #include <qmenubar.h> |
29 | #include <qmessagebox.h> | 29 | #include <qmessagebox.h> |
30 | #include <qpopupmenu.h> | 30 | #include <qpopupmenu.h> |
31 | #include <qstatusbar.h> | 31 | #include <qstatusbar.h> |
32 | #include <qtextstream.h> | 32 | #include <qtextstream.h> |
@@ -105,24 +105,25 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
105 | 105 | ||
106 | QMenuBar* mb = menuBar(); | 106 | QMenuBar* mb = menuBar(); |
107 | 107 | ||
108 | QPopupMenu* fileSave = new QPopupMenu( mb ); | 108 | QPopupMenu* fileSave = new QPopupMenu( mb ); |
109 | fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) ); | 109 | fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) ); |
110 | fileSave->insertItem( "&Log...", this, SLOT( fileSaveLog() ) ); | 110 | fileSave->insertItem( "&Log...", this, SLOT( fileSaveLog() ) ); |
111 | 111 | ||
112 | QPopupMenu* fileLoad = new QPopupMenu( mb ); | 112 | QPopupMenu* fileLoad = new QPopupMenu( mb ); |
113 | fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) ); | 113 | fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) ); |
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(); |
120 | file->insertItem( "&Exit", qApp, SLOT( quit() ) ); | 121 | file->insertItem( "&Exit", qApp, SLOT( quit() ) ); |
121 | 122 | ||
122 | QPopupMenu* view = new QPopupMenu( mb ); | 123 | QPopupMenu* view = new QPopupMenu( mb ); |
123 | view->insertItem( "&Configure..." ); | 124 | view->insertItem( "&Configure..." ); |
124 | 125 | ||
125 | QPopupMenu* sniffer = new QPopupMenu( mb ); | 126 | QPopupMenu* sniffer = new QPopupMenu( mb ); |
126 | sniffer->insertItem( "&Configure..." ); | 127 | sniffer->insertItem( "&Configure..." ); |
127 | sniffer->insertSeparator(); | 128 | sniffer->insertSeparator(); |
128 | 129 | ||
@@ -290,24 +291,31 @@ void WellenreiterMainWindow::fileLoadSession() | |||
290 | QDataStream t( &f ); | 291 | QDataStream t( &f ); |
291 | t >> *mw->netView(); | 292 | t >> *mw->netView(); |
292 | f.close(); | 293 | f.close(); |
293 | qDebug( "Loaded session from file '%s'", (const char*) fname ); | 294 | qDebug( "Loaded session from file '%s'", (const char*) fname ); |
294 | } | 295 | } |
295 | else | 296 | else |
296 | { | 297 | { |
297 | qDebug( "Problem loading session from file '%s'", (const char*) fname ); | 298 | qDebug( "Problem loading session from file '%s'", (const char*) fname ); |
298 | } | 299 | } |
299 | } | 300 | } |
300 | } | 301 | } |
301 | 302 | ||
303 | void WellenreiterMainWindow::fileNew() | ||
304 | { | ||
305 | mw->netView()->clear(); | ||
306 | mw->logWindow()->clear(); | ||
307 | mw->hexWindow()->clear(); | ||
308 | } | ||
309 | |||
302 | void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) | 310 | void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) |
303 | { | 311 | { |
304 | if ( mw->isDaemonRunning() ) | 312 | if ( mw->isDaemonRunning() ) |
305 | { | 313 | { |
306 | QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." ); | 314 | QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." ); |
307 | e->ignore(); | 315 | e->ignore(); |
308 | } | 316 | } |
309 | else | 317 | else |
310 | { | 318 | { |
311 | QMainWindow::closeEvent( e ); | 319 | QMainWindow::closeEvent( e ); |
312 | } | 320 | } |
313 | } | 321 | } |
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 | |||
@@ -46,15 +46,16 @@ class WellenreiterMainWindow: public QMainWindow | |||
46 | protected: | 46 | protected: |
47 | virtual void closeEvent( QCloseEvent* ); | 47 | virtual void closeEvent( QCloseEvent* ); |
48 | 48 | ||
49 | private: | 49 | private: |
50 | QString getFileName( bool save ); | 50 | QString getFileName( bool save ); |
51 | 51 | ||
52 | public slots: | 52 | public slots: |
53 | void showConfigure(); | 53 | void showConfigure(); |
54 | void demoAddStations(); | 54 | void demoAddStations(); |
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 | |||
@@ -19,37 +19,41 @@ | |||
19 | #include "wellenreiterbase.h" | 19 | #include "wellenreiterbase.h" |
20 | 20 | ||
21 | #ifdef QWS | 21 | #ifdef QWS |
22 | #include <opie/odevice.h> | 22 | #include <opie/odevice.h> |
23 | using namespace Opie; | 23 | using namespace Opie; |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | class QTimerEvent; | 26 | class QTimerEvent; |
27 | class QPixmap; | 27 | class QPixmap; |
28 | class OPacket; | 28 | class OPacket; |
29 | class OPacketCapturer; | 29 | class OPacketCapturer; |
30 | class OWirelessNetworkInterface; | 30 | class OWirelessNetworkInterface; |
31 | |||
31 | class ManufacturerDB; | 32 | class ManufacturerDB; |
32 | class WellenreiterConfigWindow; | 33 | class WellenreiterConfigWindow; |
34 | class MLogWindow; | ||
35 | class MHexWindow; | ||
33 | 36 | ||
34 | class Wellenreiter : public WellenreiterBase { | 37 | class Wellenreiter : public WellenreiterBase { |
35 | Q_OBJECT | 38 | Q_OBJECT |
36 | 39 | ||
37 | public: | 40 | public: |
38 | Wellenreiter( QWidget* parent = 0 ); | 41 | Wellenreiter( QWidget* parent = 0 ); |
39 | ~Wellenreiter(); | 42 | ~Wellenreiter(); |
40 | 43 | ||
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: |
47 | void receivePacket(OPacket*); | 51 | void receivePacket(OPacket*); |
48 | void startStopClicked(); | 52 | void startStopClicked(); |
49 | 53 | ||
50 | private: | 54 | private: |
51 | #ifdef QWS | 55 | #ifdef QWS |
52 | OSystem _system; // Opie Operating System identifier | 56 | OSystem _system; // Opie Operating System identifier |
53 | #endif | 57 | #endif |
54 | 58 | ||
55 | bool sniffing; | 59 | bool sniffing; |