summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 1c854d9..19e7cf9 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,47 +1,48 @@
#include "backuprestore.h"
//#include "output.h"
#include "errordialog.h"
#include <qapplication.h>
#include <qmultilineedit.h>
#include <qdir.h>
#include <qfile.h>
#include <qfileinfo.h>
#include <qlistview.h>
#include <qpushbutton.h>
#include <qheader.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qmessagebox.h>
#include <qcombobox.h>
#include <qlist.h>
#include <stdlib.h>
#include <qregexp.h>
#include <qtextstream.h>
#include <qtextview.h>
+#include <qpe/storage.h>
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include <dirent.h>
#define HEADER_NAME 0
#define HEADER_BACKUP 1
#define BACKUP_LOCATION 2
#define EXTENSION ".bck"
const QString tempFileName = "/tmp/backup.err";
BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl)
: BackupAndRestoreBase(parent, name, fl){
this->showMaximized();
backupList->header()->hide();
restoreList->header()->hide();
connect(backupButton, SIGNAL(clicked()),
this, SLOT(backupPressed()));
connect(restoreButton, SIGNAL(clicked()),
@@ -50,51 +51,57 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
this, SLOT(selectItem(QListViewItem*)));
connect(restoreSource, SIGNAL(activated( int )),
this, SLOT(sourceDirChanged(int)));
connect(updateList, SIGNAL(clicked()),
this, SLOT( fileListUpdate()));
applicationSettings = new QListViewItem(backupList, "Application Settings", "",
QDir::homeDirPath() + "/Settings/");
selectItem(applicationSettings);
applicationSettings = new QListViewItem(backupList, "Application Data", "",
QDir::homeDirPath() + "/Applications/");
selectItem(applicationSettings);
documents= new QListViewItem(backupList, "Documents", "",
QDir::homeDirPath() + "/Documents/");
selectItem(documents);
scanForApplicationSettings();
Config config("BackupAndRestore");
config.setGroup("General");
int totalLocations = config.readNumEntry("totalLocations",0);
//todo make less static here and use Storage class to get infos
if(totalLocations == 0){
- backupLocations.insert("Documents", "/root/Documents");
- backupLocations.insert("CF", "/mnt/cf");
- backupLocations.insert("SD", "/mnt/card");
+ QString home = QDir::homeDirPath();
+ home += "/Documents";
+ backupLocations.insert("Documents", home);
+ if (StorageInfo::hasCf()) {
+ backupLocations.insert("CF", "/mnt/cf");
+ }
+ if (StorageInfo::hasSd || StorageInfo::hasMmc) {
+ backupLocations.insert("SD", "/mnt/card");
+ }
}
else{
for(int i = 0; i < totalLocations; i++){
backupLocations.insert(config.readEntry(QString("backupLocationName_%1").arg(i)),
config.readEntry(QString("backupLocation_%1").arg(i)));
}
}
QMap<QString, QString>::Iterator it;
for( it = backupLocations.begin(); it != backupLocations.end(); ++it ){
storeToLocation->insertItem(it.key());
restoreSource->insertItem(it.key());
}
// Read the list of items to ignore.
QList<QString> dontBackupList;
dontBackupList.setAutoDelete(true);
config.setGroup("DontBackup");
int total = config.readNumEntry("Total", 0);
for(int i = 0; i < total; i++){
dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), "")));
}
QList<QListViewItem> list;
getAllItems(backupList->firstChild(), list);