| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -8,24 +8,25 @@ Fixed Bugs ---------- * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers) * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke) * #1482 - Fix double '/' in paths (zecke) * #1536 - Autosave of custom locations in opie backup (ar) * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke) * #1540 - Implemented deletion of DocLnks in opie-eye (zecke) * #1542 - Fix Todo crash when priority < 1 or > 5 (drw) * #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 -------- * Work around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl) * Killed the need for weak symbols in QtE (zecke) 2005-02-03 Opie 1.1.9 New Features ------------ * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl) 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 @@ -578,24 +578,29 @@ void BackupAndRestore::rescanFolder(QString directory) * 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; } + 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(); qApp->processEvents(); QString restoreFile = backupLocations[restoreSource->currentText()]; restoreFile += "/" + restoreItem->text(0); odebug << restoreFile << oendl; //check if backup file come from opie 1.0.x |