-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 @@ | |||
8 | Fixed Bugs | 8 | Fixed Bugs |
9 | ---------- | 9 | ---------- |
10 | * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers) | 10 | * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers) |
11 | * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke) | 11 | * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke) |
12 | * #1482 - Fix double '/' in paths (zecke) | 12 | * #1482 - Fix double '/' in paths (zecke) |
13 | * #1536 - Autosave of custom locations in opie backup (ar) | 13 | * #1536 - Autosave of custom locations in opie backup (ar) |
14 | * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke) | 14 | * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke) |
15 | * #1540 - Implemented deletion of DocLnks in opie-eye (zecke) | 15 | * #1540 - Implemented deletion of DocLnks in opie-eye (zecke) |
16 | * #1542 - Fix Todo crash when priority < 1 or > 5 (drw) | 16 | * #1542 - Fix Todo crash when priority < 1 or > 5 (drw) |
17 | * #1554 - Fixed Opie-Console name in .desktop file (mickeyl) | 17 | * #1554 - Fixed Opie-Console name in .desktop file (mickeyl) |
18 | * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) | 18 | * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) |
19 | * #1558 - Fixed opie-login breaking opie startup (mickeyl) | 19 | * #1558 - Fixed opie-login breaking opie startup (mickeyl) |
20 | * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar) | ||
20 | * n.a. - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw) | 21 | * n.a. - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw) |
21 | 22 | ||
22 | Internal | 23 | Internal |
23 | -------- | 24 | -------- |
24 | * Work around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl) | 25 | * Work around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl) |
25 | * Killed the need for weak symbols in QtE (zecke) | 26 | * Killed the need for weak symbols in QtE (zecke) |
26 | 27 | ||
27 | 2005-02-03Opie 1.1.9 | 28 | 2005-02-03Opie 1.1.9 |
28 | 29 | ||
29 | New Features | 30 | New Features |
30 | ------------ | 31 | ------------ |
31 | * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl) | 32 | * 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) | |||
578 | * Report errors or success | 578 | * Report errors or success |
579 | */ | 579 | */ |
580 | void BackupAndRestore::restore() | 580 | void 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 |