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 /noncore/settings/backup | |
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 | 107 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.h | 6 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestorebase.ui | 129 |
3 files changed, 192 insertions, 50 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,99 +1,82 @@ #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> #include <qdir.h> #include <qfile.h> #include <qfileinfo.h> #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> #include <stdlib.h> #include <unistd.h> #include <sys/stat.h> #include <dirent.h> #define HEADER_NAME 0 #define HEADER_BACKUP 1 #define BACKUP_LOCATION 2 #define EXTENSION ".bck" const QString tempFileName = "/tmp/backup.err"; BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) : BackupAndRestoreBase(parent, name, fl) { 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/"); selectItem(applicationSettings); applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/"); selectItem(applicationSettings); documents= new QListViewItem(backupList, "Documents", "", "Documents/"); 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 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()); @@ -151,24 +134,50 @@ BackupAndRestore::~BackupAndRestore() { config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME)); count++; } } config.writeEntry("Total", count); // Remove Temp File if ( QFile::exists( tempFileName ) ) 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) { if(item->childCount() > 0) getAllItems(item->firstChild(), list); list.append(item); item = item->nextSibling(); } return list; } @@ -515,14 +524,46 @@ QString BackupAndRestore::getExcludeFile() writeStream << "*.bck" << "\n"; excludeFile.close(); } else { return QString::null; } } 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 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 @@ -19,29 +19,35 @@ public: ~BackupAndRestore(); static QString appName() { return QString::fromLatin1("backup"); } private slots: void backup(); void restore(); void selectItem(QListViewItem *currentItem); void sourceDirChanged(int); void rescanFolder(QString directory); void fileListUpdate(); + void addLocation(); + void removeLocation(); + void saveLocation(); + private: void scanForApplicationSettings(); int getBackupFiles(QString &backupFiles, QListViewItem *parent); QString getExcludeFile(); QMap<QString, QString> backupLocations; QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list); + void refreshBackupLocations(); + void refreshLocations(); QListViewItem *systemSettings; QListViewItem *applicationSettings; QListViewItem *documents; }; #endif // backuprestore.h 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 @@ -2,71 +2,77 @@ <class>BackupAndRestoreBase</class> <widget> <class>QWidget</class> <property stdset="1"> <name>name</name> <cstring>BackupAndRestoreBase</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>231</width> - <height>275</height> + <width>290</width> + <height>243</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Backup And Restore</string> </property> <property> <name>layoutMargin</name> </property> + <property> + <name>layoutSpacing</name> + </property> <vbox> <property stdset="1"> <name>margin</name> <number>0</number> </property> <property stdset="1"> <name>spacing</name> - <number>6</number> + <number>0</number> </property> <widget> <class>QTabWidget</class> <property stdset="1"> <name>name</name> <cstring>tabWidget</cstring> </property> <property> <name>layoutMargin</name> </property> + <property> + <name>layoutSpacing</name> + </property> <widget> <class>QWidget</class> <property stdset="1"> <name>name</name> <cstring>Widget2</cstring> </property> <attribute> <name>title</name> <string>Backup</string> </attribute> <grid> <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" > <class>QLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel1</cstring> </property> <property stdset="1"> <name>text</name> <string>Save To</string> </property> </widget> @@ -123,38 +129,60 @@ <class>QWidget</class> <property stdset="1"> <name>name</name> <cstring>Widget3</cstring> </property> <attribute> <name>title</name> <string>Restore</string> </attribute> <grid> <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" > <class>QComboBox</class> <property stdset="1"> <name>name</name> <cstring>restoreSource</cstring> </property> </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> <property> <name>text</name> <string>Column 1</string> </property> <property> <name>clickable</name> <bool>true</bool> </property> <property> <name>resizeable</name> @@ -164,51 +192,118 @@ <property stdset="1"> <name>name</name> <cstring>restoreList</cstring> </property> <property stdset="1"> <name>minimumSize</name> <size> <width>0</width> <height>100</height> </size> </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> </grid> </widget> </widget> </vbox> </widget> </UI> |