diff options
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 34 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 4 |
5 files changed, 44 insertions, 14 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 7810f7f3d8..d9c750ea4d 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -91,11 +91,11 @@ void Install::accept() | |||
91 | QString myversion; | 91 | QString myversion; |
92 | QString buildname = settings->curPlatformName(); | 92 | QString buildname = settings->curPlatformName(); |
93 | if(ui.radioStable->isChecked()) { | 93 | if(ui.radioStable->isChecked()) { |
94 | file = QString("%1/rockbox-%2-%3.zip") | 94 | file = QString("%1/%2/rockbox-%3-%4.zip") |
95 | .arg(settings->downloadUrl(), | 95 | .arg(settings->releaseUrl(),settings->lastRelease(settings->curPlatform()), |
96 | buildname, settings->lastRelease()); | 96 | buildname, settings->lastRelease(settings->curPlatform())); |
97 | fileName = QString("rockbox-%1-%2.zip") | 97 | fileName = QString("rockbox-%1-%2.zip") |
98 | .arg(settings->lastRelease(), buildname); | 98 | .arg(settings->lastRelease(settings->curPlatform()), buildname); |
99 | settings->setBuild("stable"); | 99 | settings->setBuild("stable"); |
100 | myversion = version.value("rel_rev"); | 100 | myversion = version.value("rel_rev"); |
101 | } | 101 | } |
diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 6f8a6e69cc..8a8972b36c 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp | |||
@@ -113,9 +113,9 @@ QString RbSettings::bleedingUrl() | |||
113 | return devices->value("bleeding_url").toString(); | 113 | return devices->value("bleeding_url").toString(); |
114 | } | 114 | } |
115 | 115 | ||
116 | QString RbSettings::lastRelease() | 116 | QString RbSettings::lastRelease(QString plattform) |
117 | { | 117 | { |
118 | return devices->value("last_release").toString(); | 118 | return deviceSettingCurGet("last_release").toString(); |
119 | } | 119 | } |
120 | 120 | ||
121 | QString RbSettings::cachePath() | 121 | QString RbSettings::cachePath() |
@@ -148,9 +148,9 @@ QString RbSettings::doomUrl() | |||
148 | return devices->value("doom_url").toString(); | 148 | return devices->value("doom_url").toString(); |
149 | } | 149 | } |
150 | 150 | ||
151 | QString RbSettings::downloadUrl() | 151 | QString RbSettings::releaseUrl() |
152 | { | 152 | { |
153 | return devices->value("download_url").toString(); | 153 | return devices->value("release_url").toString(); |
154 | } | 154 | } |
155 | 155 | ||
156 | QString RbSettings::dailyUrl() | 156 | QString RbSettings::dailyUrl() |
diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index 49bdb81a11..cc4d32100b 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h | |||
@@ -48,14 +48,14 @@ class RbSettings : public QObject | |||
48 | QString mountpoint(); | 48 | QString mountpoint(); |
49 | QString manualUrl(); | 49 | QString manualUrl(); |
50 | QString bleedingUrl(); | 50 | QString bleedingUrl(); |
51 | QString lastRelease(); | 51 | QString lastRelease(QString plattform); |
52 | QString cachePath(); | 52 | QString cachePath(); |
53 | QString bootloaderUrl(); | 53 | QString bootloaderUrl(); |
54 | QString bootloaderInfoUrl(); | 54 | QString bootloaderInfoUrl(); |
55 | QString fontUrl(); | 55 | QString fontUrl(); |
56 | QString voiceUrl(); | 56 | QString voiceUrl(); |
57 | QString doomUrl(); | 57 | QString doomUrl(); |
58 | QString downloadUrl(); | 58 | QString releaseUrl(); |
59 | QString dailyUrl(); | 59 | QString dailyUrl(); |
60 | QString serverConfUrl(); | 60 | QString serverConfUrl(); |
61 | QString themeUrl(); | 61 | QString themeUrl(); |
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index 739bbb1ed2..9fe07bc01a 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -1,12 +1,11 @@ | |||
1 | [general] | 1 | [general] |
2 | download_url=http://download.rockbox.org/release/3.0/ | 2 | release_url=http://download.rockbox.org/release/ |
3 | daily_url=http://download.rockbox.org/daily/ | 3 | daily_url=http://download.rockbox.org/daily/ |
4 | bleeding_url=http://build.rockbox.org/dist/build- | 4 | bleeding_url=http://build.rockbox.org/dist/build- |
5 | server_conf_url=http://www.rockbox.org/daily/build-info | 5 | server_conf_url=http://www.rockbox.org/daily/build-info |
6 | bootloader_info_url=http://download.rockbox.org/bootloader/bootloaders-info | 6 | bootloader_info_url=http://download.rockbox.org/bootloader/bootloaders-info |
7 | bleeding_info=http://build.rockbox.org/cvsmod/build-info | 7 | bleeding_info=http://build.rockbox.org/cvsmod/build-info |
8 | font_url=http://www.rockbox.org/daily/fonts/rockbox-fonts.zip | 8 | font_url=http://www.rockbox.org/daily/fonts/rockbox-fonts.zip |
9 | last_release=3.0 | ||
10 | prog_name=rockbox | 9 | prog_name=rockbox |
11 | bootloader_url=http://download.rockbox.org/bootloader | 10 | bootloader_url=http://download.rockbox.org/bootloader |
12 | themes_url=http://themes.rockbox.org/ | 11 | themes_url=http://themes.rockbox.org/ |
@@ -63,6 +62,7 @@ brand=Archos | |||
63 | voicename=player | 62 | voicename=player |
64 | targetid=1 | 63 | targetid=1 |
65 | encoder=lame | 64 | encoder=lame |
65 | last_release=3.0 | ||
66 | 66 | ||
67 | [recorder] | 67 | [recorder] |
68 | name="Jukebox Recorder 6 / 10 / 15 / 20" | 68 | name="Jukebox Recorder 6 / 10 / 15 / 20" |
@@ -77,6 +77,7 @@ brand=Archos | |||
77 | voicename=recorder | 77 | voicename=recorder |
78 | targetid=2 | 78 | targetid=2 |
79 | encoder=lame | 79 | encoder=lame |
80 | last_release=3.0 | ||
80 | 81 | ||
81 | [recorder8mb] | 82 | [recorder8mb] |
82 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" | 83 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" |
@@ -91,6 +92,7 @@ brand=Archos | |||
91 | voicename=recorder | 92 | voicename=recorder |
92 | targetid=2 | 93 | targetid=2 |
93 | encoder=lame | 94 | encoder=lame |
95 | last_release=3.0 | ||
94 | 96 | ||
95 | [recorderv2] | 97 | [recorderv2] |
96 | name="Jukebox Recorder v2 (20GB)" | 98 | name="Jukebox Recorder v2 (20GB)" |
@@ -105,6 +107,7 @@ brand=Archos | |||
105 | voicename=recorderv2 | 107 | voicename=recorderv2 |
106 | targetid=4 | 108 | targetid=4 |
107 | encoder=lame | 109 | encoder=lame |
110 | last_release=3.0 | ||
108 | 111 | ||
109 | [fmrecorder] | 112 | [fmrecorder] |
110 | name="Jukebox Recorder FM" | 113 | name="Jukebox Recorder FM" |
@@ -119,6 +122,7 @@ brand=Archos | |||
119 | voicename=fmrecorder | 122 | voicename=fmrecorder |
120 | targetid=3 | 123 | targetid=3 |
121 | encoder=lame | 124 | encoder=lame |
125 | last_release=3.0 | ||
122 | 126 | ||
123 | [fmrecorder8mb] | 127 | [fmrecorder8mb] |
124 | name="Jukebox Recorder FM (with 8MiB memory)" | 128 | name="Jukebox Recorder FM (with 8MiB memory)" |
@@ -133,6 +137,7 @@ brand=Archos | |||
133 | voicename=fmrecorder | 137 | voicename=fmrecorder |
134 | targetid=3 | 138 | targetid=3 |
135 | encoder=lame | 139 | encoder=lame |
140 | last_release=3.0 | ||
136 | 141 | ||
137 | [ondiosp] | 142 | [ondiosp] |
138 | name="Ondio SP" | 143 | name="Ondio SP" |
@@ -147,6 +152,7 @@ brand=Archos | |||
147 | voicename=ondiosp | 152 | voicename=ondiosp |
148 | targetid=7 | 153 | targetid=7 |
149 | encoder=lame | 154 | encoder=lame |
155 | last_release=3.0 | ||
150 | 156 | ||
151 | [ondiofm] | 157 | [ondiofm] |
152 | name="Ondio FM" | 158 | name="Ondio FM" |
@@ -161,6 +167,7 @@ brand=Archos | |||
161 | voicename=ondiofm | 167 | voicename=ondiofm |
162 | targetid=8 | 168 | targetid=8 |
163 | encoder=lame | 169 | encoder=lame |
170 | last_release=3.0 | ||
164 | 171 | ||
165 | [h100] | 172 | [h100] |
166 | name="iHP100 / iHP110" | 173 | name="iHP100 / iHP110" |
@@ -177,6 +184,7 @@ usbid=0x10063001 | |||
177 | voicename=h100 | 184 | voicename=h100 |
178 | targetid=11 | 185 | targetid=11 |
179 | encoder=rbspeex | 186 | encoder=rbspeex |
187 | last_release=3.0 | ||
180 | 188 | ||
181 | [h120] | 189 | [h120] |
182 | name="iHP120 / iHP140 / H120 / H140" | 190 | name="iHP120 / iHP140 / H120 / H140" |
@@ -193,6 +201,7 @@ usbid=0x10063002 | |||
193 | voicename=h120 | 201 | voicename=h120 |
194 | targetid=9 | 202 | targetid=9 |
195 | encoder=rbspeex | 203 | encoder=rbspeex |
204 | last_release=3.0 | ||
196 | 205 | ||
197 | [h300] | 206 | [h300] |
198 | name="H320 / H340" | 207 | name="H320 / H340" |
@@ -209,6 +218,7 @@ usbid=0x10063003 | |||
209 | voicename=h300 | 218 | voicename=h300 |
210 | targetid=10 | 219 | targetid=10 |
211 | encoder=rbspeex | 220 | encoder=rbspeex |
221 | last_release=3.0 | ||
212 | 222 | ||
213 | [h10_5gbums] | 223 | [h10_5gbums] |
214 | name="H10 (5 / 6GB) UMS" | 224 | name="H10 (5 / 6GB) UMS" |
@@ -225,6 +235,7 @@ usbid=0x41022002 | |||
225 | voicename=h10_5gb | 235 | voicename=h10_5gb |
226 | targetid=24 | 236 | targetid=24 |
227 | encoder=rbspeex | 237 | encoder=rbspeex |
238 | last_release=3.0 | ||
228 | 239 | ||
229 | [h10_5gbmtp] | 240 | [h10_5gbmtp] |
230 | name="H10 (5 / 6GB) MTP" | 241 | name="H10 (5 / 6GB) MTP" |
@@ -241,6 +252,7 @@ usbid=0x41022105 | |||
241 | voicename=h10_5gb | 252 | voicename=h10_5gb |
242 | targetid=24 | 253 | targetid=24 |
243 | encoder=rbspeex | 254 | encoder=rbspeex |
255 | last_release=3.0 | ||
244 | 256 | ||
245 | [h10] | 257 | [h10] |
246 | name="H10 (20GB)" | 258 | name="H10 (20GB)" |
@@ -258,6 +270,7 @@ usberror=0x41022101 | |||
258 | voicename=h10 | 270 | voicename=h10 |
259 | targetid=22 | 271 | targetid=22 |
260 | encoder=rbspeex | 272 | encoder=rbspeex |
273 | last_release=3.0 | ||
261 | 274 | ||
262 | [ipod1g2g] | 275 | [ipod1g2g] |
263 | name="Ipod (1st / 2nd gen)" | 276 | name="Ipod (1st / 2nd gen)" |
@@ -272,6 +285,7 @@ brand=Apple | |||
272 | voicename=ipod1g2g | 285 | voicename=ipod1g2g |
273 | targetid=29 | 286 | targetid=29 |
274 | encoder=rbspeex | 287 | encoder=rbspeex |
288 | last_release=3.0 | ||
275 | 289 | ||
276 | [ipodcolor] | 290 | [ipodcolor] |
277 | name="Ipod Colour / Photo / U2 (4th gen)" | 291 | name="Ipod Colour / Photo / U2 (4th gen)" |
@@ -286,6 +300,7 @@ brand=Apple | |||
286 | voicename=ipodcolor | 300 | voicename=ipodcolor |
287 | targetid=13 | 301 | targetid=13 |
288 | encoder=rbspeex | 302 | encoder=rbspeex |
303 | last_release=3.0 | ||
289 | 304 | ||
290 | [ipodnano] | 305 | [ipodnano] |
291 | name="Ipod Nano (1st gen)" | 306 | name="Ipod Nano (1st gen)" |
@@ -301,6 +316,7 @@ usbincompat=0x05ac1260 | |||
301 | voicename=ipodnano | 316 | voicename=ipodnano |
302 | targetid=14 | 317 | targetid=14 |
303 | encoder=rbspeex | 318 | encoder=rbspeex |
319 | last_release=3.0 | ||
304 | 320 | ||
305 | [ipod4gray] | 321 | [ipod4gray] |
306 | name="Ipod (4th gen, greyscale)" | 322 | name="Ipod (4th gen, greyscale)" |
@@ -315,6 +331,7 @@ brand=Apple | |||
315 | voicename=ipod4gray | 331 | voicename=ipod4gray |
316 | targetid=17 | 332 | targetid=17 |
317 | encoder=rbspeex | 333 | encoder=rbspeex |
334 | last_release=3.0 | ||
318 | 335 | ||
319 | [ipodvideo] | 336 | [ipodvideo] |
320 | name="Ipod Video (5th gen) 30GB" | 337 | name="Ipod Video (5th gen) 30GB" |
@@ -329,6 +346,7 @@ brand=Apple | |||
329 | voicename=ipodvideo | 346 | voicename=ipodvideo |
330 | targetid=15 | 347 | targetid=15 |
331 | encoder=rbspeex | 348 | encoder=rbspeex |
349 | last_release=3.0 | ||
332 | 350 | ||
333 | [ipodvideo64mb] | 351 | [ipodvideo64mb] |
334 | name="Ipod Video (5th gen) 60/80GB" | 352 | name="Ipod Video (5th gen) 60/80GB" |
@@ -344,6 +362,7 @@ voicename=ipodvideo | |||
344 | usbincompat=0x05ac1261 | 362 | usbincompat=0x05ac1261 |
345 | targetid=15 | 363 | targetid=15 |
346 | encoder=rbspeex | 364 | encoder=rbspeex |
365 | last_release=3.0 | ||
347 | 366 | ||
348 | [ipod3g] | 367 | [ipod3g] |
349 | name="Ipod (3rd gen)" | 368 | name="Ipod (3rd gen)" |
@@ -359,6 +378,7 @@ usbid=0x05ac1201 | |||
359 | voicename=ipod3g | 378 | voicename=ipod3g |
360 | targetid=16 | 379 | targetid=16 |
361 | encoder=rbspeex | 380 | encoder=rbspeex |
381 | last_release=3.0 | ||
362 | 382 | ||
363 | [ipodmini1g] | 383 | [ipodmini1g] |
364 | name="Ipod Mini (1st gen)" | 384 | name="Ipod Mini (1st gen)" |
@@ -373,6 +393,7 @@ brand=Apple | |||
373 | voicename=ipodmini1g | 393 | voicename=ipodmini1g |
374 | targetid=18 | 394 | targetid=18 |
375 | encoder=rbspeex | 395 | encoder=rbspeex |
396 | last_release=3.0 | ||
376 | 397 | ||
377 | [ipodmini2g] | 398 | [ipodmini2g] |
378 | name="Ipod Mini (2nd gen)" | 399 | name="Ipod Mini (2nd gen)" |
@@ -387,6 +408,7 @@ brand=Apple | |||
387 | voicename=ipodmini2g | 408 | voicename=ipodmini2g |
388 | targetid=21 | 409 | targetid=21 |
389 | encoder=rbspeex | 410 | encoder=rbspeex |
411 | last_release=3.0 | ||
390 | 412 | ||
391 | [iaudiox5] | 413 | [iaudiox5] |
392 | name="iAudio X5 / X5L" | 414 | name="iAudio X5 / X5L" |
@@ -403,6 +425,7 @@ usbid=0x0e210510, 0x0e210513 | |||
403 | voicename=iaudiox5 | 425 | voicename=iaudiox5 |
404 | targetid=12 | 426 | targetid=12 |
405 | encoder=rbspeex | 427 | encoder=rbspeex |
428 | last_release=3.0 | ||
406 | 429 | ||
407 | [iaudiox5v] | 430 | [iaudiox5v] |
408 | name="iAudio X5V" | 431 | name="iAudio X5V" |
@@ -418,6 +441,7 @@ brand=Cowon | |||
418 | voicename=iaudiox5v | 441 | voicename=iaudiox5v |
419 | targetid=12 | 442 | targetid=12 |
420 | encoder=rbspeex | 443 | encoder=rbspeex |
444 | last_release=3.0 | ||
421 | 445 | ||
422 | [iaudiom5] | 446 | [iaudiom5] |
423 | name="iAudio M5 / M5L" | 447 | name="iAudio M5 / M5L" |
@@ -434,6 +458,7 @@ usbid=0x0e210520 | |||
434 | voicename=iaudiom5 | 458 | voicename=iaudiom5 |
435 | targetid=28 | 459 | targetid=28 |
436 | encoder=rbspeex | 460 | encoder=rbspeex |
461 | last_release=3.0 | ||
437 | 462 | ||
438 | [iaudiom3] | 463 | [iaudiom3] |
439 | name="iAudio M3 / M3L" | 464 | name="iAudio M3 / M3L" |
@@ -450,6 +475,7 @@ usbid=0x0e210500 | |||
450 | voicename=iaudiom3 | 475 | voicename=iaudiom3 |
451 | targetid=37 | 476 | targetid=37 |
452 | encoder=rbspeex | 477 | encoder=rbspeex |
478 | last_release=3.0 | ||
453 | 479 | ||
454 | [gigabeatf] | 480 | [gigabeatf] |
455 | name="Gigabeat F / X" | 481 | name="Gigabeat F / X" |
@@ -466,6 +492,7 @@ usbid=0x09300009 | |||
466 | voicename=gigabeatf | 492 | voicename=gigabeatf |
467 | targetid=20 | 493 | targetid=20 |
468 | encoder=rbspeex | 494 | encoder=rbspeex |
495 | last_release=3.0 | ||
469 | 496 | ||
470 | [sansae200] | 497 | [sansae200] |
471 | name="Sansa E200" | 498 | name="Sansa E200" |
@@ -483,6 +510,7 @@ usbincompat=0x07817422, 0x07817423 | |||
483 | voicename=sansae200 | 510 | voicename=sansae200 |
484 | targetid=23 | 511 | targetid=23 |
485 | encoder=rbspeex | 512 | encoder=rbspeex |
513 | last_release=3.0 | ||
486 | 514 | ||
487 | [sansac200] | 515 | [sansac200] |
488 | name="Sansa C200" | 516 | name="Sansa C200" |
@@ -498,6 +526,7 @@ usbid=0x07817450, 0x07817451 | |||
498 | voicename=sansac200 | 526 | voicename=sansac200 |
499 | targetid=30 | 527 | targetid=30 |
500 | encoder=rbspeex | 528 | encoder=rbspeex |
529 | last_release=3.0 | ||
501 | 530 | ||
502 | [mrobe100] | 531 | [mrobe100] |
503 | name="m:robe100" | 532 | name="m:robe100" |
@@ -514,6 +543,7 @@ usbid=0x07b40280 | |||
514 | voicename=mrobe100 | 543 | voicename=mrobe100 |
515 | targetid=33 | 544 | targetid=33 |
516 | encoder=rbspeex | 545 | encoder=rbspeex |
546 | last_release=3.0 | ||
517 | 547 | ||
518 | [languages] | 548 | [languages] |
519 | lang1=afrikaans | 549 | lang1=afrikaans |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 4f0e4b5994..e9f6f7fcf2 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -491,7 +491,7 @@ bool RbUtilQt::installAuto() | |||
491 | if(settings->curReleased()) { | 491 | if(settings->curReleased()) { |
492 | // only set the keys if needed -- querying will yield an empty string | 492 | // only set the keys if needed -- querying will yield an empty string |
493 | // if not set. | 493 | // if not set. |
494 | versmap.insert("rel_rev", settings->lastRelease()); | 494 | versmap.insert("rel_rev", settings->lastRelease(settings->curPlatform())); |
495 | versmap.insert("rel_date", ""); // FIXME: provide the release timestamp | 495 | versmap.insert("rel_date", ""); // FIXME: provide the release timestamp |
496 | } | 496 | } |
497 | 497 | ||
@@ -568,7 +568,7 @@ void RbUtilQt::install() | |||
568 | if(settings->curReleased()) { | 568 | if(settings->curReleased()) { |
569 | // only set the keys if needed -- querying will yield an empty string | 569 | // only set the keys if needed -- querying will yield an empty string |
570 | // if not set. | 570 | // if not set. |
571 | versmap.insert("rel_rev", settings->lastRelease()); | 571 | versmap.insert("rel_rev", settings->lastRelease(settings->curPlatform())); |
572 | versmap.insert("rel_date", ""); // FIXME: provide the release timestamp | 572 | versmap.insert("rel_date", ""); // FIXME: provide the release timestamp |
573 | } | 573 | } |
574 | installWindow->setVersionStrings(versmap); | 574 | installWindow->setVersionStrings(versmap); |