Diffstat (limited to 'noncore/settings/backup/backuprestore.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
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 @@ -38,6 +38,6 @@ 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(); @@ -48,9 +48,9 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) 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", "", @@ -63,11 +63,11 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) 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){ @@ -87,6 +87,6 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) restoreSource->insertItem(it.key()); } - - // Read the list of items to ignore. + + // Read the list of items to ignore. QList<QString> dontBackupList; dontBackupList.setAutoDelete(true); @@ -99,5 +99,5 @@ 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); @@ -114,9 +114,9 @@ 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++){ @@ -136,5 +136,5 @@ QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QL while(item){ if(item->childCount() > 0) - getAllItems(item->firstChild(), list); + getAllItems(item->firstChild(), list); list.append(item); item = item->nextSibling(); @@ -180,8 +180,8 @@ 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; @@ -189,5 +189,5 @@ void BackupAndRestore::backupPressed(){ QMessageBox::critical(this, "Message", "No items selected.",QString("Ok") ); - return; + return; } @@ -196,9 +196,9 @@ void BackupAndRestore::backupPressed(){ 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; @@ -208,5 +208,5 @@ void BackupAndRestore::backupPressed(){ } - // 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.. @@ -229,5 +229,5 @@ void BackupAndRestore::backupPressed(){ 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" ) ) ) ){ @@ -243,5 +243,5 @@ void BackupAndRestore::backupPressed(){ } errorFile.close(); - + pErrDialog->m_textarea->setText( s ); }else{ @@ -254,9 +254,9 @@ void BackupAndRestore::backupPressed(){ } 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")); @@ -265,5 +265,5 @@ void BackupAndRestore::backupPressed(){ /*** * Get a list of all of the files to backup. - */ + */ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){ QListViewItem * currentItem; @@ -275,5 +275,5 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent currentHome = parent->text(BACKUP_LOCATION); } - + uint count = 0; while( currentItem != 0 ){ @@ -318,5 +318,5 @@ void BackupAndRestore::rescanFolder(QString directory){ if(!d.exists()) return; - + d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); const QFileInfoList *list = d.entryInfoList(); @@ -342,5 +342,5 @@ void BackupAndRestore::rescanFolder(QString directory){ * Restore a backup file. * Report errors or success - */ + */ void BackupAndRestore::restore(){ QListViewItem *restoreItem = restoreList->currentItem(); @@ -348,12 +348,12 @@ void BackupAndRestore::restore(){ 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() ) @@ -361,5 +361,5 @@ void BackupAndRestore::restore(){ 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: @@ -374,5 +374,5 @@ void BackupAndRestore::restore(){ } errorFile.close(); - + pErrDialog->m_textarea->setText( s ); }else{ @@ -384,5 +384,5 @@ void BackupAndRestore::restore(){ setCaption(tr("Backup and Restore.. Failed !!")); - return; + return; break; |