-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 | |||
@@ -18,12 +18,13 @@ | |||
18 | #include <qcombobox.h> | 18 | #include <qcombobox.h> |
19 | #include <qlist.h> | 19 | #include <qlist.h> |
20 | #include <stdlib.h> | 20 | #include <stdlib.h> |
21 | #include <qregexp.h> | 21 | #include <qregexp.h> |
22 | #include <qtextstream.h> | 22 | #include <qtextstream.h> |
23 | #include <qtextview.h> | 23 | #include <qtextview.h> |
24 | #include <qpe/storage.h> | ||
24 | 25 | ||
25 | #include <errno.h> | 26 | #include <errno.h> |
26 | #include <stdlib.h> | 27 | #include <stdlib.h> |
27 | #include <unistd.h> | 28 | #include <unistd.h> |
28 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
29 | #include <dirent.h> | 30 | #include <dirent.h> |
@@ -68,15 +69,21 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f | |||
68 | Config config("BackupAndRestore"); | 69 | Config config("BackupAndRestore"); |
69 | config.setGroup("General"); | 70 | config.setGroup("General"); |
70 | int totalLocations = config.readNumEntry("totalLocations",0); | 71 | int totalLocations = config.readNumEntry("totalLocations",0); |
71 | 72 | ||
72 | //todo make less static here and use Storage class to get infos | 73 | //todo make less static here and use Storage class to get infos |
73 | if(totalLocations == 0){ | 74 | if(totalLocations == 0){ |
74 | backupLocations.insert("Documents", "/root/Documents"); | 75 | QString home = QDir::homeDirPath(); |
75 | backupLocations.insert("CF", "/mnt/cf"); | 76 | home += "/Documents"; |
76 | backupLocations.insert("SD", "/mnt/card"); | 77 | backupLocations.insert("Documents", home); |
78 | if (StorageInfo::hasCf()) { | ||
79 | backupLocations.insert("CF", "/mnt/cf"); | ||
80 | } | ||
81 | if (StorageInfo::hasSd || StorageInfo::hasMmc) { | ||
82 | backupLocations.insert("SD", "/mnt/card"); | ||
83 | } | ||
77 | } | 84 | } |
78 | else{ | 85 | else{ |
79 | for(int i = 0; i < totalLocations; i++){ | 86 | for(int i = 0; i < totalLocations; i++){ |
80 | backupLocations.insert(config.readEntry(QString("backupLocationName_%1").arg(i)), | 87 | backupLocations.insert(config.readEntry(QString("backupLocationName_%1").arg(i)), |
81 | config.readEntry(QString("backupLocation_%1").arg(i))); | 88 | config.readEntry(QString("backupLocation_%1").arg(i))); |
82 | } | 89 | } |