- fix bug #1536

  custom locations are stored and removed immadiately after add and remove in location list.

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
@@ -89,3 +89,2 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags f
     connect( removeLocationButton, SIGNAL( clicked() ), this, SLOT( removeLocation() ) );
-    connect( saveLocationsButton, SIGNAL( clicked() ), this, SLOT( saveLocations() ) );
     connect( selectLocationButton, SIGNAL( clicked() ), this, SLOT( selectLocation() ) );
@@ -729,2 +728,3 @@ void BackupAndRestore::addLocation()
         locationEdit->setText( "" );
+        saveLocations();
     }
@@ -737,2 +737,3 @@ void BackupAndRestore::removeLocation()
         delete( locationList->selectedItem() );
+        saveLocations();
     }
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
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>278</width>
-            <height>298</height>
+            <width>246</width>
+            <height>338</height>
         </rect>
@@ -27,6 +27,6 @@
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
-            <number>0</number>
+            <number>2</number>
         </property>
@@ -34,5 +34,5 @@
             <name>spacing</name>
-            <number>0</number>
+            <number>2</number>
         </property>
-        <widget>
+        <widget row="0"  column="0" >
             <class>QTabWidget</class>
@@ -67,17 +67,2 @@
                     </property>
-                    <widget row="0"  column="0" >
-                        <class>QLayoutWidget</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout1</cstring>
-                        </property>
-                        <grid>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
                             <widget row="1"  column="1" >
@@ -100,3 +85,3 @@
                                     <name>name</name>
-                                    <cstring>TextLabel1</cstring>
+                            <cstring>labelDestination</cstring>
                                 </property>
@@ -118,2 +103,31 @@
                             </widget>
+                    <widget row="2"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QListView</class>
+                        <column>
+                            <property>
+                                <name>text</name>
+                                <string>Applications</string>
+                            </property>
+                            <property>
+                                <name>clickable</name>
+                                <bool>true</bool>
+                            </property>
+                            <property>
+                                <name>resizeable</name>
+                                <bool>true</bool>
+                            </property>
+                        </column>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>backupList</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>allColumnsShowFocus</name>
+                            <bool>true</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>rootIsDecorated</name>
+                            <bool>true</bool>
+                        </property>
+                    </widget>
                             <widget row="0"  column="0"  rowspan="1"  colspan="2" >
@@ -134,6 +148,6 @@
                                 </property>
-                                <vbox>
+                        <grid>
                                     <property stdset="1">
                                         <name>margin</name>
-                                        <number>4</number>
+                                <number>6</number>
                                     </property>
@@ -143,18 +157,3 @@
                                     </property>
-                                    <widget>
-                                        <class>QRadioButton</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>cb_type_userdata</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>text</name>
-                                            <string>User Data (Configuration + PIM)</string>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>checked</name>
-                                            <bool>true</bool>
-                                        </property>
-                                    </widget>
-                                    <widget>
+                            <widget row="1"  column="0" >
                                         <class>QRadioButton</class>
@@ -169,30 +168,14 @@
                                     </widget>
-                                </vbox>
-                            </widget>
-                            <widget row="2"  column="0"  rowspan="1"  colspan="2" >
-                                <class>QListView</class>
-                                <column>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Applications</string>
-                                    </property>
-                                    <property>
-                                        <name>clickable</name>
-                                        <bool>true</bool>
-                                    </property>
-                                    <property>
-                                        <name>resizeable</name>
-                                        <bool>true</bool>
-                                    </property>
-                                </column>
+                            <widget row="0"  column="0" >
+                                <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>backupList</cstring>
+                                    <cstring>cb_type_userdata</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>allColumnsShowFocus</name>
-                                    <bool>true</bool>
+                                    <name>text</name>
+                                    <string>User Data (Configuration + PIM)</string>
                                 </property>
                                 <property stdset="1">
-                                    <name>rootIsDecorated</name>
+                                    <name>checked</name>
                                     <bool>true</bool>
@@ -221,3 +204,3 @@
                         <name>spacing</name>
-                        <number>4</number>
+                        <number>2</number>
                     </property>
@@ -245,3 +228,3 @@
                             <name>name</name>
-                            <cstring>TextLabel1_2</cstring>
+                            <cstring>destinationLabel</cstring>
                         </property>
@@ -299,23 +282,34 @@
                         <name>spacing</name>
-                        <number>4</number>
+                        <number>2</number>
                     </property>
-                    <widget row="1"  column="0"  rowspan="1"  colspan="4" >
-                        <class>QListView</class>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Locations</string>
+                    <widget row="0"  column="2" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>selectLocationButton</cstring>
                             </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
+                        <property stdset="1">
+                            <name>sizePolicy</name>
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>0</vsizetype>
+                            </sizepolicy>
                             </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
+                        <property stdset="1">
+                            <name>maximumSize</name>
+                            <size>
+                                <width>20</width>
+                                <height>30</height>
+                            </size>
                             </property>
-                        </column>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>...</string>
+                        </property>
+                    </widget>
+                    <widget row="0"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>locationList</cstring>
+                            <cstring>locationEdit</cstring>
                         </property>
@@ -333,3 +327,3 @@
                     </widget>
-                    <widget row="2"  column="1" >
+                    <widget row="2"  column="1"  rowspan="1"  colspan="2" >
                         <class>QPushButton</class>
@@ -344,43 +338,21 @@
                     </widget>
-                    <widget row="2"  column="2"  rowspan="1"  colspan="2" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>saveLocationsButton</cstring>
-                        </property>
-                        <property stdset="1">
+                    <widget row="1"  column="0"  rowspan="1"  colspan="3" >
+                        <class>QListView</class>
+                        <column>
+                            <property>
                             <name>text</name>
-                            <string>Save</string>
-                        </property>
-                    </widget>
-                    <widget row="0"  column="3" >
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>selectLocationButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>sizePolicy</name>
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                            </sizepolicy>
+                                <string>Locations</string>
                         </property>
-                        <property stdset="1">
-                            <name>maximumSize</name>
-                            <size>
-                                <width>20</width>
-                                <height>30</height>
-                            </size>
+                            <property>
+                                <name>clickable</name>
+                                <bool>true</bool>
                         </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>...</string>
+                            <property>
+                                <name>resizeable</name>
+                                <bool>true</bool>
                         </property>
-                    </widget>
-                    <widget row="0"  column="0"  rowspan="1"  colspan="3" >
-                        <class>QLineEdit</class>
+                        </column>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>locationEdit</cstring>
+                            <cstring>locationList</cstring>
                         </property>
@@ -390,3 +362,3 @@
         </widget>
-    </vbox>
+    </grid>
 </widget>