author | ar <ar> | 2004-07-25 14:35:09 (UTC) |
---|---|---|
committer | ar <ar> | 2004-07-25 14:35:09 (UTC) |
commit | 8b3a81d53c7db43bf748c2390b429dde2ab9aa82 (patch) (side-by-side diff) | |
tree | eb0da156fba85f8ade489a42382ace3a88df87af | |
parent | da9a436a866e608451115316c7374a6730174130 (diff) | |
download | opie-8b3a81d53c7db43bf748c2390b429dde2ab9aa82.zip opie-8b3a81d53c7db43bf748c2390b429dde2ab9aa82.tar.gz opie-8b3a81d53c7db43bf748c2390b429dde2ab9aa82.tar.bz2 |
- begin implementation of custom backup- and restore-locations
-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 127 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.h | 6 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestorebase.ui | 129 |
3 files changed, 202 insertions, 60 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 @@ -2,10 +2,14 @@ #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> @@ -17,13 +21,11 @@ using namespace Opie::Core; #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 */ @@ -47,14 +49,12 @@ 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 @@ -67,23 +67,6 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f 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"); @@ -161,4 +144,30 @@ BackupAndRestore::~BackupAndRestore() } +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) { @@ -204,5 +213,5 @@ void BackupAndRestore::scanForApplicationSettings() while ( (fi=it.current()) ) { - //odebug << (d.path()+"/"+fi->fileName()).latin1() << oendl; + //odebug << (d.path()+"/"+fi->fileName()).latin1() << oendl; if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) ) { @@ -250,5 +259,5 @@ void BackupAndRestore::backup() // The error output will be written into a temp-file which could be provided // for debugging.. - odebug << "Storing file: " << outputFile.latin1() << "" << oendl; + odebug << "Storing file: " << outputFile.latin1() << "" << oendl; outputFile += EXTENSION; @@ -259,5 +268,5 @@ void BackupAndRestore::backup() .arg( tempFileName.latin1() ); - odebug << commandLine << oendl; + odebug << commandLine << oendl; int r = system( commandLine ); @@ -273,5 +282,5 @@ void BackupAndRestore::backup() case 1: - owarn << "Details pressed !" << oendl; + owarn << "Details pressed !" << oendl; ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); QFile errorFile( tempFileName ); @@ -360,5 +369,5 @@ void BackupAndRestore::sourceDirChanged(int selection) void BackupAndRestore::fileListUpdate() { - owarn << "void BackupAndRestore::fileListUpdate()" << oendl; + owarn << "void BackupAndRestore::fileListUpdate()" << oendl; restoreList->clear(); rescanFolder( backupLocations[restoreSource->currentText()] ); @@ -372,5 +381,5 @@ void BackupAndRestore::fileListUpdate() void BackupAndRestore::rescanFolder(QString directory) { - //odebug << QString("rescanFolder: ") + directory.latin1() << oendl; + //odebug << QString("rescanFolder: ") + directory.latin1() << oendl; QDir d(directory); if(!d.exists()) @@ -420,5 +429,5 @@ void BackupAndRestore::restore() restoreFile += "/" + restoreItem->text(0); - odebug << restoreFile << oendl; + odebug << restoreFile << oendl; //check if backup file come from opie 1.0.x @@ -443,5 +452,5 @@ void BackupAndRestore::restore() .arg( tempFileName.latin1() ); - odebug << commandLine << oendl; + odebug << commandLine << oendl; r = system( commandLine ); @@ -455,5 +464,5 @@ void BackupAndRestore::restore() { case 1: - owarn << "Details pressed !" << oendl; + owarn << "Details pressed !" << oendl; ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); QFile errorFile( tempFileName ); @@ -500,5 +509,5 @@ void BackupAndRestore::restore() * Check for exclude in Applications/backup * If it does not exist, the function will create the file with *.bck as content - * The exclude_files is read by tar and will provide to exclude special files out from backup. + * The exclude_files is read by tar and will provide to exclude special files out from backup. * e.g. alle *.bck files (backup-files) will not be backed up by default */ @@ -525,4 +534,36 @@ QString BackupAndRestore::getExcludeFile() } +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 diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h index 0d88f8d..527b3cf 100644 --- a/noncore/settings/backup/backuprestore.h +++ b/noncore/settings/backup/backuprestore.h @@ -29,4 +29,8 @@ private slots: void fileListUpdate(); + void addLocation(); + void removeLocation(); + void saveLocation(); + private: void scanForApplicationSettings(); @@ -35,4 +39,6 @@ private: QMap<QString, QString> backupLocations; QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list); + void refreshBackupLocations(); + void refreshLocations(); QListViewItem *systemSettings; diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui index a52b42d..b4624bb 100644 --- a/noncore/settings/backup/backuprestorebase.ui +++ b/noncore/settings/backup/backuprestorebase.ui @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>231</width> - <height>275</height> + <width>290</width> + <height>243</height> </rect> </property> @@ -23,4 +23,7 @@ <name>layoutMargin</name> </property> + <property> + <name>layoutSpacing</name> + </property> <vbox> <property stdset="1"> @@ -30,5 +33,5 @@ <property stdset="1"> <name>spacing</name> - <number>6</number> + <number>0</number> </property> <widget> @@ -41,4 +44,7 @@ <name>layoutMargin</name> </property> + <property> + <name>layoutSpacing</name> + </property> <widget> <class>QWidget</class> @@ -54,9 +60,9 @@ <property stdset="1"> <name>margin</name> - <number>11</number> + <number>4</number> </property> <property stdset="1"> <name>spacing</name> - <number>6</number> + <number>4</number> </property> <widget row="0" column="0" > @@ -133,9 +139,9 @@ <property stdset="1"> <name>margin</name> - <number>11</number> + <number>4</number> </property> <property stdset="1"> <name>spacing</name> - <number>6</number> + <number>4</number> </property> <widget row="0" column="1" > @@ -147,4 +153,26 @@ </widget> <widget row="2" column="0" rowspan="1" colspan="2" > + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>restoreButton</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>&Restore</string> + </property> + </widget> + <widget row="0" column="0" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel1_2</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Select Source</string> + </property> + </widget> + <widget row="1" column="0" rowspan="1" colspan="2" > <class>QListView</class> <column> @@ -174,35 +202,102 @@ </property> </widget> - <widget row="3" column="0" rowspan="1" colspan="2" > + </grid> + </widget> + <widget> + <class>QWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>tab</cstring> + </property> + <attribute> + <name>title</name> + <string>Locations</string> + </attribute> + <grid> + <property stdset="1"> + <name>margin</name> + <number>4</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>4</number> + </property> + <widget row="0" column="0" rowspan="1" colspan="3" > + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>locationEdit</cstring> + </property> + </widget> + <widget row="0" column="3" > + <class>QToolButton</class> + <property stdset="1"> + <name>name</name> + <cstring>locationSelectBtn</cstring> + </property> + <property stdset="1"> + <name>maximumSize</name> + <size> + <width>20</width> + <height>30</height> + </size> + </property> + <property stdset="1"> + <name>text</name> + <string>...</string> + </property> + </widget> + <widget row="1" column="0" rowspan="1" colspan="4" > + <class>QListView</class> + <column> + <property> + <name>text</name> + <string>Locations</string> + </property> + <property> + <name>clickable</name> + <bool>true</bool> + </property> + <property> + <name>resizeable</name> + <bool>true</bool> + </property> + </column> + <property stdset="1"> + <name>name</name> + <cstring>locationList</cstring> + </property> + </widget> + <widget row="2" column="0" > <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>restoreButton</cstring> + <cstring>addLocationButton</cstring> </property> <property stdset="1"> <name>text</name> - <string>&Restore</string> + <string>Add</string> </property> </widget> - <widget row="0" column="0" > - <class>QLabel</class> + <widget row="2" column="1" > + <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>TextLabel1_2</cstring> + <cstring>removeLocationButton</cstring> </property> <property stdset="1"> <name>text</name> - <string>Select Source</string> + <string>Remove</string> </property> </widget> - <widget row="1" column="0" rowspan="1" colspan="2" > + <widget row="2" column="2" rowspan="1" colspan="2" > <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>updateList</cstring> + <cstring>saveLocationsButton</cstring> </property> <property stdset="1"> <name>text</name> - <string>Update Filelist</string> + <string>Save</string> </property> </widget> |