1 files changed, 74 insertions, 33 deletions

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 2eccdfe..3889744 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,12 +1,16 @@
 #include "backuprestore.h"
 #include "errordialog.h"
 
+
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/ostorageinfo.h>
-#include <qpe/qpeapplication.h>
 using namespace Opie::Core;
 
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
+#include <qpe/config.h>
+
 /* QT */
 #include <qapplication.h>
 #include <qmultilineedit.h>
@@ -16,15 +20,13 @@ using namespace Opie::Core;
 #include <qlistview.h>
 #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>
 #include <qtextstream.h>
 #include <qtextview.h>
+#include <qlineedit.h>
 
 /* STD */
 #include <errno.h>
@@ -46,16 +48,14 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags f
 {
     backupList->header()->hide();
     restoreList->header()->hide();
-    connect(backupButton, SIGNAL(clicked()),
-            this, SLOT(backup()));
-    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(updateList, SIGNAL(clicked()),
-            this, SLOT( fileListUpdate()));
+    locationList->header()->hide();
+    connect( backupButton, SIGNAL( clicked() ), this, SLOT( backup() ) );
+    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( addLocationButton, SIGNAL( clicked() ), this, SLOT( addLocation() ) );
+    connect( removeLocationButton, SIGNAL( clicked() ), this, SLOT( removeLocation() ) );
+    connect( saveLocationsButton, SIGNAL( clicked() ), this, SLOT( saveLocations() ) );
 
     //add directorys for backing up
     applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/");
@@ -66,25 +66,8 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags f
     selectItem(documents);
 
     scanForApplicationSettings();
-
-    Opie::Core::OStorageInfo storage;
-
-    backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
-    if ( storage.hasCf() )
-    {
-        backupLocations.insert( "CF", storage.cfPath() );
-        odebug << "Cf Path: " + storage.cfPath() << oendl; 
-    }
-    if ( storage.hasSd() )
-    {
-        backupLocations.insert( "SD", storage.sdPath() );
-        odebug << " Sd Path: " + storage.sdPath() << oendl; 
-    }
-    if ( storage.hasMmc() )
-    {
-        backupLocations.insert( "MMC", storage.mmcPath() );
-        odebug << "Mmc Path: " + storage.mmcPath() << oendl; 
-    }
+    refreshBackupLocations();
+    refreshLocations();
 
     Config config("BackupAndRestore");
     //read last locations
@@ -160,6 +143,32 @@ BackupAndRestore::~BackupAndRestore()
         QFile::remove( tempFileName );
 }
 
+void BackupAndRestore::refreshBackupLocations()
+{
+    backupLocations.clear();
+    // Add cards
+    Opie::Core::OStorageInfo storage;
+    backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
+    if ( storage.hasCf() )
+    {
+        backupLocations.insert( "CF", storage.cfPath() );
+        odebug << "Cf Path: " + storage.cfPath() << oendl;
+    }
+    if ( storage.hasSd() )
+    {
+        backupLocations.insert( "SD", storage.sdPath() );
+        odebug << " Sd Path: " + storage.sdPath() << oendl;
+    }
+    if ( storage.hasMmc() )
+    {
+        backupLocations.insert( "MMC", storage.mmcPath() );
+        odebug << "Mmc Path: " + storage.mmcPath() << oendl;
+    }
+
+    // Add own locations from locationList
+    // todo implementation
+}
+
 QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list)
 {
     while(item)
@@ -524,5 +533,37 @@ QString BackupAndRestore::getExcludeFile()
     return excludeFileName;
 }
 
+void BackupAndRestore::refreshLocations()
+{
+    locationList->clear();
+    //todo: implement add locations
+    odebug << "not implemented yet" << oendl;
+}
+
+void BackupAndRestore::addLocation()
+{
+    if ( ( !locationEdit->text().isEmpty() ) &&
+         ( QDir( locationEdit->text() ).exists() ) )
+    {
+        (void) new QListViewItem( locationList, locationEdit->text() );
+        locationEdit->setText( "" );
+    }
+}
+
+void BackupAndRestore::removeLocation()
+{
+    if ( locationList->selectedItem() )
+    {
+        delete( locationList->selectedItem() );
+    }
+}
+
+void BackupAndRestore::saveLocation()
+{
+    //todo: implement
+    odebug << "not implemented yet" << oendl;
+}
+
+
 // backuprestore.cpp