From d8254f2f295b07bdadf6b4b25f0bd125d8121c28 Mon Sep 17 00:00:00 2001 From: ar Date: Fri, 18 Feb 2005 20:21:32 +0000 Subject: - #1570 - Confirmation needed before restore backup and overwrite local data --- diff --git a/ChangeLog b/ChangeLog index 8ac976d..218aacf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * #1554 - Fixed Opie-Console name in .desktop file (mickeyl) * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) * #1558 - Fixed opie-login breaking opie startup (mickeyl) + * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar) * n.a. - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw) Internal 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 @@ -587,6 +587,11 @@ void BackupAndRestore::restore() return; } + if ( QMessageBox::warning( this, tr( "Restore" ), + tr( "Would you really overwrite your local data?" ), + tr( "Yes" ), tr( "No" ), "", 1 ) == 1 ) + return; + OWait *owait = new OWait(); Global::statusMessage( tr( "Restore Backup..." ) ); owait->show(); -- cgit v0.9.0.2