summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backup.pro2
-rw-r--r--noncore/settings/backup/backuprestore.cpp13
-rw-r--r--noncore/settings/backup/backuprestore.h1
-rw-r--r--noncore/settings/backup/backuprestorebase.ui59
-rw-r--r--noncore/settings/backup/config.in2
5 files changed, 49 insertions, 28 deletions
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index 2adb428..390c599 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -1,10 +1,10 @@
1 CONFIG = qt warn_on quick-app 1 CONFIG = qt warn_on quick-app
2 HEADERS = backuprestore.h 2 HEADERS = backuprestore.h
3 SOURCES = main.cpp backuprestore.cpp 3 SOURCES = main.cpp backuprestore.cpp
4 INCLUDEPATH+= $(OPIEDIR)/include 4 INCLUDEPATH+= $(OPIEDIR)/include
5 DEPENDPATH+= $(OPIEDIR)/include 5 DEPENDPATH+= $(OPIEDIR)/include
6LIBS += -lqpe -lopiecore2 6LIBS += -lqpe -lopiecore2 -lopieui2
7 INTERFACES= backuprestorebase.ui errordialog.ui 7 INTERFACES= backuprestorebase.ui errordialog.ui
8 TARGET = backup 8 TARGET = backup
9 9
10include ( $(OPIEDIR)/include.pro ) 10include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 478b22f..36b101c 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,107 +1,111 @@
1#include "backuprestore.h" 1#include "backuprestore.h"
2#include "errordialog.h" 2#include "errordialog.h"
3 3
4 4
5/* OPIE */ 5/* OPIE */
6#include <opie2/odebug.h> 6#include <opie2/odebug.h>
7#include <opie2/ostorageinfo.h> 7#include <opie2/ostorageinfo.h>
8using namespace Opie::Core; 8using namespace Opie::Core;
9 9
10#include <opie2/ofiledialog.h>
11using namespace Opie::Ui;
12
10#include <qpe/qpeapplication.h> 13#include <qpe/qpeapplication.h>
11#include <qpe/resource.h> 14#include <qpe/resource.h>
12#include <qpe/config.h> 15#include <qpe/config.h>
13 16
14/* QT */ 17/* QT */
15#include <qapplication.h> 18#include <qapplication.h>
16#include <qmultilineedit.h> 19#include <qmultilineedit.h>
17#include <qdir.h> 20#include <qdir.h>
18#include <qfile.h> 21#include <qfile.h>
19#include <qfileinfo.h> 22#include <qfileinfo.h>
20#include <qlistview.h> 23#include <qlistview.h>
21#include <qpushbutton.h> 24#include <qpushbutton.h>
22#include <qheader.h> 25#include <qheader.h>
23#include <qmessagebox.h> 26#include <qmessagebox.h>
24#include <qcombobox.h> 27#include <qcombobox.h>
25#include <qlist.h> 28#include <qlist.h>
26#include <qregexp.h> 29#include <qregexp.h>
27#include <qtextstream.h> 30#include <qtextstream.h>
28#include <qtextview.h> 31#include <qtextview.h>
29#include <qlineedit.h> 32#include <qlineedit.h>
30#include <qstringlist.h> 33#include <qstringlist.h>
31 34
32/* STD */ 35/* STD */
33#include <errno.h> 36#include <errno.h>
34#include <stdlib.h> 37#include <stdlib.h>
35#include <unistd.h> 38#include <unistd.h>
36#include <sys/stat.h> 39#include <sys/stat.h>
37#include <dirent.h> 40#include <dirent.h>
38 41
39#define HEADER_NAME 0 42#define HEADER_NAME 0
40#define HEADER_BACKUP 1 43#define HEADER_BACKUP 1
41#define BACKUP_LOCATION 2 44#define BACKUP_LOCATION 2
42 45
43#define EXTENSION ".bck" 46#define EXTENSION ".bck"
44 47
45const QString tempFileName = "/tmp/backup.err"; 48const QString tempFileName = "/tmp/backup.err";
46 49
47BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) 50BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl)
48 : BackupAndRestoreBase(parent, name, fl) 51 : BackupAndRestoreBase(parent, name, fl)
49{ 52{
50 backupList->header()->hide(); 53 backupList->header()->hide();
51 restoreList->header()->hide(); 54 restoreList->header()->hide();
52 locationList->header()->hide(); 55 locationList->header()->hide();
53 connect( backupButton, SIGNAL( clicked() ), this, SLOT( backup() ) ); 56 connect( backupButton, SIGNAL( clicked() ), this, SLOT( backup() ) );
54 connect( restoreButton, SIGNAL( clicked() ), this, SLOT( restore() ) ); 57 connect( restoreButton, SIGNAL( clicked() ), this, SLOT( restore() ) );
55 connect( backupList, SIGNAL( clicked( QListViewItem* ) ), this, SLOT( selectItem( QListViewItem* ) ) ); 58 connect( backupList, SIGNAL( clicked( QListViewItem* ) ), this, SLOT( selectItem( QListViewItem* ) ) );
56 connect( restoreSource, SIGNAL( activated( int ) ), this, SLOT( sourceDirChanged( int ) ) ); 59 connect( restoreSource, SIGNAL( activated( int ) ), this, SLOT( sourceDirChanged( int ) ) );
57 connect( addLocationButton, SIGNAL( clicked() ), this, SLOT( addLocation() ) ); 60 connect( addLocationButton, SIGNAL( clicked() ), this, SLOT( addLocation() ) );
58 connect( removeLocationButton, SIGNAL( clicked() ), this, SLOT( removeLocation() ) ); 61 connect( removeLocationButton, SIGNAL( clicked() ), this, SLOT( removeLocation() ) );
59 connect( saveLocationsButton, SIGNAL( clicked() ), this, SLOT( saveLocations() ) ); 62 connect( saveLocationsButton, SIGNAL( clicked() ), this, SLOT( saveLocations() ) );
63 connect( selectLocationButton, SIGNAL( clicked() ), this, SLOT( selectLocation() ) );
60 64
61 //add directorys for backing up 65 //add directorys for backing up
62 applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/"); 66 applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/");
63 selectItem(applicationSettings); 67 selectItem(applicationSettings);
64 applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/"); 68 applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/");
65 selectItem(applicationSettings); 69 selectItem(applicationSettings);
66 documents= new QListViewItem(backupList, "Documents", "", "Documents/"); 70 documents= new QListViewItem(backupList, "Documents", "", "Documents/");
67 selectItem(documents); 71 selectItem(documents);
68 72
69 scanForApplicationSettings(); 73 scanForApplicationSettings();
70 refreshLocations(); 74 refreshLocations();
71 refreshBackupLocations(); 75 refreshBackupLocations();
72 76
73 // Read the list of items to ignore. 77 // Read the list of items to ignore.
74 QList<QString> dontBackupList; 78 QList<QString> dontBackupList;
75 dontBackupList.setAutoDelete(true); 79 dontBackupList.setAutoDelete(true);
76 Config config("BackupAndRestore"); 80 Config config("BackupAndRestore");
77 config.setGroup("DontBackup"); 81 config.setGroup("DontBackup");
78 int total = config.readNumEntry("Total", 0); 82 int total = config.readNumEntry("Total", 0);
79 for(int i = 0; i < total; i++) 83 for(int i = 0; i < total; i++)
80 { 84 {
81 dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), ""))); 85 dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), "")));
82 } 86 }
83 87
84 QList<QListViewItem> list; 88 QList<QListViewItem> list;
85 getAllItems(backupList->firstChild(), list); 89 getAllItems(backupList->firstChild(), list);
86 90
87 for(uint i = 0; i < list.count(); i++) 91 for(uint i = 0; i < list.count(); i++)
88 { 92 {
89 QString text = list.at(i)->text(HEADER_NAME); 93 QString text = list.at(i)->text(HEADER_NAME);
90 for(uint i2 = 0; i2 < dontBackupList.count(); i2++) 94 for(uint i2 = 0; i2 < dontBackupList.count(); i2++)
91 { 95 {
92 if(*dontBackupList.at(i2) == text) 96 if(*dontBackupList.at(i2) == text)
93 { 97 {
94 selectItem(list.at(i)); 98 selectItem(list.at(i));
95 break; 99 break;
96 } 100 }
97 } 101 }
98 } 102 }
99 QPEApplication::showWidget( this ); 103 QPEApplication::showWidget( this );
100} 104}
101 105
102BackupAndRestore::~BackupAndRestore() 106BackupAndRestore::~BackupAndRestore()
103{ 107{
104 QList<QListViewItem> list; 108 QList<QListViewItem> list;
105 getAllItems(backupList->firstChild(), list); 109 getAllItems(backupList->firstChild(), list);
106 110
107 Config config("BackupAndRestore"); 111 Config config("BackupAndRestore");
@@ -544,50 +548,59 @@ QString BackupAndRestore::getExcludeFile()
544void BackupAndRestore::refreshLocations() 548void BackupAndRestore::refreshLocations()
545{ 549{
546 locationList->clear(); 550 locationList->clear();
547 551
548 //todo: implement add locations 552 //todo: implement add locations
549 Config config( "BackupAndRestore" ); 553 Config config( "BackupAndRestore" );
550 config.setGroup( "Locations" ); 554 config.setGroup( "Locations" );
551 555
552 QStringList locations( config.readListEntry( "locations", '|' ) ); 556 QStringList locations( config.readListEntry( "locations", '|' ) );
553 557
554 for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it ) { 558 for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it ) {
555 (void) new QListViewItem( locationList, *it ); 559 (void) new QListViewItem( locationList, *it );
556 } 560 }
557} 561}
558 562
559void BackupAndRestore::addLocation() 563void BackupAndRestore::addLocation()
560{ 564{
561 if ( ( !locationEdit->text().isEmpty() ) && 565 if ( ( !locationEdit->text().isEmpty() ) &&
562 ( QDir( locationEdit->text() ).exists() ) ) 566 ( QDir( locationEdit->text() ).exists() ) )
563 { 567 {
564 (void) new QListViewItem( locationList, locationEdit->text() ); 568 (void) new QListViewItem( locationList, locationEdit->text() );
565 locationEdit->setText( "" ); 569 locationEdit->setText( "" );
566 } 570 }
567} 571}
568 572
569void BackupAndRestore::removeLocation() 573void BackupAndRestore::removeLocation()
570{ 574{
571 if ( locationList->selectedItem() ) 575 if ( locationList->selectedItem() )
572 { 576 {
573 delete( locationList->selectedItem() ); 577 delete( locationList->selectedItem() );
574 } 578 }
575} 579}
576 580
577void BackupAndRestore::saveLocations() 581void BackupAndRestore::saveLocations()
578{ 582{
579 Config config("BackupAndRestore"); 583 Config config("BackupAndRestore");
580 config.setGroup("Locations"); 584 config.setGroup("Locations");
581 585
582 QStringList locations; 586 QStringList locations;
583 for ( QListViewItemIterator it( locationList ); it.current(); ++it ) 587 for ( QListViewItemIterator it( locationList ); it.current(); ++it )
584 { 588 {
585 locations.append( it.current()->text( 0 ) ); 589 locations.append( it.current()->text( 0 ) );
586 } 590 }
587 config.writeEntry( "locations", locations, '|' ); 591 config.writeEntry( "locations", locations, '|' );
588 592
589 refreshBackupLocations(); 593 refreshBackupLocations();
590} 594}
591 595
596void BackupAndRestore::selectLocation()
597{
598 QString location = OFileDialog::getDirectory( OFileSelector::DIRECTORYSELECTOR );
599 if ( !location.isEmpty() )
600 {
601 locationEdit->setText( location );
602 }
603}
604
592// backuprestore.cpp 605// backuprestore.cpp
593 606
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index caf6243..332123a 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -1,53 +1,54 @@
1#ifndef WINDOW_H 1#ifndef WINDOW_H
2#define WINDOW_H 2#define WINDOW_H
3 3
4#include <qmainwindow.h> 4#include <qmainwindow.h>
5#include "backuprestorebase.h" 5#include "backuprestorebase.h"
6#include <qmap.h> 6#include <qmap.h>
7#include <qlist.h> 7#include <qlist.h>
8 8
9class QListViewItem; 9class QListViewItem;
10class QStringList; 10class QStringList;
11 11
12class BackupAndRestore : public BackupAndRestoreBase 12class BackupAndRestore : public BackupAndRestoreBase
13{ 13{
14 14
15 Q_OBJECT 15 Q_OBJECT
16 16
17public: 17public:
18 18
19 BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0); 19 BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
20 ~BackupAndRestore(); 20 ~BackupAndRestore();
21 21
22 static QString appName() { return QString::fromLatin1("backup"); } 22 static QString appName() { return QString::fromLatin1("backup"); }
23 23
24private slots: 24private slots:
25 void backup(); 25 void backup();
26 void restore(); 26 void restore();
27 void selectItem(QListViewItem *currentItem); 27 void selectItem(QListViewItem *currentItem);
28 void sourceDirChanged(int); 28 void sourceDirChanged(int);
29 void rescanFolder(QString directory); 29 void rescanFolder(QString directory);
30 void fileListUpdate(); 30 void fileListUpdate();
31 31
32 void addLocation(); 32 void addLocation();
33 void removeLocation(); 33 void removeLocation();
34 void saveLocations(); 34 void saveLocations();
35 void selectLocation();
35 36
36private: 37private:
37 void scanForApplicationSettings(); 38 void scanForApplicationSettings();
38 int getBackupFiles(QString &backupFiles, QListViewItem *parent); 39 int getBackupFiles(QString &backupFiles, QListViewItem *parent);
39 QString getExcludeFile(); 40 QString getExcludeFile();
40 QMap<QString, QString> backupLocations; 41 QMap<QString, QString> backupLocations;
41 QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list); 42 QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list);
42 void refreshBackupLocations(); 43 void refreshBackupLocations();
43 void refreshLocations(); 44 void refreshLocations();
44 45
45 QListViewItem *systemSettings; 46 QListViewItem *systemSettings;
46 QListViewItem *applicationSettings; 47 QListViewItem *applicationSettings;
47 QListViewItem *documents; 48 QListViewItem *documents;
48}; 49};
49 50
50#endif 51#endif
51 52
52// backuprestore.h 53// backuprestore.h
53 54
diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui
index b4624bb..b464556 100644
--- a/noncore/settings/backup/backuprestorebase.ui
+++ b/noncore/settings/backup/backuprestorebase.ui
@@ -1,62 +1,62 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>BackupAndRestoreBase</class> 2<class>BackupAndRestoreBase</class>
3<widget> 3<widget>
4 <class>QWidget</class> 4 <class>QWidget</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>BackupAndRestoreBase</cstring> 7 <cstring>BackupAndRestoreBase</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>290</width> 14 <width>282</width>
15 <height>243</height> 15 <height>243</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>Backup And Restore</string> 20 <string>Backup And Restore</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 <vbox> 28 <vbox>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>0</number> 31 <number>0</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>0</number>
36 </property> 36 </property>
37 <widget> 37 <widget>
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> 43 <property>
44 <name>layoutMargin</name> 44 <name>layoutMargin</name>
45 </property> 45 </property>
46 <property> 46 <property>
47 <name>layoutSpacing</name> 47 <name>layoutSpacing</name>
48 </property> 48 </property>
49 <widget> 49 <widget>
50 <class>QWidget</class> 50 <class>QWidget</class>
51 <property stdset="1"> 51 <property stdset="1">
52 <name>name</name> 52 <name>name</name>
53 <cstring>Widget2</cstring> 53 <cstring>Widget2</cstring>
54 </property> 54 </property>
55 <attribute> 55 <attribute>
56 <name>title</name> 56 <name>title</name>
57 <string>Backup</string> 57 <string>Backup</string>
58 </attribute> 58 </attribute>
59 <grid> 59 <grid>
60 <property stdset="1"> 60 <property stdset="1">
61 <name>margin</name> 61 <name>margin</name>
62 <number>4</number> 62 <number>4</number>
@@ -177,133 +177,140 @@
177 <class>QListView</class> 177 <class>QListView</class>
178 <column> 178 <column>
179 <property> 179 <property>
180 <name>text</name> 180 <name>text</name>
181 <string>Column 1</string> 181 <string>Column 1</string>
182 </property> 182 </property>
183 <property> 183 <property>
184 <name>clickable</name> 184 <name>clickable</name>
185 <bool>true</bool> 185 <bool>true</bool>
186 </property> 186 </property>
187 <property> 187 <property>
188 <name>resizeable</name> 188 <name>resizeable</name>
189 <bool>true</bool> 189 <bool>true</bool>
190 </property> 190 </property>
191 </column> 191 </column>
192 <property stdset="1"> 192 <property stdset="1">
193 <name>name</name> 193 <name>name</name>
194 <cstring>restoreList</cstring> 194 <cstring>restoreList</cstring>
195 </property> 195 </property>
196 <property stdset="1"> 196 <property stdset="1">
197 <name>minimumSize</name> 197 <name>minimumSize</name>
198 <size> 198 <size>
199 <width>0</width> 199 <width>0</width>
200 <height>100</height> 200 <height>100</height>
201 </size> 201 </size>
202 </property> 202 </property>
203 </widget> 203 </widget>
204 </grid> 204 </grid>
205 </widget> 205 </widget>
206 <widget> 206 <widget>
207 <class>QWidget</class> 207 <class>QWidget</class>
208 <property stdset="1"> 208 <property stdset="1">
209 <name>name</name> 209 <name>name</name>
210 <cstring>tab</cstring> 210 <cstring>tab</cstring>
211 </property> 211 </property>
212 <attribute> 212 <attribute>
213 <name>title</name> 213 <name>title</name>
214 <string>Locations</string> 214 <string>Locations</string>
215 </attribute> 215 </attribute>
216 <grid> 216 <grid>
217 <property stdset="1"> 217 <property stdset="1">
218 <name>margin</name> 218 <name>margin</name>
219 <number>4</number> 219 <number>4</number>
220 </property> 220 </property>
221 <property stdset="1"> 221 <property stdset="1">
222 <name>spacing</name> 222 <name>spacing</name>
223 <number>4</number> 223 <number>4</number>
224 </property> 224 </property>
225 <widget row="0" column="0" rowspan="1" colspan="3" >
226 <class>QLineEdit</class>
227 <property stdset="1">
228 <name>name</name>
229 <cstring>locationEdit</cstring>
230 </property>
231 </widget>
232 <widget row="0" column="3" >
233 <class>QToolButton</class>
234 <property stdset="1">
235 <name>name</name>
236 <cstring>locationSelectBtn</cstring>
237 </property>
238 <property stdset="1">
239 <name>maximumSize</name>
240 <size>
241 <width>20</width>
242 <height>30</height>
243 </size>
244 </property>
245 <property stdset="1">
246 <name>text</name>
247 <string>...</string>
248 </property>
249 </widget>
250 <widget row="1" column="0" rowspan="1" colspan="4" > 225 <widget row="1" column="0" rowspan="1" colspan="4" >
251 <class>QListView</class> 226 <class>QListView</class>
252 <column> 227 <column>
253 <property> 228 <property>
254 <name>text</name> 229 <name>text</name>
255 <string>Locations</string> 230 <string>Locations</string>
256 </property> 231 </property>
257 <property> 232 <property>
258 <name>clickable</name> 233 <name>clickable</name>
259 <bool>true</bool> 234 <bool>true</bool>
260 </property> 235 </property>
261 <property> 236 <property>
262 <name>resizeable</name> 237 <name>resizeable</name>
263 <bool>true</bool> 238 <bool>true</bool>
264 </property> 239 </property>
265 </column> 240 </column>
266 <property stdset="1"> 241 <property stdset="1">
267 <name>name</name> 242 <name>name</name>
268 <cstring>locationList</cstring> 243 <cstring>locationList</cstring>
269 </property> 244 </property>
270 </widget> 245 </widget>
271 <widget row="2" column="0" > 246 <widget row="2" column="0" >
272 <class>QPushButton</class> 247 <class>QPushButton</class>
273 <property stdset="1"> 248 <property stdset="1">
274 <name>name</name> 249 <name>name</name>
275 <cstring>addLocationButton</cstring> 250 <cstring>addLocationButton</cstring>
276 </property> 251 </property>
277 <property stdset="1"> 252 <property stdset="1">
278 <name>text</name> 253 <name>text</name>
279 <string>Add</string> 254 <string>Add</string>
280 </property> 255 </property>
281 </widget> 256 </widget>
282 <widget row="2" column="1" > 257 <widget row="2" column="1" >
283 <class>QPushButton</class> 258 <class>QPushButton</class>
284 <property stdset="1"> 259 <property stdset="1">
285 <name>name</name> 260 <name>name</name>
286 <cstring>removeLocationButton</cstring> 261 <cstring>removeLocationButton</cstring>
287 </property> 262 </property>
288 <property stdset="1"> 263 <property stdset="1">
289 <name>text</name> 264 <name>text</name>
290 <string>Remove</string> 265 <string>Remove</string>
291 </property> 266 </property>
292 </widget> 267 </widget>
293 <widget row="2" column="2" rowspan="1" colspan="2" > 268 <widget row="2" column="2" rowspan="1" colspan="2" >
294 <class>QPushButton</class> 269 <class>QPushButton</class>
295 <property stdset="1"> 270 <property stdset="1">
296 <name>name</name> 271 <name>name</name>
297 <cstring>saveLocationsButton</cstring> 272 <cstring>saveLocationsButton</cstring>
298 </property> 273 </property>
299 <property stdset="1"> 274 <property stdset="1">
300 <name>text</name> 275 <name>text</name>
301 <string>Save</string> 276 <string>Save</string>
302 </property> 277 </property>
303 </widget> 278 </widget>
279 <widget row="0" column="3" >
280 <class>QPushButton</class>
281 <property stdset="1">
282 <name>name</name>
283 <cstring>selectLocationButton</cstring>
284 </property>
285 <property stdset="1">
286 <name>sizePolicy</name>
287 <sizepolicy>
288 <hsizetype>0</hsizetype>
289 <vsizetype>0</vsizetype>
290 </sizepolicy>
291 </property>
292 <property stdset="1">
293 <name>maximumSize</name>
294 <size>
295 <width>20</width>
296 <height>30</height>
297 </size>
298 </property>
299 <property stdset="1">
300 <name>text</name>
301 <string>...</string>
302 </property>
303 </widget>
304 <widget row="0" column="0" rowspan="1" colspan="3" >
305 <class>QLineEdit</class>
306 <property stdset="1">
307 <name>name</name>
308 <cstring>locationEdit</cstring>
309 </property>
310 </widget>
304 </grid> 311 </grid>
305 </widget> 312 </widget>
306 </widget> 313 </widget>
307 </vbox> 314 </vbox>
308</widget> 315</widget>
309</UI> 316</UI>
diff --git a/noncore/settings/backup/config.in b/noncore/settings/backup/config.in
index 27a5408..fddde4b 100644
--- a/noncore/settings/backup/config.in
+++ b/noncore/settings/backup/config.in
@@ -1,4 +1,4 @@
1 config BACKUP 1 config BACKUP
2 boolean "opie-backup (save and restore current Opie settings)" 2 boolean "opie-backup (save and restore current Opie settings)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI