diff options
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstalls5l.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp index 6568ffb74d..63a30ff2b0 100644 --- a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp | |||
@@ -138,10 +138,10 @@ void BootloaderInstallS5l::installStageWaitForEject(void) | |||
138 | } | 138 | } |
139 | if (!scanSuccess) { | 139 | if (!scanSuccess) { |
140 | if (!actionShown) { | 140 | if (!actionShown) { |
141 | emit logItem(tr("Action required:\n" | 141 | emit logItem(tr("Action required:\n\n" |
142 | " Please make sure no programs are accessing\n" | 142 | "Please make sure no programs are accessing " |
143 | " files on the device. If ejecting still fails\n" | 143 | "files on the device. If ejecting still fails " |
144 | " please use your computers eject funtionality."), | 144 | "please use your computers eject functionality."), |
145 | LOGWARNING); | 145 | LOGWARNING); |
146 | actionShown = true; | 146 | actionShown = true; |
147 | } | 147 | } |
@@ -168,8 +168,8 @@ void BootloaderInstallS5l::installStageWaitForProcs(void) | |||
168 | } | 168 | } |
169 | if (!scanSuccess) { | 169 | if (!scanSuccess) { |
170 | if (!actionShown) { | 170 | if (!actionShown) { |
171 | emit logItem(tr("Action required:\n" | 171 | emit logItem(tr("Action required:\n\n" |
172 | " Quit iTunes application."), LOGWARNING); | 172 | "Quit iTunes application."), LOGWARNING); |
173 | actionShown = true; | 173 | actionShown = true; |
174 | } | 174 | } |
175 | QTimer::singleShot(250, this, &BootloaderInstallS5l::installStageWaitForProcs); | 175 | QTimer::singleShot(250, this, &BootloaderInstallS5l::installStageWaitForProcs); |
@@ -189,7 +189,7 @@ void BootloaderInstallS5l::installStageWaitForProcs(void) | |||
189 | #endif | 189 | #endif |
190 | suspendedPids = Utils::suspendProcess(helperPids, true); | 190 | suspendedPids = Utils::suspendProcess(helperPids, true); |
191 | if (suspendedPids.size() != helperPids.size()) { | 191 | if (suspendedPids.size() != helperPids.size()) { |
192 | emit logItem(tr("Could not suspend iTunesHelper. Stop it\n" | 192 | emit logItem(tr("Could not suspend iTunesHelper. Stop it " |
193 | "using the Task Manager, and try again."), LOGERROR); | 193 | "using the Task Manager, and try again."), LOGERROR); |
194 | emit done(true); | 194 | emit done(true); |
195 | return; | 195 | return; |
@@ -215,11 +215,11 @@ void BootloaderInstallS5l::installStageWaitForSpindown(void) | |||
215 | 215 | ||
216 | LOG_INFO() << "preparing installStageWaitForDfu"; | 216 | LOG_INFO() << "preparing installStageWaitForDfu"; |
217 | emit logItem(tr("Waiting for DFU mode..."), LOGINFO); | 217 | emit logItem(tr("Waiting for DFU mode..."), LOGINFO); |
218 | emit logItem(tr("Action required:\n" | 218 | emit logItem(tr("Action required:\n\n" |
219 | " Press and hold SELECT+MENU buttons, after\n" | 219 | "Press and hold SELECT+MENU buttons, after " |
220 | " about 12 seconds a new action will require\n" | 220 | "about 12 seconds a new action will require " |
221 | " you to release the buttons, DO IT QUICKLY,\n" | 221 | "you to release the buttons, DO IT QUICKLY, " |
222 | " otherwise the process could fail."), LOGWARNING); | 222 | "otherwise the process could fail."), LOGWARNING); |
223 | scanTimer.invalidate(); | 223 | scanTimer.invalidate(); |
224 | installStageWaitForDfu(); | 224 | installStageWaitForDfu(); |
225 | } | 225 | } |
@@ -240,8 +240,8 @@ void BootloaderInstallS5l::installStageWaitForDfu(void) | |||
240 | } | 240 | } |
241 | emit logItem(tr("DFU mode detected."), LOGINFO); | 241 | emit logItem(tr("DFU mode detected."), LOGINFO); |
242 | 242 | ||
243 | emit logItem(tr("Action required:\n" | 243 | emit logItem(tr("Action required:\n\n" |
244 | " Release SELECT+MENU buttons and wait..."), LOGWARNING); | 244 | "Release SELECT+MENU buttons and wait..."), LOGWARNING); |
245 | 245 | ||
246 | // Once the iPod enters DFU mode, the device will reset again if | 246 | // Once the iPod enters DFU mode, the device will reset again if |
247 | // SELECT+MENU remains pressed for another 8 seconds. To avoid a | 247 | // SELECT+MENU remains pressed for another 8 seconds. To avoid a |
@@ -265,8 +265,8 @@ void BootloaderInstallS5l::installStageSendDfu(void) | |||
265 | 265 | ||
266 | if (!System::listUsbIds().contains(0x05ac1223)) { | 266 | if (!System::listUsbIds().contains(0x05ac1223)) { |
267 | LOG_ERROR() << "device not in DFU mode"; | 267 | LOG_ERROR() << "device not in DFU mode"; |
268 | emit logItem(tr("Device is not in DFU mode. It seems that\n" | 268 | emit logItem(tr("Device is not in DFU mode. It seems that " |
269 | "the previous required action failed, please\n" | 269 | "the previous required action failed, please " |
270 | "try again."), LOGERROR); | 270 | "try again."), LOGERROR); |
271 | emit done(true); | 271 | emit done(true); |
272 | return; | 272 | return; |
@@ -282,8 +282,8 @@ void BootloaderInstallS5l::installStageSendDfu(void) | |||
282 | #if defined(Q_OS_WIN32) | 282 | #if defined(Q_OS_WIN32) |
283 | if (strstr(errstr, "DFU device not found")) | 283 | if (strstr(errstr, "DFU device not found")) |
284 | { | 284 | { |
285 | emit logItem(tr("No valid DFU USB driver found.\n" | 285 | emit logItem(tr("No valid DFU USB driver found.\n\n" |
286 | "Install iTunes (or the Apple Device Driver)\n" | 286 | "Install iTunes (or the Apple Device Driver) " |
287 | "and try again."), | 287 | "and try again."), |
288 | LOGERROR); | 288 | LOGERROR); |
289 | } | 289 | } |
@@ -318,12 +318,12 @@ void BootloaderInstallS5l::installStageWaitForRemount(void) | |||
318 | } | 318 | } |
319 | if (!scanSuccess) { | 319 | if (!scanSuccess) { |
320 | if (!actionShown && (progressTimer.elapsed() > progressTimeout)) { | 320 | if (!actionShown && (progressTimer.elapsed() > progressTimeout)) { |
321 | emit logItem(tr("Action required:\n" | 321 | emit logItem(tr("Action required:\n\n" |
322 | " Could not remount the device, try to do it\n" | 322 | "Could not remount the device, try to do it " |
323 | " manually. If the iPod didn't restart, force\n" | 323 | "manually. If the iPod didn't restart, force " |
324 | " a reset by pressing SELECT+MENU buttons\n" | 324 | "a reset by pressing SELECT+MENU buttons " |
325 | " for about 5 seconds. If the problem could\n" | 325 | "for about 5 seconds. If the problem could " |
326 | " not be solved then click 'Abort' to cancel."), | 326 | "not be solved then click 'Abort' to cancel."), |
327 | LOGWARNING); | 327 | LOGWARNING); |
328 | actionShown = true; | 328 | actionShown = true; |
329 | } | 329 | } |