summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/.cvsignore2
-rw-r--r--noncore/settings/aqpkg/aqpkg.pro3
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp2
-rw-r--r--noncore/settings/aqpkg/settings.ui872
-rw-r--r--noncore/settings/aqpkg/settingsimpl.cpp237
-rw-r--r--noncore/settings/aqpkg/settingsimpl.h45
6 files changed, 239 insertions, 922 deletions
diff --git a/noncore/settings/aqpkg/.cvsignore b/noncore/settings/aqpkg/.cvsignore
index 751040e..12658fc 100644
--- a/noncore/settings/aqpkg/.cvsignore
+++ b/noncore/settings/aqpkg/.cvsignore
@@ -2,7 +2,5 @@ Makefile*
2instoptions.cpp 2instoptions.cpp
3instoptions.h 3instoptions.h
4moc* 4moc*
5settings.cpp
6settings.h
7categoryfilter.cpp 5categoryfilter.cpp
8categoryfilter.h 6categoryfilter.h
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index d3f898b..f66fd95 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -32,8 +32,7 @@ SOURCES = mainwin.cpp \
32 inputdlg.cpp \ 32 inputdlg.cpp \
33 version.cpp \ 33 version.cpp \
34 categoryfilterimpl.cpp 34 categoryfilterimpl.cpp
35 INTERFACES= settings.ui \ 35 INTERFACES= instoptions.ui \
36 instoptions.ui \
37 categoryfilter.ui 36 categoryfilter.ui
38 TARGET = aqpkg 37 TARGET = aqpkg
39INCLUDEPATH += $(OPIEDIR)/include 38INCLUDEPATH += $(OPIEDIR)/include
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 947aace..361946c 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -345,7 +345,7 @@ void MainWindow :: setDocument( const QString &doc )
345void MainWindow :: displaySettings() 345void MainWindow :: displaySettings()
346{ 346{
347 SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); 347 SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );
348 if ( dlg->showDlg( 0 ) ) 348 if ( dlg->showDlg() )
349 { 349 {
350 stack->raiseWidget( progressWindow ); 350 stack->raiseWidget( progressWindow );
351 updateData(); 351 updateData();
diff --git a/noncore/settings/aqpkg/settings.ui b/noncore/settings/aqpkg/settings.ui
deleted file mode 100644
index 2db0768..0000000
--- a/noncore/settings/aqpkg/settings.ui
+++ b/dev/null
@@ -1,872 +0,0 @@
1<!DOCTYPE UI><UI>
2<class>SettingsBase</class>
3<widget>
4 <class>QDialog</class>
5 <property stdset="1">
6 <name>name</name>
7 <cstring>Settings</cstring>
8 </property>
9 <property stdset="1">
10 <name>geometry</name>
11 <rect>
12 <x>0</x>
13 <y>0</y>
14 <width>238</width>
15 <height>353</height>
16 </rect>
17 </property>
18 <property stdset="1">
19 <name>caption</name>
20 <string>Configuration</string>
21 </property>
22 <property>
23 <name>layoutMargin</name>
24 </property>
25 <property>
26 <name>layoutSpacing</name>
27 </property>
28 <grid>
29 <property stdset="1">
30 <name>margin</name>
31 <number>11</number>
32 </property>
33 <property stdset="1">
34 <name>spacing</name>
35 <number>6</number>
36 </property>
37 <widget row="0" column="0" >
38 <class>QTabWidget</class>
39 <property stdset="1">
40 <name>name</name>
41 <cstring>TabWidget</cstring>
42 </property>
43 <property stdset="1">
44 <name>enabled</name>
45 <bool>true</bool>
46 </property>
47 <property>
48 <name>layoutMargin</name>
49 </property>
50 <property>
51 <name>layoutSpacing</name>
52 </property>
53 <widget>
54 <class>QWidget</class>
55 <property stdset="1">
56 <name>name</name>
57 <cstring>tab</cstring>
58 </property>
59 <attribute>
60 <name>title</name>
61 <string>Servers</string>
62 </attribute>
63 <grid>
64 <property stdset="1">
65 <name>margin</name>
66 <number>11</number>
67 </property>
68 <property stdset="1">
69 <name>spacing</name>
70 <number>6</number>
71 </property>
72 <widget row="0" column="0" >
73 <class>QLayoutWidget</class>
74 <property stdset="1">
75 <name>name</name>
76 <cstring>Layout2</cstring>
77 </property>
78 <hbox>
79 <property stdset="1">
80 <name>margin</name>
81 <number>0</number>
82 </property>
83 <property stdset="1">
84 <name>spacing</name>
85 <number>6</number>
86 </property>
87 <widget>
88 <class>QLabel</class>
89 <property stdset="1">
90 <name>name</name>
91 <cstring>Servers</cstring>
92 </property>
93 <property stdset="1">
94 <name>text</name>
95 <string>Servers</string>
96 </property>
97 </widget>
98 <spacer>
99 <property>
100 <name>name</name>
101 <cstring>Spacer2</cstring>
102 </property>
103 <property stdset="1">
104 <name>orientation</name>
105 <enum>Horizontal</enum>
106 </property>
107 <property stdset="1">
108 <name>sizeType</name>
109 <enum>Expanding</enum>
110 </property>
111 <property>
112 <name>sizeHint</name>
113 <size>
114 <width>20</width>
115 <height>20</height>
116 </size>
117 </property>
118 </spacer>
119 </hbox>
120 </widget>
121 <widget row="1" column="0" >
122 <class>QLayoutWidget</class>
123 <property stdset="1">
124 <name>name</name>
125 <cstring>Layout8</cstring>
126 </property>
127 <grid>
128 <property stdset="1">
129 <name>margin</name>
130 <number>0</number>
131 </property>
132 <property stdset="1">
133 <name>spacing</name>
134 <number>6</number>
135 </property>
136 <widget row="0" column="0" rowspan="1" colspan="2" >
137 <class>QListBox</class>
138 <property stdset="1">
139 <name>name</name>
140 <cstring>servers</cstring>
141 </property>
142 <property stdset="1">
143 <name>selectionMode</name>
144 <enum>Extended</enum>
145 </property>
146 </widget>
147 <widget row="2" column="0" rowspan="1" colspan="2" >
148 <class>QLayoutWidget</class>
149 <property stdset="1">
150 <name>name</name>
151 <cstring>Layout6</cstring>
152 </property>
153 <grid>
154 <property stdset="1">
155 <name>margin</name>
156 <number>0</number>
157 </property>
158 <property stdset="1">
159 <name>spacing</name>
160 <number>6</number>
161 </property>
162 <widget row="2" column="1" >
163 <class>QCheckBox</class>
164 <property stdset="1">
165 <name>name</name>
166 <cstring>active</cstring>
167 </property>
168 <property stdset="1">
169 <name>text</name>
170 <string>Active Server</string>
171 </property>
172 </widget>
173 <widget row="0" column="0" >
174 <class>QLabel</class>
175 <property stdset="1">
176 <name>name</name>
177 <cstring>TextLabel1_3</cstring>
178 </property>
179 <property stdset="1">
180 <name>text</name>
181 <string>Name:</string>
182 </property>
183 </widget>
184 <widget row="1" column="0" >
185 <class>QLabel</class>
186 <property stdset="1">
187 <name>name</name>
188 <cstring>TextLabel2_3</cstring>
189 </property>
190 <property stdset="1">
191 <name>text</name>
192 <string>URL:</string>
193 </property>
194 </widget>
195 <widget row="0" column="1" >
196 <class>QLineEdit</class>
197 <property stdset="1">
198 <name>name</name>
199 <cstring>servername</cstring>
200 </property>
201 </widget>
202 <widget row="1" column="1" >
203 <class>QLineEdit</class>
204 <property stdset="1">
205 <name>name</name>
206 <cstring>serverurl</cstring>
207 </property>
208 </widget>
209 <widget row="3" column="1" >
210 <class>QPushButton</class>
211 <property stdset="1">
212 <name>name</name>
213 <cstring>btnChangeServer</cstring>
214 </property>
215 <property stdset="1">
216 <name>text</name>
217 <string>Change</string>
218 </property>
219 </widget>
220 </grid>
221 </widget>
222 <widget row="1" column="1" >
223 <class>QPushButton</class>
224 <property stdset="1">
225 <name>name</name>
226 <cstring>removeserver</cstring>
227 </property>
228 <property stdset="1">
229 <name>enabled</name>
230 <bool>true</bool>
231 </property>
232 <property stdset="1">
233 <name>text</name>
234 <string>Remove</string>
235 </property>
236 <property stdset="1">
237 <name>autoDefault</name>
238 <bool>false</bool>
239 </property>
240 </widget>
241 <widget row="1" column="0" >
242 <class>QPushButton</class>
243 <property stdset="1">
244 <name>name</name>
245 <cstring>newserver</cstring>
246 </property>
247 <property stdset="1">
248 <name>enabled</name>
249 <bool>true</bool>
250 </property>
251 <property stdset="1">
252 <name>text</name>
253 <string>New</string>
254 </property>
255 <property stdset="1">
256 <name>autoDefault</name>
257 <bool>false</bool>
258 </property>
259 </widget>
260 </grid>
261 </widget>
262 </grid>
263 </widget>
264 <widget>
265 <class>QWidget</class>
266 <property stdset="1">
267 <name>name</name>
268 <cstring>tab</cstring>
269 </property>
270 <attribute>
271 <name>title</name>
272 <string>Destinations</string>
273 </attribute>
274 <grid>
275 <property stdset="1">
276 <name>margin</name>
277 <number>11</number>
278 </property>
279 <property stdset="1">
280 <name>spacing</name>
281 <number>6</number>
282 </property>
283 <widget row="0" column="0" >
284 <class>QLayoutWidget</class>
285 <property stdset="1">
286 <name>name</name>
287 <cstring>Layout3</cstring>
288 </property>
289 <hbox>
290 <property stdset="1">
291 <name>margin</name>
292 <number>0</number>
293 </property>
294 <property stdset="1">
295 <name>spacing</name>
296 <number>6</number>
297 </property>
298 <widget>
299 <class>QLabel</class>
300 <property stdset="1">
301 <name>name</name>
302 <cstring>Destinations</cstring>
303 </property>
304 <property stdset="1">
305 <name>text</name>
306 <string>Destinations</string>
307 </property>
308 </widget>
309 <spacer>
310 <property>
311 <name>name</name>
312 <cstring>Spacer2_2</cstring>
313 </property>
314 <property stdset="1">
315 <name>orientation</name>
316 <enum>Horizontal</enum>
317 </property>
318 <property stdset="1">
319 <name>sizeType</name>
320 <enum>Expanding</enum>
321 </property>
322 <property>
323 <name>sizeHint</name>
324 <size>
325 <width>20</width>
326 <height>20</height>
327 </size>
328 </property>
329 </spacer>
330 </hbox>
331 </widget>
332 <widget row="2" column="0" >
333 <class>QLayoutWidget</class>
334 <property stdset="1">
335 <name>name</name>
336 <cstring>Layout5</cstring>
337 </property>
338 <hbox>
339 <property stdset="1">
340 <name>margin</name>
341 <number>0</number>
342 </property>
343 <property stdset="1">
344 <name>spacing</name>
345 <number>6</number>
346 </property>
347 <widget>
348 <class>QPushButton</class>
349 <property stdset="1">
350 <name>name</name>
351 <cstring>newdestination</cstring>
352 </property>
353 <property stdset="1">
354 <name>enabled</name>
355 <bool>true</bool>
356 </property>
357 <property stdset="1">
358 <name>text</name>
359 <string>New</string>
360 </property>
361 <property stdset="1">
362 <name>autoDefault</name>
363 <bool>false</bool>
364 </property>
365 </widget>
366 <widget>
367 <class>QPushButton</class>
368 <property stdset="1">
369 <name>name</name>
370 <cstring>removedestination</cstring>
371 </property>
372 <property stdset="1">
373 <name>enabled</name>
374 <bool>true</bool>
375 </property>
376 <property stdset="1">
377 <name>text</name>
378 <string>Remove</string>
379 </property>
380 <property stdset="1">
381 <name>autoDefault</name>
382 <bool>false</bool>
383 </property>
384 </widget>
385 </hbox>
386 </widget>
387 <spacer row="0" column="0" >
388 <property>
389 <name>name</name>
390 <cstring>Spacer3</cstring>
391 </property>
392 <property stdset="1">
393 <name>orientation</name>
394 <enum>Horizontal</enum>
395 </property>
396 <property stdset="1">
397 <name>sizeType</name>
398 <enum>Expanding</enum>
399 </property>
400 <property>
401 <name>sizeHint</name>
402 <size>
403 <width>20</width>
404 <height>20</height>
405 </size>
406 </property>
407 </spacer>
408 <widget row="1" column="0" >
409 <class>QListBox</class>
410 <property stdset="1">
411 <name>name</name>
412 <cstring>destinations</cstring>
413 </property>
414 <property stdset="1">
415 <name>selectionMode</name>
416 <enum>Single</enum>
417 </property>
418 </widget>
419 <widget row="3" column="0" >
420 <class>QLayoutWidget</class>
421 <property stdset="1">
422 <name>name</name>
423 <cstring>Layout13</cstring>
424 </property>
425 <grid>
426 <property stdset="1">
427 <name>margin</name>
428 <number>0</number>
429 </property>
430 <property stdset="1">
431 <name>spacing</name>
432 <number>6</number>
433 </property>
434 <widget row="1" column="0" >
435 <class>QLabel</class>
436 <property stdset="1">
437 <name>name</name>
438 <cstring>TextLabel1_3_2_2</cstring>
439 </property>
440 <property stdset="1">
441 <name>text</name>
442 <string>URL:</string>
443 </property>
444 </widget>
445 <widget row="3" column="1" >
446 <class>QPushButton</class>
447 <property stdset="1">
448 <name>name</name>
449 <cstring>btnChangeDest</cstring>
450 </property>
451 <property stdset="1">
452 <name>text</name>
453 <string>Change</string>
454 </property>
455 </widget>
456 <widget row="0" column="1" >
457 <class>QLineEdit</class>
458 <property stdset="1">
459 <name>name</name>
460 <cstring>destinationname</cstring>
461 </property>
462 </widget>
463 <widget row="0" column="0" >
464 <class>QLabel</class>
465 <property stdset="1">
466 <name>name</name>
467 <cstring>TextLabel1_3_2</cstring>
468 </property>
469 <property stdset="1">
470 <name>text</name>
471 <string>Name:</string>
472 </property>
473 </widget>
474 <widget row="2" column="1" >
475 <class>QCheckBox</class>
476 <property stdset="1">
477 <name>name</name>
478 <cstring>linkToRoot</cstring>
479 </property>
480 <property stdset="1">
481 <name>text</name>
482 <string>Link To Root</string>
483 </property>
484 <property stdset="1">
485 <name>checked</name>
486 <bool>true</bool>
487 </property>
488 </widget>
489 <widget row="1" column="1" >
490 <class>QLineEdit</class>
491 <property stdset="1">
492 <name>name</name>
493 <cstring>destinationurl</cstring>
494 </property>
495 </widget>
496 </grid>
497 </widget>
498 </grid>
499 </widget>
500 <widget>
501 <class>QWidget</class>
502 <property stdset="1">
503 <name>name</name>
504 <cstring>tab</cstring>
505 </property>
506 <attribute>
507 <name>title</name>
508 <string>Proxies</string>
509 </attribute>
510 <widget>
511 <class>QLabel</class>
512 <property stdset="1">
513 <name>name</name>
514 <cstring>TextLabel1_2</cstring>
515 </property>
516 <property stdset="1">
517 <name>geometry</name>
518 <rect>
519 <x>1</x>
520 <y>19</y>
521 <width>67</width>
522 <height>22</height>
523 </rect>
524 </property>
525 <property stdset="1">
526 <name>text</name>
527 <string>HTTP Proxy</string>
528 </property>
529 </widget>
530 <widget>
531 <class>QLineEdit</class>
532 <property stdset="1">
533 <name>name</name>
534 <cstring>txtFtpProxy</cstring>
535 </property>
536 <property stdset="1">
537 <name>geometry</name>
538 <rect>
539 <x>74</x>
540 <y>72</y>
541 <width>110</width>
542 <height>22</height>
543 </rect>
544 </property>
545 </widget>
546 <widget>
547 <class>QLineEdit</class>
548 <property stdset="1">
549 <name>name</name>
550 <cstring>txtHttpProxy</cstring>
551 </property>
552 <property stdset="1">
553 <name>geometry</name>
554 <rect>
555 <x>74</x>
556 <y>19</y>
557 <width>110</width>
558 <height>22</height>
559 </rect>
560 </property>
561 </widget>
562 <widget>
563 <class>QLabel</class>
564 <property stdset="1">
565 <name>name</name>
566 <cstring>TextLabel4</cstring>
567 </property>
568 <property stdset="1">
569 <name>geometry</name>
570 <rect>
571 <x>1</x>
572 <y>153</y>
573 <width>67</width>
574 <height>22</height>
575 </rect>
576 </property>
577 <property stdset="1">
578 <name>text</name>
579 <string>Password</string>
580 </property>
581 </widget>
582 <widget>
583 <class>QLineEdit</class>
584 <property stdset="1">
585 <name>name</name>
586 <cstring>txtUsername</cstring>
587 </property>
588 <property stdset="1">
589 <name>geometry</name>
590 <rect>
591 <x>74</x>
592 <y>125</y>
593 <width>110</width>
594 <height>22</height>
595 </rect>
596 </property>
597 </widget>
598 <widget>
599 <class>QLineEdit</class>
600 <property stdset="1">
601 <name>name</name>
602 <cstring>txtPassword</cstring>
603 </property>
604 <property stdset="1">
605 <name>geometry</name>
606 <rect>
607 <x>74</x>
608 <y>153</y>
609 <width>110</width>
610 <height>22</height>
611 </rect>
612 </property>
613 </widget>
614 <widget>
615 <class>QCheckBox</class>
616 <property stdset="1">
617 <name>name</name>
618 <cstring>chkFtpProxyEnabled</cstring>
619 </property>
620 <property stdset="1">
621 <name>geometry</name>
622 <rect>
623 <x>74</x>
624 <y>100</y>
625 <width>110</width>
626 <height>19</height>
627 </rect>
628 </property>
629 <property stdset="1">
630 <name>text</name>
631 <string>Enabled</string>
632 </property>
633 </widget>
634 <widget>
635 <class>QLabel</class>
636 <property stdset="1">
637 <name>name</name>
638 <cstring>TextLabel2</cstring>
639 </property>
640 <property stdset="1">
641 <name>geometry</name>
642 <rect>
643 <x>1</x>
644 <y>72</y>
645 <width>67</width>
646 <height>22</height>
647 </rect>
648 </property>
649 <property stdset="1">
650 <name>text</name>
651 <string>FTP Proxy</string>
652 </property>
653 </widget>
654 <widget>
655 <class>QLabel</class>
656 <property stdset="1">
657 <name>name</name>
658 <cstring>TextLabel3</cstring>
659 </property>
660 <property stdset="1">
661 <name>geometry</name>
662 <rect>
663 <x>1</x>
664 <y>125</y>
665 <width>67</width>
666 <height>22</height>
667 </rect>
668 </property>
669 <property stdset="1">
670 <name>text</name>
671 <string>Username</string>
672 </property>
673 </widget>
674 <widget>
675 <class>QCheckBox</class>
676 <property stdset="1">
677 <name>name</name>
678 <cstring>chkHttpProxyEnabled</cstring>
679 </property>
680 <property stdset="1">
681 <name>geometry</name>
682 <rect>
683 <x>74</x>
684 <y>47</y>
685 <width>110</width>
686 <height>19</height>
687 </rect>
688 </property>
689 <property stdset="1">
690 <name>text</name>
691 <string>Enabled</string>
692 </property>
693 </widget>
694 <widget>
695 <class>QPushButton</class>
696 <property stdset="1">
697 <name>name</name>
698 <cstring>btnProxyApply</cstring>
699 </property>
700 <property stdset="1">
701 <name>geometry</name>
702 <rect>
703 <x>74</x>
704 <y>181</y>
705 <width>110</width>
706 <height>28</height>
707 </rect>
708 </property>
709 <property stdset="1">
710 <name>text</name>
711 <string>&amp;Apply</string>
712 </property>
713 </widget>
714 </widget>
715 <widget>
716 <class>QWidget</class>
717 <property stdset="1">
718 <name>name</name>
719 <cstring>tab</cstring>
720 </property>
721 <attribute>
722 <name>title</name>
723 <string>General</string>
724 </attribute>
725 <widget>
726 <class>QLabel</class>
727 <property stdset="1">
728 <name>name</name>
729 <cstring>TextLabel1</cstring>
730 </property>
731 <property stdset="1">
732 <name>geometry</name>
733 <rect>
734 <x>20</x>
735 <y>30</y>
736 <width>150</width>
737 <height>20</height>
738 </rect>
739 </property>
740 <property stdset="1">
741 <name>text</name>
742 <string>(Will take effect on restart)</string>
743 </property>
744 </widget>
745 <widget>
746 <class>QCheckBox</class>
747 <property stdset="1">
748 <name>name</name>
749 <cstring>jumpTo</cstring>
750 </property>
751 <property stdset="1">
752 <name>geometry</name>
753 <rect>
754 <x>17</x>
755 <y>14</y>
756 <width>150</width>
757 <height>20</height>
758 </rect>
759 </property>
760 <property stdset="1">
761 <name>text</name>
762 <string>Show Jump To Letters</string>
763 </property>
764 </widget>
765 </widget>
766 </widget>
767 </grid>
768</widget>
769<connections>
770 <connection>
771 <sender>newserver</sender>
772 <signal>clicked()</signal>
773 <receiver>Settings</receiver>
774 <slot>newServer()</slot>
775 </connection>
776 <connection>
777 <sender>removeserver</sender>
778 <signal>clicked()</signal>
779 <receiver>Settings</receiver>
780 <slot>removeServer()</slot>
781 </connection>
782 <connection>
783 <sender>newdestination</sender>
784 <signal>clicked()</signal>
785 <receiver>Settings</receiver>
786 <slot>newDestination()</slot>
787 </connection>
788 <connection>
789 <sender>removedestination</sender>
790 <signal>clicked()</signal>
791 <receiver>Settings</receiver>
792 <slot>removeDestination()</slot>
793 </connection>
794 <connection>
795 <sender>servers</sender>
796 <signal>highlighted(int)</signal>
797 <receiver>Settings</receiver>
798 <slot>editServer(int)</slot>
799 </connection>
800 <connection>
801 <sender>destinations</sender>
802 <signal>highlighted(int)</signal>
803 <receiver>Settings</receiver>
804 <slot>editDestination(int)</slot>
805 </connection>
806 <connection>
807 <sender>btnChangeServer</sender>
808 <signal>clicked()</signal>
809 <receiver>Settings</receiver>
810 <slot>changeServerDetails()</slot>
811 </connection>
812 <connection>
813 <sender>btnChangeDest</sender>
814 <signal>clicked()</signal>
815 <receiver>Settings</receiver>
816 <slot>changeDestinationDetails()</slot>
817 </connection>
818 <connection>
819 <sender>jumpTo</sender>
820 <signal>toggled(bool)</signal>
821 <receiver>Settings</receiver>
822 <slot>toggleJumpTo(bool)</slot>
823 </connection>
824 <connection>
825 <sender>btnProxyApply</sender>
826 <signal>clicked()</signal>
827 <receiver>Settings</receiver>
828 <slot>proxyApplyChanges()</slot>
829 </connection>
830 <slot access="public">activeServerChanged()</slot>
831 <slot access="public">changeDestinationDetails()</slot>
832 <slot access="public">changeServerDetails()</slot>
833 <slot access="public">createLinksToDest()</slot>
834 <slot access="public">destNameChanged(const QString&amp;)</slot>
835 <slot access="public">destUrlChanged(const QString&amp;)</slot>
836 <slot access="public">editDestination(int)</slot>
837 <slot access="public">editServer(int)</slot>
838 <slot access="public">installationSettingChange(int)</slot>
839 <slot access="public">installationSettingSetName(const QString &amp;)</slot>
840 <slot access="public">linkEnabled(bool)</slot>
841 <slot access="public">newDestination()</slot>
842 <slot access="public">newInstallationSetting()</slot>
843 <slot access="public">newServer()</slot>
844 <slot access="public">proxyApplyChanges()</slot>
845 <slot access="public">removeDestination()</slot>
846 <slot access="public">removeInstallationSetting()</slot>
847 <slot access="public">removeLinksToDest()</slot>
848 <slot access="public">removeServer()</slot>
849 <slot access="public">renameInstallationSetting()</slot>
850 <slot access="public">serverNameChanged(const QString&amp;)</slot>
851 <slot access="public">serverUrlChanged(const QString&amp;)</slot>
852 <slot access="public">toggleJumpTo(bool)</slot>
853</connections>
854<tabstops>
855 <tabstop>servers</tabstop>
856 <tabstop>newserver</tabstop>
857 <tabstop>removeserver</tabstop>
858 <tabstop>servername</tabstop>
859 <tabstop>serverurl</tabstop>
860 <tabstop>active</tabstop>
861 <tabstop>btnChangeServer</tabstop>
862 <tabstop>TabWidget</tabstop>
863 <tabstop>destinations</tabstop>
864 <tabstop>newdestination</tabstop>
865 <tabstop>removedestination</tabstop>
866 <tabstop>destinationname</tabstop>
867 <tabstop>destinationurl</tabstop>
868 <tabstop>linkToRoot</tabstop>
869 <tabstop>btnChangeDest</tabstop>
870 <tabstop>jumpTo</tabstop>
871</tabstops>
872</UI>
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 4bb928a..c5a55d2 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -19,14 +19,19 @@
19#include <algorithm> 19#include <algorithm>
20using namespace std; 20using namespace std;
21 21
22#include <qlistbox.h> 22#include <qcheckbox.h>
23#include <qgroupbox.h>
24#include <qlabel.h>
25#include <qlayout.h>
23#include <qlineedit.h> 26#include <qlineedit.h>
27#include <qlistbox.h>
24#include <qpushbutton.h> 28#include <qpushbutton.h>
25#include <qtabwidget.h> 29
26#include <qcheckbox.h> 30#include <opie/otabwidget.h>
27 31
28#ifdef QWS 32#ifdef QWS
29#include <qpe/config.h> 33#include <qpe/config.h>
34#include <qpe/resource.h>
30#endif 35#endif
31 36
32#include "settingsimpl.h" 37#include "settingsimpl.h"
@@ -34,10 +39,25 @@ using namespace std;
34#include "global.h" 39#include "global.h"
35 40
36SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) 41SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
37 : SettingsBase( parent, name, modal, fl ) 42 : QDialog( parent, name, modal, fl )
38{ 43{
44 setCaption( tr( "Configuration" ) );
45
46 // Setup layout to make everything pretty
47 QVBoxLayout *layout = new QVBoxLayout( this );
48 layout->setMargin( 2 );
49 layout->setSpacing( 4 );
50
51 // Setup tabs for all info
52 OTabWidget *tabwidget = new OTabWidget( this );
53 layout->addWidget( tabwidget );
54
55 tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) );
56 tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) );
57 tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) );
58 tabwidget->setCurrentTab( tr( "Servers" ) );
59
39 dataMgr = dataManager; 60 dataMgr = dataManager;
40
41 setupData(); 61 setupData();
42 changed = false; 62 changed = false;
43 newserver = false; 63 newserver = false;
@@ -49,9 +69,8 @@ SettingsImpl :: ~SettingsImpl()
49 69
50} 70}
51 71
52bool SettingsImpl :: showDlg( int i ) 72bool SettingsImpl :: showDlg()
53{ 73{
54 TabWidget->setCurrentPage( i );
55 showMaximized(); 74 showMaximized();
56 exec(); 75 exec();
57 76
@@ -61,6 +80,177 @@ bool SettingsImpl :: showDlg( int i )
61 return changed; 80 return changed;
62} 81}
63 82
83QWidget *SettingsImpl :: initServerTab()
84{
85 QWidget *control = new QWidget( this );
86
87 QVBoxLayout *vb = new QVBoxLayout( control );
88
89 QScrollView *sv = new QScrollView( control );
90 vb->addWidget( sv, 0, 0 );
91 sv->setResizePolicy( QScrollView::AutoOneFit );
92 sv->setFrameStyle( QFrame::NoFrame );
93
94 QWidget *container = new QWidget( sv->viewport() );
95 sv->addChild( container );
96
97 QGridLayout *layout = new QGridLayout( container );
98 layout->setSpacing( 2 );
99 layout->setMargin( 4 );
100
101 servers = new QListBox( container );
102 servers->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
103 connect( servers, SIGNAL( highlighted( int ) ), this, SLOT( editServer( int ) ) );
104 layout->addMultiCellWidget( servers, 0, 0, 0, 1 );
105
106 QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
107 connect( btn, SIGNAL( clicked() ), this, SLOT( newServer() ) );
108 layout->addWidget( btn, 1, 0 );
109
110 btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
111 connect( btn, SIGNAL( clicked() ), this, SLOT( removeServer() ) );
112 layout->addWidget( btn, 1, 1 );
113
114 QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Server" ), container );
115 grpbox->layout()->setSpacing( 2 );
116 grpbox->layout()->setMargin( 4 );
117 layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
118
119 QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
120
121 QLabel *label = new QLabel( tr( "Name:" ), grpbox );
122 grplayout->addWidget( label, 0, 0 );
123 servername = new QLineEdit( grpbox );
124 grplayout->addWidget( servername, 0, 1 );
125
126 label = new QLabel( tr( "Address:" ), grpbox );
127 grplayout->addWidget( label, 1, 0 );
128 serverurl = new QLineEdit( grpbox );
129 grplayout->addWidget( serverurl, 1, 1 );
130
131 active = new QCheckBox( tr( "Active Server" ), grpbox );
132 grplayout->addMultiCellWidget( active, 2, 2, 0, 1 );
133
134 btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
135 connect( btn, SIGNAL( clicked() ), this, SLOT( changeServerDetails() ) );
136 grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
137
138 return control;
139}
140
141QWidget *SettingsImpl :: initDestinationTab()
142{
143 QWidget *control = new QWidget( this );
144
145 QVBoxLayout *vb = new QVBoxLayout( control );
146
147 QScrollView *sv = new QScrollView( control );
148 vb->addWidget( sv, 0, 0 );
149 sv->setResizePolicy( QScrollView::AutoOneFit );
150 sv->setFrameStyle( QFrame::NoFrame );
151
152 QWidget *container = new QWidget( sv->viewport() );
153 sv->addChild( container );
154
155 QGridLayout *layout = new QGridLayout( container );
156 layout->setSpacing( 2 );
157 layout->setMargin( 4 );
158
159 destinations = new QListBox( container );
160 destinations->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
161 connect( destinations, SIGNAL( highlighted( int ) ), this, SLOT( editDestination( int ) ) );
162 layout->addMultiCellWidget( destinations, 0, 0, 0, 1 );
163
164 QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
165 connect( btn, SIGNAL( clicked() ), this, SLOT( newDestination() ) );
166 layout->addWidget( btn, 1, 0 );
167
168 btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
169 connect( btn, SIGNAL( clicked() ), this, SLOT( removeDestination() ) );
170 layout->addWidget( btn, 1, 1 );
171
172 QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Destination" ), container );
173 grpbox->layout()->setSpacing( 2 );
174 grpbox->layout()->setMargin( 4 );
175 layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
176
177 QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
178
179 QLabel *label = new QLabel( tr( "Name:" ), grpbox );
180 grplayout->addWidget( label, 0, 0 );
181 destinationname = new QLineEdit( grpbox );
182 grplayout->addWidget( destinationname, 0, 1 );
183
184 label = new QLabel( tr( "Location:" ), grpbox );
185 grplayout->addWidget( label, 1, 0 );
186 destinationurl = new QLineEdit( grpbox );
187 grplayout->addWidget( destinationurl, 1, 1 );
188
189 linkToRoot = new QCheckBox( tr( "Link to root" ), grpbox );
190 grplayout->addMultiCellWidget( linkToRoot, 2, 2, 0, 1 );
191
192 btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
193 connect( btn, SIGNAL( clicked() ), this, SLOT( changeDestinationDetails() ) );
194 grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
195
196 return control;
197}
198
199QWidget *SettingsImpl :: initProxyTab()
200{
201 QWidget *control = new QWidget( this );
202
203 QVBoxLayout *vb = new QVBoxLayout( control );
204
205 QScrollView *sv = new QScrollView( control );
206 vb->addWidget( sv, 0, 0 );
207 sv->setResizePolicy( QScrollView::AutoOneFit );
208 sv->setFrameStyle( QFrame::NoFrame );
209
210 QWidget *container = new QWidget( sv->viewport() );
211 sv->addChild( container );
212
213 QGridLayout *layout = new QGridLayout( container );
214 layout->setSpacing( 2 );
215 layout->setMargin( 4 );
216
217 QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "HTTP Proxy" ), container );
218 grpbox->layout()->setSpacing( 2 );
219 grpbox->layout()->setMargin( 4 );
220 layout->addMultiCellWidget( grpbox, 0, 0, 0, 1 );
221 QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
222 txtHttpProxy = new QLineEdit( grpbox );
223 grplayout->addWidget( txtHttpProxy );
224 chkHttpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox );
225 grplayout->addWidget( chkHttpProxyEnabled );
226
227 grpbox = new QGroupBox( 0, Qt::Vertical, tr( "FTP Proxy" ), container );
228 grpbox->layout()->setSpacing( 2 );
229 grpbox->layout()->setMargin( 4 );
230 layout->addMultiCellWidget( grpbox, 1, 1, 0, 1 );
231 grplayout = new QVBoxLayout( grpbox->layout() );
232 txtFtpProxy = new QLineEdit( grpbox );
233 grplayout->addWidget( txtFtpProxy );
234 chkFtpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox );
235 grplayout->addWidget( chkFtpProxyEnabled );
236
237 QLabel *label = new QLabel( tr( "Username:" ), container );
238 layout->addWidget( label, 2, 0 );
239 txtUsername = new QLineEdit( container );
240 layout->addWidget( txtUsername, 2, 1 );
241
242 label = new QLabel( tr( "Password:" ), container );
243 layout->addWidget( label, 3, 0 );
244 txtPassword = new QLineEdit( container );
245 layout->addWidget( txtPassword, 3, 1 );
246
247 QPushButton *btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), container );
248 connect( btn, SIGNAL( clicked() ), this, SLOT( proxyApplyChanges() ) );
249 layout->addMultiCellWidget( btn, 4, 4, 0, 1 );
250
251 return control;
252}
253
64void SettingsImpl :: setupData() 254void SettingsImpl :: setupData()
65{ 255{
66 // add servers 256 // add servers
@@ -73,20 +263,12 @@ void SettingsImpl :: setupData()
73 servers->insertItem( it->getServerName() ); 263 servers->insertItem( it->getServerName() );
74 } 264 }
75 265
266
76 // add destinations 267 // add destinations
77 vector<Destination>::iterator it2; 268 vector<Destination>::iterator it2;
78 for ( it2 = dataMgr->getDestinationList().begin() ; it2 != dataMgr->getDestinationList().end() ; ++it2 ) 269 for ( it2 = dataMgr->getDestinationList().begin() ; it2 != dataMgr->getDestinationList().end() ; ++it2 )
79 destinations->insertItem( it2->getDestinationName() ); 270 destinations->insertItem( it2->getDestinationName() );
80 271
81 // setup general tab
82#ifdef QWS
83 Config cfg( "aqpkg" );
84 cfg.setGroup( "settings" );
85 jumpTo->setChecked( cfg.readBoolEntry( "showJumpTo", "true" ) );
86#else
87 jumpTo->setChecked( true );
88#endif
89
90 // setup proxy tab 272 // setup proxy tab
91 txtHttpProxy->setText( dataMgr->getHttpProxy() ); 273 txtHttpProxy->setText( dataMgr->getHttpProxy() );
92 txtFtpProxy->setText( dataMgr->getFtpProxy() ); 274 txtFtpProxy->setText( dataMgr->getFtpProxy() );
@@ -100,7 +282,7 @@ void SettingsImpl :: setupData()
100 282
101void SettingsImpl :: editServer( int sel ) 283void SettingsImpl :: editServer( int sel )
102{ 284{
103 currentSelectedServer = sel; 285 currentSelectedServer = sel;
104 vector<Server>::iterator s = dataMgr->getServer( servers->currentText() ); 286 vector<Server>::iterator s = dataMgr->getServer( servers->currentText() );
105 serverName = s->getServerName(); 287 serverName = s->getServerName();
106 servername->setText( s->getServerName() ); 288 servername->setText( s->getServerName() );
@@ -110,10 +292,10 @@ void SettingsImpl :: editServer( int sel )
110 292
111void SettingsImpl :: newServer() 293void SettingsImpl :: newServer()
112{ 294{
113 newserver = true; 295 newserver = true;
114 servername->setText( "" ); 296 servername->setText( "" );
115 serverurl->setText( "" ); 297 serverurl->setText( "" );
116 servername->setFocus(); 298 servername->setFocus();
117 active->setChecked( true ); 299 active->setChecked( true );
118} 300}
119 301
@@ -242,17 +424,6 @@ void SettingsImpl :: changeDestinationDetails()
242 } 424 }
243} 425}
244 426
245//------------------ General tab ----------------------
246
247void SettingsImpl :: toggleJumpTo( bool val )
248{
249#ifdef QWS
250 Config cfg( "aqpkg" );
251 cfg.setGroup( "settings" );
252 cfg.writeEntry( "showJumpTo", val );
253#endif
254}
255
256//------------------ Proxy tab ---------------------- 427//------------------ Proxy tab ----------------------
257void SettingsImpl :: proxyApplyChanges() 428void SettingsImpl :: proxyApplyChanges()
258{ 429{
diff --git a/noncore/settings/aqpkg/settingsimpl.h b/noncore/settings/aqpkg/settingsimpl.h
index bb027dc..9ffc259 100644
--- a/noncore/settings/aqpkg/settingsimpl.h
+++ b/noncore/settings/aqpkg/settingsimpl.h
@@ -15,19 +15,39 @@
15 * * 15 * *
16 ***************************************************************************/ 16 ***************************************************************************/
17 17
18#include "settings.h"
19
20#include "datamgr.h" 18#include "datamgr.h"
21 19
22class SettingsImpl : public SettingsBase 20#include <qdialog.h>
21
22class QCheckBox;
23class QLineEdit;
24class QListBox;
25
26class SettingsImpl : public QDialog
23{ 27{
28 Q_OBJECT
24public: 29public:
25 SettingsImpl( DataManager *dataManager, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); 30 SettingsImpl( DataManager *dataManager, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
26 ~SettingsImpl(); 31 ~SettingsImpl();
27 32
28 bool showDlg( int i ); 33 bool showDlg();
29 34
30private: 35private:
36 QListBox *servers;
37 QLineEdit *servername;
38 QLineEdit *serverurl;
39 QCheckBox *active;
40 QListBox *destinations;
41 QLineEdit *destinationname;
42 QLineEdit *destinationurl;
43 QCheckBox *linkToRoot;
44 QLineEdit *txtHttpProxy;
45 QCheckBox *chkHttpProxyEnabled;
46 QLineEdit *txtFtpProxy;
47 QCheckBox *chkFtpProxyEnabled;
48 QLineEdit *txtUsername;
49 QLineEdit *txtPassword;
50
31 DataManager *dataMgr; 51 DataManager *dataMgr;
32 QString serverName; 52 QString serverName;
33 QString destinationName; 53 QString destinationName;
@@ -37,20 +57,21 @@ private:
37 bool newserver; 57 bool newserver;
38 bool newdestination; 58 bool newdestination;
39 59
60 QWidget *initServerTab();
61 QWidget *initDestinationTab();
62 QWidget *initProxyTab();
63
40 void setupConnections(); 64 void setupConnections();
41 void setupData(); 65 void setupData();
42 66
67public slots:
43 void editServer( int s ); 68 void editServer( int s );
44 void changeServerDetails(); 69 void changeServerDetails();
45 void newServer(); 70 void newServer();
46 void removeServer(); 71 void removeServer();
47
48 void editDestination( int s ); 72 void editDestination( int s );
49 void changeDestinationDetails(); 73 void changeDestinationDetails();
50 void newDestination(); 74 void newDestination();
51 void removeDestination(); 75 void removeDestination();
52
53 void toggleJumpTo( bool val );
54
55 void proxyApplyChanges(); 76 void proxyApplyChanges();
56}; 77};