summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2002-12-12 10:53:13 (UTC)
committer mickeyl <mickeyl>2002-12-12 10:53:13 (UTC)
commit767365b49f2aa679afd388c1fd9384cc6a6df4ef (patch) (unidiff)
tree5ea4f7aa7f34c7b042dd9cef56f01582eb174331
parent830a9a484064e0703e7e4e98714e415f5896068c (diff)
downloadopie-767365b49f2aa679afd388c1fd9384cc6a6df4ef.zip
opie-767365b49f2aa679afd388c1fd9384cc6a6df4ef.tar.gz
opie-767365b49f2aa679afd388c1fd9384cc6a6df4ef.tar.bz2
Config Tab is shaping up.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui498
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro4
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp5
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.h4
4 files changed, 296 insertions, 215 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,18 +1,18 @@
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">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
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>
18 <property stdset="1"> 18 <property stdset="1">
@@ -29,250 +29,320 @@
29 <number>6</number> 29 <number>6</number>
30 </property> 30 </property>
31 <widget> 31 <widget>
32 <class>QGroupBox</class> 32 <class>QLayoutWidget</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>GroupBox1</cstring> 35 <cstring>Layout5</cstring>
36 </property> 36 </property>
37 <hbox>
38 <property stdset="1">
39 <name>margin</name>
40 <number>0</number>
41 </property>
42 <property stdset="1">
43 <name>spacing</name>
44 <number>6</number>
45 </property>
46 <widget>
47 <class>QLabel</class>
48 <property stdset="1">
49 <name>name</name>
50 <cstring>TextLabel3_2</cstring>
51 </property>
52 <property stdset="1">
53 <name>sizePolicy</name>
54 <sizepolicy>
55 <hsizetype>4</hsizetype>
56 <vsizetype>1</vsizetype>
57 </sizepolicy>
58 </property>
59 <property stdset="1">
60 <name>text</name>
61 <string>Sniffer</string>
62 </property>
63 </widget>
64 <widget>
65 <class>Line</class>
66 <property stdset="1">
67 <name>name</name>
68 <cstring>Line9</cstring>
69 </property>
70 <property stdset="1">
71 <name>orientation</name>
72 <enum>Horizontal</enum>
73 </property>
74 </widget>
75 </hbox>
76 </widget>
77 <widget>
78 <class>QLayoutWidget</class>
37 <property stdset="1"> 79 <property stdset="1">
38 <name>title</name> 80 <name>name</name>
39 <string>Sniffer Options</string> 81 <cstring>Layout7</cstring>
40 </property> 82 </property>
41 <grid> 83 <grid>
42 <property stdset="1"> 84 <property stdset="1">
43 <name>margin</name> 85 <name>margin</name>
44 <number>11</number> 86 <number>0</number>
45 </property> 87 </property>
46 <property stdset="1"> 88 <property stdset="1">
47 <name>spacing</name> 89 <name>spacing</name>
48 <number>6</number> 90 <number>6</number>
49 </property> 91 </property>
50 <widget row="0" column="0" > 92 <widget row="0" column="0" >
51 <class>QLayoutWidget</class> 93 <class>QComboBox</class>
94 <item>
95 <property>
96 <name>text</name>
97 <string>&lt;select&gt;</string>
98 </property>
99 </item>
100 <item>
101 <property>
102 <name>text</name>
103 <string>eth0</string>
104 </property>
105 </item>
106 <item>
107 <property>
108 <name>text</name>
109 <string>eth1</string>
110 </property>
111 </item>
112 <item>
113 <property>
114 <name>text</name>
115 <string>wlan0</string>
116 </property>
117 </item>
118 <item>
119 <property>
120 <name>text</name>
121 <string>wlan1</string>
122 </property>
123 </item>
124 <item>
125 <property>
126 <name>text</name>
127 <string>wifi0</string>
128 </property>
129 </item>
130 <item>
131 <property>
132 <name>text</name>
133 <string>wifi1</string>
134 </property>
135 </item>
52 <property stdset="1"> 136 <property stdset="1">
53 <name>name</name> 137 <name>name</name>
54 <cstring>Layout1</cstring> 138 <cstring>interfaceName</cstring>
139 </property>
140 <property stdset="1">
141 <name>enabled</name>
142 <bool>false</bool>
55 </property> 143 </property>
56 <grid> 144 </widget>
57 <property stdset="1"> 145 <widget row="4" column="0" rowspan="1" colspan="2" >
58 <name>margin</name> 146 <class>QCheckBox</class>
59 <number>0</number> 147 <property stdset="1">
148 <name>name</name>
149 <cstring>activeScanning</cstring>
150 </property>
151 <property stdset="1">
152 <name>enabled</name>
153 <bool>false</bool>
154 </property>
155 <property stdset="1">
156 <name>text</name>
157 <string>Active Scanning (caution!)</string>
158 </property>
159 </widget>
160 <widget row="1" column="0" >
161 <class>QComboBox</class>
162 <item>
163 <property>
164 <name>text</name>
165 <string>&lt;select&gt;</string>
166 </property>
167 </item>
168 <item>
169 <property>
170 <name>text</name>
171 <string>cisco</string>
172 </property>
173 </item>
174 <item>
175 <property>
176 <name>text</name>
177 <string>orinoco</string>
178 </property>
179 </item>
180 <item>
181 <property>
182 <name>text</name>
183 <string>prism</string>
60 </property> 184 </property>
61 <property stdset="1"> 185 </item>
62 <name>spacing</name> 186 <item>
63 <number>6</number> 187 <property>
188 <name>text</name>
189 <string>&lt;manual&gt;</string>
64 </property> 190 </property>
65 <widget row="2" column="0" > 191 </item>
66 <class>QSpinBox</class> 192 <property stdset="1">
67 <property stdset="1"> 193 <name>name</name>
68 <name>name</name> 194 <cstring>deviceType</cstring>
69 <cstring>hopInterval</cstring> 195 </property>
70 </property> 196 <property stdset="1">
71 <property stdset="1"> 197 <name>enabled</name>
72 <name>suffix</name> 198 <bool>false</bool>
73 <string> ms</string> 199 </property>
74 </property> 200 </widget>
75 <property stdset="1"> 201 <widget row="3" column="0" rowspan="1" colspan="2" >
76 <name>maxValue</name> 202 <class>QCheckBox</class>
77 <number>2000</number> 203 <property stdset="1">
78 </property> 204 <name>name</name>
79 <property stdset="1"> 205 <cstring>additionalInfo</cstring>
80 <name>minValue</name> 206 </property>
81 <number>100</number> 207 <property stdset="1">
82 </property> 208 <name>enabled</name>
83 <property stdset="1"> 209 <bool>false</bool>
84 <name>lineStep</name> 210 </property>
85 <number>100</number> 211 <property stdset="1">
86 </property> 212 <name>text</name>
87 </widget> 213 <string>Gather Additional Info</string>
88 <widget row="2" column="1" > 214 </property>
89 <class>QLabel</class> 215 </widget>
90 <property stdset="1"> 216 <widget row="2" column="0" >
91 <name>name</name> 217 <class>QSpinBox</class>
92 <cstring>TextLabel3</cstring> 218 <property stdset="1">
93 </property> 219 <name>name</name>
94 <property stdset="1"> 220 <cstring>hopInterval</cstring>
95 <name>text</name> 221 </property>
96 <string>Hop Interval</string> 222 <property stdset="1">
97 </property> 223 <name>enabled</name>
98 </widget> 224 <bool>false</bool>
99 <widget row="0" column="0" > 225 </property>
100 <class>QComboBox</class> 226 <property stdset="1">
101 <item> 227 <name>suffix</name>
102 <property> 228 <string> ms</string>
103 <name>text</name> 229 </property>
104 <string>&lt;select&gt;</string> 230 <property stdset="1">
105 </property> 231 <name>maxValue</name>
106 </item> 232 <number>2000</number>
107 <item> 233 </property>
108 <property> 234 <property stdset="1">
109 <name>text</name> 235 <name>minValue</name>
110 <string>eth0</string> 236 <number>100</number>
111 </property> 237 </property>
112 </item> 238 <property stdset="1">
113 <item> 239 <name>lineStep</name>
114 <property> 240 <number>100</number>
115 <name>text</name> 241 </property>
116 <string>eth1</string> 242 </widget>
117 </property> 243 <widget row="2" column="1" >
118 </item> 244 <class>QLabel</class>
119 <item> 245 <property stdset="1">
120 <property> 246 <name>name</name>
121 <name>text</name> 247 <cstring>TextLabel3_3</cstring>
122 <string>wlan0</string> 248 </property>
123 </property> 249 <property stdset="1">
124 </item> 250 <name>enabled</name>
125 <item> 251 <bool>false</bool>
126 <property> 252 </property>
127 <name>text</name> 253 <property stdset="1">
128 <string>wlan1</string> 254 <name>text</name>
129 </property> 255 <string>Hop Interval</string>
130 </item> 256 </property>
131 <item> 257 </widget>
132 <property> 258 <widget row="1" column="1" >
133 <name>text</name> 259 <class>QLabel</class>
134 <string>wifi0</string> 260 <property stdset="1">
135 </property> 261 <name>name</name>
136 </item> 262 <cstring>TextLabel2_3</cstring>
137 <item> 263 </property>
138 <property> 264 <property stdset="1">
139 <name>text</name> 265 <name>enabled</name>
140 <string>wifi1</string> 266 <bool>false</bool>
141 </property> 267 </property>
142 </item> 268 <property stdset="1">
143 <property stdset="1"> 269 <name>text</name>
144 <name>name</name> 270 <string>Device Type</string>
145 <cstring>interfaceName</cstring> 271 </property>
146 </property> 272 </widget>
147 </widget> 273 <widget row="0" column="1" >
148 <widget row="0" column="1" > 274 <class>QLabel</class>
149 <class>QLabel</class> 275 <property stdset="1">
150 <property stdset="1"> 276 <name>name</name>
151 <name>name</name> 277 <cstring>TextLabel1_2</cstring>
152 <cstring>TextLabel1</cstring> 278 </property>
153 </property> 279 <property stdset="1">
154 <property stdset="1"> 280 <name>enabled</name>
155 <name>text</name> 281 <bool>false</bool>
156 <string>Interface Name</string> 282 </property>
157 </property> 283 <property stdset="1">
158 </widget> 284 <name>text</name>
159 <widget row="1" column="0" > 285 <string>Interface Name</string>
160 <class>QComboBox</class> 286 </property>
161 <item>
162 <property>
163 <name>text</name>
164 <string>&lt;select&gt;</string>
165 </property>
166 </item>
167 <item>
168 <property>
169 <name>text</name>
170 <string>cisco</string>
171 </property>
172 </item>
173 <item>
174 <property>
175 <name>text</name>
176 <string>orinoco</string>
177 </property>
178 </item>
179 <item>
180 <property>
181 <name>text</name>
182 <string>prism</string>
183 </property>
184 </item>
185 <item>
186 <property>
187 <name>text</name>
188 <string>&lt;manual&gt;</string>
189 </property>
190 </item>
191 <property stdset="1">
192 <name>name</name>
193 <cstring>deviceType</cstring>
194 </property>
195 </widget>
196 <widget row="1" column="1" >
197 <class>QLabel</class>
198 <property stdset="1">
199 <name>name</name>
200 <cstring>TextLabel2</cstring>
201 </property>
202 <property stdset="1">
203 <name>text</name>
204 <string>Device Type</string>
205 </property>
206 </widget>
207 </grid>
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>
217 <property stdset="1"> 296 <hbox>
218 <name>title</name>
219 <string>Advanced Options</string>
220 </property>
221 <widget>
222 <class>QCheckBox</class>
223 <property stdset="1">
224 <name>name</name>
225 <cstring>additionalInfo</cstring>
226 </property>
227 <property stdset="1">
228 <name>geometry</name>
229 <rect>
230 <x>11</x>
231 <y>19</y>
232 <width>147</width>
233 <height>19</height>
234 </rect>
235 </property>
236 <property stdset="1">
237 <name>text</name>
238 <string>Gather Additional Info</string>
239 </property>
240 </widget>
241 <widget>
242 <class>QCheckBox</class>
243 <property stdset="1">
244 <name>name</name>
245 <cstring>activeScanning</cstring>
246 </property>
247 <property stdset="1"> 297 <property stdset="1">
248 <name>geometry</name> 298 <name>margin</name>
249 <rect> 299 <number>0</number>
250 <x>11</x>
251 <y>44</y>
252 <width>175</width>
253 <height>19</height>
254 </rect>
255 </property> 300 </property>
256 <property stdset="1"> 301 <property stdset="1">
257 <name>text</name> 302 <name>spacing</name>
258 <string>Active Scanning (caution!)</string> 303 <number>6</number>
259 </property> 304 </property>
260 </widget> 305 <widget>
306 <class>QLabel</class>
307 <property stdset="1">
308 <name>name</name>
309 <cstring>TextLabel3_2_2</cstring>
310 </property>
311 <property stdset="1">
312 <name>sizePolicy</name>
313 <sizepolicy>
314 <hsizetype>4</hsizetype>
315 <vsizetype>1</vsizetype>
316 </sizepolicy>
317 </property>
318 <property stdset="1">
319 <name>text</name>
320 <string>GUI</string>
321 </property>
322 </widget>
323 <widget>
324 <class>Line</class>
325 <property stdset="1">
326 <name>name</name>
327 <cstring>Line9_2</cstring>
328 </property>
329 <property stdset="1">
330 <name>orientation</name>
331 <enum>Horizontal</enum>
332 </property>
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">
278 <name>spacing</name> 348 <name>spacing</name>
@@ -285,6 +355,10 @@
285 <cstring>groupNetworks</cstring> 355 <cstring>groupNetworks</cstring>
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>
290 </property> 364 </property>
@@ -296,6 +370,10 @@
296 <cstring>enableActivity</cstring> 370 <cstring>enableActivity</cstring>
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>
301 </property> 379 </property>
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
@@ -2,8 +2,8 @@ DESTDIR = $(OPIEDIR)/bin
2TEMPLATE = app 2TEMPLATE = app
3CONFIG = qt warn_on debug 3CONFIG = qt warn_on debug
4#CONFIG = qt warn_on release 4#CONFIG = qt warn_on release
5HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h 5HEADERS = wellenreiterbase.h wellenreiter.h scanlistitem.h scanlist.h logwindow.h hexwindow.h configwindow.h
6SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp 6SOURCES = main.cpp wellenreiterbase.cpp wellenreiter.cpp scanlistitem.cpp scanlist.cpp logwindow.cpp hexwindow.cpp configwindow.cpp
7INCLUDEPATH += $(OPIEDIR)/include ../daemon 7INCLUDEPATH += $(OPIEDIR)/include ../daemon
8DEPENDPATH += $(OPIEDIR)/include ../daemon 8DEPENDPATH += $(OPIEDIR)/include ../daemon
9LIBS += -lqpe -lopie -lwellenreiter 9LIBS += -lqpe -lopie -lwellenreiter
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
@@ -30,6 +30,7 @@
30 30
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>
35 36
@@ -90,8 +91,8 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
90 91
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 --------------
97 98
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
@@ -28,6 +28,7 @@ class QPushButton;
28class OTabWidget; 28class OTabWidget;
29class MLogWindow; 29class MLogWindow;
30class MHexWindow; 30class MHexWindow;
31class WellenreiterConfigWindow;
31 32
32class WellenreiterBase : public QWidget 33class WellenreiterBase : public QWidget
33{ 34{
@@ -41,7 +42,8 @@ public:
41 QWidget* ap; 42 QWidget* ap;
42 QListView* netview; 43 QListView* netview;
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;
47 QLabel* TextLabel1_4_2; 49 QLabel* TextLabel1_4_2;