1 files changed, 29 insertions, 15 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
@@ -16,42 +16,52 @@
 #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){
+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", "", "/home/etc");
+  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);
-  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);
   
   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", "/home/root/Documents");
+    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)));
+      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());
@@ -147,13 +157,14 @@ void BackupAndRestore::scanForApplicationSettings(){
  * 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") );
+    QMessageBox::critical(this, "Message",
+                          "No items selected.",QString("Ok") );
     return;	  
   }
 
   QString outputFile = backupLocations[storeToLocation->currentText()];
 
   QDateTime time = QDateTime::currentDateTime();
@@ -251,24 +262,27 @@ void BackupAndRestore::rescanFolder(QString directory){
  * Restore a backup file.
  * Report errors or success
  */ 
 void BackupAndRestore::restore(){
   QListViewItem *restoreItem = restoreList->currentItem();
   if(!restoreItem){
-    QMessageBox::critical(this, "Message", "Please select something to restore.",QString("Ok") );
+    QMessageBox::critical(this, "Message",
+                          "Please select something to restore.",QString("Ok") );
     return;	  
   }
   QString restoreFile = backupLocations[restoreSource->currentText()];
   
   restoreFile += "/" + restoreItem->text(0);
   
   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") );
   }
 }
 
 // backuprestore.cpp