Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/configbase.ui | 80 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 98 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 2 |
4 files changed, 151 insertions, 30 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui index 57ffd2a..e2f734a 100644 --- a/noncore/net/wellenreiter/gui/configbase.ui +++ b/noncore/net/wellenreiter/gui/configbase.ui | |||
@@ -13,4 +13,4 @@ | |||
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>240</width> | 14 | <width>232</width> |
15 | <height>276</height> | 15 | <height>267</height> |
16 | </rect> | 16 | </rect> |
@@ -21,2 +21,8 @@ | |||
21 | </property> | 21 | </property> |
22 | <property> | ||
23 | <name>layoutMargin</name> | ||
24 | </property> | ||
25 | <property> | ||
26 | <name>layoutSpacing</name> | ||
27 | </property> | ||
22 | <vbox> | 28 | <vbox> |
@@ -24,3 +30,3 @@ | |||
24 | <name>margin</name> | 30 | <name>margin</name> |
25 | <number>11</number> | 31 | <number>4</number> |
26 | </property> | 32 | </property> |
@@ -28,3 +34,3 @@ | |||
28 | <name>spacing</name> | 34 | <name>spacing</name> |
29 | <number>6</number> | 35 | <number>0</number> |
30 | </property> | 36 | </property> |
@@ -36,2 +42,5 @@ | |||
36 | </property> | 42 | </property> |
43 | <property> | ||
44 | <name>layoutSpacing</name> | ||
45 | </property> | ||
37 | <hbox> | 46 | <hbox> |
@@ -43,3 +52,3 @@ | |||
43 | <name>spacing</name> | 52 | <name>spacing</name> |
44 | <number>6</number> | 53 | <number>2</number> |
45 | </property> | 54 | </property> |
@@ -82,2 +91,5 @@ | |||
82 | </property> | 91 | </property> |
92 | <property> | ||
93 | <name>layoutSpacing</name> | ||
94 | </property> | ||
83 | <grid> | 95 | <grid> |
@@ -89,3 +101,3 @@ | |||
89 | <name>spacing</name> | 101 | <name>spacing</name> |
90 | <number>6</number> | 102 | <number>2</number> |
91 | </property> | 103 | </property> |
@@ -141,3 +153,3 @@ | |||
141 | <name>enabled</name> | 153 | <name>enabled</name> |
142 | <bool>false</bool> | 154 | <bool>true</bool> |
143 | </property> | 155 | </property> |
@@ -197,3 +209,3 @@ | |||
197 | <name>enabled</name> | 209 | <name>enabled</name> |
198 | <bool>false</bool> | 210 | <bool>true</bool> |
199 | </property> | 211 | </property> |
@@ -223,3 +235,3 @@ | |||
223 | <name>enabled</name> | 235 | <name>enabled</name> |
224 | <bool>false</bool> | 236 | <bool>true</bool> |
225 | </property> | 237 | </property> |
@@ -250,3 +262,3 @@ | |||
250 | <name>enabled</name> | 262 | <name>enabled</name> |
251 | <bool>false</bool> | 263 | <bool>true</bool> |
252 | </property> | 264 | </property> |
@@ -265,3 +277,3 @@ | |||
265 | <name>enabled</name> | 277 | <name>enabled</name> |
266 | <bool>false</bool> | 278 | <bool>true</bool> |
267 | </property> | 279 | </property> |
@@ -280,3 +292,3 @@ | |||
280 | <name>enabled</name> | 292 | <name>enabled</name> |
281 | <bool>false</bool> | 293 | <bool>true</bool> |
282 | </property> | 294 | </property> |
@@ -295,2 +307,5 @@ | |||
295 | </property> | 307 | </property> |
308 | <property> | ||
309 | <name>layoutSpacing</name> | ||
310 | </property> | ||
296 | <hbox> | 311 | <hbox> |
@@ -302,3 +317,3 @@ | |||
302 | <name>spacing</name> | 317 | <name>spacing</name> |
303 | <number>6</number> | 318 | <number>2</number> |
304 | </property> | 319 | </property> |
@@ -339,3 +354,6 @@ | |||
339 | <name>name</name> | 354 | <name>name</name> |
340 | <cstring>Layout8</cstring> | 355 | <cstring>Layout5</cstring> |
356 | </property> | ||
357 | <property> | ||
358 | <name>layoutSpacing</name> | ||
341 | </property> | 359 | </property> |
@@ -348,3 +366,3 @@ | |||
348 | <name>spacing</name> | 366 | <name>spacing</name> |
349 | <number>6</number> | 367 | <number>-1</number> |
350 | </property> | 368 | </property> |
@@ -380,4 +398,36 @@ | |||
380 | </widget> | 398 | </widget> |
399 | <widget> | ||
400 | <class>QCheckBox</class> | ||
401 | <property stdset="1"> | ||
402 | <name>name</name> | ||
403 | <cstring>beepOnFound</cstring> | ||
404 | </property> | ||
405 | <property stdset="1"> | ||
406 | <name>text</name> | ||
407 | <string>Beep on new network</string> | ||
408 | </property> | ||
409 | </widget> | ||
381 | </vbox> | 410 | </vbox> |
382 | </widget> | 411 | </widget> |
412 | <spacer> | ||
413 | <property> | ||
414 | <name>name</name> | ||
415 | <cstring>Spacer2</cstring> | ||
416 | </property> | ||
417 | <property stdset="1"> | ||
418 | <name>orientation</name> | ||
419 | <enum>Vertical</enum> | ||
420 | </property> | ||
421 | <property stdset="1"> | ||
422 | <name>sizeType</name> | ||
423 | <enum>Expanding</enum> | ||
424 | </property> | ||
425 | <property> | ||
426 | <name>sizeHint</name> | ||
427 | <size> | ||
428 | <width>20</width> | ||
429 | <height>20</height> | ||
430 | </size> | ||
431 | </property> | ||
432 | </spacer> | ||
383 | </vbox> | 433 | </vbox> |
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h index 759d46d..c2db283 100644 --- a/noncore/net/wellenreiter/gui/configwindow.h +++ b/noncore/net/wellenreiter/gui/configwindow.h | |||
@@ -26,2 +26,3 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase | |||
26 | 26 | ||
27 | |||
27 | }; | 28 | }; |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 5808e9c..764ef34 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -18,2 +18,11 @@ | |||
18 | #include <qpushbutton.h> | 18 | #include <qpushbutton.h> |
19 | #include <qmessagebox.h> | ||
20 | #include <qcombobox.h> | ||
21 | #include <qspinbox.h> | ||
22 | |||
23 | // Qtopia | ||
24 | |||
25 | #ifdef QWS | ||
26 | #include <qpe/global.h> | ||
27 | #endif | ||
19 | 28 | ||
@@ -26,2 +35,3 @@ | |||
26 | #include <sys/types.h> | 35 | #include <sys/types.h> |
36 | #include <stdlib.h> | ||
27 | 37 | ||
@@ -33,2 +43,3 @@ | |||
33 | #include "hexwindow.h" | 43 | #include "hexwindow.h" |
44 | #include "configwindow.h" | ||
34 | 45 | ||
@@ -39,3 +50,3 @@ | |||
39 | Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | 50 | Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) |
40 | : WellenreiterBase( parent, name, fl ) | 51 | : WellenreiterBase( parent, name, fl ), daemonRunning( false ) |
41 | { | 52 | { |
@@ -151,6 +162,6 @@ void Wellenreiter::timerEvent( QTimerEvent* e ) | |||
151 | { | 162 | { |
152 | qDebug( "checking for message..." ); | 163 | //qDebug( "checking for message..." ); |
153 | if ( hasMessage() ) | 164 | if ( hasMessage() ) |
154 | { | 165 | { |
155 | qDebug( "got message" ); | 166 | //qDebug( "got message from daemon" ); |
156 | handleMessage(); | 167 | handleMessage(); |
@@ -159,3 +170,3 @@ void Wellenreiter::timerEvent( QTimerEvent* e ) | |||
159 | { | 170 | { |
160 | qDebug( "no message..." ); | 171 | //qDebug( "no message..." ); |
161 | } | 172 | } |
@@ -239,19 +250,76 @@ void Wellenreiter::buttonClicked() | |||
239 | { | 250 | { |
251 | if ( daemonRunning ) | ||
252 | { | ||
253 | logwindow->log( "(i) Daemon has been stopped." ); | ||
254 | button->setText( "Start Scanning" ); | ||
255 | |||
256 | // Stop daemon | ||
257 | |||
258 | // find out pids of wellenreiterd and orinoco_hopper | ||
259 | |||
260 | } | ||
261 | |||
262 | else | ||
263 | { | ||
264 | |||
265 | // get configuration from config window | ||
266 | |||
267 | const QString& interface = configwindow->interfaceName->currentText(); | ||
268 | const QString& cardtype = configwindow->deviceType->currentText(); | ||
269 | const QString& interval = configwindow->hopInterval->cleanText(); | ||
270 | |||
271 | if ( ( interface == "<select>" ) || ( cardtype == "<select>" ) ) | ||
272 | { | ||
273 | QMessageBox::information( this, "Wellenreiter/Opie", "You must configure your\ndevice before scanning." ); | ||
274 | return; | ||
275 | } | ||
276 | |||
277 | logwindow->log( "(i) Daemon has been started." ); | ||
278 | button->setText( "Stop Scanning" ); | ||
279 | |||
280 | #ifdef QWS | ||
281 | |||
282 | // set interface into monitor mode | ||
283 | |||
284 | QString cmdline; | ||
285 | |||
286 | cmdline.sprintf( "iwpriv %s monitor 2", (const char*) interface ); | ||
287 | system( cmdline ); | ||
288 | cmdline.sprintf( "iwpriv %s monitor 2 1", (const char*) interface ); | ||
289 | system( cmdline ); | ||
290 | |||
291 | // start channel hopper | ||
292 | |||
293 | cmdline = "orinoco_hopper "; | ||
294 | cmdline += interface; | ||
295 | cmdline += " -i "; | ||
296 | cmdline += interval; | ||
297 | //qDebug( "execute: %s", (const char*) cmdline ); | ||
298 | Global::execute( cmdline ); | ||
299 | |||
300 | // start daemon | ||
301 | |||
302 | cmdline = "wellenreiterd "; | ||
303 | cmdline += interface; | ||
304 | cmdline += " 3"; | ||
305 | //qDebug( "execute: %s", (const char*) cmdline ); | ||
306 | Global::execute( cmdline ); | ||
307 | #endif | ||
240 | 308 | ||
241 | // FIXME: communicate with daemon and set button text according to state | 309 | /* |
242 | 310 | ||
243 | button->setText( "Stop Scanning" ); | 311 | // add some test stations, so that we can see if the GUI part works |
244 | 312 | ||
245 | // add some test stations, so that we can see if the GUI part works | 313 | addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 ); |
314 | addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 ); | ||
315 | addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 ); | ||
316 | addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 ); | ||
317 | addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 ); | ||
246 | 318 | ||
247 | addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 ); | 319 | QString command ("98"); |
248 | addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 ); | ||
249 | addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 ); | ||
250 | addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 ); | ||
251 | addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 ); | ||
252 | |||
253 | QString command ("98"); | ||
254 | 320 | ||
255 | //sendcomm( DAEMONADDR, DAEMONPORT, (const char*) command ); | 321 | //sendcomm( DAEMONADDR, DAEMONPORT, (const char*) command ); |
256 | 322 | ||
323 | */ | ||
324 | } | ||
257 | } | 325 | } |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index 61f7503..052a242 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -32,2 +32,4 @@ protected: | |||
32 | virtual void timerEvent( QTimerEvent* ); | 32 | virtual void timerEvent( QTimerEvent* ); |
33 | |||
34 | bool daemonRunning; | ||
33 | 35 | ||