diff options
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 14 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 27 |
2 files changed, 23 insertions, 18 deletions
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index edec2f6037..58c8510d1c 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -26,7 +26,7 @@ release_font_url=http://download.rockbox.org/release/%RELEASEVER%/rockbox-fonts- | |||
26 | daily_font_url=http://download.rockbox.org/daily/fonts/rockbox-fonts.zip | 26 | daily_font_url=http://download.rockbox.org/daily/fonts/rockbox-fonts.zip |
27 | 27 | ||
28 | ; other | 28 | ; other |
29 | manual_url=http://download.rockbox.org/daily/manual | 29 | manual_url=http://download.rockbox.org/daily/manual/%MANUALBASENAME%.%EXTENSION% |
30 | doom_url=http://download.rockbox.org/useful/rockdoom.zip | 30 | doom_url=http://download.rockbox.org/useful/rockdoom.zip |
31 | rbutil_url=http://download.rockbox.org/rbutil/ | 31 | rbutil_url=http://download.rockbox.org/rbutil/ |
32 | 32 | ||
@@ -109,7 +109,7 @@ name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" | |||
109 | buildserver_modelname=archosrecorder8mb | 109 | buildserver_modelname=archosrecorder8mb |
110 | bootloadermethod=none | 110 | bootloadermethod=none |
111 | bootloadername= | 111 | bootloadername= |
112 | manualname=rockbox-recorder | 112 | manualname=recorder |
113 | brand=Archos | 113 | brand=Archos |
114 | configure_modelname=archosrecorder | 114 | configure_modelname=archosrecorder |
115 | encoder=lame | 115 | encoder=lame |
@@ -139,7 +139,7 @@ name="Jukebox Recorder FM (with 8MiB memory)" | |||
139 | buildserver_modelname=archosfmrecorder8mb | 139 | buildserver_modelname=archosfmrecorder8mb |
140 | bootloadermethod=none | 140 | bootloadermethod=none |
141 | bootloadername= | 141 | bootloadername= |
142 | manualname=rockbox-fmrecorder | 142 | manualname=archosfmrecorder |
143 | brand=Archos | 143 | brand=Archos |
144 | configure_modelname=archosfmrecorder | 144 | configure_modelname=archosfmrecorder |
145 | encoder=lame | 145 | encoder=lame |
@@ -170,7 +170,7 @@ buildserver_modelname=iriverh100 | |||
170 | bootloadermethod=hex | 170 | bootloadermethod=hex |
171 | bootloadername=/iriver/bootloader-h100.bin | 171 | bootloadername=/iriver/bootloader-h100.bin |
172 | bootloaderfile=/ihp_100.hex | 172 | bootloaderfile=/ihp_100.hex |
173 | manualname=rockbox-h100 | 173 | manualname=iriverh100 |
174 | brand=Iriver | 174 | brand=Iriver |
175 | usbid=0x10063001 | 175 | usbid=0x10063001 |
176 | configure_modelname=iriverh100 | 176 | configure_modelname=iriverh100 |
@@ -182,7 +182,7 @@ buildserver_modelname=iriverh120 | |||
182 | bootloadermethod=hex | 182 | bootloadermethod=hex |
183 | bootloadername=/iriver/bootloader-h120.bin | 183 | bootloadername=/iriver/bootloader-h120.bin |
184 | bootloaderfile=/ihp_120.hex | 184 | bootloaderfile=/ihp_120.hex |
185 | manualname=rockbox-h100 | 185 | manualname=iriverh100 |
186 | brand=Iriver | 186 | brand=Iriver |
187 | usbid=0x10063002 | 187 | usbid=0x10063002 |
188 | configure_modelname=iriverh120 | 188 | configure_modelname=iriverh120 |
@@ -194,7 +194,7 @@ buildserver_modelname=iriverh300 | |||
194 | bootloadermethod=hex | 194 | bootloadermethod=hex |
195 | bootloadername=/iriver/bootloader-h300.bin | 195 | bootloadername=/iriver/bootloader-h300.bin |
196 | bootloaderfile=/H300.hex | 196 | bootloaderfile=/H300.hex |
197 | manualname=rockbox-h300 | 197 | manualname=iriverh300 |
198 | brand=Iriver | 198 | brand=Iriver |
199 | usbid=0x10063003 | 199 | usbid=0x10063003 |
200 | configure_modelname=iriverh300 | 200 | configure_modelname=iriverh300 |
@@ -322,7 +322,7 @@ name="Ipod Mini (2nd gen)" | |||
322 | buildserver_modelname=ipodmini2g | 322 | buildserver_modelname=ipodmini2g |
323 | bootloadermethod=ipod | 323 | bootloadermethod=ipod |
324 | bootloadername=/ipod/bootloader-ipodmini2g.ipod | 324 | bootloadername=/ipod/bootloader-ipodmini2g.ipod |
325 | manualname=rockbox-ipodmini1g | 325 | manualname=ipodmini1g |
326 | brand=Apple | 326 | brand=Apple |
327 | configure_modelname=ipodmini2g | 327 | configure_modelname=ipodmini2g |
328 | encoder=rbspeex | 328 | encoder=rbspeex |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 70b7e5fa47..ab86a16581 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -418,17 +418,22 @@ void RbUtilQt::updateManual() | |||
418 | { | 418 | { |
419 | if(RbSettings::value(RbSettings::Platform) != "") | 419 | if(RbSettings::value(RbSettings::Platform) != "") |
420 | { | 420 | { |
421 | QString manual= SystemInfo::value(SystemInfo::CurManual).toString(); | 421 | QString manual = SystemInfo::value(SystemInfo::CurManual).toString(); |
422 | 422 | QString buildservermodel = SystemInfo::value(SystemInfo::CurBuildserverModel).toString(); | |
423 | if(manual == "") | 423 | QString pdfmanual = SystemInfo::value(SystemInfo::ManualUrl).toString(); |
424 | manual = "rockbox-" | 424 | QString htmlmanual = pdfmanual; |
425 | + SystemInfo::value(SystemInfo::CurBuildserverModel).toString(); | 425 | |
426 | QString pdfmanual; | 426 | pdfmanual.replace("%EXTENSION%", "pdf"); |
427 | pdfmanual = SystemInfo::value(SystemInfo::ManualUrl).toString() | 427 | htmlmanual.replace("%EXTENSION%", "html"); |
428 | + "/" + manual + ".pdf"; | 428 | if(manual.isEmpty()) { |
429 | QString htmlmanual; | 429 | pdfmanual.replace("%MANUALBASENAME%", "rockbox-" + buildservermodel); |
430 | htmlmanual = SystemInfo::value(SystemInfo::ManualUrl).toString() | 430 | htmlmanual.replace("%MANUALBASENAME%", "rockbox-" + buildservermodel + "/rockbox-build"); |
431 | + "/" + manual + "/rockbox-build.html"; | 431 | } |
432 | else { | ||
433 | pdfmanual.replace("%MANUALBASENAME%", "rockbox-" + manual); | ||
434 | htmlmanual.replace("%MANUALBASENAME%", "rockbox-" + manual + "/rockbox-build"); | ||
435 | } | ||
436 | |||
432 | ui.labelPdfManual->setText(tr("<a href='%1'>PDF Manual</a>") | 437 | ui.labelPdfManual->setText(tr("<a href='%1'>PDF Manual</a>") |
433 | .arg(pdfmanual)); | 438 | .arg(pdfmanual)); |
434 | ui.labelHtmlManual->setText(tr("<a href='%1'>HTML Manual (opens in browser)</a>") | 439 | ui.labelHtmlManual->setText(tr("<a href='%1'>HTML Manual (opens in browser)</a>") |