author | mickeyl <mickeyl> | 2002-12-12 10:53:13 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2002-12-12 10:53:13 (UTC) |
commit | 767365b49f2aa679afd388c1fd9384cc6a6df4ef (patch) (unidiff) | |
tree | 5ea4f7aa7f34c7b042dd9cef56f01582eb174331 /noncore/net | |
parent | 830a9a484064e0703e7e4e98714e415f5896068c (diff) | |
download | opie-767365b49f2aa679afd388c1fd9384cc6a6df4ef.zip opie-767365b49f2aa679afd388c1fd9384cc6a6df4ef.tar.gz opie-767365b49f2aa679afd388c1fd9384cc6a6df4ef.tar.bz2 |
Config Tab is shaping up.
-rw-r--r-- | noncore/net/wellenreiter/gui/configbase.ui | 242 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 5 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.h | 2 |
4 files changed, 167 insertions, 86 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui index 8f38252..57ffd2a 100644 --- a/noncore/net/wellenreiter/gui/configbase.ui +++ b/noncore/net/wellenreiter/gui/configbase.ui | |||
@@ -1,9 +1,9 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>Form1</class> | 2 | <class>WellenreiterConfigBase</class> |
3 | <widget> | 3 | <widget> |
4 | <class>QWidget</class> | 4 | <class>QWidget</class> |
5 | <property stdset="1"> | 5 | <property stdset="1"> |
6 | <name>name</name> | 6 | <name>name</name> |
7 | <cstring>Form1</cstring> | 7 | <cstring>WellenreiterConfigBase</cstring> |
8 | </property> | 8 | </property> |
9 | <property stdset="1"> | 9 | <property stdset="1"> |
@@ -12,6 +12,6 @@ | |||
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>226</width> | 14 | <width>240</width> |
15 | <height>300</height> | 15 | <height>276</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
@@ -30,29 +30,10 @@ | |||
30 | </property> | 30 | </property> |
31 | <widget> | 31 | <widget> |
32 | <class>QGroupBox</class> | ||
33 | <property stdset="1"> | ||
34 | <name>name</name> | ||
35 | <cstring>GroupBox1</cstring> | ||
36 | </property> | ||
37 | <property stdset="1"> | ||
38 | <name>title</name> | ||
39 | <string>Sniffer Options</string> | ||
40 | </property> | ||
41 | <grid> | ||
42 | <property stdset="1"> | ||
43 | <name>margin</name> | ||
44 | <number>11</number> | ||
45 | </property> | ||
46 | <property stdset="1"> | ||
47 | <name>spacing</name> | ||
48 | <number>6</number> | ||
49 | </property> | ||
50 | <widget row="0" column="0" > | ||
51 | <class>QLayoutWidget</class> | 32 | <class>QLayoutWidget</class> |
52 | <property stdset="1"> | 33 | <property stdset="1"> |
53 | <name>name</name> | 34 | <name>name</name> |
54 | <cstring>Layout1</cstring> | 35 | <cstring>Layout5</cstring> |
55 | </property> | 36 | </property> |
56 | <grid> | 37 | <hbox> |
57 | <property stdset="1"> | 38 | <property stdset="1"> |
58 | <name>margin</name> | 39 | <name>margin</name> |
@@ -63,38 +44,50 @@ | |||
63 | <number>6</number> | 44 | <number>6</number> |
64 | </property> | 45 | </property> |
65 | <widget row="2" column="0" > | 46 | <widget> |
66 | <class>QSpinBox</class> | 47 | <class>QLabel</class> |
67 | <property stdset="1"> | 48 | <property stdset="1"> |
68 | <name>name</name> | 49 | <name>name</name> |
69 | <cstring>hopInterval</cstring> | 50 | <cstring>TextLabel3_2</cstring> |
70 | </property> | 51 | </property> |
71 | <property stdset="1"> | 52 | <property stdset="1"> |
72 | <name>suffix</name> | 53 | <name>sizePolicy</name> |
73 | <string> ms</string> | 54 | <sizepolicy> |
55 | <hsizetype>4</hsizetype> | ||
56 | <vsizetype>1</vsizetype> | ||
57 | </sizepolicy> | ||
74 | </property> | 58 | </property> |
75 | <property stdset="1"> | 59 | <property stdset="1"> |
76 | <name>maxValue</name> | 60 | <name>text</name> |
77 | <number>2000</number> | 61 | <string>Sniffer</string> |
78 | </property> | 62 | </property> |
63 | </widget> | ||
64 | <widget> | ||
65 | <class>Line</class> | ||
79 | <property stdset="1"> | 66 | <property stdset="1"> |
80 | <name>minValue</name> | 67 | <name>name</name> |
81 | <number>100</number> | 68 | <cstring>Line9</cstring> |
82 | </property> | 69 | </property> |
83 | <property stdset="1"> | 70 | <property stdset="1"> |
84 | <name>lineStep</name> | 71 | <name>orientation</name> |
85 | <number>100</number> | 72 | <enum>Horizontal</enum> |
86 | </property> | 73 | </property> |
87 | </widget> | 74 | </widget> |
88 | <widget row="2" column="1" > | 75 | </hbox> |
89 | <class>QLabel</class> | 76 | </widget> |
77 | <widget> | ||
78 | <class>QLayoutWidget</class> | ||
90 | <property stdset="1"> | 79 | <property stdset="1"> |
91 | <name>name</name> | 80 | <name>name</name> |
92 | <cstring>TextLabel3</cstring> | 81 | <cstring>Layout7</cstring> |
82 | </property> | ||
83 | <grid> | ||
84 | <property stdset="1"> | ||
85 | <name>margin</name> | ||
86 | <number>0</number> | ||
93 | </property> | 87 | </property> |
94 | <property stdset="1"> | 88 | <property stdset="1"> |
95 | <name>text</name> | 89 | <name>spacing</name> |
96 | <string>Hop Interval</string> | 90 | <number>6</number> |
97 | </property> | 91 | </property> |
98 | </widget> | ||
99 | <widget row="0" column="0" > | 92 | <widget row="0" column="0" > |
100 | <class>QComboBox</class> | 93 | <class>QComboBox</class> |
@@ -145,14 +138,22 @@ | |||
145 | <cstring>interfaceName</cstring> | 138 | <cstring>interfaceName</cstring> |
146 | </property> | 139 | </property> |
140 | <property stdset="1"> | ||
141 | <name>enabled</name> | ||
142 | <bool>false</bool> | ||
143 | </property> | ||
147 | </widget> | 144 | </widget> |
148 | <widget row="0" column="1" > | 145 | <widget row="4" column="0" rowspan="1" colspan="2" > |
149 | <class>QLabel</class> | 146 | <class>QCheckBox</class> |
150 | <property stdset="1"> | 147 | <property stdset="1"> |
151 | <name>name</name> | 148 | <name>name</name> |
152 | <cstring>TextLabel1</cstring> | 149 | <cstring>activeScanning</cstring> |
150 | </property> | ||
151 | <property stdset="1"> | ||
152 | <name>enabled</name> | ||
153 | <bool>false</bool> | ||
153 | </property> | 154 | </property> |
154 | <property stdset="1"> | 155 | <property stdset="1"> |
155 | <name>text</name> | 156 | <name>text</name> |
156 | <string>Interface Name</string> | 157 | <string>Active Scanning (caution!)</string> |
157 | </property> | 158 | </property> |
158 | </widget> | 159 | </widget> |
@@ -193,4 +194,65 @@ | |||
193 | <cstring>deviceType</cstring> | 194 | <cstring>deviceType</cstring> |
194 | </property> | 195 | </property> |
196 | <property stdset="1"> | ||
197 | <name>enabled</name> | ||
198 | <bool>false</bool> | ||
199 | </property> | ||
200 | </widget> | ||
201 | <widget row="3" column="0" rowspan="1" colspan="2" > | ||
202 | <class>QCheckBox</class> | ||
203 | <property stdset="1"> | ||
204 | <name>name</name> | ||
205 | <cstring>additionalInfo</cstring> | ||
206 | </property> | ||
207 | <property stdset="1"> | ||
208 | <name>enabled</name> | ||
209 | <bool>false</bool> | ||
210 | </property> | ||
211 | <property stdset="1"> | ||
212 | <name>text</name> | ||
213 | <string>Gather Additional Info</string> | ||
214 | </property> | ||
215 | </widget> | ||
216 | <widget row="2" column="0" > | ||
217 | <class>QSpinBox</class> | ||
218 | <property stdset="1"> | ||
219 | <name>name</name> | ||
220 | <cstring>hopInterval</cstring> | ||
221 | </property> | ||
222 | <property stdset="1"> | ||
223 | <name>enabled</name> | ||
224 | <bool>false</bool> | ||
225 | </property> | ||
226 | <property stdset="1"> | ||
227 | <name>suffix</name> | ||
228 | <string> ms</string> | ||
229 | </property> | ||
230 | <property stdset="1"> | ||
231 | <name>maxValue</name> | ||
232 | <number>2000</number> | ||
233 | </property> | ||
234 | <property stdset="1"> | ||
235 | <name>minValue</name> | ||
236 | <number>100</number> | ||
237 | </property> | ||
238 | <property stdset="1"> | ||
239 | <name>lineStep</name> | ||
240 | <number>100</number> | ||
241 | </property> | ||
242 | </widget> | ||
243 | <widget row="2" column="1" > | ||
244 | <class>QLabel</class> | ||
245 | <property stdset="1"> | ||
246 | <name>name</name> | ||
247 | <cstring>TextLabel3_3</cstring> | ||
248 | </property> | ||
249 | <property stdset="1"> | ||
250 | <name>enabled</name> | ||
251 | <bool>false</bool> | ||
252 | </property> | ||
253 | <property stdset="1"> | ||
254 | <name>text</name> | ||
255 | <string>Hop Interval</string> | ||
256 | </property> | ||
195 | </widget> | 257 | </widget> |
196 | <widget row="1" column="1" > | 258 | <widget row="1" column="1" > |
@@ -198,5 +260,9 @@ | |||
198 | <property stdset="1"> | 260 | <property stdset="1"> |
199 | <name>name</name> | 261 | <name>name</name> |
200 | <cstring>TextLabel2</cstring> | 262 | <cstring>TextLabel2_3</cstring> |
263 | </property> | ||
264 | <property stdset="1"> | ||
265 | <name>enabled</name> | ||
266 | <bool>false</bool> | ||
201 | </property> | 267 | </property> |
202 | <property stdset="1"> | 268 | <property stdset="1"> |
@@ -205,73 +271,77 @@ | |||
205 | </property> | 271 | </property> |
206 | </widget> | 272 | </widget> |
207 | </grid> | 273 | <widget row="0" column="1" > |
274 | <class>QLabel</class> | ||
275 | <property stdset="1"> | ||
276 | <name>name</name> | ||
277 | <cstring>TextLabel1_2</cstring> | ||
278 | </property> | ||
279 | <property stdset="1"> | ||
280 | <name>enabled</name> | ||
281 | <bool>false</bool> | ||
282 | </property> | ||
283 | <property stdset="1"> | ||
284 | <name>text</name> | ||
285 | <string>Interface Name</string> | ||
286 | </property> | ||
208 | </widget> | 287 | </widget> |
209 | </grid> | 288 | </grid> |
210 | </widget> | 289 | </widget> |
211 | <widget> | 290 | <widget> |
212 | <class>QGroupBox</class> | 291 | <class>QLayoutWidget</class> |
213 | <property stdset="1"> | 292 | <property stdset="1"> |
214 | <name>name</name> | 293 | <name>name</name> |
215 | <cstring>GroupBox8</cstring> | 294 | <cstring>Layout6</cstring> |
216 | </property> | 295 | </property> |
296 | <hbox> | ||
217 | <property stdset="1"> | 297 | <property stdset="1"> |
218 | <name>title</name> | 298 | <name>margin</name> |
219 | <string>Advanced Options</string> | 299 | <number>0</number> |
300 | </property> | ||
301 | <property stdset="1"> | ||
302 | <name>spacing</name> | ||
303 | <number>6</number> | ||
220 | </property> | 304 | </property> |
221 | <widget> | 305 | <widget> |
222 | <class>QCheckBox</class> | 306 | <class>QLabel</class> |
223 | <property stdset="1"> | 307 | <property stdset="1"> |
224 | <name>name</name> | 308 | <name>name</name> |
225 | <cstring>additionalInfo</cstring> | 309 | <cstring>TextLabel3_2_2</cstring> |
226 | </property> | 310 | </property> |
227 | <property stdset="1"> | 311 | <property stdset="1"> |
228 | <name>geometry</name> | 312 | <name>sizePolicy</name> |
229 | <rect> | 313 | <sizepolicy> |
230 | <x>11</x> | 314 | <hsizetype>4</hsizetype> |
231 | <y>19</y> | 315 | <vsizetype>1</vsizetype> |
232 | <width>147</width> | 316 | </sizepolicy> |
233 | <height>19</height> | ||
234 | </rect> | ||
235 | </property> | 317 | </property> |
236 | <property stdset="1"> | 318 | <property stdset="1"> |
237 | <name>text</name> | 319 | <name>text</name> |
238 | <string>Gather Additional Info</string> | 320 | <string>GUI</string> |
239 | </property> | 321 | </property> |
240 | </widget> | 322 | </widget> |
241 | <widget> | 323 | <widget> |
242 | <class>QCheckBox</class> | 324 | <class>Line</class> |
243 | <property stdset="1"> | 325 | <property stdset="1"> |
244 | <name>name</name> | 326 | <name>name</name> |
245 | <cstring>activeScanning</cstring> | 327 | <cstring>Line9_2</cstring> |
246 | </property> | ||
247 | <property stdset="1"> | ||
248 | <name>geometry</name> | ||
249 | <rect> | ||
250 | <x>11</x> | ||
251 | <y>44</y> | ||
252 | <width>175</width> | ||
253 | <height>19</height> | ||
254 | </rect> | ||
255 | </property> | 328 | </property> |
256 | <property stdset="1"> | 329 | <property stdset="1"> |
257 | <name>text</name> | 330 | <name>orientation</name> |
258 | <string>Active Scanning (caution!)</string> | 331 | <enum>Horizontal</enum> |
259 | </property> | 332 | </property> |
260 | </widget> | 333 | </widget> |
334 | </hbox> | ||
261 | </widget> | 335 | </widget> |
262 | <widget> | 336 | <widget> |
263 | <class>QGroupBox</class> | 337 | <class>QLayoutWidget</class> |
264 | <property stdset="1"> | 338 | <property stdset="1"> |
265 | <name>name</name> | 339 | <name>name</name> |
266 | <cstring>GroupBox3</cstring> | 340 | <cstring>Layout8</cstring> |
267 | </property> | ||
268 | <property stdset="1"> | ||
269 | <name>title</name> | ||
270 | <string>GUI Options</string> | ||
271 | </property> | 341 | </property> |
272 | <vbox> | 342 | <vbox> |
273 | <property stdset="1"> | 343 | <property stdset="1"> |
274 | <name>margin</name> | 344 | <name>margin</name> |
275 | <number>11</number> | 345 | <number>0</number> |
276 | </property> | 346 | </property> |
277 | <property stdset="1"> | 347 | <property stdset="1"> |
@@ -286,4 +356,8 @@ | |||
286 | </property> | 356 | </property> |
287 | <property stdset="1"> | 357 | <property stdset="1"> |
358 | <name>enabled</name> | ||
359 | <bool>false</bool> | ||
360 | </property> | ||
361 | <property stdset="1"> | ||
288 | <name>text</name> | 362 | <name>text</name> |
289 | <string>Group Detected Networks</string> | 363 | <string>Group Detected Networks</string> |
@@ -297,4 +371,8 @@ | |||
297 | </property> | 371 | </property> |
298 | <property stdset="1"> | 372 | <property stdset="1"> |
373 | <name>enabled</name> | ||
374 | <bool>false</bool> | ||
375 | </property> | ||
376 | <property stdset="1"> | ||
299 | <name>text</name> | 377 | <name>text</name> |
300 | <string>Enable Activity Display</string> | 378 | <string>Enable Activity Display</string> |
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index a047433..b271ee3 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -3,6 +3,6 @@ TEMPLATE = app | |||
3 | CONFIG = qt warn_on debug | 3 | CONFIG = qt warn_on debug |
4 | #CONFIG = qt warn_on release | 4 | #CONFIG = qt warn_on release |
5 | HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h | 5 | HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h |
6 | SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp | 6 | SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include ../daemon | 7 | INCLUDEPATH += $(OPIEDIR)/include ../daemon |
8 | DEPENDPATH += $(OPIEDIR)/include ../daemon | 8 | DEPENDPATH += $(OPIEDIR)/include ../daemon |
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index b1845b9..aa94c81 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -31,4 +31,5 @@ | |||
31 | #include "logwindow.h" | 31 | #include "logwindow.h" |
32 | #include "hexwindow.h" | 32 | #include "hexwindow.h" |
33 | #include "configwindow.h" | ||
33 | 34 | ||
34 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
@@ -91,6 +92,6 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
91 | //--------- CONFIG TAB -------------- | 92 | //--------- CONFIG TAB -------------- |
92 | 93 | ||
93 | QPushButton* dummy = new QPushButton( "under construction", TabWidget ); | 94 | configwindow = new WellenreiterConfigWindow( TabWidget, "Config" ); |
94 | TabWidget->addTab( dummy, "wellenreiter/config", tr( "Config" ) ); | 95 | TabWidget->addTab( configwindow, "wellenreiter/config", tr( "Config" ) ); |
95 | 96 | ||
96 | //--------- ABOUT TAB -------------- | 97 | //--------- ABOUT TAB -------------- |
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h index b7bd820..4e5ca94 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.h +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h | |||
@@ -29,4 +29,5 @@ class OTabWidget; | |||
29 | class MLogWindow; | 29 | class MLogWindow; |
30 | class MHexWindow; | 30 | class MHexWindow; |
31 | class WellenreiterConfigWindow; | ||
31 | 32 | ||
32 | class WellenreiterBase : public QWidget | 33 | class WellenreiterBase : public QWidget |
@@ -43,4 +44,5 @@ public: | |||
43 | MLogWindow* logwindow; | 44 | MLogWindow* logwindow; |
44 | MHexWindow* hexwindow; | 45 | MHexWindow* hexwindow; |
46 | WellenreiterConfigWindow* configwindow; | ||
45 | QWidget* about; | 47 | QWidget* about; |
46 | QLabel* PixmapLabel1_3_2; | 48 | QLabel* PixmapLabel1_3_2; |