diff options
Diffstat (limited to 'rbutil/rbutilqt/gui/selectiveinstallwidget.cpp')
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index 96183d1075..35837ba41d 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | |||
@@ -30,6 +30,7 @@ | |||
30 | #include "bootloaderinstallhelper.h" | 30 | #include "bootloaderinstallhelper.h" |
31 | #include "themesinstallwindow.h" | 31 | #include "themesinstallwindow.h" |
32 | #include "utils.h" | 32 | #include "utils.h" |
33 | #include "Logger.h" | ||
33 | 34 | ||
34 | SelectiveInstallWidget::SelectiveInstallWidget(QWidget* parent) : QWidget(parent) | 35 | SelectiveInstallWidget::SelectiveInstallWidget(QWidget* parent) : QWidget(parent) |
35 | { | 36 | { |
@@ -147,7 +148,7 @@ void SelectiveInstallWidget::updateVersion(void) | |||
147 | 148 | ||
148 | void SelectiveInstallWidget::saveSettings(void) | 149 | void SelectiveInstallWidget::saveSettings(void) |
149 | { | 150 | { |
150 | qDebug() << "[SelectiveInstallWidget] saving current settings"; | 151 | LOG_INFO() << "saving current settings"; |
151 | 152 | ||
152 | RbSettings::setValue(RbSettings::InstallRockbox, ui.rockboxCheckbox->isChecked()); | 153 | RbSettings::setValue(RbSettings::InstallRockbox, ui.rockboxCheckbox->isChecked()); |
153 | RbSettings::setValue(RbSettings::InstallFonts, ui.fontsCheckbox->isChecked()); | 154 | RbSettings::setValue(RbSettings::InstallFonts, ui.fontsCheckbox->isChecked()); |
@@ -158,7 +159,7 @@ void SelectiveInstallWidget::saveSettings(void) | |||
158 | 159 | ||
159 | void SelectiveInstallWidget::startInstall(void) | 160 | void SelectiveInstallWidget::startInstall(void) |
160 | { | 161 | { |
161 | qDebug() << "[SelectiveInstallWidget] starting installation"; | 162 | LOG_INFO() << "starting installation"; |
162 | saveSettings(); | 163 | saveSettings(); |
163 | 164 | ||
164 | m_installStage = 0; | 165 | m_installStage = 0; |
@@ -191,15 +192,15 @@ void SelectiveInstallWidget::startInstall(void) | |||
191 | 192 | ||
192 | void SelectiveInstallWidget::continueInstall(bool error) | 193 | void SelectiveInstallWidget::continueInstall(bool error) |
193 | { | 194 | { |
194 | qDebug() << "[SelectiveInstallWidget] continuing install with stage" << m_installStage; | 195 | LOG_INFO() << "continuing install with stage" << m_installStage; |
195 | if(error) { | 196 | if(error) { |
196 | qDebug() << "[SelectiveInstallWidget] Last part returned error."; | 197 | LOG_ERROR() << "Last part returned error."; |
197 | m_logger->setFinished(); | 198 | m_logger->setFinished(); |
198 | m_installStage = 7; | 199 | m_installStage = 7; |
199 | } | 200 | } |
200 | m_installStage++; | 201 | m_installStage++; |
201 | switch(m_installStage) { | 202 | switch(m_installStage) { |
202 | case 0: qDebug() << "[SelectiveInstallWidget] Something wrong!"; break; | 203 | case 0: LOG_ERROR() << "Something wrong!"; break; |
203 | case 1: installBootloader(); break; | 204 | case 1: installBootloader(); break; |
204 | case 2: installRockbox(); break; | 205 | case 2: installRockbox(); break; |
205 | case 3: installFonts(); break; | 206 | case 3: installFonts(); break; |
@@ -210,7 +211,7 @@ void SelectiveInstallWidget::continueInstall(bool error) | |||
210 | } | 211 | } |
211 | 212 | ||
212 | if(m_installStage > 6) { | 213 | if(m_installStage > 6) { |
213 | qDebug() << "[SelectiveInstallWidget] All install stages done."; | 214 | LOG_INFO() << "All install stages done."; |
214 | m_logger->setFinished(); | 215 | m_logger->setFinished(); |
215 | if(m_blmethod != "none") { | 216 | if(m_blmethod != "none") { |
216 | // check if Rockbox is installed by looking after rockbox-info.txt. | 217 | // check if Rockbox is installed by looking after rockbox-info.txt. |
@@ -225,7 +226,7 @@ void SelectiveInstallWidget::continueInstall(bool error) | |||
225 | void SelectiveInstallWidget::installBootloader(void) | 226 | void SelectiveInstallWidget::installBootloader(void) |
226 | { | 227 | { |
227 | if(ui.bootloaderCheckbox->isChecked()) { | 228 | if(ui.bootloaderCheckbox->isChecked()) { |
228 | qDebug() << "[SelectiveInstallWidget] installing bootloader"; | 229 | LOG_INFO() << "installing bootloader"; |
229 | 230 | ||
230 | QString platform = RbSettings::value(RbSettings::Platform).toString(); | 231 | QString platform = RbSettings::value(RbSettings::Platform).toString(); |
231 | QString backupDestination = ""; | 232 | QString backupDestination = ""; |
@@ -292,7 +293,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
292 | if(!backupDestination.isEmpty()) | 293 | if(!backupDestination.isEmpty()) |
293 | backupDestination += "/" + targetFolder; | 294 | backupDestination += "/" + targetFolder; |
294 | 295 | ||
295 | qDebug() << "[RbUtil] backing up to" << backupDestination; | 296 | LOG_INFO() << "backing up to" << backupDestination; |
296 | // backup needs to be done after the m_logger has been set up. | 297 | // backup needs to be done after the m_logger has been set up. |
297 | } | 298 | } |
298 | } | 299 | } |
@@ -350,7 +351,7 @@ void SelectiveInstallWidget::installBootloader(void) | |||
350 | 351 | ||
351 | } | 352 | } |
352 | else { | 353 | else { |
353 | qDebug() << "[SelectiveInstallWidget] Bootloader install disabled."; | 354 | LOG_INFO() << "Bootloader install disabled."; |
354 | emit installSkipped(false); | 355 | emit installSkipped(false); |
355 | } | 356 | } |
356 | } | 357 | } |
@@ -372,7 +373,7 @@ void SelectiveInstallWidget::installBootloaderPost() | |||
372 | void SelectiveInstallWidget::installRockbox(void) | 373 | void SelectiveInstallWidget::installRockbox(void) |
373 | { | 374 | { |
374 | if(ui.rockboxCheckbox->isChecked()) { | 375 | if(ui.rockboxCheckbox->isChecked()) { |
375 | qDebug() << "[SelectiveInstallWidget] installing Rockbox"; | 376 | LOG_INFO() << "installing Rockbox"; |
376 | QString url; | 377 | QString url; |
377 | 378 | ||
378 | QString selected = ui.selectedVersion->itemData(ui.selectedVersion->currentIndex()).toString(); | 379 | QString selected = ui.selectedVersion->itemData(ui.selectedVersion->currentIndex()).toString(); |
@@ -405,7 +406,7 @@ void SelectiveInstallWidget::installRockbox(void) | |||
405 | 406 | ||
406 | } | 407 | } |
407 | else { | 408 | else { |
408 | qDebug() << "[SelectiveInstallWidget] Rockbox install disabled."; | 409 | LOG_INFO() << "Rockbox install disabled."; |
409 | emit installSkipped(false); | 410 | emit installSkipped(false); |
410 | } | 411 | } |
411 | } | 412 | } |
@@ -414,7 +415,7 @@ void SelectiveInstallWidget::installRockbox(void) | |||
414 | void SelectiveInstallWidget::installFonts(void) | 415 | void SelectiveInstallWidget::installFonts(void) |
415 | { | 416 | { |
416 | if(ui.fontsCheckbox->isChecked()) { | 417 | if(ui.fontsCheckbox->isChecked()) { |
417 | qDebug() << "[SelectiveInstallWidget] installing Fonts"; | 418 | LOG_INFO() << "installing Fonts"; |
418 | 419 | ||
419 | RockboxInfo installInfo(m_mountpoint); | 420 | RockboxInfo installInfo(m_mountpoint); |
420 | QString fontsurl; | 421 | QString fontsurl; |
@@ -447,7 +448,7 @@ void SelectiveInstallWidget::installFonts(void) | |||
447 | m_zipinstaller->install(); | 448 | m_zipinstaller->install(); |
448 | } | 449 | } |
449 | else { | 450 | else { |
450 | qDebug() << "[SelectiveInstallWidget] Fonts install disabled."; | 451 | LOG_INFO() << "Fonts install disabled."; |
451 | emit installSkipped(false); | 452 | emit installSkipped(false); |
452 | } | 453 | } |
453 | } | 454 | } |
@@ -465,7 +466,7 @@ void SelectiveInstallWidget::customizeThemes(void) | |||
465 | void SelectiveInstallWidget::installThemes(void) | 466 | void SelectiveInstallWidget::installThemes(void) |
466 | { | 467 | { |
467 | if(ui.themesCheckbox->isChecked()) { | 468 | if(ui.themesCheckbox->isChecked()) { |
468 | qDebug() << "[SelectiveInstallWidget] installing themes"; | 469 | LOG_INFO() << "installing themes"; |
469 | if(m_themesinstaller == NULL) | 470 | if(m_themesinstaller == NULL) |
470 | m_themesinstaller = new ThemesInstallWindow(this); | 471 | m_themesinstaller = new ThemesInstallWindow(this); |
471 | 472 | ||
@@ -475,7 +476,7 @@ void SelectiveInstallWidget::installThemes(void) | |||
475 | m_themesinstaller->install(); | 476 | m_themesinstaller->install(); |
476 | } | 477 | } |
477 | else { | 478 | else { |
478 | qDebug() << "[SelectiveInstallWidget] Themes install disabled."; | 479 | LOG_INFO() << "Themes install disabled."; |
479 | emit installSkipped(false); | 480 | emit installSkipped(false); |
480 | } | 481 | } |
481 | } | 482 | } |
@@ -489,7 +490,7 @@ void SelectiveInstallWidget::installGamefiles(void) | |||
489 | m_logger->addItem(tr("Your installation doesn't require game files, skipping."), LOGINFO); | 490 | m_logger->addItem(tr("Your installation doesn't require game files, skipping."), LOGINFO); |
490 | emit installSkipped(false); | 491 | emit installSkipped(false); |
491 | } | 492 | } |
492 | qDebug() << "[SelectiveInstallWidget] installing gamefiles"; | 493 | LOG_INFO() << "installing gamefiles"; |
493 | // create new zip installer | 494 | // create new zip installer |
494 | if(m_zipinstaller != NULL) m_zipinstaller->deleteLater(); | 495 | if(m_zipinstaller != NULL) m_zipinstaller->deleteLater(); |
495 | m_zipinstaller = new ZipInstaller(this); | 496 | m_zipinstaller = new ZipInstaller(this); |
@@ -507,7 +508,7 @@ void SelectiveInstallWidget::installGamefiles(void) | |||
507 | m_zipinstaller->install(); | 508 | m_zipinstaller->install(); |
508 | } | 509 | } |
509 | else { | 510 | else { |
510 | qDebug() << "[SelectiveInstallWidget] Gamefile install disabled."; | 511 | LOG_INFO() << "Gamefile install disabled."; |
511 | emit installSkipped(false); | 512 | emit installSkipped(false); |
512 | } | 513 | } |
513 | } | 514 | } |