summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp105
-rw-r--r--noncore/net/opietooth/manager/bluebase.h17
-rw-r--r--noncore/net/opietooth/manager/bluetoothbase.ui156
-rw-r--r--noncore/net/opietooth/manager/devicedialog.ui12
-rw-r--r--noncore/net/opietooth/manager/scandialog.ui6
5 files changed, 220 insertions, 76 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index c17271f..3d446f0 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -9,54 +9,157 @@
9 */ 9 */
10/*************************************************************************** 10/***************************************************************************
11 * * 11 * *
12 * This program is free software; you can redistribute it and/or modify * 12 * This program is free software; you can redistribute it and/or modify *
13 * it under the terms of the GNU General Public License as published by * 13 * it under the terms of the GNU General Public License as published by *
14 * the Free Software Foundation; either version 2 of the License, or * 14 * the Free Software Foundation; either version 2 of the License, or *
15 * (at your option) any later version. * 15 * (at your option) any later version. *
16 * * 16 * *
17 ***************************************************************************/ 17 ***************************************************************************/
18 18
19#include "bluebase.h" 19#include "bluebase.h"
20#include "scandialog.h" 20#include "scandialog.h"
21 21
22#include <qframe.h> 22#include <qframe.h>
23#include <qlabel.h> 23#include <qlabel.h>
24#include <qpushbutton.h> 24#include <qpushbutton.h>
25#include <qlayout.h> 25#include <qlayout.h>
26#include <qvariant.h> 26#include <qvariant.h>
27#include <qwhatsthis.h> 27#include <qwhatsthis.h>
28#include <qimage.h> 28#include <qimage.h>
29#include <qpixmap.h> 29#include <qpixmap.h>
30#include <qtabwidget.h> 30#include <qtabwidget.h>
31#include <qscrollview.h> 31#include <qscrollview.h>
32#include <qvbox.h> 32#include <qvbox.h>
33#include <qmessagebox.h>
33#include <qapplication.h> 34#include <qapplication.h>
34#include <qcheckbox.h> 35#include <qcheckbox.h>
36#include <qlineedit.h>
35 37
36#include <qpe/resource.h> 38#include <qpe/resource.h>
39#include <qpe/config.h>
37 40
38BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) 41BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
39 : BluetoothBase( parent, name, fl ) { 42 : BluetoothBase( parent, name, fl ) {
40 43
41 44
42 QObject::connect( (QObject*) PushButton2, SIGNAL( clicked() ), this, SLOT(startScan())); 45 QObject::connect( (QObject*) PushButton2, SIGNAL( clicked() ), this, SLOT(startScan()));
46 QObject::connect((QObject*)configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges()));
43 47
44 QPalette pal = this->palette(); 48 QPalette pal = this->palette();
45 QColor col = pal.color(QPalette::Active, QColorGroup::Background); 49 QColor col = pal.color(QPalette::Active, QColorGroup::Background);
46 pal.setColor(QPalette::Active, QColorGroup::Button, col); 50 pal.setColor(QPalette::Active, QColorGroup::Button, col);
47 pal.setColor(QPalette::Inactive, QColorGroup::Button, col); 51 pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
48 pal.setColor(QPalette::Normal, QColorGroup::Button, col); 52 pal.setColor(QPalette::Normal, QColorGroup::Button, col);
49 pal.setColor(QPalette::Disabled, QColorGroup::Button, col); 53 pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
50 this->setPalette(pal); 54 this->setPalette(pal);
55
56 readConfig();
57 initGui();
58}
59
60/**
61 * Reads all options from the config file
62 */
63void BlueBase::readConfig() {
64
65 Config cfg("bluetoothmanager");
66 cfg.setGroup("bluezsettings");
67
68
69 deviceName = cfg.readEntry("name", "No name"); // name the device should identify with
70 defaultPasskey = cfg.readEntryCrypt("passkey", ""); // <- hmm, look up how good the trolls did that, maybe too weak
71 useEncryption = cfg.readNumEntry("useEncryption", 1);
72 enableAuthentification = cfg.readNumEntry("enableAuthentification", 1);
73 enablePagescan = cfg.readNumEntry("enablePagescan",1);
74 enableInquiryscan = cfg.readNumEntry("enableInquiryscan", 1);
75
76}
77
78/**
79 * Writes all options to the config file
80 */
81void BlueBase::writeConfig() {
82
83
84 Config cfg("bluetoothmanager");
85 cfg.setGroup("bluezsettings");
86
87
88 cfg.writeEntry("name", deviceName);
89 cfg.writeEntryCrypt("passkey", defaultPasskey);
90 cfg.writeEntry("useEncryption", useEncryption);
91 cfg.writeEntry("enableAuthentification", enableAuthentification);
92 cfg.writeEntry("enablePagescan",enablePagescan);
93 cfg.writeEntry("enableInquiryscan", enableInquiryscan);
94
95
96}
97
98
99/**
100 * Set up the gui
101 */
102void BlueBase::initGui() {
103
104 StatusLabel->setText(getStatus()); // maybe move it to getStatus()
105
106 cryptCheckBox->setChecked(useEncryption);
107 authCheckBox->setChecked(enableAuthentification);
108 pagescanCheckBox->setChecked(enablePagescan);
109 inquiryscanCheckBox->setChecked(enableInquiryscan);
110 deviceNameLine->setText(deviceName);
111 passkeyLine->setText(defaultPasskey);
112
113}
114
115
116/**
117 * Get the status informations and returns it
118 * @return QString the status informations gathered
119 */
120QString BlueBase::getStatus(){
121
122 return ("manger.h need also a status method");
123
124}
125
126
127/**
128 * Read the current values from the gui and invoke writeConfig()
129 */
130void BlueBase::applyConfigChanges() {
131
132 deviceName = deviceNameLine->text();
133 defaultPasskey = passkeyLine->text();
134 useEncryption = cryptCheckBox->isChecked();
135 enableAuthentification = authCheckBox->isChecked();
136 enablePagescan = pagescanCheckBox->isChecked();
137 enableInquiryscan = inquiryscanCheckBox->isChecked();
138
139 writeConfig();
140
141 QMessageBox* box = new QMessageBox(this, "Test");
142 box->setText(tr("Changes applied"));
143 box->show();
144
145 // falls nötig hcid killhupen - die funktionalität adden
146
147
51} 148}
52 149
53 150
151/**
152 * Open the "scan for devices" dialog
153 */
54void BlueBase::startScan() { 154void BlueBase::startScan() {
55 Form3 *scan = new Form3( this, "", true); 155 ScanDialog *scan = new ScanDialog( this, "", true);
56 scan->exec(); 156 scan->exec();
57} 157}
58 158
159/**
160 * Decontructor
161 */
59BlueBase::~BlueBase(){ 162BlueBase::~BlueBase(){
60} 163}
61 164
62 165
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 29c45be..fb1844c 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -10,30 +10,47 @@
10#include "bluetoothbase.h" 10#include "bluetoothbase.h"
11 11
12class QVBox; 12class QVBox;
13class QHBoxLayout; 13class QHBoxLayout;
14class QGridLayout; 14class QGridLayout;
15class QFrame; 15class QFrame;
16class QLabel; 16class QLabel;
17class QPushButton; 17class QPushButton;
18class QTabWidget; 18class QTabWidget;
19class QCheckBox; 19class QCheckBox;
20 20
21class BlueBase : public BluetoothBase { 21class BlueBase : public BluetoothBase {
22 Q_OBJECT 22 Q_OBJECT
23 23
24public: 24public:
25 BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 25 BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
26 ~BlueBase(); 26 ~BlueBase();
27 27
28protected: 28protected:
29 29
30 30
31 private slots: 31 private slots:
32 void startScan(); 32 void startScan();
33 33
34 private:
35 void readConfig();
36 void writeConfig();
37 QString getStatus();
38 void initGui();
39
40
41 QString deviceName;
42 QString defaultPasskey;
43 int useEncryption;
44 int enableAuthentification;
45 int enablePagescan;
46 int enableInquiryscan;
47
48 private slots:
49
50 void applyConfigChanges();
34 51
35}; 52};
36 53
37 54
38 55
39#endif 56#endif
diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui
index 61cb95f..61e2bcf 100644
--- a/noncore/net/opietooth/manager/bluetoothbase.ui
+++ b/noncore/net/opietooth/manager/bluetoothbase.ui
@@ -1,97 +1,70 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>BluetoothBase</class> 2<class>BluetoothBase</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>BluetoothBase</cstring> 7 <cstring>BluetoothBase</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>596</width> 14 <width>228</width>
15 <height>480</height> 15 <height>320</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Form1</string> 20 <string>Form1</string>
21 </property> 21 </property>
22 <widget> 22 <widget>
23 <class>QTabWidget</class> 23 <class>QTabWidget</class>
24 <property stdset="1"> 24 <property stdset="1">
25 <name>name</name> 25 <name>name</name>
26 <cstring>Status</cstring> 26 <cstring>Status</cstring>
27 </property> 27 </property>
28 <property stdset="1"> 28 <property stdset="1">
29 <name>geometry</name> 29 <name>geometry</name>
30 <rect> 30 <rect>
31 <x>0</x> 31 <x>0</x>
32 <y>0</y> 32 <y>0</y>
33 <width>260</width> 33 <width>260</width>
34 <height>350</height> 34 <height>350</height>
35 </rect> 35 </rect>
36 </property> 36 </property>
37 <widget> 37 <widget>
38 <class>QWidget</class> 38 <class>QWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>tab</cstring> 41 <cstring>tab</cstring>
42 </property> 42 </property>
43 <attribute> 43 <attribute>
44 <name>title</name> 44 <name>title</name>
45 <string>Devices</string> 45 <string>Devices</string>
46 </attribute> 46 </attribute>
47 <widget>
48 <class>QPushButton</class>
49 <property stdset="1">
50 <name>name</name>
51 <cstring>PushButton2</cstring>
52 </property>
53 <property stdset="1">
54 <name>geometry</name>
55 <rect>
56 <x>50</x>
57 <y>260</y>
58 <width>154</width>
59 <height>31</height>
60 </rect>
61 </property>
62 <property stdset="1">
63 <name>sizePolicy</name>
64 <sizepolicy>
65 <hsizetype>0</hsizetype>
66 <vsizetype>0</vsizetype>
67 </sizepolicy>
68 </property>
69 <property stdset="1">
70 <name>text</name>
71 <string>Scan for Devices</string>
72 </property>
73 </widget>
74 <spacer> 47 <spacer>
75 <property> 48 <property>
76 <name>name</name> 49 <name>name</name>
77 <cstring>Spacer3</cstring> 50 <cstring>Spacer3</cstring>
78 </property> 51 </property>
79 <property stdset="1"> 52 <property stdset="1">
80 <name>orientation</name> 53 <name>orientation</name>
81 <enum>Vertical</enum> 54 <enum>Vertical</enum>
82 </property> 55 </property>
83 <property stdset="1"> 56 <property stdset="1">
84 <name>sizeType</name> 57 <name>sizeType</name>
85 <enum>Expanding</enum> 58 <enum>Expanding</enum>
86 </property> 59 </property>
87 <property> 60 <property>
88 <name>sizeHint</name> 61 <name>sizeHint</name>
89 <size> 62 <size>
90 <width>20</width> 63 <width>20</width>
91 <height>20</height> 64 <height>20</height>
92 </size> 65 </size>
93 </property> 66 </property>
94 </spacer> 67 </spacer>
95 <spacer> 68 <spacer>
96 <property> 69 <property>
97 <name>name</name> 70 <name>name</name>
@@ -143,274 +116,325 @@
143 <bool>true</bool> 116 <bool>true</bool>
144 </property> 117 </property>
145 </column> 118 </column>
146 <column> 119 <column>
147 <property> 120 <property>
148 <name>text</name> 121 <name>text</name>
149 <string>Type</string> 122 <string>Type</string>
150 </property> 123 </property>
151 <property> 124 <property>
152 <name>clickable</name> 125 <name>clickable</name>
153 <bool>true</bool> 126 <bool>true</bool>
154 </property> 127 </property>
155 <property> 128 <property>
156 <name>resizeable</name> 129 <name>resizeable</name>
157 <bool>true</bool> 130 <bool>true</bool>
158 </property> 131 </property>
159 </column> 132 </column>
160 <property stdset="1"> 133 <property stdset="1">
161 <name>name</name> 134 <name>name</name>
162 <cstring>ListView2</cstring> 135 <cstring>ListView2</cstring>
163 </property> 136 </property>
164 <property stdset="1"> 137 <property stdset="1">
165 <name>geometry</name> 138 <name>geometry</name>
166 <rect> 139 <rect>
167 <x>8</x> 140 <x>0</x>
168 <y>3</y> 141 <y>0</y>
169 <width>240</width> 142 <width>230</width>
170 <height>140</height> 143 <height>230</height>
171 </rect> 144 </rect>
172 </property> 145 </property>
173 </widget> 146 </widget>
147 <widget>
148 <class>QPushButton</class>
149 <property stdset="1">
150 <name>name</name>
151 <cstring>PushButton2</cstring>
152 </property>
153 <property stdset="1">
154 <name>geometry</name>
155 <rect>
156 <x>40</x>
157 <y>231</y>
158 <width>154</width>
159 <height>30</height>
160 </rect>
161 </property>
162 <property stdset="1">
163 <name>sizePolicy</name>
164 <sizepolicy>
165 <hsizetype>0</hsizetype>
166 <vsizetype>0</vsizetype>
167 </sizepolicy>
168 </property>
169 <property stdset="1">
170 <name>text</name>
171 <string>Scan for Devices</string>
172 </property>
173 </widget>
174 </widget> 174 </widget>
175 <widget> 175 <widget>
176 <class>QWidget</class> 176 <class>QWidget</class>
177 <property stdset="1"> 177 <property stdset="1">
178 <name>name</name> 178 <name>name</name>
179 <cstring>tab</cstring> 179 <cstring>tab</cstring>
180 </property> 180 </property>
181 <attribute> 181 <attribute>
182 <name>title</name> 182 <name>title</name>
183 <string>Connections</string> 183 <string>Connections</string>
184 </attribute> 184 </attribute>
185 <widget> 185 <widget>
186 <class>QListView</class> 186 <class>QListView</class>
187 <column> 187 <column>
188 <property> 188 <property>
189 <name>text</name> 189 <name>text</name>
190 <string>Device Name</string> 190 <string>Device Name</string>
191 </property> 191 </property>
192 <property> 192 <property>
193 <name>clickable</name> 193 <name>clickable</name>
194 <bool>true</bool> 194 <bool>true</bool>
195 </property> 195 </property>
196 <property> 196 <property>
197 <name>resizeable</name> 197 <name>resizeable</name>
198 <bool>true</bool> 198 <bool>true</bool>
199 </property> 199 </property>
200 </column> 200 </column>
201 <column> 201 <column>
202 <property> 202 <property>
203 <name>text</name> 203 <name>text</name>
204 <string>Connection type</string> 204 <string>Connection type</string>
205 </property> 205 </property>
206 <property> 206 <property>
207 <name>clickable</name> 207 <name>clickable</name>
208 <bool>true</bool> 208 <bool>true</bool>
209 </property> 209 </property>
210 <property> 210 <property>
211 <name>resizeable</name> 211 <name>resizeable</name>
212 <bool>true</bool> 212 <bool>true</bool>
213 </property> 213 </property>
214 </column> 214 </column>
215 <property stdset="1"> 215 <property stdset="1">
216 <name>name</name> 216 <name>name</name>
217 <cstring>ListView4</cstring> 217 <cstring>ListView4</cstring>
218 </property> 218 </property>
219 <property stdset="1"> 219 <property stdset="1">
220 <name>geometry</name> 220 <name>geometry</name>
221 <rect> 221 <rect>
222 <x>8</x> 222 <x>0</x>
223 <y>3</y> 223 <y>0</y>
224 <width>241</width> 224 <width>240</width>
225 <height>301</height> 225 <height>240</height>
226 </rect> 226 </rect>
227 </property> 227 </property>
228 </widget> 228 </widget>
229 </widget> 229 </widget>
230 <widget> 230 <widget>
231 <class>QWidget</class> 231 <class>QWidget</class>
232 <property stdset="1"> 232 <property stdset="1">
233 <name>name</name> 233 <name>name</name>
234 <cstring>tab</cstring> 234 <cstring>tab</cstring>
235 </property> 235 </property>
236 <attribute> 236 <attribute>
237 <name>title</name> 237 <name>title</name>
238 <string>Config</string> 238 <string>Config</string>
239 </attribute> 239 </attribute>
240 <widget> 240 <widget>
241 <class>QLabel</class> 241 <class>QLabel</class>
242 <property stdset="1"> 242 <property stdset="1">
243 <name>name</name> 243 <name>name</name>
244 <cstring>TextLabel6</cstring> 244 <cstring>deviceNameLabel</cstring>
245 </property> 245 </property>
246 <property stdset="1"> 246 <property stdset="1">
247 <name>geometry</name> 247 <name>geometry</name>
248 <rect> 248 <rect>
249 <x>10</x> 249 <x>10</x>
250 <y>20</y> 250 <y>10</y>
251 <width>121</width> 251 <width>70</width>
252 <height>20</height> 252 <height>20</height>
253 </rect> 253 </rect>
254 </property> 254 </property>
255 <property stdset="1"> 255 <property stdset="1">
256 <name>text</name> 256 <name>text</name>
257 <string>Device Name</string> 257 <string>Device Name</string>
258 </property> 258 </property>
259 </widget> 259 </widget>
260 <widget> 260 <widget>
261 <class>QLabel</class> 261 <class>QLabel</class>
262 <property stdset="1"> 262 <property stdset="1">
263 <name>name</name> 263 <name>name</name>
264 <cstring>TextLabel7</cstring> 264 <cstring>passkeyLabel</cstring>
265 </property> 265 </property>
266 <property stdset="1"> 266 <property stdset="1">
267 <name>geometry</name> 267 <name>geometry</name>
268 <rect> 268 <rect>
269 <x>10</x> 269 <x>10</x>
270 <y>50</y> 270 <y>50</y>
271 <width>120</width> 271 <width>80</width>
272 <height>20</height> 272 <height>20</height>
273 </rect> 273 </rect>
274 </property> 274 </property>
275 <property stdset="1"> 275 <property stdset="1">
276 <name>text</name> 276 <name>text</name>
277 <string>Default Passkey</string> 277 <string>Default Passkey</string>
278 </property> 278 </property>
279 </widget> 279 </widget>
280 <widget> 280 <widget>
281 <class>QLineEdit</class> 281 <class>QLineEdit</class>
282 <property stdset="1"> 282 <property stdset="1">
283 <name>name</name> 283 <name>name</name>
284 <cstring>LineEdit4</cstring> 284 <cstring>passkeyLine</cstring>
285 </property> 285 </property>
286 <property stdset="1"> 286 <property stdset="1">
287 <name>geometry</name> 287 <name>geometry</name>
288 <rect> 288 <rect>
289 <x>128</x> 289 <x>98</x>
290 <y>53</y> 290 <y>53</y>
291 <width>120</width> 291 <width>120</width>
292 <height>22</height> 292 <height>22</height>
293 </rect> 293 </rect>
294 </property> 294 </property>
295 </widget>
296 <widget>
297 <class>QLineEdit</class>
298 <property stdset="1"> 295 <property stdset="1">
299 <name>name</name> 296 <name>echoMode</name>
300 <cstring>LineEdit5</cstring> 297 <enum>Password</enum>
301 </property>
302 <property stdset="1">
303 <name>geometry</name>
304 <rect>
305 <x>128</x>
306 <y>13</y>
307 <width>120</width>
308 <height>22</height>
309 </rect>
310 </property> 298 </property>
311 </widget> 299 </widget>
312 <widget> 300 <widget>
313 <class>QLayoutWidget</class> 301 <class>QLayoutWidget</class>
314 <property stdset="1"> 302 <property stdset="1">
315 <name>name</name> 303 <name>name</name>
316 <cstring>Layout5</cstring> 304 <cstring>Layout5</cstring>
317 </property> 305 </property>
318 <property stdset="1"> 306 <property stdset="1">
319 <name>geometry</name> 307 <name>geometry</name>
320 <rect> 308 <rect>
321 <x>10</x> 309 <x>10</x>
322 <y>100</y> 310 <y>100</y>
323 <width>188</width> 311 <width>188</width>
324 <height>104</height> 312 <height>120</height>
325 </rect> 313 </rect>
326 </property> 314 </property>
327 <vbox> 315 <vbox>
328 <property stdset="1"> 316 <property stdset="1">
329 <name>margin</name> 317 <name>margin</name>
330 <number>0</number> 318 <number>0</number>
331 </property> 319 </property>
332 <property stdset="1"> 320 <property stdset="1">
333 <name>spacing</name> 321 <name>spacing</name>
334 <number>6</number> 322 <number>6</number>
335 </property> 323 </property>
336 <widget> 324 <widget>
337 <class>QCheckBox</class> 325 <class>QCheckBox</class>
338 <property stdset="1"> 326 <property stdset="1">
339 <name>name</name> 327 <name>name</name>
340 <cstring>CheckBox1</cstring> 328 <cstring>authCheckBox</cstring>
341 </property> 329 </property>
342 <property stdset="1"> 330 <property stdset="1">
343 <name>text</name> 331 <name>text</name>
344 <string>enable authentification</string> 332 <string>enable authentification</string>
345 </property> 333 </property>
346 </widget> 334 </widget>
347 <widget> 335 <widget>
348 <class>QCheckBox</class> 336 <class>QCheckBox</class>
349 <property stdset="1"> 337 <property stdset="1">
350 <name>name</name> 338 <name>name</name>
351 <cstring>CheckBox2</cstring> 339 <cstring>cryptCheckBox</cstring>
352 </property> 340 </property>
353 <property stdset="1"> 341 <property stdset="1">
354 <name>text</name> 342 <name>text</name>
355 <string>enable encryption</string> 343 <string>enable encryption</string>
356 </property> 344 </property>
357 </widget> 345 </widget>
358 <widget> 346 <widget>
359 <class>QCheckBox</class> 347 <class>QCheckBox</class>
360 <property stdset="1"> 348 <property stdset="1">
361 <name>name</name> 349 <name>name</name>
362 <cstring>CheckBox5</cstring> 350 <cstring>pagescanCheckBox</cstring>
363 </property> 351 </property>
364 <property stdset="1"> 352 <property stdset="1">
365 <name>text</name> 353 <name>text</name>
366 <string>Enable Page scan</string> 354 <string>Enable Page scan</string>
367 </property> 355 </property>
368 </widget> 356 </widget>
369 <widget> 357 <widget>
370 <class>QCheckBox</class> 358 <class>QCheckBox</class>
371 <property stdset="1"> 359 <property stdset="1">
372 <name>name</name> 360 <name>name</name>
373 <cstring>CheckBox6</cstring> 361 <cstring>inquiryscanCheckBox</cstring>
374 </property> 362 </property>
375 <property stdset="1"> 363 <property stdset="1">
376 <name>text</name> 364 <name>text</name>
377 <string>Enable Inquiry scan</string> 365 <string>Enable Inquiry scan</string>
378 </property> 366 </property>
379 </widget> 367 </widget>
380 </vbox> 368 </vbox>
381 </widget> 369 </widget>
370 <widget>
371 <class>QLineEdit</class>
372 <property stdset="1">
373 <name>name</name>
374 <cstring>deviceNameLine</cstring>
375 </property>
376 <property stdset="1">
377 <name>geometry</name>
378 <rect>
379 <x>98</x>
380 <y>13</y>
381 <width>120</width>
382 <height>22</height>
383 </rect>
384 </property>
385 </widget>
386 <widget>
387 <class>QPushButton</class>
388 <property stdset="1">
389 <name>name</name>
390 <cstring>configApplyButton</cstring>
391 </property>
392 <property stdset="1">
393 <name>geometry</name>
394 <rect>
395 <x>60</x>
396 <y>230</y>
397 <width>99</width>
398 <height>32</height>
399 </rect>
400 </property>
401 <property stdset="1">
402 <name>text</name>
403 <string>Apply</string>
404 </property>
405 </widget>
382 </widget> 406 </widget>
383 <widget> 407 <widget>
384 <class>QWidget</class> 408 <class>QWidget</class>
385 <property stdset="1"> 409 <property stdset="1">
386 <name>name</name> 410 <name>name</name>
387 <cstring>tab</cstring> 411 <cstring>tab</cstring>
388 </property> 412 </property>
389 <attribute> 413 <attribute>
390 <name>title</name> 414 <name>title</name>
391 <string>Status</string> 415 <string>Status</string>
392 </attribute> 416 </attribute>
393 <widget> 417 <widget>
394 <class>QLabel</class> 418 <class>QLabel</class>
395 <property stdset="1"> 419 <property stdset="1">
396 <name>name</name> 420 <name>name</name>
397 <cstring>StutusLabel</cstring> 421 <cstring>StatusLabel</cstring>
398 </property> 422 </property>
399 <property stdset="1"> 423 <property stdset="1">
400 <name>geometry</name> 424 <name>geometry</name>
401 <rect> 425 <rect>
402 <x>10</x> 426 <x>10</x>
403 <y>10</y> 427 <y>10</y>
404 <width>240</width> 428 <width>220</width>
405 <height>300</height> 429 <height>250</height>
406 </rect> 430 </rect>
407 </property> 431 </property>
408 <property stdset="1"> 432 <property stdset="1">
409 <name>text</name> 433 <name>text</name>
410 <string>Status Label</string> 434 <string>Status Label</string>
411 </property> 435 </property>
412 </widget> 436 </widget>
413 </widget> 437 </widget>
414 </widget> 438 </widget>
415</widget> 439</widget>
416</UI> 440</UI>
diff --git a/noncore/net/opietooth/manager/devicedialog.ui b/noncore/net/opietooth/manager/devicedialog.ui
index 121fdf0..e5750ed 100644
--- a/noncore/net/opietooth/manager/devicedialog.ui
+++ b/noncore/net/opietooth/manager/devicedialog.ui
@@ -1,78 +1,78 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>Form2</class> 2<class>DeviceDialog</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>Form2</cstring> 7 <cstring>DeviceDialog</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>592</width> 14 <width>584</width>
15 <height>480</height> 15 <height>480</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Form2</string> 20 <string>Form2</string>
21 </property> 21 </property>
22 <widget> 22 <widget>
23 <class>QLabel</class> 23 <class>QLabel</class>
24 <property stdset="1"> 24 <property stdset="1">
25 <name>name</name> 25 <name>name</name>
26 <cstring>TextLabel4</cstring> 26 <cstring>TextLabel4</cstring>
27 </property> 27 </property>
28 <property stdset="1"> 28 <property stdset="1">
29 <name>geometry</name> 29 <name>geometry</name>
30 <rect> 30 <rect>
31 <x>0</x> 31 <x>0</x>
32 <y>0</y> 32 <y>0</y>
33 <width>170</width> 33 <width>170</width>
34 <height>20</height> 34 <height>20</height>
35 </rect> 35 </rect>
36 </property> 36 </property>
37 <property stdset="1"> 37 <property stdset="1">
38 <name>text</name> 38 <name>text</name>
39 <string>Devicename</string> 39 <string>Devicename</string>
40 </property> 40 </property>
41 </widget> 41 </widget>
42 <widget> 42 <widget>
43 <class>QTabWidget</class> 43 <class>QTabWidget</class>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>name</name> 45 <name>name</name>
46 <cstring>TabWidget7</cstring> 46 <cstring>TabWidget7</cstring>
47 </property> 47 </property>
48 <property stdset="1"> 48 <property stdset="1">
49 <name>geometry</name> 49 <name>geometry</name>
50 <rect> 50 <rect>
51 <x>0</x> 51 <x>-10</x>
52 <y>20</y> 52 <y>0</y>
53 <width>240</width> 53 <width>240</width>
54 <height>290</height> 54 <height>320</height>
55 </rect> 55 </rect>
56 </property> 56 </property>
57 <widget> 57 <widget>
58 <class>QWidget</class> 58 <class>QWidget</class>
59 <property stdset="1"> 59 <property stdset="1">
60 <name>name</name> 60 <name>name</name>
61 <cstring>tab</cstring> 61 <cstring>tab</cstring>
62 </property> 62 </property>
63 <attribute> 63 <attribute>
64 <name>title</name> 64 <name>title</name>
65 <string>Services</string> 65 <string>Services</string>
66 </attribute> 66 </attribute>
67 <widget> 67 <widget>
68 <class>QPushButton</class> 68 <class>QPushButton</class>
69 <property stdset="1"> 69 <property stdset="1">
70 <name>name</name> 70 <name>name</name>
71 <cstring>PushButton5</cstring> 71 <cstring>PushButton5</cstring>
72 </property> 72 </property>
73 <property stdset="1"> 73 <property stdset="1">
74 <name>geometry</name> 74 <name>geometry</name>
75 <rect> 75 <rect>
76 <x>50</x> 76 <x>50</x>
77 <y>200</y> 77 <y>200</y>
78 <width>129</width> 78 <width>129</width>
diff --git a/noncore/net/opietooth/manager/scandialog.ui b/noncore/net/opietooth/manager/scandialog.ui
index c8d018f..37847ba 100644
--- a/noncore/net/opietooth/manager/scandialog.ui
+++ b/noncore/net/opietooth/manager/scandialog.ui
@@ -1,38 +1,38 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>Form3</class> 2<class>ScanDialog</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>Form3</cstring> 7 <cstring>ScanDialog</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>368</width> 14 <width>360</width>
15 <height>392</height> 15 <height>392</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Form3</string> 20 <string>Form3</string>
21 </property> 21 </property>
22 <widget> 22 <widget>
23 <class>QFrame</class> 23 <class>QFrame</class>
24 <property stdset="1"> 24 <property stdset="1">
25 <name>name</name> 25 <name>name</name>
26 <cstring>Frame7</cstring> 26 <cstring>Frame7</cstring>
27 </property> 27 </property>
28 <property stdset="1"> 28 <property stdset="1">
29 <name>geometry</name> 29 <name>geometry</name>
30 <rect> 30 <rect>
31 <x>0</x> 31 <x>0</x>
32 <y>0</y> 32 <y>0</y>
33 <width>240</width> 33 <width>240</width>
34 <height>331</height> 34 <height>331</height>
35 </rect> 35 </rect>
36 </property> 36 </property>
37 <property stdset="1"> 37 <property stdset="1">
38 <name>frameShape</name> 38 <name>frameShape</name>