author | ar <ar> | 2005-02-01 19:54:57 (UTC) |
---|---|---|
committer | ar <ar> | 2005-02-01 19:54:57 (UTC) |
commit | 62aad63f824740f15357c28e6bb61fbdf2120585 (patch) (unidiff) | |
tree | 079a6f219f8eed3743414b64b68e45d7003a08d7 | |
parent | 17a8d1d5d2d9ec7a5e09da00e055d566fbd85353 (diff) | |
download | opie-62aad63f824740f15357c28e6bb61fbdf2120585.zip opie-62aad63f824740f15357c28e6bb61fbdf2120585.tar.gz opie-62aad63f824740f15357c28e6bb61fbdf2120585.tar.bz2 |
- fix bug #1536
custom locations are stored and removed immadiately after add and remove in location list.
-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestorebase.ui | 204 |
2 files changed, 90 insertions, 117 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index d028379..8928cda 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp | |||
@@ -88,5 +88,4 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f | |||
88 | connect( addLocationButton, SIGNAL( clicked() ), this, SLOT( addLocation() ) ); | 88 | connect( addLocationButton, SIGNAL( clicked() ), this, SLOT( addLocation() ) ); |
89 | connect( removeLocationButton, SIGNAL( clicked() ), this, SLOT( removeLocation() ) ); | 89 | connect( removeLocationButton, SIGNAL( clicked() ), this, SLOT( removeLocation() ) ); |
90 | connect( saveLocationsButton, SIGNAL( clicked() ), this, SLOT( saveLocations() ) ); | ||
91 | connect( selectLocationButton, SIGNAL( clicked() ), this, SLOT( selectLocation() ) ); | 90 | connect( selectLocationButton, SIGNAL( clicked() ), this, SLOT( selectLocation() ) ); |
92 | 91 | ||
@@ -728,4 +727,5 @@ void BackupAndRestore::addLocation() | |||
728 | (void) new QListViewItem( locationList, locationEdit->text() ); | 727 | (void) new QListViewItem( locationList, locationEdit->text() ); |
729 | locationEdit->setText( "" ); | 728 | locationEdit->setText( "" ); |
729 | saveLocations(); | ||
730 | } | 730 | } |
731 | } | 731 | } |
@@ -736,4 +736,5 @@ void BackupAndRestore::removeLocation() | |||
736 | { | 736 | { |
737 | delete( locationList->selectedItem() ); | 737 | delete( locationList->selectedItem() ); |
738 | saveLocations(); | ||
738 | } | 739 | } |
739 | } | 740 | } |
diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui index 6186d68..cca3dee 100644 --- a/noncore/settings/backup/backuprestorebase.ui +++ b/noncore/settings/backup/backuprestorebase.ui | |||
@@ -12,6 +12,6 @@ | |||
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>278</width> | 14 | <width>246</width> |
15 | <height>298</height> | 15 | <height>338</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
@@ -26,14 +26,14 @@ | |||
26 | <name>layoutSpacing</name> | 26 | <name>layoutSpacing</name> |
27 | </property> | 27 | </property> |
28 | <vbox> | 28 | <grid> |
29 | <property stdset="1"> | 29 | <property stdset="1"> |
30 | <name>margin</name> | 30 | <name>margin</name> |
31 | <number>0</number> | 31 | <number>2</number> |
32 | </property> | 32 | </property> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>spacing</name> | 34 | <name>spacing</name> |
35 | <number>0</number> | 35 | <number>2</number> |
36 | </property> | 36 | </property> |
37 | <widget> | 37 | <widget row="0" column="0" > |
38 | <class>QTabWidget</class> | 38 | <class>QTabWidget</class> |
39 | <property stdset="1"> | 39 | <property stdset="1"> |
@@ -66,19 +66,4 @@ | |||
66 | <number>2</number> | 66 | <number>2</number> |
67 | </property> | 67 | </property> |
68 | <widget row="0" column="0" > | ||
69 | <class>QLayoutWidget</class> | ||
70 | <property stdset="1"> | ||
71 | <name>name</name> | ||
72 | <cstring>Layout1</cstring> | ||
73 | </property> | ||
74 | <grid> | ||
75 | <property stdset="1"> | ||
76 | <name>margin</name> | ||
77 | <number>0</number> | ||
78 | </property> | ||
79 | <property stdset="1"> | ||
80 | <name>spacing</name> | ||
81 | <number>6</number> | ||
82 | </property> | ||
83 | <widget row="1" column="1" > | 68 | <widget row="1" column="1" > |
84 | <class>QComboBox</class> | 69 | <class>QComboBox</class> |
@@ -99,5 +84,5 @@ | |||
99 | <property stdset="1"> | 84 | <property stdset="1"> |
100 | <name>name</name> | 85 | <name>name</name> |
101 | <cstring>TextLabel1</cstring> | 86 | <cstring>labelDestination</cstring> |
102 | </property> | 87 | </property> |
103 | <property stdset="1"> | 88 | <property stdset="1"> |
@@ -117,4 +102,33 @@ | |||
117 | </property> | 102 | </property> |
118 | </widget> | 103 | </widget> |
104 | <widget row="2" column="0" rowspan="1" colspan="2" > | ||
105 | <class>QListView</class> | ||
106 | <column> | ||
107 | <property> | ||
108 | <name>text</name> | ||
109 | <string>Applications</string> | ||
110 | </property> | ||
111 | <property> | ||
112 | <name>clickable</name> | ||
113 | <bool>true</bool> | ||
114 | </property> | ||
115 | <property> | ||
116 | <name>resizeable</name> | ||
117 | <bool>true</bool> | ||
118 | </property> | ||
119 | </column> | ||
120 | <property stdset="1"> | ||
121 | <name>name</name> | ||
122 | <cstring>backupList</cstring> | ||
123 | </property> | ||
124 | <property stdset="1"> | ||
125 | <name>allColumnsShowFocus</name> | ||
126 | <bool>true</bool> | ||
127 | </property> | ||
128 | <property stdset="1"> | ||
129 | <name>rootIsDecorated</name> | ||
130 | <bool>true</bool> | ||
131 | </property> | ||
132 | </widget> | ||
119 | <widget row="0" column="0" rowspan="1" colspan="2" > | 133 | <widget row="0" column="0" rowspan="1" colspan="2" > |
120 | <class>QButtonGroup</class> | 134 | <class>QButtonGroup</class> |
@@ -133,8 +147,8 @@ | |||
133 | <name>layoutSpacing</name> | 147 | <name>layoutSpacing</name> |
134 | </property> | 148 | </property> |
135 | <vbox> | 149 | <grid> |
136 | <property stdset="1"> | 150 | <property stdset="1"> |
137 | <name>margin</name> | 151 | <name>margin</name> |
138 | <number>4</number> | 152 | <number>6</number> |
139 | </property> | 153 | </property> |
140 | <property stdset="1"> | 154 | <property stdset="1"> |
@@ -142,20 +156,5 @@ | |||
142 | <number>2</number> | 156 | <number>2</number> |
143 | </property> | 157 | </property> |
144 | <widget> | 158 | <widget row="1" column="0" > |
145 | <class>QRadioButton</class> | ||
146 | <property stdset="1"> | ||
147 | <name>name</name> | ||
148 | <cstring>cb_type_userdata</cstring> | ||
149 | </property> | ||
150 | <property stdset="1"> | ||
151 | <name>text</name> | ||
152 | <string>User Data (Configuration + PIM)</string> | ||
153 | </property> | ||
154 | <property stdset="1"> | ||
155 | <name>checked</name> | ||
156 | <bool>true</bool> | ||
157 | </property> | ||
158 | </widget> | ||
159 | <widget> | ||
160 | <class>QRadioButton</class> | 159 | <class>QRadioButton</class> |
161 | <property stdset="1"> | 160 | <property stdset="1"> |
@@ -168,32 +167,16 @@ | |||
168 | </property> | 167 | </property> |
169 | </widget> | 168 | </widget> |
170 | </vbox> | 169 | <widget row="0" column="0" > |
171 | </widget> | 170 | <class>QRadioButton</class> |
172 | <widget row="2" column="0" rowspan="1" colspan="2" > | ||
173 | <class>QListView</class> | ||
174 | <column> | ||
175 | <property> | ||
176 | <name>text</name> | ||
177 | <string>Applications</string> | ||
178 | </property> | ||
179 | <property> | ||
180 | <name>clickable</name> | ||
181 | <bool>true</bool> | ||
182 | </property> | ||
183 | <property> | ||
184 | <name>resizeable</name> | ||
185 | <bool>true</bool> | ||
186 | </property> | ||
187 | </column> | ||
188 | <property stdset="1"> | 171 | <property stdset="1"> |
189 | <name>name</name> | 172 | <name>name</name> |
190 | <cstring>backupList</cstring> | 173 | <cstring>cb_type_userdata</cstring> |
191 | </property> | 174 | </property> |
192 | <property stdset="1"> | 175 | <property stdset="1"> |
193 | <name>allColumnsShowFocus</name> | 176 | <name>text</name> |
194 | <bool>true</bool> | 177 | <string>User Data (Configuration + PIM)</string> |
195 | </property> | 178 | </property> |
196 | <property stdset="1"> | 179 | <property stdset="1"> |
197 | <name>rootIsDecorated</name> | 180 | <name>checked</name> |
198 | <bool>true</bool> | 181 | <bool>true</bool> |
199 | </property> | 182 | </property> |
@@ -220,5 +203,5 @@ | |||
220 | <property stdset="1"> | 203 | <property stdset="1"> |
221 | <name>spacing</name> | 204 | <name>spacing</name> |
222 | <number>4</number> | 205 | <number>2</number> |
223 | </property> | 206 | </property> |
224 | <widget row="0" column="1" > | 207 | <widget row="0" column="1" > |
@@ -244,5 +227,5 @@ | |||
244 | <property stdset="1"> | 227 | <property stdset="1"> |
245 | <name>name</name> | 228 | <name>name</name> |
246 | <cstring>TextLabel1_2</cstring> | 229 | <cstring>destinationLabel</cstring> |
247 | </property> | 230 | </property> |
248 | <property stdset="1"> | 231 | <property stdset="1"> |
@@ -298,25 +281,36 @@ | |||
298 | <property stdset="1"> | 281 | <property stdset="1"> |
299 | <name>spacing</name> | 282 | <name>spacing</name> |
300 | <number>4</number> | 283 | <number>2</number> |
301 | </property> | 284 | </property> |
302 | <widget row="1" column="0" rowspan="1" colspan="4" > | 285 | <widget row="0" column="2" > |
303 | <class>QListView</class> | 286 | <class>QPushButton</class> |
304 | <column> | 287 | <property stdset="1"> |
305 | <property> | 288 | <name>name</name> |
306 | <name>text</name> | 289 | <cstring>selectLocationButton</cstring> |
307 | <string>Locations</string> | ||
308 | </property> | 290 | </property> |
309 | <property> | 291 | <property stdset="1"> |
310 | <name>clickable</name> | 292 | <name>sizePolicy</name> |
311 | <bool>true</bool> | 293 | <sizepolicy> |
294 | <hsizetype>0</hsizetype> | ||
295 | <vsizetype>0</vsizetype> | ||
296 | </sizepolicy> | ||
312 | </property> | 297 | </property> |
313 | <property> | 298 | <property stdset="1"> |
314 | <name>resizeable</name> | 299 | <name>maximumSize</name> |
315 | <bool>true</bool> | 300 | <size> |
301 | <width>20</width> | ||
302 | <height>30</height> | ||
303 | </size> | ||
316 | </property> | 304 | </property> |
317 | </column> | 305 | <property stdset="1"> |
306 | <name>text</name> | ||
307 | <string>...</string> | ||
308 | </property> | ||
309 | </widget> | ||
310 | <widget row="0" column="0" rowspan="1" colspan="2" > | ||
311 | <class>QLineEdit</class> | ||
318 | <property stdset="1"> | 312 | <property stdset="1"> |
319 | <name>name</name> | 313 | <name>name</name> |
320 | <cstring>locationList</cstring> | 314 | <cstring>locationEdit</cstring> |
321 | </property> | 315 | </property> |
322 | </widget> | 316 | </widget> |
@@ -332,5 +326,5 @@ | |||
332 | </property> | 326 | </property> |
333 | </widget> | 327 | </widget> |
334 | <widget row="2" column="1" > | 328 | <widget row="2" column="1" rowspan="1" colspan="2" > |
335 | <class>QPushButton</class> | 329 | <class>QPushButton</class> |
336 | <property stdset="1"> | 330 | <property stdset="1"> |
@@ -343,45 +337,23 @@ | |||
343 | </property> | 337 | </property> |
344 | </widget> | 338 | </widget> |
345 | <widget row="2" column="2" rowspan="1" colspan="2" > | 339 | <widget row="1" column="0" rowspan="1" colspan="3" > |
346 | <class>QPushButton</class> | 340 | <class>QListView</class> |
347 | <property stdset="1"> | 341 | <column> |
348 | <name>name</name> | 342 | <property> |
349 | <cstring>saveLocationsButton</cstring> | ||
350 | </property> | ||
351 | <property stdset="1"> | ||
352 | <name>text</name> | 343 | <name>text</name> |
353 | <string>Save</string> | 344 | <string>Locations</string> |
354 | </property> | ||
355 | </widget> | ||
356 | <widget row="0" column="3" > | ||
357 | <class>QPushButton</class> | ||
358 | <property stdset="1"> | ||
359 | <name>name</name> | ||
360 | <cstring>selectLocationButton</cstring> | ||
361 | </property> | ||
362 | <property stdset="1"> | ||
363 | <name>sizePolicy</name> | ||
364 | <sizepolicy> | ||
365 | <hsizetype>0</hsizetype> | ||
366 | <vsizetype>0</vsizetype> | ||
367 | </sizepolicy> | ||
368 | </property> | 345 | </property> |
369 | <property stdset="1"> | 346 | <property> |
370 | <name>maximumSize</name> | 347 | <name>clickable</name> |
371 | <size> | 348 | <bool>true</bool> |
372 | <width>20</width> | ||
373 | <height>30</height> | ||
374 | </size> | ||
375 | </property> | 349 | </property> |
376 | <property stdset="1"> | 350 | <property> |
377 | <name>text</name> | 351 | <name>resizeable</name> |
378 | <string>...</string> | 352 | <bool>true</bool> |
379 | </property> | 353 | </property> |
380 | </widget> | 354 | </column> |
381 | <widget row="0" column="0" rowspan="1" colspan="3" > | ||
382 | <class>QLineEdit</class> | ||
383 | <property stdset="1"> | 355 | <property stdset="1"> |
384 | <name>name</name> | 356 | <name>name</name> |
385 | <cstring>locationEdit</cstring> | 357 | <cstring>locationList</cstring> |
386 | </property> | 358 | </property> |
387 | </widget> | 359 | </widget> |
@@ -389,5 +361,5 @@ | |||
389 | </widget> | 361 | </widget> |
390 | </widget> | 362 | </widget> |
391 | </vbox> | 363 | </grid> |
392 | </widget> | 364 | </widget> |
393 | </UI> | 365 | </UI> |