summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 8928cda..180980a 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -566,48 +566,53 @@ void BackupAndRestore::rescanFolder(QString directory)
566 else 566 else
567 { 567 {
568 // If it is a backup file add to list. 568 // If it is a backup file add to list.
569 if(file->fileName().contains(EXTENSION)) 569 if(file->fileName().contains(EXTENSION))
570 (void)new QListViewItem(restoreList, file->fileName()); 570 (void)new QListViewItem(restoreList, file->fileName());
571 } 571 }
572 ++it; 572 ++it;
573 } 573 }
574} 574}
575 575
576/** 576/**
577 * Restore a backup file. 577 * Restore a backup file.
578 * Report errors or success 578 * Report errors or success
579 */ 579 */
580void BackupAndRestore::restore() 580void BackupAndRestore::restore()
581{ 581{
582 QListViewItem *restoreItem = restoreList->currentItem(); 582 QListViewItem *restoreItem = restoreList->currentItem();
583 if(!restoreItem) 583 if(!restoreItem)
584 { 584 {
585 QMessageBox::critical(this, tr( "Message" ), 585 QMessageBox::critical(this, tr( "Message" ),
586 tr( "Please select something to restore." ),QString( tr( "Ok") ) ); 586 tr( "Please select something to restore." ),QString( tr( "Ok") ) );
587 return; 587 return;
588 } 588 }
589 589
590 if ( QMessageBox::warning( this, tr( "Restore" ),
591 tr( "Would you really overwrite your local data?" ),
592 tr( "Yes" ), tr( "No" ), "", 1 ) == 1 )
593 return;
594
590 OWait *owait = new OWait(); 595 OWait *owait = new OWait();
591 Global::statusMessage( tr( "Restore Backup..." ) ); 596 Global::statusMessage( tr( "Restore Backup..." ) );
592 owait->show(); 597 owait->show();
593 qApp->processEvents(); 598 qApp->processEvents();
594 599
595 QString restoreFile = backupLocations[restoreSource->currentText()]; 600 QString restoreFile = backupLocations[restoreSource->currentText()];
596 601
597 restoreFile += "/" + restoreItem->text(0); 602 restoreFile += "/" + restoreItem->text(0);
598 603
599 odebug << restoreFile << oendl; 604 odebug << restoreFile << oendl;
600 605
601 //check if backup file come from opie 1.0.x 606 //check if backup file come from opie 1.0.x
602 607
603 QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() ); 608 QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() );
604 609
605 int r = system( commandLine ); 610 int r = system( commandLine );
606 611
607 QString startDir; 612 QString startDir;
608 613
609 if( r != 0 ) //Applications/backup/exclude not found - old backup file 614 if( r != 0 ) //Applications/backup/exclude not found - old backup file
610 { 615 {
611 startDir = QString( "/" ); 616 startDir = QString( "/" );
612 } else 617 } else
613 { 618 {