summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp25
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.h1
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h1
3 files changed, 21 insertions, 6 deletions
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index b2d3a71..2d5ecd2 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -17,6 +17,8 @@
17#include "mainwindow.h" 17#include "mainwindow.h"
18#include "wellenreiter.h" 18#include "wellenreiter.h"
19 19
20#include "scanlist.h"
21
20#include <qcombobox.h> 22#include <qcombobox.h>
21#include <qiconset.h> 23#include <qiconset.h>
22#include <qmenubar.h> 24#include <qmenubar.h>
@@ -80,24 +82,28 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
80 QMenuBar* mb = menuBar(); 82 QMenuBar* mb = menuBar();
81 83
82 QPopupMenu* file = new QPopupMenu( mb ); 84 QPopupMenu* file = new QPopupMenu( mb );
83 file->insertItem( "&Load" ); 85 file->insertItem( "&Load..." );
84 file->insertItem( "&Save" ); 86 file->insertItem( "&Save..." );
85 87
86 QPopupMenu* view = new QPopupMenu( mb ); 88 QPopupMenu* view = new QPopupMenu( mb );
87 view->insertItem( "&Configure" ); 89 view->insertItem( "&Configure..." );
88 90
89 QPopupMenu* sniffer = new QPopupMenu( mb ); 91 QPopupMenu* sniffer = new QPopupMenu( mb );
90 sniffer->insertItem( "&Configure" ); 92 sniffer->insertItem( "&Configure..." );
91 sniffer->insertSeparator(); 93 sniffer->insertSeparator();
92 94
93 int id; 95 QPopupMenu* demo = new QPopupMenu( mb );
96 demo->insertItem( "&Add something", this, SLOT( demoAddStations() ) );
94 97
98 int id;
95 id = mb->insertItem( "&File", file ); 99 id = mb->insertItem( "&File", file );
96 mb->setItemEnabled( id, false ); 100 mb->setItemEnabled( id, false );
97 id = mb->insertItem( "&View", view ); 101 id = mb->insertItem( "&View", view );
98 mb->setItemEnabled( id, false ); 102 mb->setItemEnabled( id, false );
99 id = mb->insertItem( "&Sniffer", sniffer ); 103 id = mb->insertItem( "&Sniffer", sniffer );
100 mb->setItemEnabled( id, false ); 104 mb->setItemEnabled( id, false );
105 id = mb->insertItem( "&Demo", demo );
106 mb->setItemEnabled( id, true );
101 107
102 #ifdef QWS 108 #ifdef QWS
103 mb->insertItem( startStopButton ); 109 mb->insertItem( startStopButton );
@@ -157,5 +163,12 @@ WellenreiterMainWindow::~WellenreiterMainWindow()
157 163
158}; 164};
159 165
160 166void WellenreiterMainWindow::demoAddStations()
167{
168 mw->netView()->addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 );
169 mw->netView()->addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 );
170 mw->netView()->addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 );
171 mw->netView()->addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 );
172 mw->netView()->addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 );
173}
161 174
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index c21841a..22c21e8 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -45,6 +45,7 @@ class WellenreiterMainWindow: public QMainWindow
45 45
46 public slots: 46 public slots:
47 void showConfigure(); 47 void showConfigure();
48 void demoAddStations();
48}; 49};
49 50
50#endif 51#endif
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index a55d6a1..61960d2 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -51,6 +51,7 @@ class Wellenreiter : public WellenreiterBase {
51 ~Wellenreiter(); 51 ~Wellenreiter();
52 52
53 void setConfigWindow( WellenreiterConfigWindow* cw ); 53 void setConfigWindow( WellenreiterConfigWindow* cw );
54 MScanListView* netView() const { return netview; };
54 55
55 protected: 56 protected:
56 bool daemonRunning; 57 bool daemonRunning;