- remember last store- and restore-location

- information for successfull restore

1 files changed, 27 insertions, 4 deletions

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index cfba907..477e24d 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -54,58 +54,70 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags f
             this, SLOT(sourceDirChanged(int)));
     connect(updateList, SIGNAL(clicked()),
             this, SLOT( fileListUpdate()));
 
     //add directorys for backing up
     applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/");
     selectItem(applicationSettings);
     applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/");
     selectItem(applicationSettings);
     documents= new QListViewItem(backupList, "Documents", "", "Documents/");
     selectItem(documents);
 
     scanForApplicationSettings();
 
     backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
     if (StorageInfo::hasCf())
     {
         backupLocations.insert("CF", "/mnt/cf");
     }
     if (StorageInfo::hasSd() || StorageInfo::hasMmc())
     {
         backupLocations.insert("SD", "/mnt/card");
     }
 
+    Config config("BackupAndRestore");
+    //read last locations
+    config.setGroup("LastLocation");
+    QString lastStoreLocation   = config.readEntry( "LastStoreLocation", "" );
+    QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" );
+    int locationIndex    = 0;
+
     QMap<QString, QString>::Iterator it;
     for( it = backupLocations.begin(); it != backupLocations.end(); ++it )
     {
         storeToLocation->insertItem(it.key());
         restoreSource->insertItem(it.key());
+
+        //check for last locations
+        if ( it.key() == lastStoreLocation )
+            storeToLocation->setCurrentItem( locationIndex );
+        if ( it.key() == lastRestoreLocation )
+            restoreSource->setCurrentItem( locationIndex );
+        locationIndex++;
     }
 
     // Read the list of items to ignore.
-    Config config("BackupAndRestore");
-
     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), "")));
     }
 
     QList<QListViewItem> list;
     getAllItems(backupList->firstChild(), list);
 
     for(uint i = 0; i < list.count(); i++)
     {
         QString text = list.at(i)->text(HEADER_NAME);
         for(uint i2 = 0;  i2 < dontBackupList.count(); i2++)
         {
             if(*dontBackupList.at(i2) == text)
             {
                 selectItem(list.at(i));
                 break;
             }
         }
     }
@@ -258,48 +270,54 @@ void BackupAndRestore::backup()
                 {        // until end of file...
                     s += t.readLine();       // line of text excluding '\n'
                 }
                 errorFile.close();
 
                 pErrDialog->m_textarea->setText( s );
             }
             else
             {
                 pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" );
             }
             pErrDialog->showMaximized();
             pErrDialog->exec();
             delete pErrDialog;
             break;
         }
         setCaption(tr("Backup and Restore.. Failed !!"));
         return;
     }
     else
     {
         QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) );
 
     }
+
+    //write store-location
+    Config config( "BackupAndRestore" );
+    config.setGroup( "LastLocation" );
+    config.writeEntry( "LastStoreLocation", storeToLocation->currentText() );
+
     setCaption(tr("Backup and Restore"));
 }
 
 /***
  * 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 )
@@ -417,32 +435,37 @@ void BackupAndRestore::restore()
                 {        // until end of file...
                     s += t.readLine();       // line of text excluding '\n'
                 }
                 errorFile.close();
 
                 pErrDialog->m_textarea->setText( s );
             }
             else
             {
                 pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) );
             }
             pErrDialog->showMaximized();
             pErrDialog->exec();
             delete pErrDialog;
 
             setCaption(tr("Backup and Restore.. Failed !!"));
             return;
 
             break;
 
         }
     }
     else
     {
-        QMessageBox::critical(this, tr( "Message" ),
-                              tr( "Restore Successfull." ), QString( tr( "Ok") ) );
+        QMessageBox::information(this, tr( "Message" ), tr( "Restore Successfull." ), QString( tr( "Ok") ) );
     }
+
+    //write restore-location
+    Config config( "BackupAndRestore" );
+    config.setGroup( "LastLocation" );
+    config.writeEntry( "LastRestoreLocation", restoreSource->currentText() );
+
     setCaption(tr("Backup and Restore"));
 }
 
 // backuprestore.cpp