| -rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 13 |
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 @@ -12,24 +12,25 @@ #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" @@ -62,27 +63,33 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f 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()); } |