diff options
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index e126b0ec45..d36f9637c0 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -393,7 +393,7 @@ void RbUtilQt::completeInstall() | |||
393 | 393 | ||
394 | if(smallInstallInner()) | 394 | if(smallInstallInner()) |
395 | return; | 395 | return; |
396 | logger->undoAbort(); | 396 | logger->setRunning(); |
397 | // Fonts | 397 | // Fonts |
398 | m_error = false; | 398 | m_error = false; |
399 | m_installed = false; | 399 | m_installed = false; |
@@ -406,7 +406,7 @@ void RbUtilQt::completeInstall() | |||
406 | QApplication::processEvents(); | 406 | QApplication::processEvents(); |
407 | } | 407 | } |
408 | if(m_error) return; | 408 | if(m_error) return; |
409 | logger->undoAbort(); | 409 | logger->setRunning(); |
410 | 410 | ||
411 | // Doom | 411 | // Doom |
412 | if(hasDoom()) | 412 | if(hasDoom()) |
@@ -459,7 +459,7 @@ bool RbUtilQt::smallInstallInner() | |||
459 | // show dialog with error if mount point is wrong | 459 | // show dialog with error if mount point is wrong |
460 | if(!QFileInfo(mountpoint).isDir()) { | 460 | if(!QFileInfo(mountpoint).isDir()) { |
461 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | 461 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); |
462 | logger->abort(); | 462 | logger->setFinished(); |
463 | return true; | 463 | return true; |
464 | } | 464 | } |
465 | // Bootloader | 465 | // Bootloader |
@@ -469,7 +469,7 @@ bool RbUtilQt::smallInstallInner() | |||
469 | m_installed = false; | 469 | m_installed = false; |
470 | m_auto = true; | 470 | m_auto = true; |
471 | if(!installBootloaderAuto()) { | 471 | if(!installBootloaderAuto()) { |
472 | logger->abort(); | 472 | logger->setFinished(); |
473 | return true; | 473 | return true; |
474 | } | 474 | } |
475 | else | 475 | else |
@@ -480,7 +480,7 @@ bool RbUtilQt::smallInstallInner() | |||
480 | } | 480 | } |
481 | m_auto = false; | 481 | m_auto = false; |
482 | if(m_error) return true; | 482 | if(m_error) return true; |
483 | logger->undoAbort(); | 483 | logger->setRunning(); |
484 | } | 484 | } |
485 | 485 | ||
486 | // Rockbox | 486 | // Rockbox |
@@ -533,7 +533,7 @@ bool RbUtilQt::installAuto() | |||
533 | QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort) == QMessageBox::Abort) | 533 | QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort) == QMessageBox::Abort) |
534 | { | 534 | { |
535 | logger->addItem(tr("Aborted!"), LOGERROR); | 535 | logger->addItem(tr("Aborted!"), LOGERROR); |
536 | logger->abort(); | 536 | logger->setFinished(); |
537 | return false; | 537 | return false; |
538 | } | 538 | } |
539 | } | 539 | } |
@@ -568,7 +568,7 @@ bool RbUtilQt::installAuto() | |||
568 | else | 568 | else |
569 | { | 569 | { |
570 | logger->addItem(tr("Backup failed!"),LOGERROR); | 570 | logger->addItem(tr("Backup failed!"),LOGERROR); |
571 | logger->abort(); | 571 | logger->setFinished(); |
572 | return false; | 572 | return false; |
573 | } | 573 | } |
574 | } | 574 | } |
@@ -647,7 +647,7 @@ void RbUtilQt::installBootloader() | |||
647 | } | 647 | } |
648 | else { | 648 | else { |
649 | logger->addItem(tr("No install method known."), LOGERROR); | 649 | logger->addItem(tr("No install method known."), LOGERROR); |
650 | logger->abort(); | 650 | logger->setFinished(); |
651 | return; | 651 | return; |
652 | } | 652 | } |
653 | 653 | ||
@@ -749,7 +749,7 @@ void RbUtilQt::installBootloader() | |||
749 | 749 | ||
750 | // the bootloader install class does NOT use any GUI stuff. | 750 | // the bootloader install class does NOT use any GUI stuff. |
751 | // All messages are passed via signals. | 751 | // All messages are passed via signals. |
752 | connect(bl, SIGNAL(done(bool)), logger, SLOT(abort())); | 752 | connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished())); |
753 | connect(bl, SIGNAL(done(bool)), this, SLOT(installBootloaderPost(bool))); | 753 | connect(bl, SIGNAL(done(bool)), this, SLOT(installBootloaderPost(bool))); |
754 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 754 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); |
755 | connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); | 755 | connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); |
@@ -762,7 +762,7 @@ void RbUtilQt::installBootloader() | |||
762 | tr("Could not create backup file. Continue?"), | 762 | tr("Could not create backup file. Continue?"), |
763 | QMessageBox::No | QMessageBox::Yes) | 763 | QMessageBox::No | QMessageBox::Yes) |
764 | == QMessageBox::No) { | 764 | == QMessageBox::No) { |
765 | logger->abort(); | 765 | logger->setFinished(); |
766 | return; | 766 | return; |
767 | } | 767 | } |
768 | } | 768 | } |
@@ -990,7 +990,7 @@ void RbUtilQt::uninstallBootloader(void) | |||
990 | } | 990 | } |
991 | else { | 991 | else { |
992 | logger->addItem(tr("No uninstall method known."), LOGERROR); | 992 | logger->addItem(tr("No uninstall method known."), LOGERROR); |
993 | logger->abort(); | 993 | logger->setFinished(); |
994 | return; | 994 | return; |
995 | } | 995 | } |
996 | 996 | ||
@@ -1011,7 +1011,7 @@ void RbUtilQt::uninstallBootloader(void) | |||
1011 | int result; | 1011 | int result; |
1012 | result = bl->uninstall(); | 1012 | result = bl->uninstall(); |
1013 | 1013 | ||
1014 | logger->abort(); | 1014 | logger->setFinished(); |
1015 | 1015 | ||
1016 | } | 1016 | } |
1017 | 1017 | ||
@@ -1079,7 +1079,7 @@ void RbUtilQt::installPortable(void) | |||
1079 | // check mountpoint | 1079 | // check mountpoint |
1080 | if(!QFileInfo(settings->value(RbSettings::Mountpoint).toString()).isDir()) { | 1080 | if(!QFileInfo(settings->value(RbSettings::Mountpoint).toString()).isDir()) { |
1081 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | 1081 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); |
1082 | logger->abort(); | 1082 | logger->setFinished(); |
1083 | return; | 1083 | return; |
1084 | } | 1084 | } |
1085 | 1085 | ||
@@ -1093,7 +1093,7 @@ void RbUtilQt::installPortable(void) | |||
1093 | settings->value(RbSettings::Mountpoint).toString() | 1093 | settings->value(RbSettings::Mountpoint).toString() |
1094 | + "/RockboxUtility.exe")) { | 1094 | + "/RockboxUtility.exe")) { |
1095 | logger->addItem(tr("Error installing Rockbox Utility"), LOGERROR); | 1095 | logger->addItem(tr("Error installing Rockbox Utility"), LOGERROR); |
1096 | logger->abort(); | 1096 | logger->setFinished(); |
1097 | return; | 1097 | return; |
1098 | } | 1098 | } |
1099 | logger->addItem(tr("Installing user configuration"), LOGINFO); | 1099 | logger->addItem(tr("Installing user configuration"), LOGINFO); |
@@ -1101,11 +1101,11 @@ void RbUtilQt::installPortable(void) | |||
1101 | settings->value(RbSettings::Mountpoint).toString() | 1101 | settings->value(RbSettings::Mountpoint).toString() |
1102 | + "/RockboxUtility.ini")) { | 1102 | + "/RockboxUtility.ini")) { |
1103 | logger->addItem(tr("Error installing user configuration"), LOGERROR); | 1103 | logger->addItem(tr("Error installing user configuration"), LOGERROR); |
1104 | logger->abort(); | 1104 | logger->setFinished(); |
1105 | return; | 1105 | return; |
1106 | } | 1106 | } |
1107 | logger->addItem(tr("Successfully installed Rockbox Utility."), LOGOK); | 1107 | logger->addItem(tr("Successfully installed Rockbox Utility."), LOGOK); |
1108 | logger->abort(); | 1108 | logger->setFinished(); |
1109 | logger->setProgressMax(1); | 1109 | logger->setProgressMax(1); |
1110 | logger->setProgressValue(1); | 1110 | logger->setProgressValue(1); |
1111 | 1111 | ||