summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index fb892d9..02998f0 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -26,31 +26,31 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
26 restoreList->header()->hide(); 26 restoreList->header()->hide();
27 connect(backupButton, SIGNAL(clicked()), 27 connect(backupButton, SIGNAL(clicked()),
28 this, SLOT(backupPressed())); 28 this, SLOT(backupPressed()));
29 connect(restoreButton, SIGNAL(clicked()), 29 connect(restoreButton, SIGNAL(clicked()),
30 this, SLOT(restore())); 30 this, SLOT(restore()));
31 connect(backupList, SIGNAL(clicked( QListViewItem * )), 31 connect(backupList, SIGNAL(clicked( QListViewItem * )),
32 this, SLOT(selectItem(QListViewItem*))); 32 this, SLOT(selectItem(QListViewItem*)));
33 connect(restoreSource, SIGNAL(activated( int )), 33 connect(restoreSource, SIGNAL(activated( int )),
34 this, SLOT(sourceDirChanged(int))); 34 this, SLOT(sourceDirChanged(int)));
35 35
36 systemSettings = new QListViewItem(backupList, "System Settings", "", 36 systemSettings = new QListViewItem(backupList, "System Settings", "",
37 "/etc"); 37 "/etc");
38 selectItem(systemSettings); 38// selectItem(systemSettings);
39 applicationSettings = new QListViewItem(backupList, "Application Settings", "", 39 applicationSettings = new QListViewItem(backupList, "Application Settings", "",
40 QDir::homeDirPath() + "/Settings/"); 40 QDir::homeDirPath() + "/Settings/");
41 selectItem(applicationSettings); 41 selectItem(applicationSettings);
42 documents= new QListViewItem(backupList, "Documents", "", 42 documents= new QListViewItem(backupList, "Documents", "",
43 QDir::homeDirPath() + "/Documents/"); 43 QDir::homeDirPath() + "/Documents/");
44 selectItem(documents); 44// selectItem(documents);
45 45
46 scanForApplicationSettings(); 46 scanForApplicationSettings();
47 47
48 Config config("BackupAndRestore"); 48 Config config("BackupAndRestore");
49 config.setGroup("General"); 49 config.setGroup("General");
50 int totalLocations = config.readNumEntry("totalLocations",0); 50 int totalLocations = config.readNumEntry("totalLocations",0);
51 51
52//todo make less static here and use Storage class to get infos 52//todo make less static here and use Storage class to get infos
53 if(totalLocations == 0){ 53 if(totalLocations == 0){
54 backupLocations.insert("Documents", "/root/Documents"); 54 backupLocations.insert("Documents", "/root/Documents");
55 backupLocations.insert("CF", "/mnt/cf"); 55 backupLocations.insert("CF", "/mnt/cf");
56 backupLocations.insert("SD", "/mnt/card"); 56 backupLocations.insert("SD", "/mnt/card");
@@ -169,26 +169,26 @@ void BackupAndRestore::backupPressed(){
169 169
170 QDateTime time = QDateTime::currentDateTime(); 170 QDateTime time = QDateTime::currentDateTime();
171 QString dateString = time.date().toString().replace(QRegExp(" "), ""); 171 QString dateString = time.date().toString().replace(QRegExp(" "), "");
172 outputFile += "/" + dateString; 172 outputFile += "/" + dateString;
173 173
174 QString t = outputFile; 174 QString t = outputFile;
175 int c = 1; 175 int c = 1;
176 while(QFile::exists(outputFile + EXTENSION)){ 176 while(QFile::exists(outputFile + EXTENSION)){
177 outputFile = t + QString("%1").arg(c); 177 outputFile = t + QString("%1").arg(c);
178 c++; 178 c++;
179 } 179 }
180 outputFile += EXTENSION; 180 outputFile += EXTENSION;
181 181 qDebug("system(\"tar -c %1 | gzip > %2\").arg(backupFiles).arg(outputFile).latin1())");
182 int r = system(QString("tar -c %1 | gzip --best > %2").arg(backupFiles).arg(outputFile).latin1()); 182 int r = system(QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() );
183 if(r != 0){ 183 if(r != 0){
184 QMessageBox::critical(this, "Message", "Backup Failed.",QString("Ok") ); 184 QMessageBox::critical(this, "Message", "Backup Failed.",QString("Ok") );
185 return; 185 return;
186 } 186 }
187 else{ 187 else{
188 QMessageBox::critical(this, "Message", "Backup Successfull.",QString("Ok") ); 188 QMessageBox::critical(this, "Message", "Backup Successfull.",QString("Ok") );
189 } 189 }
190} 190}
191 191
192/*** 192/***
193 * Get a list of all of the files to backup. 193 * Get a list of all of the files to backup.
194 */ 194 */