summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 93bedf6..1b34105 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -44,56 +44,65 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
this->showMaximized();
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()));
//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();
+ StorageInfo storage;
+
backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
- if (StorageInfo::hasCf())
+ if ( storage.hasCf() )
+ {
+ backupLocations.insert( "CF", storage.getCfPath() );
+ qDebug( "Cf Path: " + storage.getCfPath() );
+ }
+ if ( storage.hasSd() )
{
- backupLocations.insert("CF", "/mnt/cf");
+ backupLocations.insert( "SD", storage.getSdPath() );
+ qDebug( " Sd Path: " + storage.getSdPath() );
}
- if (StorageInfo::hasSd() || StorageInfo::hasMmc())
+ if ( storage.hasMmc() )
{
- backupLocations.insert("SD", "/mnt/card");
+ backupLocations.insert( "MMC", storage.getMmcPath() );
+ qDebug( "Mmc Path: " + storage.getMmcPath() );
}
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.