-rw-r--r-- | noncore/settings/backup/backup.pro | 7 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 68 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.h | 13 | ||||
-rw-r--r-- | noncore/settings/backup/main.cpp | 10 |
4 files changed, 44 insertions, 54 deletions
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro index cadb381..1e9af61 100644 --- a/noncore/settings/backup/backup.pro +++ b/noncore/settings/backup/backup.pro @@ -1,15 +1,12 @@ -TEMPLATE = app -#CONFIG = qt warn_on debug -CONFIG = qt warn_on release +CONFIG = qt warn_on release quick-app HEADERS = backuprestore.h SOURCES = main.cpp backuprestore.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = backuprestorebase.ui errordialog.ui TARGET = backup -DESTDIR = $(OPIEDIR)/bin TRANSLATIONS = ../../../i18n/de/backup.ts \ ../../../i18n/nl/backup.ts \ ../../../i18n/xx/backup.ts \ @@ -29,7 +26,5 @@ TRANSLATIONS = ../../../i18n/de/backup.ts \ ../../../i18n/it/backup.ts \ ../../../i18n/da/backup.ts - - include ( $(OPIEDIR)/include.pro ) diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 922523b..1c854d9 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp @@ -36,23 +36,23 @@ const QString tempFileName = "/tmp/backup.err"; -BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) - : BackupAndRestoreBase(parent, name){ +BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) + : BackupAndRestoreBase(parent, name, fl){ this->showMaximized(); backupList->header()->hide(); restoreList->header()->hide(); connect(backupButton, SIGNAL(clicked()), this, SLOT(backupPressed())); connect(restoreButton, SIGNAL(clicked()), this, SLOT(restore())); connect(backupList, SIGNAL(clicked( QListViewItem * )), - this, SLOT(selectItem(QListViewItem*))); + this, SLOT(selectItem(QListViewItem*))); connect(restoreSource, SIGNAL(activated( int )), - this, SLOT(sourceDirChanged(int))); + this, SLOT(sourceDirChanged(int))); connect(updateList, SIGNAL(clicked()), - this, SLOT( fileListUpdate())); + this, SLOT( fileListUpdate())); applicationSettings = new QListViewItem(backupList, "Application Settings", "", QDir::homeDirPath() + "/Settings/"); selectItem(applicationSettings); @@ -61,15 +61,15 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) selectItem(applicationSettings); documents= new QListViewItem(backupList, "Documents", "", QDir::homeDirPath() + "/Documents/"); selectItem(documents); - + scanForApplicationSettings(); - + Config config("BackupAndRestore"); config.setGroup("General"); int totalLocations = config.readNumEntry("totalLocations",0); - + //todo make less static here and use Storage class to get infos if(totalLocations == 0){ backupLocations.insert("Documents", "/root/Documents"); backupLocations.insert("CF", "/mnt/cf"); @@ -85,10 +85,10 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) for( it = backupLocations.begin(); it != backupLocations.end(); ++it ){ storeToLocation->insertItem(it.key()); restoreSource->insertItem(it.key()); } - - // Read the list of items to ignore. + + // Read the list of items to ignore. QList<QString> dontBackupList; dontBackupList.setAutoDelete(true); config.setGroup("DontBackup"); int total = config.readNumEntry("Total", 0); @@ -97,9 +97,9 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) } QList<QListViewItem> list; getAllItems(backupList->firstChild(), list); - + for(uint i = 0; i < list.count(); i++){ QString text = list.at(i)->text(HEADER_NAME); for(uint i2 = 0; i2 < dontBackupList.count(); i2++){ if(*dontBackupList.at(i2) == text){ @@ -112,13 +112,13 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) BackupAndRestore::~BackupAndRestore(){ QList<QListViewItem> list; getAllItems(backupList->firstChild(), list); - + Config config("BackupAndRestore"); config.setGroup("DontBackup"); config.clearGroup(); - + int count = 0; for(uint i = 0; i < list.count(); i++){ if(list.at(i)->text(HEADER_BACKUP) == ""){ config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME)); @@ -134,9 +134,9 @@ BackupAndRestore::~BackupAndRestore(){ QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){ while(item){ if(item->childCount() > 0) - getAllItems(item->firstChild(), list); + getAllItems(item->firstChild(), list); list.append(item); item = item->nextSibling(); } return list; @@ -178,37 +178,37 @@ void BackupAndRestore::scanForApplicationSettings(){ } /** * The "Backup" button has been pressed. Get a list of all of the files that - * should be backed up. If there are no files, emit and error and exit. + * should be backed up. If there are no files, emit and error and exit. * Determine the file name to store the backup in. Backup the file(s) using * tar and gzip --best. Report failure or success - */ + */ void BackupAndRestore::backupPressed(){ QString backupFiles; if(getBackupFiles(backupFiles, NULL) == 0){ QMessageBox::critical(this, "Message", "No items selected.",QString("Ok") ); - return; + return; } setCaption(tr("Backup and Restore... working...")); QString outputFile = backupLocations[storeToLocation->currentText()]; QDateTime datetime = QDateTime::currentDateTime(); - QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + + QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + QString::number( datetime.date().day() ).rightJustify(2, '0'); outputFile += "/" + dateString; - + QString t = outputFile; int c = 1; while(QFile::exists(outputFile + EXTENSION)){ outputFile = t + QString("%1").arg(c); c++; } - // We execute tar and compressing its output with gzip.. + // We execute tar and compressing its output with gzip.. // The error output will be written into a temp-file which could be provided // for debugging.. qDebug( "Storing file: %s", outputFile.latin1() ); outputFile += EXTENSION; @@ -227,9 +227,9 @@ void BackupAndRestore::backupPressed(){ if(r != 0){ perror("Error: "); QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); - switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" + switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ){ case 1: qWarning("Details pressed !"); @@ -241,9 +241,9 @@ void BackupAndRestore::backupPressed(){ while ( !t.eof() ) { // until end of file... s += t.readLine(); // line of text excluding '\n' } errorFile.close(); - + pErrDialog->m_textarea->setText( s ); }else{ pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" ); } @@ -252,20 +252,20 @@ void BackupAndRestore::backupPressed(){ delete pErrDialog; break; } setCaption(tr("Backup and Restore.. Failed !!")); - return; + return; } else{ QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) ); - + } setCaption(tr("Backup and Restore")); } /*** * Get a list of all of the files to backup. - */ + */ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){ QListViewItem * currentItem; QString currentHome; if(!parent) @@ -273,9 +273,9 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent else{ currentItem = parent->firstChild(); currentHome = parent->text(BACKUP_LOCATION); } - + uint count = 0; while( currentItem != 0 ){ if(currentItem->text(HEADER_BACKUP) == "B" ){ if(currentItem->childCount() == 0 ){ @@ -316,9 +316,9 @@ void BackupAndRestore::rescanFolder(QString directory){ //qDebug(QString("rescanFolder: ") + directory.latin1()); QDir d(directory); if(!d.exists()) return; - + d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); const QFileInfoList *list = d.entryInfoList(); QFileInfoListIterator it( *list ); QFileInfo *file; @@ -340,28 +340,28 @@ void BackupAndRestore::rescanFolder(QString directory){ /** * Restore a backup file. * Report errors or success - */ + */ void BackupAndRestore::restore(){ QListViewItem *restoreItem = restoreList->currentItem(); if(!restoreItem){ QMessageBox::critical(this, tr( "Message" ), tr( "Please select something to restore." ),QString( tr( "Ok") ) ); - return; + return; } setCaption(tr("Backup and Restore... working...")); QString restoreFile = backupLocations[restoreSource->currentText()]; - + restoreFile += "/" + restoreItem->text(0); - + int r = system(QString("tar -C / -zxf %1 2> %3") .arg( restoreFile.latin1() ) .arg( tempFileName.latin1() ) ); if(r != 0){ QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); - switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" + switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) { case 1: qWarning("Details pressed !"); ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); @@ -372,9 +372,9 @@ void BackupAndRestore::restore(){ while ( !t.eof() ) { // until end of file... s += t.readLine(); // line of text excluding '\n' } errorFile.close(); - + pErrDialog->m_textarea->setText( s ); }else{ pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) ); } @@ -382,9 +382,9 @@ void BackupAndRestore::restore(){ pErrDialog->exec(); delete pErrDialog; setCaption(tr("Backup and Restore.. Failed !!")); - return; + return; break; } diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h index 8c733e3..4bdc758 100644 --- a/noncore/settings/backup/backuprestore.h +++ b/noncore/settings/backup/backuprestore.h @@ -1,5 +1,5 @@ -#ifndef WINDOW_H +#ifndef WINDOW_H #define WINDOW_H #include <qmainwindow.h> #include "backuprestorebase.h" @@ -7,18 +7,19 @@ #include <qlist.h> class QListViewItem; -class BackupAndRestore : public BackupAndRestoreBase { +class BackupAndRestore : public BackupAndRestoreBase { Q_OBJECT - + public: - BackupAndRestore( QWidget* parent = 0, const char* name = 0); + BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0); ~BackupAndRestore(); - - + + static QString appName() { return QString::fromLatin1("backup"); } + private slots: void backupPressed(); void restore(); void selectItem(QListViewItem *currentItem); diff --git a/noncore/settings/backup/main.cpp b/noncore/settings/backup/main.cpp index 676e1f0..b375a3b 100644 --- a/noncore/settings/backup/main.cpp +++ b/noncore/settings/backup/main.cpp @@ -1,14 +1,8 @@ #include "backuprestore.h" #include "qnetworkprotocol.h" #include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.h> -int main(int argc, char *argv[]) { - QPEApplication a( argc, argv ); - - BackupAndRestore app(0, "mainwindow"); - a.showMainWidget(&app); - return a.exec(); -} -// main.cpp +OPIE_EXPORT_APP( OApplicationFactory<BackupAndRestore> ) |