summaryrefslogtreecommitdiff
authorar <ar>2004-07-25 21:41:01 (UTC)
committer ar <ar>2004-07-25 21:41:01 (UTC)
commitd61db324b7bac184b067b6f798ec3c85749bac15 (patch) (side-by-side diff)
tree14f9d2f24a82fa8eaf12bb378f2d4125979f7751
parent8b3a81d53c7db43bf748c2390b429dde2ab9aa82 (diff)
downloadopie-d61db324b7bac184b067b6f798ec3c85749bac15.zip
opie-d61db324b7bac184b067b6f798ec3c85749bac15.tar.gz
opie-d61db324b7bac184b067b6f798ec3c85749bac15.tar.bz2
- implementation of custom backup- and restore-locations
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp82
-rw-r--r--noncore/settings/backup/backuprestore.h4
2 files changed, 55 insertions, 31 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 3889744..478b22f 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -24,12 +24,13 @@ using namespace Opie::Core;
#include <qcombobox.h>
#include <qlist.h>
#include <qregexp.h>
#include <qtextstream.h>
#include <qtextview.h>
#include <qlineedit.h>
+#include <qstringlist.h>
/* STD */
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
@@ -63,39 +64,19 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/");
selectItem(applicationSettings);
documents= new QListViewItem(backupList, "Documents", "", "Documents/");
selectItem(documents);
scanForApplicationSettings();
- refreshBackupLocations();
refreshLocations();
-
- 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++;
- }
+ refreshBackupLocations();
// Read the list of items to ignore.
QList<QString> dontBackupList;
dontBackupList.setAutoDelete(true);
+ Config config("BackupAndRestore");
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), "")));
}
@@ -162,14 +143,42 @@ void BackupAndRestore::refreshBackupLocations()
if ( storage.hasMmc() )
{
backupLocations.insert( "MMC", storage.mmcPath() );
odebug << "Mmc Path: " + storage.mmcPath() << oendl;
}
- // Add own locations from locationList
- // todo implementation
+ for ( QListViewItemIterator it( locationList ); it.current(); ++it )
+ {
+ backupLocations.insert( it.current()->text( 0 ), it.current()->text( 0 ) );
+ }
+
+ //update QComboBox
+ storeToLocation->clear();
+ restoreSource->clear();
+
+ //read last locations
+ Config config("BackupAndRestore");
+ config.setGroup("LastLocation");
+ QString lastStoreLocation = config.readEntry( "LastStoreLocation", "" );
+ QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" );
+ int locationIndex = 0;
+
+ //fill QComboBox
+ 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++;
+ }
}
QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list)
{
while(item)
{
@@ -307,13 +316,12 @@ void BackupAndRestore::backup()
setCaption(tr("Backup and Restore.. Failed !!"));
return;
}
else
{
QMessageBox::information(this, tr( "Message" ), tr( "Backup Successful." ), QString(tr( "Ok" ) ) );
-
}
//write store-location
Config config( "BackupAndRestore" );
config.setGroup( "LastLocation" );
config.writeEntry( "LastStoreLocation", storeToLocation->currentText() );
@@ -533,14 +541,22 @@ QString BackupAndRestore::getExcludeFile()
return excludeFileName;
}
void BackupAndRestore::refreshLocations()
{
locationList->clear();
+
//todo: implement add locations
- odebug << "not implemented yet" << oendl;
+ Config config( "BackupAndRestore" );
+ config.setGroup( "Locations" );
+
+ QStringList locations( config.readListEntry( "locations", '|' ) );
+
+ for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it ) {
+ (void) new QListViewItem( locationList, *it );
+ }
}
void BackupAndRestore::addLocation()
{
if ( ( !locationEdit->text().isEmpty() ) &&
( QDir( locationEdit->text() ).exists() ) )
@@ -555,15 +571,23 @@ void BackupAndRestore::removeLocation()
if ( locationList->selectedItem() )
{
delete( locationList->selectedItem() );
}
}
-void BackupAndRestore::saveLocation()
+void BackupAndRestore::saveLocations()
{
- //todo: implement
- odebug << "not implemented yet" << oendl;
+ Config config("BackupAndRestore");
+ config.setGroup("Locations");
+
+ QStringList locations;
+ for ( QListViewItemIterator it( locationList ); it.current(); ++it )
+ {
+ locations.append( it.current()->text( 0 ) );
}
+ config.writeEntry( "locations", locations, '|' );
+ refreshBackupLocations();
+}
// backuprestore.cpp
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index 527b3cf..caf6243 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -4,12 +4,13 @@
#include <qmainwindow.h>
#include "backuprestorebase.h"
#include <qmap.h>
#include <qlist.h>
class QListViewItem;
+class QStringList;
class BackupAndRestore : public BackupAndRestoreBase
{
Q_OBJECT
@@ -27,13 +28,13 @@ private slots:
void sourceDirChanged(int);
void rescanFolder(QString directory);
void fileListUpdate();
void addLocation();
void removeLocation();
- void saveLocation();
+ void saveLocations();
private:
void scanForApplicationSettings();
int getBackupFiles(QString &backupFiles, QListViewItem *parent);
QString getExcludeFile();
QMap<QString, QString> backupLocations;
@@ -41,13 +42,12 @@ private:
void refreshBackupLocations();
void refreshLocations();
QListViewItem *systemSettings;
QListViewItem *applicationSettings;
QListViewItem *documents;
-
};
#endif
// backuprestore.h