summaryrefslogtreecommitdiff
authorandyq <andyq>2002-10-17 22:50:20 (UTC)
committer andyq <andyq>2002-10-17 22:50:20 (UTC)
commitb61a21e46590228b6c5800d168fc57789ce733f6 (patch) (unidiff)
treeda0732436919ccb19167eb124898615d499e5914
parent51dbf76486cb81a7cb34c07483b344c8ea7a8a24 (diff)
downloadopie-b61a21e46590228b6c5800d168fc57789ce733f6.zip
opie-b61a21e46590228b6c5800d168fc57789ce733f6.tar.gz
opie-b61a21e46590228b6c5800d168fc57789ce733f6.tar.bz2
Changed dlg to add linkToRoot checkbox to destinations tab
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/settings.ui1105
-rw-r--r--noncore/settings/aqpkg/settingsimpl.cpp47
2 files changed, 613 insertions, 539 deletions
diff --git a/noncore/settings/aqpkg/settings.ui b/noncore/settings/aqpkg/settings.ui
index eb99cf7..6b3cfd4 100644
--- a/noncore/settings/aqpkg/settings.ui
+++ b/noncore/settings/aqpkg/settings.ui
@@ -1,531 +1,574 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>SettingsBase</class> 2<class>SettingsBase</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>Settings</cstring> 7 <cstring>Settings</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>331</width> 14 <width>247</width>
15 <height>456</height> 15 <height>390</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>Package Servers</string> 20 <string>Package Servers</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <grid> 28 <grid>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>11</number> 31 <number>11</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>6</number> 35 <number>6</number>
36 </property> 36 </property>
37 <widget row="0" column="0" > 37 <widget row="0" column="0" >
38 <class>QTabWidget</class> 38 <class>QTabWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>TabWidget</cstring> 41 <cstring>TabWidget</cstring>
42 </property> 42 </property>
43 <property stdset="1"> 43 <property stdset="1">
44 <name>enabled</name> 44 <name>enabled</name>
45 <bool>true</bool> 45 <bool>true</bool>
46 </property> 46 </property>
47 <property> 47 <property>
48 <name>layoutMargin</name> 48 <name>layoutMargin</name>
49 </property> 49 </property>
50 <property> 50 <property>
51 <name>layoutSpacing</name> 51 <name>layoutSpacing</name>
52 </property> 52 </property>
53 <widget> 53 <widget>
54 <class>QWidget</class> 54 <class>QWidget</class>
55 <property stdset="1"> 55 <property stdset="1">
56 <name>name</name> 56 <name>name</name>
57 <cstring>tab</cstring> 57 <cstring>tab</cstring>
58 </property> 58 </property>
59 <attribute> 59 <attribute>
60 <name>title</name> 60 <name>title</name>
61 <string>Servers</string> 61 <string>Servers</string>
62 </attribute> 62 </attribute>
63 <grid> 63 <grid>
64 <property stdset="1"> 64 <property stdset="1">
65 <name>margin</name> 65 <name>margin</name>
66 <number>11</number> 66 <number>11</number>
67 </property> 67 </property>
68 <property stdset="1"> 68 <property stdset="1">
69 <name>spacing</name> 69 <name>spacing</name>
70 <number>6</number> 70 <number>6</number>
71 </property> 71 </property>
72 <widget row="0" column="0" rowspan="1" colspan="2" > 72 <widget row="0" column="0" >
73 <class>QLayoutWidget</class> 73 <class>QLayoutWidget</class>
74 <property stdset="1"> 74 <property stdset="1">
75 <name>name</name> 75 <name>name</name>
76 <cstring>Layout2</cstring> 76 <cstring>Layout2</cstring>
77 </property> 77 </property>
78 <hbox> 78 <hbox>
79 <property stdset="1"> 79 <property stdset="1">
80 <name>margin</name> 80 <name>margin</name>
81 <number>0</number> 81 <number>0</number>
82 </property> 82 </property>
83 <property stdset="1"> 83 <property stdset="1">
84 <name>spacing</name> 84 <name>spacing</name>
85 <number>6</number> 85 <number>6</number>
86 </property> 86 </property>
87 <widget> 87 <widget>
88 <class>QLabel</class> 88 <class>QLabel</class>
89 <property stdset="1"> 89 <property stdset="1">
90 <name>name</name> 90 <name>name</name>
91 <cstring>Servers</cstring> 91 <cstring>Servers</cstring>
92 </property> 92 </property>
93 <property stdset="1"> 93 <property stdset="1">
94 <name>text</name> 94 <name>text</name>
95 <string>Servers</string> 95 <string>Servers</string>
96 </property> 96 </property>
97 </widget> 97 </widget>
98 <spacer> 98 <spacer>
99 <property> 99 <property>
100 <name>name</name> 100 <name>name</name>
101 <cstring>Spacer2</cstring> 101 <cstring>Spacer2</cstring>
102 </property> 102 </property>
103 <property stdset="1"> 103 <property stdset="1">
104 <name>orientation</name> 104 <name>orientation</name>
105 <enum>Horizontal</enum> 105 <enum>Horizontal</enum>
106 </property> 106 </property>
107 <property stdset="1"> 107 <property stdset="1">
108 <name>sizeType</name> 108 <name>sizeType</name>
109 <enum>Expanding</enum> 109 <enum>Expanding</enum>
110 </property> 110 </property>
111 <property> 111 <property>
112 <name>sizeHint</name> 112 <name>sizeHint</name>
113 <size> 113 <size>
114 <width>20</width> 114 <width>20</width>
115 <height>20</height> 115 <height>20</height>
116 </size> 116 </size>
117 </property> 117 </property>
118 </spacer> 118 </spacer>
119 </hbox> 119 </hbox>
120 </widget> 120 </widget>
121 <widget row="1" column="0" rowspan="1" colspan="2" > 121 <widget row="1" column="0" >
122 <class>QListBox</class> 122 <class>QLayoutWidget</class>
123 <property stdset="1"> 123 <property stdset="1">
124 <name>name</name> 124 <name>name</name>
125 <cstring>servers</cstring> 125 <cstring>Layout8</cstring>
126 </property> 126 </property>
127 <property stdset="1"> 127 <grid>
128 <name>selectionMode</name> 128 <property stdset="1">
129 <enum>Extended</enum> 129 <name>margin</name>
130 </property> 130 <number>0</number>
131 </widget> 131 </property>
132 <widget row="2" column="1" > 132 <property stdset="1">
133 <class>QPushButton</class> 133 <name>spacing</name>
134 <property stdset="1"> 134 <number>6</number>
135 <name>name</name> 135 </property>
136 <cstring>removeserver</cstring> 136 <widget row="0" column="0" rowspan="1" colspan="2" >
137 </property> 137 <class>QListBox</class>
138 <property stdset="1"> 138 <property stdset="1">
139 <name>enabled</name> 139 <name>name</name>
140 <bool>true</bool> 140 <cstring>servers</cstring>
141 </property> 141 </property>
142 <property stdset="1"> 142 <property stdset="1">
143 <name>text</name> 143 <name>selectionMode</name>
144 <string>Remove</string> 144 <enum>Extended</enum>
145 </property> 145 </property>
146 <property stdset="1"> 146 </widget>
147 <name>autoDefault</name> 147 <widget row="2" column="0" rowspan="1" colspan="2" >
148 <bool>false</bool> 148 <class>QLayoutWidget</class>
149 </property> 149 <property stdset="1">
150 </widget> 150 <name>name</name>
151 <widget row="2" column="0" > 151 <cstring>Layout6</cstring>
152 <class>QPushButton</class> 152 </property>
153 <property stdset="1"> 153 <grid>
154 <name>name</name> 154 <property stdset="1">
155 <cstring>newserver</cstring> 155 <name>margin</name>
156 </property> 156 <number>0</number>
157 <property stdset="1"> 157 </property>
158 <name>enabled</name> 158 <property stdset="1">
159 <bool>true</bool> 159 <name>spacing</name>
160 </property> 160 <number>6</number>
161 <property stdset="1"> 161 </property>
162 <name>text</name> 162 <widget row="2" column="1" >
163 <string>New</string> 163 <class>QCheckBox</class>
164 </property> 164 <property stdset="1">
165 <property stdset="1"> 165 <name>name</name>
166 <name>autoDefault</name> 166 <cstring>active</cstring>
167 <bool>false</bool> 167 </property>
168 </property> 168 <property stdset="1">
169 </widget> 169 <name>text</name>
170 <widget row="3" column="0" rowspan="1" colspan="2" > 170 <string>Active Server</string>
171 <class>QLayoutWidget</class> 171 </property>
172 <property stdset="1"> 172 </widget>
173 <name>name</name> 173 <widget row="0" column="0" >
174 <cstring>Layout10</cstring> 174 <class>QLabel</class>
175 </property> 175 <property stdset="1">
176 <grid> 176 <name>name</name>
177 <property stdset="1"> 177 <cstring>TextLabel1_3</cstring>
178 <name>margin</name> 178 </property>
179 <number>0</number> 179 <property stdset="1">
180 </property> 180 <name>text</name>
181 <property stdset="1"> 181 <string>Name:</string>
182 <name>spacing</name> 182 </property>
183 <number>6</number> 183 </widget>
184 </property> 184 <widget row="1" column="0" >
185 <widget row="1" column="1" > 185 <class>QLabel</class>
186 <class>QLineEdit</class> 186 <property stdset="1">
187 <property stdset="1"> 187 <name>name</name>
188 <name>name</name> 188 <cstring>TextLabel2_3</cstring>
189 <cstring>serverurl</cstring> 189 </property>
190 </property> 190 <property stdset="1">
191 </widget> 191 <name>text</name>
192 <widget row="1" column="0" > 192 <string>URL:</string>
193 <class>QLabel</class> 193 </property>
194 <property stdset="1"> 194 </widget>
195 <name>name</name> 195 <widget row="0" column="1" >
196 <cstring>TextLabel2_3</cstring> 196 <class>QLineEdit</class>
197 </property> 197 <property stdset="1">
198 <property stdset="1"> 198 <name>name</name>
199 <name>text</name> 199 <cstring>servername</cstring>
200 <string>URL:</string> 200 </property>
201 </property> 201 </widget>
202 </widget> 202 <widget row="1" column="1" >
203 <widget row="0" column="1" > 203 <class>QLineEdit</class>
204 <class>QLineEdit</class> 204 <property stdset="1">
205 <property stdset="1"> 205 <name>name</name>
206 <name>name</name> 206 <cstring>serverurl</cstring>
207 <cstring>servername</cstring> 207 </property>
208 </property> 208 </widget>
209 </widget> 209 <widget row="3" column="1" >
210 <widget row="0" column="0" > 210 <class>QPushButton</class>
211 <class>QLabel</class> 211 <property stdset="1">
212 <property stdset="1"> 212 <name>name</name>
213 <name>name</name> 213 <cstring>btnChangeServer</cstring>
214 <cstring>TextLabel1_3</cstring> 214 </property>
215 </property> 215 <property stdset="1">
216 <property stdset="1"> 216 <name>text</name>
217 <name>text</name> 217 <string>Change</string>
218 <string>Name:</string> 218 </property>
219 </property> 219 </widget>
220 </widget> 220 </grid>
221 <widget row="2" column="1" > 221 </widget>
222 <class>QPushButton</class> 222 <widget row="1" column="1" >
223 <property stdset="1"> 223 <class>QPushButton</class>
224 <name>name</name> 224 <property stdset="1">
225 <cstring>btnChangeServer</cstring> 225 <name>name</name>
226 </property> 226 <cstring>removeserver</cstring>
227 <property stdset="1"> 227 </property>
228 <name>text</name> 228 <property stdset="1">
229 <string>Change</string> 229 <name>enabled</name>
230 </property> 230 <bool>true</bool>
231 </widget> 231 </property>
232 </grid> 232 <property stdset="1">
233 </widget> 233 <name>text</name>
234 </grid> 234 <string>Remove</string>
235 </widget> 235 </property>
236 <widget> 236 <property stdset="1">
237 <class>QWidget</class> 237 <name>autoDefault</name>
238 <property stdset="1"> 238 <bool>false</bool>
239 <name>name</name> 239 </property>
240 <cstring>tab</cstring> 240 </widget>
241 </property> 241 <widget row="1" column="0" >
242 <attribute> 242 <class>QPushButton</class>
243 <name>title</name> 243 <property stdset="1">
244 <string>Destinations</string> 244 <name>name</name>
245 </attribute> 245 <cstring>newserver</cstring>
246 <grid> 246 </property>
247 <property stdset="1"> 247 <property stdset="1">
248 <name>margin</name> 248 <name>enabled</name>
249 <number>11</number> 249 <bool>true</bool>
250 </property> 250 </property>
251 <property stdset="1"> 251 <property stdset="1">
252 <name>spacing</name> 252 <name>text</name>
253 <number>6</number> 253 <string>New</string>
254 </property> 254 </property>
255 <widget row="0" column="0" > 255 <property stdset="1">
256 <class>QLayoutWidget</class> 256 <name>autoDefault</name>
257 <property stdset="1"> 257 <bool>false</bool>
258 <name>name</name> 258 </property>
259 <cstring>Layout3</cstring> 259 </widget>
260 </property> 260 </grid>
261 <hbox> 261 </widget>
262 <property stdset="1"> 262 </grid>
263 <name>margin</name> 263 </widget>
264 <number>0</number> 264 <widget>
265 </property> 265 <class>QWidget</class>
266 <property stdset="1"> 266 <property stdset="1">
267 <name>spacing</name> 267 <name>name</name>
268 <number>6</number> 268 <cstring>tab</cstring>
269 </property> 269 </property>
270 <widget> 270 <attribute>
271 <class>QLabel</class> 271 <name>title</name>
272 <property stdset="1"> 272 <string>Destinations</string>
273 <name>name</name> 273 </attribute>
274 <cstring>Destinations</cstring> 274 <grid>
275 </property> 275 <property stdset="1">
276 <property stdset="1"> 276 <name>margin</name>
277 <name>text</name> 277 <number>11</number>
278 <string>Destinations</string> 278 </property>
279 </property> 279 <property stdset="1">
280 </widget> 280 <name>spacing</name>
281 <spacer> 281 <number>6</number>
282 <property> 282 </property>
283 <name>name</name> 283 <widget row="0" column="0" >
284 <cstring>Spacer2_2</cstring> 284 <class>QLayoutWidget</class>
285 </property> 285 <property stdset="1">
286 <property stdset="1"> 286 <name>name</name>
287 <name>orientation</name> 287 <cstring>Layout3</cstring>
288 <enum>Horizontal</enum> 288 </property>
289 </property> 289 <hbox>
290 <property stdset="1"> 290 <property stdset="1">
291 <name>sizeType</name> 291 <name>margin</name>
292 <enum>Expanding</enum> 292 <number>0</number>
293 </property> 293 </property>
294 <property> 294 <property stdset="1">
295 <name>sizeHint</name> 295 <name>spacing</name>
296 <size> 296 <number>6</number>
297 <width>20</width> 297 </property>
298 <height>20</height> 298 <widget>
299 </size> 299 <class>QLabel</class>
300 </property> 300 <property stdset="1">
301 </spacer> 301 <name>name</name>
302 </hbox> 302 <cstring>Destinations</cstring>
303 </widget> 303 </property>
304 <widget row="2" column="0" > 304 <property stdset="1">
305 <class>QLayoutWidget</class> 305 <name>text</name>
306 <property stdset="1"> 306 <string>Destinations</string>
307 <name>name</name> 307 </property>
308 <cstring>Layout5</cstring> 308 </widget>
309 </property> 309 <spacer>
310 <hbox> 310 <property>
311 <property stdset="1"> 311 <name>name</name>
312 <name>margin</name> 312 <cstring>Spacer2_2</cstring>
313 <number>0</number> 313 </property>
314 </property> 314 <property stdset="1">
315 <property stdset="1"> 315 <name>orientation</name>
316 <name>spacing</name> 316 <enum>Horizontal</enum>
317 <number>6</number> 317 </property>
318 </property> 318 <property stdset="1">
319 <widget> 319 <name>sizeType</name>
320 <class>QPushButton</class> 320 <enum>Expanding</enum>
321 <property stdset="1"> 321 </property>
322 <name>name</name> 322 <property>
323 <cstring>newdestination</cstring> 323 <name>sizeHint</name>
324 </property> 324 <size>
325 <property stdset="1"> 325 <width>20</width>
326 <name>enabled</name> 326 <height>20</height>
327 <bool>true</bool> 327 </size>
328 </property> 328 </property>
329 <property stdset="1"> 329 </spacer>
330 <name>text</name> 330 </hbox>
331 <string>New</string> 331 </widget>
332 </property> 332 <widget row="2" column="0" >
333 <property stdset="1"> 333 <class>QLayoutWidget</class>
334 <name>autoDefault</name> 334 <property stdset="1">
335 <bool>false</bool> 335 <name>name</name>
336 </property> 336 <cstring>Layout5</cstring>
337 </widget> 337 </property>
338 <widget> 338 <hbox>
339 <class>QPushButton</class> 339 <property stdset="1">
340 <property stdset="1"> 340 <name>margin</name>
341 <name>name</name> 341 <number>0</number>
342 <cstring>removedestination</cstring> 342 </property>
343 </property> 343 <property stdset="1">
344 <property stdset="1"> 344 <name>spacing</name>
345 <name>enabled</name> 345 <number>6</number>
346 <bool>true</bool> 346 </property>
347 </property> 347 <widget>
348 <property stdset="1"> 348 <class>QPushButton</class>
349 <name>text</name> 349 <property stdset="1">
350 <string>Remove</string> 350 <name>name</name>
351 </property> 351 <cstring>newdestination</cstring>
352 <property stdset="1"> 352 </property>
353 <name>autoDefault</name> 353 <property stdset="1">
354 <bool>false</bool> 354 <name>enabled</name>
355 </property> 355 <bool>true</bool>
356 </widget> 356 </property>
357 </hbox> 357 <property stdset="1">
358 </widget> 358 <name>text</name>
359 <spacer row="0" column="0" > 359 <string>New</string>
360 <property> 360 </property>
361 <name>name</name> 361 <property stdset="1">
362 <cstring>Spacer3</cstring> 362 <name>autoDefault</name>
363 </property> 363 <bool>false</bool>
364 <property stdset="1"> 364 </property>
365 <name>orientation</name> 365 </widget>
366 <enum>Horizontal</enum> 366 <widget>
367 </property> 367 <class>QPushButton</class>
368 <property stdset="1"> 368 <property stdset="1">
369 <name>sizeType</name> 369 <name>name</name>
370 <enum>Expanding</enum> 370 <cstring>removedestination</cstring>
371 </property> 371 </property>
372 <property> 372 <property stdset="1">
373 <name>sizeHint</name> 373 <name>enabled</name>
374 <size> 374 <bool>true</bool>
375 <width>20</width> 375 </property>
376 <height>20</height> 376 <property stdset="1">
377 </size> 377 <name>text</name>
378 </property> 378 <string>Remove</string>
379 </spacer> 379 </property>
380 <widget row="1" column="0" > 380 <property stdset="1">
381 <class>QListBox</class> 381 <name>autoDefault</name>
382 <property stdset="1"> 382 <bool>false</bool>
383 <name>name</name> 383 </property>
384 <cstring>destinations</cstring> 384 </widget>
385 </property> 385 </hbox>
386 <property stdset="1"> 386 </widget>
387 <name>selectionMode</name> 387 <spacer row="0" column="0" >
388 <enum>Single</enum> 388 <property>
389 </property> 389 <name>name</name>
390 </widget> 390 <cstring>Spacer3</cstring>
391 <widget row="3" column="0" > 391 </property>
392 <class>QLayoutWidget</class> 392 <property stdset="1">
393 <property stdset="1"> 393 <name>orientation</name>
394 <name>name</name> 394 <enum>Horizontal</enum>
395 <cstring>Layout8</cstring> 395 </property>
396 </property> 396 <property stdset="1">
397 <grid> 397 <name>sizeType</name>
398 <property stdset="1"> 398 <enum>Expanding</enum>
399 <name>margin</name> 399 </property>
400 <number>0</number> 400 <property>
401 </property> 401 <name>sizeHint</name>
402 <property stdset="1"> 402 <size>
403 <name>spacing</name> 403 <width>20</width>
404 <number>6</number> 404 <height>20</height>
405 </property> 405 </size>
406 <widget row="0" column="1" > 406 </property>
407 <class>QLineEdit</class> 407 </spacer>
408 <property stdset="1"> 408 <widget row="1" column="0" >
409 <name>name</name> 409 <class>QListBox</class>
410 <cstring>destinationname</cstring> 410 <property stdset="1">
411 </property> 411 <name>name</name>
412 </widget> 412 <cstring>destinations</cstring>
413 <widget row="1" column="1" > 413 </property>
414 <class>QLineEdit</class> 414 <property stdset="1">
415 <property stdset="1"> 415 <name>selectionMode</name>
416 <name>name</name> 416 <enum>Single</enum>
417 <cstring>destinationurl</cstring> 417 </property>
418 </property> 418 </widget>
419 </widget> 419 <widget row="3" column="0" >
420 <widget row="2" column="1" > 420 <class>QLayoutWidget</class>
421 <class>QPushButton</class> 421 <property stdset="1">
422 <property stdset="1"> 422 <name>name</name>
423 <name>name</name> 423 <cstring>Layout13</cstring>
424 <cstring>btnChangeDest</cstring> 424 </property>
425 </property> 425 <grid>
426 <property stdset="1"> 426 <property stdset="1">
427 <name>text</name> 427 <name>margin</name>
428 <string>Change</string> 428 <number>0</number>
429 </property> 429 </property>
430 </widget> 430 <property stdset="1">
431 <widget row="0" column="0" > 431 <name>spacing</name>
432 <class>QLabel</class> 432 <number>6</number>
433 <property stdset="1"> 433 </property>
434 <name>name</name> 434 <widget row="1" column="0" >
435 <cstring>TextLabel1_3_2</cstring> 435 <class>QLabel</class>
436 </property> 436 <property stdset="1">
437 <property stdset="1"> 437 <name>name</name>
438 <name>text</name> 438 <cstring>TextLabel1_3_2_2</cstring>
439 <string>Name:</string> 439 </property>
440 </property> 440 <property stdset="1">
441 </widget> 441 <name>text</name>
442 <widget row="1" column="0" > 442 <string>URL:</string>
443 <class>QLabel</class> 443 </property>
444 <property stdset="1"> 444 </widget>
445 <name>name</name> 445 <widget row="3" column="1" >
446 <cstring>TextLabel1_3_2_2</cstring> 446 <class>QPushButton</class>
447 </property> 447 <property stdset="1">
448 <property stdset="1"> 448 <name>name</name>
449 <name>text</name> 449 <cstring>btnChangeDest</cstring>
450 <string>URL:</string> 450 </property>
451 </property> 451 <property stdset="1">
452 </widget> 452 <name>text</name>
453 </grid> 453 <string>Change</string>
454 </widget> 454 </property>
455 </grid> 455 </widget>
456 </widget> 456 <widget row="0" column="1" >
457 </widget> 457 <class>QLineEdit</class>
458 </grid> 458 <property stdset="1">
459</widget> 459 <name>name</name>
460<connections> 460 <cstring>destinationname</cstring>
461 <connection> 461 </property>
462 <sender>newserver</sender> 462 </widget>
463 <signal>clicked()</signal> 463 <widget row="0" column="0" >
464 <receiver>Settings</receiver> 464 <class>QLabel</class>
465 <slot>newServer()</slot> 465 <property stdset="1">
466 </connection> 466 <name>name</name>
467 <connection> 467 <cstring>TextLabel1_3_2</cstring>
468 <sender>removeserver</sender> 468 </property>
469 <signal>clicked()</signal> 469 <property stdset="1">
470 <receiver>Settings</receiver> 470 <name>text</name>
471 <slot>removeServer()</slot> 471 <string>Name:</string>
472 </connection> 472 </property>
473 <connection> 473 </widget>
474 <sender>newdestination</sender> 474 <widget row="2" column="1" >
475 <signal>clicked()</signal> 475 <class>QCheckBox</class>
476 <receiver>Settings</receiver> 476 <property stdset="1">
477 <slot>newDestination()</slot> 477 <name>name</name>
478 </connection> 478 <cstring>linkToRoot</cstring>
479 <connection> 479 </property>
480 <sender>removedestination</sender> 480 <property stdset="1">
481 <signal>clicked()</signal> 481 <name>text</name>
482 <receiver>Settings</receiver> 482 <string>LinkToRoot</string>
483 <slot>removeDestination()</slot> 483 </property>
484 </connection> 484 <property stdset="1">
485 <connection> 485 <name>checked</name>
486 <sender>servers</sender> 486 <bool>true</bool>
487 <signal>highlighted(int)</signal> 487 </property>
488 <receiver>Settings</receiver> 488 </widget>
489 <slot>editServer(int)</slot> 489 <widget row="1" column="1" >
490 </connection> 490 <class>QLineEdit</class>
491 <connection> 491 <property stdset="1">
492 <sender>destinations</sender> 492 <name>name</name>
493 <signal>highlighted(int)</signal> 493 <cstring>destinationurl</cstring>
494 <receiver>Settings</receiver> 494 </property>
495 <slot>editDestination(int)</slot> 495 </widget>
496 </connection> 496 </grid>
497 <connection> 497 </widget>
498 <sender>btnChangeServer</sender> 498 </grid>
499 <signal>clicked()</signal> 499 </widget>
500 <receiver>Settings</receiver> 500 </widget>
501 <slot>changeServerDetails()</slot> 501 </grid>
502 </connection> 502</widget>
503 <connection> 503<connections>
504 <sender>btnChangeDest</sender> 504 <connection>
505 <signal>clicked()</signal> 505 <sender>newserver</sender>
506 <receiver>Settings</receiver> 506 <signal>clicked()</signal>
507 <slot>changeDestinationDetails()</slot> 507 <receiver>Settings</receiver>
508 </connection> 508 <slot>newServer()</slot>
509 <slot access="public">activeServerChanged()</slot> 509 </connection>
510 <slot access="public">changeServerDetails()</slot> 510 <connection>
511 <slot access="public">createLinksToDest()</slot> 511 <sender>removeserver</sender>
512 <slot access="public">destNameChanged(const QString&amp;)</slot> 512 <signal>clicked()</signal>
513 <slot access="public">destUrlChanged(const QString&amp;)</slot> 513 <receiver>Settings</receiver>
514 <slot access="public">editDestination(int)</slot> 514 <slot>removeServer()</slot>
515 <slot access="public">editServer(int)</slot> 515 </connection>
516 <slot access="public">installationSettingChange(int)</slot> 516 <connection>
517 <slot access="public">installationSettingSetName(const QString &amp;)</slot> 517 <sender>newdestination</sender>
518 <slot access="public">linkEnabled(bool)</slot> 518 <signal>clicked()</signal>
519 <slot access="public">newDestination()</slot> 519 <receiver>Settings</receiver>
520 <slot access="public">newInstallationSetting()</slot> 520 <slot>newDestination()</slot>
521 <slot access="public">newServer()</slot> 521 </connection>
522 <slot access="public">changeDestinationDetails()</slot> 522 <connection>
523 <slot access="public">removeDestination()</slot> 523 <sender>removedestination</sender>
524 <slot access="public">removeInstallationSetting()</slot> 524 <signal>clicked()</signal>
525 <slot access="public">removeLinksToDest()</slot> 525 <receiver>Settings</receiver>
526 <slot access="public">removeServer()</slot> 526 <slot>removeDestination()</slot>
527 <slot access="public">renameInstallationSetting()</slot> 527 </connection>
528 <slot access="public">serverNameChanged(const QString&amp;)</slot> 528 <connection>
529 <slot access="public">serverUrlChanged(const QString&amp;)</slot> 529 <sender>servers</sender>
530</connections> 530 <signal>highlighted(int)</signal>
531</UI> 531 <receiver>Settings</receiver>
532 <slot>editServer(int)</slot>
533 </connection>
534 <connection>
535 <sender>destinations</sender>
536 <signal>highlighted(int)</signal>
537 <receiver>Settings</receiver>
538 <slot>editDestination(int)</slot>
539 </connection>
540 <connection>
541 <sender>btnChangeServer</sender>
542 <signal>clicked()</signal>
543 <receiver>Settings</receiver>
544 <slot>changeServerDetails()</slot>
545 </connection>
546 <connection>
547 <sender>btnChangeDest</sender>
548 <signal>clicked()</signal>
549 <receiver>Settings</receiver>
550 <slot>changeDestinationDetails()</slot>
551 </connection>
552 <slot access="public">activeServerChanged()</slot>
553 <slot access="public">changeServerDetails()</slot>
554 <slot access="public">createLinksToDest()</slot>
555 <slot access="public">destNameChanged(const QString&amp;)</slot>
556 <slot access="public">destUrlChanged(const QString&amp;)</slot>
557 <slot access="public">editDestination(int)</slot>
558 <slot access="public">editServer(int)</slot>
559 <slot access="public">installationSettingChange(int)</slot>
560 <slot access="public">installationSettingSetName(const QString &amp;)</slot>
561 <slot access="public">linkEnabled(bool)</slot>
562 <slot access="public">newDestination()</slot>
563 <slot access="public">newInstallationSetting()</slot>
564 <slot access="public">newServer()</slot>
565 <slot access="public">changeDestinationDetails()</slot>
566 <slot access="public">removeDestination()</slot>
567 <slot access="public">removeInstallationSetting()</slot>
568 <slot access="public">removeLinksToDest()</slot>
569 <slot access="public">removeServer()</slot>
570 <slot access="public">renameInstallationSetting()</slot>
571 <slot access="public">serverNameChanged(const QString&amp;)</slot>
572 <slot access="public">serverUrlChanged(const QString&amp;)</slot>
573</connections>
574</UI>
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 81e89ed..9ee3a33 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -1,195 +1,226 @@
1/*************************************************************************** 1/***************************************************************************
2 settingsimpl.cpp - description 2 settingsimpl.cpp - description
3 ------------------- 3 -------------------
4 begin : Thu Aug 29 2002 4 begin : Thu Aug 29 2002
5 copyright : (C) 2002 by Andy Qua 5 copyright : (C) 2002 by Andy Qua
6 email : andy.qua@blueyonder.co.uk 6 email : andy.qua@blueyonder.co.uk
7 ***************************************************************************/ 7 ***************************************************************************/
8 8
9/*************************************************************************** 9/***************************************************************************
10 * * 10 * *
11 * This program is free software; you can redistribute it and/or modify * 11 * This program is free software; you can redistribute it and/or modify *
12 * it under the terms of the GNU General Public License as published by * 12 * it under the terms of the GNU General Public License as published by *
13 * the Free Software Foundation; either version 2 of the License, or * 13 * the Free Software Foundation; either version 2 of the License, or *
14 * (at your option) any later version. * 14 * (at your option) any later version. *
15 * * 15 * *
16 ***************************************************************************/ 16 ***************************************************************************/
17 17
18#include <fstream> 18#include <fstream>
19using namespace std; 19using namespace std;
20 20
21#include <qlistbox.h> 21#include <qlistbox.h>
22#include <qlineedit.h> 22#include <qlineedit.h>
23#include <qpushbutton.h> 23#include <qpushbutton.h>
24#include <qtabwidget.h> 24#include <qtabwidget.h>
25#include <qcheckbox.h>
26
27#ifdef QWS
28#include <qpe/config.h>
29#endif
25 30
26#include "settingsimpl.h" 31#include "settingsimpl.h"
27 32
28#include "global.h" 33#include "global.h"
29 34
30SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) 35SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
31 : SettingsBase( parent, name, modal, fl ) 36 : SettingsBase( parent, name, modal, fl )
32{ 37{
33 dataMgr = dataManager; 38 dataMgr = dataManager;
34 39
35 setupData(); 40 setupData();
36 changed = false; 41 changed = false;
37 newserver = false; 42 newserver = false;
38 newdestination = false; 43 newdestination = false;
39} 44}
40 45
41SettingsImpl :: ~SettingsImpl() 46SettingsImpl :: ~SettingsImpl()
42{ 47{
43 48
44} 49}
45 50
46bool SettingsImpl :: showDlg( int i ) 51bool SettingsImpl :: showDlg( int i )
47{ 52{
48 TabWidget->setCurrentPage( i ); 53 TabWidget->setCurrentPage( i );
49 showMaximized(); 54 showMaximized();
50 exec(); 55 exec();
51 56
52 if ( changed ) 57 if ( changed )
53 dataMgr->writeOutIpkgConf(); 58 dataMgr->writeOutIpkgConf();
54 59
55 return changed; 60 return changed;
56} 61}
57 62
58void SettingsImpl :: setupData() 63void SettingsImpl :: setupData()
59{ 64{
60 // add servers 65 // add servers
61 vector<Server>::iterator it; 66 vector<Server>::iterator it;
62 for ( it = dataMgr->getServerList().begin() ; it != dataMgr->getServerList().end() ; ++it ) 67 for ( it = dataMgr->getServerList().begin() ; it != dataMgr->getServerList().end() ; ++it )
63 { 68 {
64 if ( it->getServerName() == LOCAL_SERVER || it->getServerName() == LOCAL_IPKGS ) 69 if ( it->getServerName() == LOCAL_SERVER || it->getServerName() == LOCAL_IPKGS )
65 continue; 70 continue;
66 71
67 servers->insertItem( it->getServerName() ); 72 servers->insertItem( it->getServerName() );
68 } 73 }
69 74
70 // add destinations 75 // add destinations
71 vector<Destination>::iterator it2; 76 vector<Destination>::iterator it2;
72 for ( it2 = dataMgr->getDestinationList().begin() ; it2 != dataMgr->getDestinationList().end() ; ++it2 ) 77 for ( it2 = dataMgr->getDestinationList().begin() ; it2 != dataMgr->getDestinationList().end() ; ++it2 )
73 destinations->insertItem( it2->getDestinationName() ); 78 destinations->insertItem( it2->getDestinationName() );
74 79
75} 80}
76 81
77//------------------ Servers tab ---------------------- 82//------------------ Servers tab ----------------------
78 83
79void SettingsImpl :: editServer( int sel ) 84void SettingsImpl :: editServer( int sel )
80{ 85{
81 currentSelectedServer = sel; 86 currentSelectedServer = sel;
82 Server *s = dataMgr->getServer( servers->currentText() ); 87 Server *s = dataMgr->getServer( servers->currentText() );
83 serverName = s->getServerName(); 88 serverName = s->getServerName();
84 servername->setText( s->getServerName() ); 89 servername->setText( s->getServerName() );
85 serverurl->setText( s->getServerUrl() ); 90 serverurl->setText( s->getServerUrl() );
91 active->setChecked( s->isServerActive() );
86} 92}
87 93
88void SettingsImpl :: newServer() 94void SettingsImpl :: newServer()
89{ 95{
90 newserver = true; 96 newserver = true;
91 servername->setText( "" ); 97 servername->setText( "" );
92 serverurl->setText( "" ); 98 serverurl->setText( "" );
93 servername->setFocus(); 99 servername->setFocus();
100 active->setChecked( true );
94} 101}
95 102
96void SettingsImpl :: removeServer() 103void SettingsImpl :: removeServer()
97{ 104{
98 changed = true; 105 changed = true;
99 Server *s = dataMgr->getServer( servers->currentText() ); 106 Server *s = dataMgr->getServer( servers->currentText() );
100 dataMgr->getServerList().erase( s ); 107 dataMgr->getServerList().erase( s );
101 servers->removeItem( currentSelectedServer ); 108 servers->removeItem( currentSelectedServer );
102} 109}
103 110
104void SettingsImpl :: changeServerDetails() 111void SettingsImpl :: changeServerDetails()
105{ 112{
106 changed = true; 113 changed = true;
107 114
108 QString newName = servername->text(); 115 QString newName = servername->text();
109 if ( !newserver ) 116 if ( !newserver )
110 { 117 {
111 Server *s = dataMgr->getServer( serverName ); 118 Server *s = dataMgr->getServer( serverName );
112 119
113 // Update url 120 // Update url
114 s->setServerUrl( serverurl->text() ); 121 s->setServerUrl( serverurl->text() );
122 s->setActive( active->isChecked() );
123
115 124
116 // Check if server name has changed, if it has then we need to replace the key in the map 125 // Check if server name has changed, if it has then we need to replace the key in the map
117 if ( serverName != newName ) 126 if ( serverName != newName )
118 { 127 {
119 // Update server name 128 // Update server name
120 s->setServerName( newName ); 129 s->setServerName( newName );
121 130
122 // See if this server is the active server 131 // See if this server is the active server
123 if ( dataMgr->getActiveServer() == serverName ) 132 // if ( dataMgr->getActiveServer() == serverName )
124 dataMgr->setActiveServer( newName ); 133 // dataMgr->setActiveServer( newName );
125 134
126 // Update list box 135 // Update list box
127 servers->changeItem( newName, currentSelectedServer ); 136 servers->changeItem( newName, currentSelectedServer );
128 } 137 }
129 } 138 }
130 else 139 else
131 { 140 {
132 dataMgr->getServerList().push_back( Server( newName, serverurl->text() ) ); 141 Server s( newName, serverurl->text() );
142 dataMgr->getServerList().push_back( Server( newName, serverurl->text() ) );
143 dataMgr->getServerList().end()->setActive( active->isChecked() );
133 servers->insertItem( newName ); 144 servers->insertItem( newName );
134 servers->setCurrentItem( servers->count() ); 145 servers->setCurrentItem( servers->count() );
135 newserver = false; 146 newserver = false;
136 } 147 }
137} 148}
138 149
139//------------------ Destinations tab ---------------------- 150//------------------ Destinations tab ----------------------
140 151
141void SettingsImpl :: editDestination( int sel ) 152void SettingsImpl :: editDestination( int sel )
142{ 153{
143 currentSelectedDestination = sel; 154 currentSelectedDestination = sel;
144 Destination *s = dataMgr->getDestination( destinations->currentText() ); 155 Destination *d = dataMgr->getDestination( destinations->currentText() );
145 destinationName = s->getDestinationName(); 156 destinationName = d->getDestinationName();
146 destinationname->setText( s->getDestinationName() ); 157 destinationname->setText( d->getDestinationName() );
147 destinationurl->setText( s->getDestinationPath() ); 158 destinationurl->setText( d->getDestinationPath() );
159 linkToRoot->setChecked( d->linkToRoot() );
148} 160}
149 161
150void SettingsImpl :: newDestination() 162void SettingsImpl :: newDestination()
151{ 163{
152 newdestination = true; 164 newdestination = true;
153 destinationname->setText( "" ); 165 destinationname->setText( "" );
154 destinationurl->setText( "" ); 166 destinationurl->setText( "" );
155 destinationname->setFocus(); 167 destinationname->setFocus();
168 linkToRoot->setChecked( true );
156} 169}
157 170
158void SettingsImpl :: removeDestination() 171void SettingsImpl :: removeDestination()
159{ 172{
160 changed = true; 173 changed = true;
161 Destination *d = dataMgr->getDestination( destinations->currentText() ); 174 Destination *d = dataMgr->getDestination( destinations->currentText() );
162 dataMgr->getDestinationList().erase( d ); 175 dataMgr->getDestinationList().erase( d );
163 destinations->removeItem( currentSelectedDestination ); 176 destinations->removeItem( currentSelectedDestination );
164} 177}
165 178
166void SettingsImpl :: changeDestinationDetails() 179void SettingsImpl :: changeDestinationDetails()
167{ 180{
168 changed = true; 181 changed = true;
169 182
170 QString newName = destinationname->text(); 183#ifdef QWS
184 Config cfg( "aqpkg" );
185 cfg.setGroup( "destinations" );
186#endif
187
188 QString newName = destinationname->text();
171 if ( !newdestination ) 189 if ( !newdestination )
172 { 190 {
173 Destination *d = dataMgr->getDestination( destinationName ); 191 Destination *d = dataMgr->getDestination( destinationName );
174 192
175 // Update url 193 // Update url
176 d->setDestinationPath( destinationurl->text() ); 194 d->setDestinationPath( destinationurl->text() );
195 d->linkToRoot( linkToRoot->isChecked() );
177 196
178 // Check if server name has changed, if it has then we need to replace the key in the map 197 // Check if server name has changed, if it has then we need to replace the key in the map
179 if ( destinationName != newName ) 198 if ( destinationName != newName )
180 { 199 {
181 // Update server name 200 // Update server name
182 d->setDestinationName( newName ); 201 d->setDestinationName( newName );
183 202
184 // Update list box 203 // Update list box
185 destinations->changeItem( newName, currentSelectedDestination ); 204 destinations->changeItem( newName, currentSelectedDestination );
186 } 205 }
206#ifdef QWS
207 QString key = newName;
208 key += "_linkToRoot";
209 int val = d->linkToRoot();
210 cfg.writeEntry( key, val );
211#endif
187 } 212 }
188 else 213 else
189 { 214 {
190 dataMgr->getDestinationList().push_back( Destination( newName, destinationurl->text() ) ); 215 dataMgr->getDestinationList().push_back( Destination( newName, destinationurl->text() ) );
191 destinations->insertItem( newName ); 216 destinations->insertItem( newName );
192 destinations->setCurrentItem( destinations->count() ); 217 destinations->setCurrentItem( destinations->count() );
193 newdestination = false; 218 newdestination = false;
219
220#ifdef QWS
221 QString key = newName;
222 key += "_linkToRoot";
223 cfg.writeEntry( key, true );
224#endif
194 } 225 }
195} 226}