summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -6,71 +6,71 @@
#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>
#define HEADER_NAME 0
#define HEADER_BACKUP 1
#define BACKUP_LOCATION 2
#define EXTENSION ".bck"
BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
: BackupAndRestoreBase(parent, name){
this->showMaximized();
backupList->header()->hide();
restoreList->header()->hide();
connect(backupButton, SIGNAL(clicked()),
this, SLOT(backupPressed()));
connect(restoreButton, SIGNAL(clicked()),
this, SLOT(restore()));
connect(backupList, SIGNAL(clicked( QListViewItem * )),
this, SLOT(selectItem(QListViewItem*)));
connect(restoreSource, SIGNAL(activated( int )),
this, SLOT(sourceDirChanged(int)));
systemSettings = new QListViewItem(backupList, "System Settings", "",
"/etc");
- selectItem(systemSettings);
+// selectItem(systemSettings);
applicationSettings = new QListViewItem(backupList, "Application Settings", "",
QDir::homeDirPath() + "/Settings/");
selectItem(applicationSettings);
documents= new QListViewItem(backupList, "Documents", "",
QDir::homeDirPath() + "/Documents/");
- selectItem(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");
}
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), "")));
@@ -149,66 +149,66 @@ void BackupAndRestore::scanForApplicationSettings(){
selectItem(newItem);
++it;
}
}
/**
* The "Backup" button has been pressed. Get a list of all of the files that
* should be backed up. If there are no files, emit and error and exit.
* Determine the file name to store the backup in. Backup the file(s) using
* tar and gzip --best. Report failure or success
*/
void BackupAndRestore::backupPressed(){
QString backupFiles;
if(getBackupFiles(backupFiles, NULL) == 0){
QMessageBox::critical(this, "Message",
"No items selected.",QString("Ok") );
return;
}
QString outputFile = backupLocations[storeToLocation->currentText()];
QDateTime time = QDateTime::currentDateTime();
QString dateString = time.date().toString().replace(QRegExp(" "), "");
outputFile += "/" + dateString;
QString t = outputFile;
int c = 1;
while(QFile::exists(outputFile + EXTENSION)){
outputFile = t + QString("%1").arg(c);
c++;
}
outputFile += EXTENSION;
-
- int r = system(QString("tar -c %1 | gzip --best > %2").arg(backupFiles).arg(outputFile).latin1());
+ qDebug("system(\"tar -c %1 | gzip > %2\").arg(backupFiles).arg(outputFile).latin1())");
+ int r = system(QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() );
if(r != 0){
QMessageBox::critical(this, "Message", "Backup Failed.",QString("Ok") );
return;
}
else{
QMessageBox::critical(this, "Message", "Backup Successfull.",QString("Ok") );
}
}
/***
* Get a list of all of the files to backup.
*/
int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){
QListViewItem * currentItem;
QString currentHome;
if(!parent)
currentItem = backupList->firstChild();
else{
currentItem = parent->firstChild();
currentHome = parent->text(BACKUP_LOCATION);
}
uint count = 0;
while( currentItem != 0 ){
if(currentItem->text(HEADER_BACKUP) == "B" ){
if(currentItem->childCount() == 0 ){
if(parent == NULL)
backupFiles += currentItem->text(BACKUP_LOCATION);
else
backupFiles += currentHome + currentItem->text(HEADER_NAME);
backupFiles += " ";
count++;