summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-11-14 12:34:11 (UTC)
committer llornkcor <llornkcor>2002-11-14 12:34:11 (UTC)
commitd419cd6d7f96341efc16717d68d7f7a0cfc09a80 (patch) (side-by-side diff)
tree3c12ccf13c348d6e905bcc8976b833295ae608a2
parent9daeebf24f8a7cb00216df90527d993c5ff7df0d (diff)
downloadopie-d419cd6d7f96341efc16717d68d7f7a0cfc09a80.zip
opie-d419cd6d7f96341efc16717d68d7f7a0cfc09a80.tar.gz
opie-d419cd6d7f96341efc16717d68d7f7a0cfc09a80.tar.bz2
use real filepaths instead of Sharps idiotic ones
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp62
1 files changed, 38 insertions, 24 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 5776f3c..fb892d9 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -20,18 +20,26 @@
#define EXTENSION ".bck"
-BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) : BackupAndRestoreBase(parent, name){
+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)));
+ 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", "", "/home/etc");
+ systemSettings = new QListViewItem(backupList, "System Settings", "",
+ "/etc");
selectItem(systemSettings);
- applicationSettings = new QListViewItem(backupList, "Application Settings", "", QDir::homeDirPath() + "/Settings/");
+ applicationSettings = new QListViewItem(backupList, "Application Settings", "",
+ QDir::homeDirPath() + "/Settings/");
selectItem(applicationSettings);
- documents= new QListViewItem(backupList, "Documents", "", QDir::homeDirPath() + "/Documents/");
+ documents= new QListViewItem(backupList, "Documents", "",
+ QDir::homeDirPath() + "/Documents/");
selectItem(documents);
@@ -42,6 +50,7 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) : BackupA
int totalLocations = config.readNumEntry("totalLocations",0);
+//todo make less static here and use Storage class to get infos
if(totalLocations == 0){
- backupLocations.insert("Documents", "/home/root/Documents");
+ backupLocations.insert("Documents", "/root/Documents");
backupLocations.insert("CF", "/mnt/cf");
backupLocations.insert("SD", "/mnt/card");
@@ -49,5 +58,6 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) : BackupA
else{
for(int i = 0; i < totalLocations; i++){
- backupLocations.insert(config.readEntry(QString("backupLocationName_%1").arg(i)), config.readEntry(QString("backupLocation_%1").arg(i)));
+ backupLocations.insert(config.readEntry(QString("backupLocationName_%1").arg(i)),
+ config.readEntry(QString("backupLocation_%1").arg(i)));
}
}
@@ -69,5 +79,5 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) : BackupA
QList<QListViewItem> list;
getAllItems(backupList->firstChild(), list);
-
+
for(uint i = 0; i < list.count(); i++){
QString text = list.at(i)->text(HEADER_NAME);
@@ -84,5 +94,5 @@ BackupAndRestore::~BackupAndRestore(){
QList<QListViewItem> list;
getAllItems(backupList->firstChild(), list);
-
+
Config config("BackupAndRestore");
config.setGroup("DontBackup");
@@ -151,6 +161,7 @@ void BackupAndRestore::backupPressed(){
QString backupFiles;
if(getBackupFiles(backupFiles, NULL) == 0){
- QMessageBox::critical(this, "Message", "No items selected.",QString("Ok") );
- return;
+ QMessageBox::critical(this, "Message",
+ "No items selected.",QString("Ok") );
+ return;
}
@@ -172,5 +183,5 @@ void BackupAndRestore::backupPressed(){
if(r != 0){
QMessageBox::critical(this, "Message", "Backup Failed.",QString("Ok") );
- return;
+ return;
}
else{
@@ -197,9 +208,9 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
if(currentItem->childCount() == 0 ){
if(parent == NULL)
- backupFiles += currentItem->text(BACKUP_LOCATION);
- else
+ backupFiles += currentItem->text(BACKUP_LOCATION);
+ else
backupFiles += currentHome + currentItem->text(HEADER_NAME);
- backupFiles += " ";
- count++;
+ backupFiles += " ";
+ count++;
}
else{
@@ -236,5 +247,5 @@ void BackupAndRestore::rescanFolder(QString directory){
if(file->isDir()){
if(file->fileName() != ".." && file->fileName() != ".") {
- rescanFolder(directory + "/" + file->fileName());
+ rescanFolder(directory + "/" + file->fileName());
}
}
@@ -255,6 +266,7 @@ void BackupAndRestore::restore(){
QListViewItem *restoreItem = restoreList->currentItem();
if(!restoreItem){
- QMessageBox::critical(this, "Message", "Please select something to restore.",QString("Ok") );
- return;
+ QMessageBox::critical(this, "Message",
+ "Please select something to restore.",QString("Ok") );
+ return;
}
QString restoreFile = backupLocations[restoreSource->currentText()];
@@ -264,8 +276,10 @@ void BackupAndRestore::restore(){
int r = system(QString("tar -C / -zxf %1").arg(restoreFile).latin1());
if(r != 0){
- QMessageBox::critical(this, "Message", "Restore Failed.",QString("Ok") );
+ QMessageBox::critical(this, "Message",
+ "Restore Failed.",QString("Ok") );
}
else{
- QMessageBox::critical(this, "Message", "Restore Successfull.",QString("Ok") );
+ QMessageBox::critical(this, "Message",
+ "Restore Successfull.",QString("Ok") );
}
}