len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 20:55:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: Rework action texts for ipod6g bootloader installation.

Browse source 
The logging entries do word wrapping, so no need to add hard line
breaks. Those will become problematic for translations and in some cases
on UI scaling. Instead add an empty line after the header to make things
clearer.

Change-Id: Ib774b1ad77abcfa2f5955988f7756e3a510cd1be
This commit is contained in:
Dominik Riebeling 2021-01-02 21:26:51 +01:00
parent e74cde1c6e
commit 95cfa9a8c4
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

40
rbutil/rbutilqt/base/bootloaderinstalls5l.cpp
View file

@ -138,10 +138,10 @@ void BootloaderInstallS5l::installStageWaitForEject(void)
} }
if (!scanSuccess) { if (!scanSuccess) {
if (!actionShown) { if (!actionShown) {
emit logItem(tr("Action required:\n" emit logItem(tr("Action required:\n\n"
" Please make sure no programs are accessing\n" "Please make sure no programs are accessing "
" files on the device. If ejecting still fails\n" "files on the device. If ejecting still fails "
" please use your computers eject funtionality."), "please use your computers eject functionality."),
LOGWARNING); LOGWARNING);
actionShown = true; actionShown = true;
} }
@ -168,7 +168,7 @@ void BootloaderInstallS5l::installStageWaitForProcs(void)
} }
if (!scanSuccess) { if (!scanSuccess) {
if (!actionShown) { if (!actionShown) {
emit logItem(tr("Action required:\n" emit logItem(tr("Action required:\n\n"
"Quit iTunes application."), LOGWARNING); "Quit iTunes application."), LOGWARNING);
actionShown = true; actionShown = true;
} }
@ -189,7 +189,7 @@ void BootloaderInstallS5l::installStageWaitForProcs(void)
#endif #endif
suspendedPids = Utils::suspendProcess(helperPids, true); suspendedPids = Utils::suspendProcess(helperPids, true);
if (suspendedPids.size() != helperPids.size()) { if (suspendedPids.size() != helperPids.size()) {
emit logItem(tr("Could not suspend iTunesHelper. Stop it\n" emit logItem(tr("Could not suspend iTunesHelper. Stop it "
"using the Task Manager, and try again."), LOGERROR); "using the Task Manager, and try again."), LOGERROR);
emit done(true); emit done(true);
return; return;
@ -215,10 +215,10 @@ void BootloaderInstallS5l::installStageWaitForSpindown(void)
LOG_INFO() << "preparing installStageWaitForDfu"; LOG_INFO() << "preparing installStageWaitForDfu";
emit logItem(tr("Waiting for DFU mode..."), LOGINFO); emit logItem(tr("Waiting for DFU mode..."), LOGINFO);
emit logItem(tr("Action required:\n" emit logItem(tr("Action required:\n\n"
" Press and hold SELECT+MENU buttons, after\n" "Press and hold SELECT+MENU buttons, after "
" about 12 seconds a new action will require\n" "about 12 seconds a new action will require "
" you to release the buttons, DO IT QUICKLY,\n" "you to release the buttons, DO IT QUICKLY, "
"otherwise the process could fail."), LOGWARNING); "otherwise the process could fail."), LOGWARNING);
scanTimer.invalidate(); scanTimer.invalidate();
installStageWaitForDfu(); installStageWaitForDfu();
@ -240,7 +240,7 @@ void BootloaderInstallS5l::installStageWaitForDfu(void)
} }
emit logItem(tr("DFU mode detected."), LOGINFO); emit logItem(tr("DFU mode detected."), LOGINFO);
emit logItem(tr("Action required:\n" emit logItem(tr("Action required:\n\n"
"Release SELECT+MENU buttons and wait..."), LOGWARNING); "Release SELECT+MENU buttons and wait..."), LOGWARNING);
// Once the iPod enters DFU mode, the device will reset again if // Once the iPod enters DFU mode, the device will reset again if
@ -265,8 +265,8 @@ void BootloaderInstallS5l::installStageSendDfu(void)
if (!System::listUsbIds().contains(0x05ac1223)) { if (!System::listUsbIds().contains(0x05ac1223)) {
LOG_ERROR() << "device not in DFU mode"; LOG_ERROR() << "device not in DFU mode";
emit logItem(tr("Device is not in DFU mode. It seems that\n" emit logItem(tr("Device is not in DFU mode. It seems that "
"the previous required action failed, please\n" "the previous required action failed, please "
"try again."), LOGERROR); "try again."), LOGERROR);
emit done(true); emit done(true);
return; return;
@ -282,8 +282,8 @@ void BootloaderInstallS5l::installStageSendDfu(void)
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
if (strstr(errstr, "DFU device not found")) if (strstr(errstr, "DFU device not found"))
{ {
emit logItem(tr("No valid DFU USB driver found.\n" emit logItem(tr("No valid DFU USB driver found.\n\n"
"Install iTunes (or the Apple Device Driver)\n" "Install iTunes (or the Apple Device Driver) "
"and try again."), "and try again."),
LOGERROR); LOGERROR);
} }
@ -318,11 +318,11 @@ void BootloaderInstallS5l::installStageWaitForRemount(void)
} }
if (!scanSuccess) { if (!scanSuccess) {
if (!actionShown && (progressTimer.elapsed() > progressTimeout)) { if (!actionShown && (progressTimer.elapsed() > progressTimeout)) {
emit logItem(tr("Action required:\n" emit logItem(tr("Action required:\n\n"
" Could not remount the device, try to do it\n" "Could not remount the device, try to do it "
" manually. If the iPod didn't restart, force\n" "manually. If the iPod didn't restart, force "
" a reset by pressing SELECT+MENU buttons\n" "a reset by pressing SELECT+MENU buttons "
" for about 5 seconds. If the problem could\n" "for about 5 seconds. If the problem could "
"not be solved then click 'Abort' to cancel."), "not be solved then click 'Abort' to cancel."),
LOGWARNING); LOGWARNING);
actionShown = true; actionShown = true;