-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestorebase.ui | 308 |
2 files changed, 142 insertions, 169 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,7 +67,82 @@ </property> - <widget row="0" column="0" > - <class>QLayoutWidget</class> + <widget row="1" column="1" > + <class>QComboBox</class> + <property stdset="1"> + <name>name</name> + <cstring>storeToLocation</cstring> + </property> + <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>1</vsizetype> + </sizepolicy> + </property> + </widget> + <widget row="1" column="0" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>labelDestination</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Destination</string> + </property> + </widget> + <widget row="3" column="0" rowspan="1" colspan="2" > + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>backupButton</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>&Backup</string> + </property> + </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>Layout1</cstring> + <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" > + <class>QButtonGroup</class> + <property stdset="1"> + <name>name</name> + <cstring>frame_type</cstring> + </property> + <property stdset="1"> + <name>title</name> + <string>Type</string> + </property> + <property> + <name>layoutMargin</name> + </property> + <property> + <name>layoutSpacing</name> </property> @@ -76,3 +151,3 @@ <name>margin</name> - <number>0</number> + <number>6</number> </property> @@ -80,23 +155,9 @@ <name>spacing</name> - <number>6</number> + <number>2</number> </property> - <widget row="1" column="1" > - <class>QComboBox</class> - <property stdset="1"> - <name>name</name> - <cstring>storeToLocation</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>1</vsizetype> - </sizepolicy> - </property> - </widget> <widget row="1" column="0" > - <class>QLabel</class> + <class>QRadioButton</class> <property stdset="1"> <name>name</name> - <cstring>TextLabel1</cstring> + <cstring>cb_type_fullbackup</cstring> </property> @@ -104,10 +165,10 @@ <name>text</name> - <string>Destination</string> + <string>Full Backup (Root File System)</string> </property> </widget> - <widget row="3" column="0" rowspan="1" colspan="2" > - <class>QPushButton</class> + <widget row="0" column="0" > + <class>QRadioButton</class> <property stdset="1"> <name>name</name> - <cstring>backupButton</cstring> + <cstring>cb_type_userdata</cstring> </property> @@ -115,84 +176,6 @@ <name>text</name> - <string>&Backup</string> + <string>User Data (Configuration + PIM)</string> </property> - </widget> - <widget row="0" column="0" rowspan="1" colspan="2" > - <class>QButtonGroup</class> <property stdset="1"> - <name>name</name> - <cstring>frame_type</cstring> - </property> - <property stdset="1"> - <name>title</name> - <string>Type</string> - </property> - <property> - <name>layoutMargin</name> - </property> - <property> - <name>layoutSpacing</name> - </property> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>4</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>2</number> - </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> - <class>QRadioButton</class> - <property stdset="1"> - <name>name</name> - <cstring>cb_type_fullbackup</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Full Backup (Root File System)</string> - </property> - </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> - <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> + <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,30 +282,23 @@ <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> - </property> - <property> - <name>clickable</name> - <bool>true</bool> - </property> - <property> - <name>resizeable</name> - <bool>true</bool> - </property> - </column> + <widget row="0" column="2" > + <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>locationList</cstring> + <cstring>selectLocationButton</cstring> </property> - </widget> - <widget row="2" column="0" > - <class>QPushButton</class> <property stdset="1"> - <name>name</name> - <cstring>addLocationButton</cstring> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> + <name>maximumSize</name> + <size> + <width>20</width> + <height>30</height> + </size> </property> @@ -330,17 +306,13 @@ <name>text</name> - <string>Add</string> + <string>...</string> </property> </widget> - <widget row="2" column="1" > - <class>QPushButton</class> + <widget row="0" column="0" rowspan="1" colspan="2" > + <class>QLineEdit</class> <property stdset="1"> <name>name</name> - <cstring>removeLocationButton</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Remove</string> + <cstring>locationEdit</cstring> </property> </widget> - <widget row="2" column="2" rowspan="1" colspan="2" > + <widget row="2" column="0" > <class>QPushButton</class> @@ -348,3 +320,3 @@ <name>name</name> - <cstring>saveLocationsButton</cstring> + <cstring>addLocationButton</cstring> </property> @@ -352,6 +324,6 @@ <name>text</name> - <string>Save</string> + <string>Add</string> </property> </widget> - <widget row="0" column="3" > + <widget row="2" column="1" rowspan="1" colspan="2" > <class>QPushButton</class> @@ -359,17 +331,3 @@ <name>name</name> - <cstring>selectLocationButton</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - </sizepolicy> - </property> - <property stdset="1"> - <name>maximumSize</name> - <size> - <width>20</width> - <height>30</height> - </size> + <cstring>removeLocationButton</cstring> </property> @@ -377,10 +335,24 @@ <name>text</name> - <string>...</string> + <string>Remove</string> </property> </widget> - <widget row="0" column="0" rowspan="1" colspan="3" > - <class>QLineEdit</class> + <widget row="1" column="0" rowspan="1" colspan="3" > + <class>QListView</class> + <column> + <property> + <name>text</name> + <string>Locations</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>locationEdit</cstring> + <cstring>locationList</cstring> </property> @@ -390,3 +362,3 @@ </widget> - </vbox> + </grid> </widget> |