diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-25 17:22:06 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-25 17:22:06 +0000 |
commit | 07894de36dd2af7054db87fc00dc953f73c72f0d (patch) | |
tree | da0ef1080f54f31f930eb0cd22f6823d9539577c | |
parent | 21a0504d16bc15966bcd394239d5f757d284060b (diff) | |
download | rockbox-07894de36dd2af7054db87fc00dc953f73c72f0d.tar.gz rockbox-07894de36dd2af7054db87fc00dc953f73c72f0d.zip |
Remove hard-coded release version numbers.
- get the target specific version number from the build-info file
- disable Quick Start buttons until version info is available
- only enable Quick Start buttons if a release is available.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19854 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.cpp | 15 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 62 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 36 |
5 files changed, 25 insertions, 93 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 34920e3951..0651e8ffe4 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -292,6 +292,9 @@ void Install::setVersionStrings(QMap<QString, QString> ver) | |||
292 | ui.radioArchived->setEnabled(false); | 292 | ui.radioArchived->setEnabled(false); |
293 | qDebug() << "no information about archived version available!"; | 293 | qDebug() << "no information about archived version available!"; |
294 | } | 294 | } |
295 | if(version.value("rel_rev").isEmpty()) { | ||
296 | ui.radioStable->setEnabled(false); | ||
297 | } | ||
295 | 298 | ||
296 | // try to use the old selection first. If no selection has been made | 299 | // try to use the old selection first. If no selection has been made |
297 | // in the past, use a preselection based on released status. | 300 | // in the past, use a preselection based on released status. |
diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 30552e6f3b..28e507fd6a 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp | |||
@@ -113,12 +113,6 @@ 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(QString platform) | ||
117 | { | ||
118 | (void)platform; | ||
119 | return deviceSettingCurGet("last_release").toString(); | ||
120 | } | ||
121 | |||
122 | QString RbSettings::cachePath() | 116 | QString RbSettings::cachePath() |
123 | { | 117 | { |
124 | return userSettings->value("cachepath", QDir::tempPath()).toString(); | 118 | return userSettings->value("cachepath", QDir::tempPath()).toString(); |
@@ -232,15 +226,6 @@ QString RbSettings::curManual() | |||
232 | devices->value("platform").toString()).toString(); | 226 | devices->value("platform").toString()).toString(); |
233 | } | 227 | } |
234 | 228 | ||
235 | bool RbSettings::curReleased() | ||
236 | { | ||
237 | QString released = deviceSettingCurGet("released").toString(); | ||
238 | if(released == "yes") | ||
239 | return true; | ||
240 | else | ||
241 | return false; | ||
242 | } | ||
243 | |||
244 | QString RbSettings::curBootloaderMethod() | 229 | QString RbSettings::curBootloaderMethod() |
245 | { | 230 | { |
246 | return deviceSettingCurGet("bootloadermethod").toString(); | 231 | return deviceSettingCurGet("bootloadermethod").toString(); |
diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index f232a66c85..beea602977 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h | |||
@@ -48,7 +48,6 @@ 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(QString platform); | ||
52 | QString cachePath(); | 51 | QString cachePath(); |
53 | QString build(void); | 52 | QString build(void); |
54 | QString bootloaderUrl(); | 53 | QString bootloaderUrl(); |
@@ -96,7 +95,6 @@ class RbSettings : public QObject | |||
96 | QString curPlatform(); | 95 | QString curPlatform(); |
97 | QString curPlatformName(); | 96 | QString curPlatformName(); |
98 | QString curManual(); | 97 | QString curManual(); |
99 | bool curReleased(); | ||
100 | QString curBootloaderMethod(); | 98 | QString curBootloaderMethod(); |
101 | QString curBootloaderName(); | 99 | QString curBootloaderName(); |
102 | QString curVoiceName(); | 100 | QString curVoiceName(); |
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index abf6bf78f5..fb500d4345 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -52,7 +52,6 @@ platform60=mrobe100 | |||
52 | [player] | 52 | [player] |
53 | name="Jukebox Player 6000 / Jukebox Studio 5 / 10 / 20" | 53 | name="Jukebox Player 6000 / Jukebox Studio 5 / 10 / 20" |
54 | platform=player | 54 | platform=player |
55 | released=yes | ||
56 | needsbootloader=no | 55 | needsbootloader=no |
57 | bootloadermethod= | 56 | bootloadermethod= |
58 | bootloadername= | 57 | bootloadername= |
@@ -62,12 +61,10 @@ brand=Archos | |||
62 | voicename=player | 61 | voicename=player |
63 | targetid=1 | 62 | targetid=1 |
64 | encoder=lame | 63 | encoder=lame |
65 | last_release=3.1 | ||
66 | 64 | ||
67 | [recorder] | 65 | [recorder] |
68 | name="Jukebox Recorder 6 / 10 / 15 / 20" | 66 | name="Jukebox Recorder 6 / 10 / 15 / 20" |
69 | platform=recorder | 67 | platform=recorder |
70 | released=yes | ||
71 | needsbootloader=no | 68 | needsbootloader=no |
72 | bootloadermethod= | 69 | bootloadermethod= |
73 | bootloadername= | 70 | bootloadername= |
@@ -77,12 +74,10 @@ brand=Archos | |||
77 | voicename=recorder | 74 | voicename=recorder |
78 | targetid=2 | 75 | targetid=2 |
79 | encoder=lame | 76 | encoder=lame |
80 | last_release=3.1 | ||
81 | 77 | ||
82 | [recorder8mb] | 78 | [recorder8mb] |
83 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" | 79 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" |
84 | platform=recorder8mb | 80 | platform=recorder8mb |
85 | released=yes | ||
86 | needsbootloader=no | 81 | needsbootloader=no |
87 | bootloadermethod= | 82 | bootloadermethod= |
88 | bootloadername= | 83 | bootloadername= |
@@ -92,12 +87,10 @@ brand=Archos | |||
92 | voicename=recorder | 87 | voicename=recorder |
93 | targetid=2 | 88 | targetid=2 |
94 | encoder=lame | 89 | encoder=lame |
95 | last_release=3.1 | ||
96 | 90 | ||
97 | [recorderv2] | 91 | [recorderv2] |
98 | name="Jukebox Recorder v2 (20GB)" | 92 | name="Jukebox Recorder v2 (20GB)" |
99 | platform=recorderv2 | 93 | platform=recorderv2 |
100 | released=yes | ||
101 | needsbootloader=no | 94 | needsbootloader=no |
102 | bootloadermethod= | 95 | bootloadermethod= |
103 | bootloadername= | 96 | bootloadername= |
@@ -107,12 +100,10 @@ brand=Archos | |||
107 | voicename=recorderv2 | 100 | voicename=recorderv2 |
108 | targetid=4 | 101 | targetid=4 |
109 | encoder=lame | 102 | encoder=lame |
110 | last_release=3.1 | ||
111 | 103 | ||
112 | [fmrecorder] | 104 | [fmrecorder] |
113 | name="Jukebox Recorder FM" | 105 | name="Jukebox Recorder FM" |
114 | platform=fmrecorder | 106 | platform=fmrecorder |
115 | released=yes | ||
116 | needsbootloader=no | 107 | needsbootloader=no |
117 | bootloadermethod= | 108 | bootloadermethod= |
118 | bootloadername= | 109 | bootloadername= |
@@ -122,12 +113,10 @@ brand=Archos | |||
122 | voicename=fmrecorder | 113 | voicename=fmrecorder |
123 | targetid=3 | 114 | targetid=3 |
124 | encoder=lame | 115 | encoder=lame |
125 | last_release=3.1 | ||
126 | 116 | ||
127 | [fmrecorder8mb] | 117 | [fmrecorder8mb] |
128 | name="Jukebox Recorder FM (with 8MiB memory)" | 118 | name="Jukebox Recorder FM (with 8MiB memory)" |
129 | platform=fmrecorder8mb | 119 | platform=fmrecorder8mb |
130 | released=yes | ||
131 | needsbootloader=no | 120 | needsbootloader=no |
132 | bootloadermethod= | 121 | bootloadermethod= |
133 | bootloadername= | 122 | bootloadername= |
@@ -137,12 +126,10 @@ brand=Archos | |||
137 | voicename=fmrecorder | 126 | voicename=fmrecorder |
138 | targetid=3 | 127 | targetid=3 |
139 | encoder=lame | 128 | encoder=lame |
140 | last_release=3.1 | ||
141 | 129 | ||
142 | [ondiosp] | 130 | [ondiosp] |
143 | name="Ondio SP" | 131 | name="Ondio SP" |
144 | platform=ondiosp | 132 | platform=ondiosp |
145 | released=yes | ||
146 | needsbootloader=no | 133 | needsbootloader=no |
147 | bootloadermethod= | 134 | bootloadermethod= |
148 | bootloadername= | 135 | bootloadername= |
@@ -152,12 +139,10 @@ brand=Archos | |||
152 | voicename=ondiosp | 139 | voicename=ondiosp |
153 | targetid=7 | 140 | targetid=7 |
154 | encoder=lame | 141 | encoder=lame |
155 | last_release=3.1 | ||
156 | 142 | ||
157 | [ondiofm] | 143 | [ondiofm] |
158 | name="Ondio FM" | 144 | name="Ondio FM" |
159 | platform=ondiofm | 145 | platform=ondiofm |
160 | released=yes | ||
161 | needsbootloader=no | 146 | needsbootloader=no |
162 | bootloadermethod= | 147 | bootloadermethod= |
163 | bootloadername= | 148 | bootloadername= |
@@ -167,12 +152,10 @@ brand=Archos | |||
167 | voicename=ondiofm | 152 | voicename=ondiofm |
168 | targetid=8 | 153 | targetid=8 |
169 | encoder=lame | 154 | encoder=lame |
170 | last_release=3.1 | ||
171 | 155 | ||
172 | [h100] | 156 | [h100] |
173 | name="iHP100 / iHP110" | 157 | name="iHP100 / iHP110" |
174 | platform=h100 | 158 | platform=h100 |
175 | released=yes | ||
176 | needsbootloader=yes | 159 | needsbootloader=yes |
177 | bootloadermethod=hex | 160 | bootloadermethod=hex |
178 | bootloadername=/iriver/bootloader-h100.bin | 161 | bootloadername=/iriver/bootloader-h100.bin |
@@ -184,12 +167,10 @@ usbid=0x10063001 | |||
184 | voicename=h100 | 167 | voicename=h100 |
185 | targetid=11 | 168 | targetid=11 |
186 | encoder=rbspeex | 169 | encoder=rbspeex |
187 | last_release=3.1 | ||
188 | 170 | ||
189 | [h120] | 171 | [h120] |
190 | name="iHP120 / iHP140 / H120 / H140" | 172 | name="iHP120 / iHP140 / H120 / H140" |
191 | platform=h120 | 173 | platform=h120 |
192 | released=yes | ||
193 | needsbootloader=yes | 174 | needsbootloader=yes |
194 | bootloadermethod=hex | 175 | bootloadermethod=hex |
195 | bootloadername=/iriver/bootloader-h120.bin | 176 | bootloadername=/iriver/bootloader-h120.bin |
@@ -201,12 +182,10 @@ usbid=0x10063002 | |||
201 | voicename=h120 | 182 | voicename=h120 |
202 | targetid=9 | 183 | targetid=9 |
203 | encoder=rbspeex | 184 | encoder=rbspeex |
204 | last_release=3.1 | ||
205 | 185 | ||
206 | [h300] | 186 | [h300] |
207 | name="H320 / H340" | 187 | name="H320 / H340" |
208 | platform=h300 | 188 | platform=h300 |
209 | released=yes | ||
210 | needsbootloader=yes | 189 | needsbootloader=yes |
211 | bootloadermethod=hex | 190 | bootloadermethod=hex |
212 | bootloadername=/iriver/bootloader-h300.bin | 191 | bootloadername=/iriver/bootloader-h300.bin |
@@ -218,12 +197,10 @@ usbid=0x10063003 | |||
218 | voicename=h300 | 197 | voicename=h300 |
219 | targetid=10 | 198 | targetid=10 |
220 | encoder=rbspeex | 199 | encoder=rbspeex |
221 | last_release=3.1 | ||
222 | 200 | ||
223 | [h10_5gbums] | 201 | [h10_5gbums] |
224 | name="H10 (5 / 6GB) UMS" | 202 | name="H10 (5 / 6GB) UMS" |
225 | platform=h10_5gb | 203 | platform=h10_5gb |
226 | released=yes | ||
227 | needsbootloader=yes | 204 | needsbootloader=yes |
228 | bootloadermethod=mi4 | 205 | bootloadermethod=mi4 |
229 | bootloadername=/iriver/H10.mi4 | 206 | bootloadername=/iriver/H10.mi4 |
@@ -235,12 +212,10 @@ usbid=0x41022002 | |||
235 | voicename=h10_5gb | 212 | voicename=h10_5gb |
236 | targetid=24 | 213 | targetid=24 |
237 | encoder=rbspeex | 214 | encoder=rbspeex |
238 | last_release=3.1 | ||
239 | 215 | ||
240 | [h10_5gbmtp] | 216 | [h10_5gbmtp] |
241 | name="H10 (5 / 6GB) MTP" | 217 | name="H10 (5 / 6GB) MTP" |
242 | platform=h10_5gb | 218 | platform=h10_5gb |
243 | released=yes | ||
244 | needsbootloader=yes | 219 | needsbootloader=yes |
245 | bootloadermethod=mi4 | 220 | bootloadermethod=mi4 |
246 | bootloadername=/iriver/H10_5GB-MTP/H10.mi4 | 221 | bootloadername=/iriver/H10_5GB-MTP/H10.mi4 |
@@ -252,12 +227,10 @@ usbid=0x41022105 | |||
252 | voicename=h10_5gb | 227 | voicename=h10_5gb |
253 | targetid=24 | 228 | targetid=24 |
254 | encoder=rbspeex | 229 | encoder=rbspeex |
255 | last_release=3.1 | ||
256 | 230 | ||
257 | [h10] | 231 | [h10] |
258 | name="H10 (20GB)" | 232 | name="H10 (20GB)" |
259 | platform=h10 | 233 | platform=h10 |
260 | released=yes | ||
261 | needsbootloader=yes | 234 | needsbootloader=yes |
262 | bootloadermethod=mi4 | 235 | bootloadermethod=mi4 |
263 | bootloadername=/iriver/H10_20GC.mi4 | 236 | bootloadername=/iriver/H10_20GC.mi4 |
@@ -270,12 +243,10 @@ usberror=0x41022101 | |||
270 | voicename=h10 | 243 | voicename=h10 |
271 | targetid=22 | 244 | targetid=22 |
272 | encoder=rbspeex | 245 | encoder=rbspeex |
273 | last_release=3.1 | ||
274 | 246 | ||
275 | [ipod1g2g] | 247 | [ipod1g2g] |
276 | name="Ipod (1st / 2nd gen)" | 248 | name="Ipod (1st / 2nd gen)" |
277 | platform=ipod1g2g | 249 | platform=ipod1g2g |
278 | released=yes | ||
279 | needsbootloader=yes | 250 | needsbootloader=yes |
280 | bootloadermethod=ipod | 251 | bootloadermethod=ipod |
281 | bootloadername=/ipod/bootloader-ipod1g2g.ipod | 252 | bootloadername=/ipod/bootloader-ipod1g2g.ipod |
@@ -285,12 +256,10 @@ brand=Apple | |||
285 | voicename=ipod1g2g | 256 | voicename=ipod1g2g |
286 | targetid=29 | 257 | targetid=29 |
287 | encoder=rbspeex | 258 | encoder=rbspeex |
288 | last_release=3.1 | ||
289 | 259 | ||
290 | [ipodcolor] | 260 | [ipodcolor] |
291 | name="Ipod Colour / Photo / U2 (4th gen)" | 261 | name="Ipod Colour / Photo / U2 (4th gen)" |
292 | platform=ipodcolor | 262 | platform=ipodcolor |
293 | released=yes | ||
294 | needsbootloader=yes | 263 | needsbootloader=yes |
295 | bootloadermethod=ipod | 264 | bootloadermethod=ipod |
296 | bootloadername=/ipod/bootloader-ipodcolor.ipod | 265 | bootloadername=/ipod/bootloader-ipodcolor.ipod |
@@ -300,12 +269,10 @@ brand=Apple | |||
300 | voicename=ipodcolor | 269 | voicename=ipodcolor |
301 | targetid=13 | 270 | targetid=13 |
302 | encoder=rbspeex | 271 | encoder=rbspeex |
303 | last_release=3.1 | ||
304 | 272 | ||
305 | [ipodnano] | 273 | [ipodnano] |
306 | name="Ipod Nano (1st gen)" | 274 | name="Ipod Nano (1st gen)" |
307 | platform=ipodnano | 275 | platform=ipodnano |
308 | released=yes | ||
309 | needsbootloader=yes | 276 | needsbootloader=yes |
310 | bootloadermethod=ipod | 277 | bootloadermethod=ipod |
311 | bootloadername=/ipod/bootloader-ipodnano.ipod | 278 | bootloadername=/ipod/bootloader-ipodnano.ipod |
@@ -316,12 +283,10 @@ usbincompat=0x05ac1260 | |||
316 | voicename=ipodnano | 283 | voicename=ipodnano |
317 | targetid=14 | 284 | targetid=14 |
318 | encoder=rbspeex | 285 | encoder=rbspeex |
319 | last_release=3.1 | ||
320 | 286 | ||
321 | [ipod4gray] | 287 | [ipod4gray] |
322 | name="Ipod (4th gen, greyscale)" | 288 | name="Ipod (4th gen, greyscale)" |
323 | platform=ipod4gray | 289 | platform=ipod4gray |
324 | released=yes | ||
325 | needsbootloader=yes | 290 | needsbootloader=yes |
326 | bootloadermethod=ipod | 291 | bootloadermethod=ipod |
327 | bootloadername=/ipod/bootloader-ipod4g.ipod | 292 | bootloadername=/ipod/bootloader-ipod4g.ipod |
@@ -331,12 +296,10 @@ brand=Apple | |||
331 | voicename=ipod4gray | 296 | voicename=ipod4gray |
332 | targetid=17 | 297 | targetid=17 |
333 | encoder=rbspeex | 298 | encoder=rbspeex |
334 | last_release=3.1 | ||
335 | 299 | ||
336 | [ipodvideo] | 300 | [ipodvideo] |
337 | name="Ipod Video (5th gen) 30GB" | 301 | name="Ipod Video (5th gen) 30GB" |
338 | platform=ipodvideo | 302 | platform=ipodvideo |
339 | released=yes | ||
340 | needsbootloader=yes | 303 | needsbootloader=yes |
341 | bootloadermethod=ipod | 304 | bootloadermethod=ipod |
342 | bootloadername=/ipod/bootloader-ipodvideo.ipod | 305 | bootloadername=/ipod/bootloader-ipodvideo.ipod |
@@ -346,12 +309,10 @@ brand=Apple | |||
346 | voicename=ipodvideo | 309 | voicename=ipodvideo |
347 | targetid=15 | 310 | targetid=15 |
348 | encoder=rbspeex | 311 | encoder=rbspeex |
349 | last_release=3.1 | ||
350 | 312 | ||
351 | [ipodvideo64mb] | 313 | [ipodvideo64mb] |
352 | name="Ipod Video (5th gen) 60/80GB" | 314 | name="Ipod Video (5th gen) 60/80GB" |
353 | platform=ipodvideo64mb | 315 | platform=ipodvideo64mb |
354 | released=yes | ||
355 | needsbootloader=yes | 316 | needsbootloader=yes |
356 | bootloadermethod=ipod | 317 | bootloadermethod=ipod |
357 | bootloadername=/ipod/bootloader-ipodvideo.ipod | 318 | bootloadername=/ipod/bootloader-ipodvideo.ipod |
@@ -362,12 +323,10 @@ voicename=ipodvideo | |||
362 | usbincompat=0x05ac1261 | 323 | usbincompat=0x05ac1261 |
363 | targetid=15 | 324 | targetid=15 |
364 | encoder=rbspeex | 325 | encoder=rbspeex |
365 | last_release=3.1 | ||
366 | 326 | ||
367 | [ipod3g] | 327 | [ipod3g] |
368 | name="Ipod (3rd gen)" | 328 | name="Ipod (3rd gen)" |
369 | platform=ipod3g | 329 | platform=ipod3g |
370 | released=yes | ||
371 | needsbootloader=yes | 330 | needsbootloader=yes |
372 | bootloadermethod=ipod | 331 | bootloadermethod=ipod |
373 | bootloadername=/ipod/bootloader-ipod3g.ipod | 332 | bootloadername=/ipod/bootloader-ipod3g.ipod |
@@ -378,12 +337,10 @@ usbid=0x05ac1201 | |||
378 | voicename=ipod3g | 337 | voicename=ipod3g |
379 | targetid=16 | 338 | targetid=16 |
380 | encoder=rbspeex | 339 | encoder=rbspeex |
381 | last_release=3.1 | ||
382 | 340 | ||
383 | [ipodmini1g] | 341 | [ipodmini1g] |
384 | name="Ipod Mini (1st gen)" | 342 | name="Ipod Mini (1st gen)" |
385 | platform=ipodmini1g | 343 | platform=ipodmini1g |
386 | released=yes | ||
387 | needsbootloader=yes | 344 | needsbootloader=yes |
388 | bootloadermethod=ipod | 345 | bootloadermethod=ipod |
389 | bootloadername=/ipod/bootloader-ipodmini.ipod | 346 | bootloadername=/ipod/bootloader-ipodmini.ipod |
@@ -393,12 +350,10 @@ brand=Apple | |||
393 | voicename=ipodmini1g | 350 | voicename=ipodmini1g |
394 | targetid=18 | 351 | targetid=18 |
395 | encoder=rbspeex | 352 | encoder=rbspeex |
396 | last_release=3.1 | ||
397 | 353 | ||
398 | [ipodmini2g] | 354 | [ipodmini2g] |
399 | name="Ipod Mini (2nd gen)" | 355 | name="Ipod Mini (2nd gen)" |
400 | platform=ipodmini2g | 356 | platform=ipodmini2g |
401 | released=yes | ||
402 | needsbootloader=yes | 357 | needsbootloader=yes |
403 | bootloadermethod=ipod | 358 | bootloadermethod=ipod |
404 | bootloadername=/ipod/bootloader-ipodmini2g.ipod | 359 | bootloadername=/ipod/bootloader-ipodmini2g.ipod |
@@ -408,12 +363,10 @@ brand=Apple | |||
408 | voicename=ipodmini2g | 363 | voicename=ipodmini2g |
409 | targetid=21 | 364 | targetid=21 |
410 | encoder=rbspeex | 365 | encoder=rbspeex |
411 | last_release=3.1 | ||
412 | 366 | ||
413 | [iaudiox5] | 367 | [iaudiox5] |
414 | name="iAudio X5 / X5L" | 368 | name="iAudio X5 / X5L" |
415 | platform=iaudiox5 | 369 | platform=iaudiox5 |
416 | released=yes | ||
417 | needsbootloader=yes | 370 | needsbootloader=yes |
418 | bootloadermethod=file | 371 | bootloadermethod=file |
419 | bootloadername=/iaudio/x5_fw.bin | 372 | bootloadername=/iaudio/x5_fw.bin |
@@ -425,12 +378,10 @@ usbid=0x0e210510, 0x0e210513 | |||
425 | voicename=iaudiox5 | 378 | voicename=iaudiox5 |
426 | targetid=12 | 379 | targetid=12 |
427 | encoder=rbspeex | 380 | encoder=rbspeex |
428 | last_release=3.1 | ||
429 | 381 | ||
430 | [iaudiox5v] | 382 | [iaudiox5v] |
431 | name="iAudio X5V" | 383 | name="iAudio X5V" |
432 | platform=iaudiox5 | 384 | platform=iaudiox5 |
433 | released=yes | ||
434 | needsbootloader=yes | 385 | needsbootloader=yes |
435 | bootloadermethod=file | 386 | bootloadermethod=file |
436 | bootloadername=/iaudio/x5v_fw.bin | 387 | bootloadername=/iaudio/x5v_fw.bin |
@@ -441,12 +392,10 @@ brand=Cowon | |||
441 | voicename=iaudiox5v | 392 | voicename=iaudiox5v |
442 | targetid=12 | 393 | targetid=12 |
443 | encoder=rbspeex | 394 | encoder=rbspeex |
444 | last_release=3.1 | ||
445 | 395 | ||
446 | [iaudiom5] | 396 | [iaudiom5] |
447 | name="iAudio M5 / M5L" | 397 | name="iAudio M5 / M5L" |
448 | platform=iaudiom5 | 398 | platform=iaudiom5 |
449 | released=yes | ||
450 | needsbootloader=yes | 399 | needsbootloader=yes |
451 | bootloadermethod=file | 400 | bootloadermethod=file |
452 | bootloadername=/iaudio/m5_fw.bin | 401 | bootloadername=/iaudio/m5_fw.bin |
@@ -458,12 +407,10 @@ usbid=0x0e210520 | |||
458 | voicename=iaudiom5 | 407 | voicename=iaudiom5 |
459 | targetid=28 | 408 | targetid=28 |
460 | encoder=rbspeex | 409 | encoder=rbspeex |
461 | last_release=3.1 | ||
462 | 410 | ||
463 | [iaudiom3] | 411 | [iaudiom3] |
464 | name="iAudio M3 / M3L" | 412 | name="iAudio M3 / M3L" |
465 | platform=iaudiom3 | 413 | platform=iaudiom3 |
466 | released=no | ||
467 | needsbootloader=yes | 414 | needsbootloader=yes |
468 | bootloadermethod=file | 415 | bootloadermethod=file |
469 | bootloadername=/iaudio/cowon_m3.bin | 416 | bootloadername=/iaudio/cowon_m3.bin |
@@ -475,12 +422,10 @@ usbid=0x0e210500 | |||
475 | voicename=iaudiom3 | 422 | voicename=iaudiom3 |
476 | targetid=37 | 423 | targetid=37 |
477 | encoder=rbspeex | 424 | encoder=rbspeex |
478 | last_release=3.1 | ||
479 | 425 | ||
480 | [gigabeatf] | 426 | [gigabeatf] |
481 | name="Gigabeat F / X" | 427 | name="Gigabeat F / X" |
482 | platform=gigabeatf | 428 | platform=gigabeatf |
483 | released=yes | ||
484 | needsbootloader=yes | 429 | needsbootloader=yes |
485 | bootloadermethod=file | 430 | bootloadermethod=file |
486 | bootloadername=/gigabeat/FWIMG01.DAT | 431 | bootloadername=/gigabeat/FWIMG01.DAT |
@@ -492,12 +437,10 @@ usbid=0x09300009 | |||
492 | voicename=gigabeatf | 437 | voicename=gigabeatf |
493 | targetid=20 | 438 | targetid=20 |
494 | encoder=rbspeex | 439 | encoder=rbspeex |
495 | last_release=3.1 | ||
496 | 440 | ||
497 | [sansae200] | 441 | [sansae200] |
498 | name="Sansa E200" | 442 | name="Sansa E200" |
499 | platform=sansae200 | 443 | platform=sansae200 |
500 | released=yes | ||
501 | needsbootloader=yes | 444 | needsbootloader=yes |
502 | bootloadermethod=sansa | 445 | bootloadermethod=sansa |
503 | bootloadername=/sandisk-sansa/e200/PP5022.mi4 | 446 | bootloadername=/sandisk-sansa/e200/PP5022.mi4 |
@@ -510,12 +453,10 @@ usbincompat=0x07817422, 0x07817423 | |||
510 | voicename=sansae200 | 453 | voicename=sansae200 |
511 | targetid=23 | 454 | targetid=23 |
512 | encoder=rbspeex | 455 | encoder=rbspeex |
513 | last_release=3.1 | ||
514 | 456 | ||
515 | [sansac200] | 457 | [sansac200] |
516 | name="Sansa C200" | 458 | name="Sansa C200" |
517 | platform=sansac200 | 459 | platform=sansac200 |
518 | released=yes | ||
519 | needsbootloader=yes | 460 | needsbootloader=yes |
520 | bootloadermethod=sansa | 461 | bootloadermethod=sansa |
521 | bootloadername=/sandisk-sansa/c200/firmware.mi4 | 462 | bootloadername=/sandisk-sansa/c200/firmware.mi4 |
@@ -526,12 +467,10 @@ usbid=0x07817450, 0x07817451 | |||
526 | voicename=sansac200 | 467 | voicename=sansac200 |
527 | targetid=30 | 468 | targetid=30 |
528 | encoder=rbspeex | 469 | encoder=rbspeex |
529 | last_release=3.1 | ||
530 | 470 | ||
531 | [mrobe100] | 471 | [mrobe100] |
532 | name="m:robe100" | 472 | name="m:robe100" |
533 | platform=mrobe100 | 473 | platform=mrobe100 |
534 | released=yes | ||
535 | needsbootloader=yes | 474 | needsbootloader=yes |
536 | bootloadermethod=mi4 | 475 | bootloadermethod=mi4 |
537 | bootloadername=/olympus/mrobe100/pp5020.mi4 | 476 | bootloadername=/olympus/mrobe100/pp5020.mi4 |
@@ -543,7 +482,6 @@ usbid=0x07b40280 | |||
543 | voicename=mrobe100 | 482 | voicename=mrobe100 |
544 | targetid=33 | 483 | targetid=33 |
545 | encoder=rbspeex | 484 | encoder=rbspeex |
546 | last_release=3.1 | ||
547 | 485 | ||
548 | [languages] | 486 | [languages] |
549 | lang1=afrikaans | 487 | lang1=afrikaans |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index c9efb5e81a..5ef43b6732 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -79,6 +79,9 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | |||
79 | ui.treeInfo->setHeaderLabels(QStringList() << tr("File") << tr("Version")); | 79 | ui.treeInfo->setHeaderLabels(QStringList() << tr("File") << tr("Version")); |
80 | ui.treeInfo->expandAll(); | 80 | ui.treeInfo->expandAll(); |
81 | ui.treeInfo->setColumnCount(2); | 81 | ui.treeInfo->setColumnCount(2); |
82 | // disable quick install until version info is available | ||
83 | ui.buttonSmall->setEnabled(false); | ||
84 | ui.buttonComplete->setEnabled(false); | ||
82 | 85 | ||
83 | connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTabs(int))); | 86 | connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTabs(int))); |
84 | connect(ui.actionAbout_Qt, SIGNAL(triggered()), qApp, SLOT(aboutQt())); | 87 | connect(ui.actionAbout_Qt, SIGNAL(triggered()), qApp, SLOT(aboutQt())); |
@@ -177,6 +180,19 @@ void RbUtilQt::downloadDone(bool error) | |||
177 | versmap.insert("arch_rev", info.value("dailies/rev").toString()); | 180 | versmap.insert("arch_rev", info.value("dailies/rev").toString()); |
178 | versmap.insert("arch_date", info.value("dailies/date").toString()); | 181 | versmap.insert("arch_date", info.value("dailies/date").toString()); |
179 | 182 | ||
183 | info.beginGroup("release"); | ||
184 | versmap.insert("rel_rev", info.value(settings->curPlatform()).toString()); | ||
185 | info.endGroup(); | ||
186 | |||
187 | if(versmap.value("rel_rev").isEmpty()) { | ||
188 | ui.buttonSmall->setEnabled(false); | ||
189 | ui.buttonComplete->setEnabled(false); | ||
190 | } | ||
191 | else { | ||
192 | ui.buttonSmall->setEnabled(true); | ||
193 | ui.buttonComplete->setEnabled(true); | ||
194 | } | ||
195 | |||
180 | bleeding = new HttpGet(this); | 196 | bleeding = new HttpGet(this); |
181 | connect(bleeding, SIGNAL(done(bool)), this, SLOT(downloadBleedingDone(bool))); | 197 | connect(bleeding, SIGNAL(done(bool)), this, SLOT(downloadBleedingDone(bool))); |
182 | connect(bleeding, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); | 198 | connect(bleeding, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); |
@@ -215,7 +231,7 @@ void RbUtilQt::downloadBleedingDone(bool error) | |||
215 | versmap.insert("bleed_rev", info.value("bleeding/rev").toString()); | 231 | versmap.insert("bleed_rev", info.value("bleeding/rev").toString()); |
216 | versmap.insert("bleed_date", info.value("bleeding/timestamp").toString()); | 232 | versmap.insert("bleed_date", info.value("bleeding/timestamp").toString()); |
217 | qDebug() << "versmap =" << versmap; | 233 | qDebug() << "versmap =" << versmap; |
218 | 234 | ||
219 | m_gotInfo = true; | 235 | m_gotInfo = true; |
220 | } | 236 | } |
221 | 237 | ||
@@ -362,7 +378,7 @@ void RbUtilQt::completeInstall() | |||
362 | "This will install Rockbox %1. To install the most recent " | 378 | "This will install Rockbox %1. To install the most recent " |
363 | "development build available press \"Cancel\" and " | 379 | "development build available press \"Cancel\" and " |
364 | "use the \"Installation\" tab.") | 380 | "use the \"Installation\" tab.") |
365 | .arg(settings->lastRelease(settings->curPlatform())), | 381 | .arg(versmap.value("rel_rev")), |
366 | QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok) | 382 | QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok) |
367 | return; | 383 | return; |
368 | // create logger | 384 | // create logger |
@@ -420,7 +436,7 @@ void RbUtilQt::smallInstall() | |||
420 | "This will install Rockbox %1. To install the most recent " | 436 | "This will install Rockbox %1. To install the most recent " |
421 | "development build available press \"Cancel\" and " | 437 | "development build available press \"Cancel\" and " |
422 | "use the \"Installation\" tab.") | 438 | "use the \"Installation\" tab.") |
423 | .arg(settings->lastRelease(settings->curPlatform())), | 439 | .arg(versmap.value("rel_rev")), |
424 | QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok) | 440 | QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok) |
425 | return; | 441 | return; |
426 | 442 | ||
@@ -491,9 +507,8 @@ void RbUtilQt::installBtn() | |||
491 | bool RbUtilQt::installAuto() | 507 | bool RbUtilQt::installAuto() |
492 | { | 508 | { |
493 | QString file = QString("%1/%2/rockbox-%3-%4.zip") | 509 | QString file = QString("%1/%2/rockbox-%3-%4.zip") |
494 | .arg(settings->releaseUrl(), settings->lastRelease(settings->curPlatform()), | 510 | .arg(settings->releaseUrl(), versmap.value(settings->curPlatform()), |
495 | settings->curPlatform(), settings->lastRelease(settings->curPlatform())); | 511 | settings->curPlatform(), versmap.value(settings->curPlatform())); |
496 | |||
497 | buildInfo.open(); | 512 | buildInfo.open(); |
498 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); | 513 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); |
499 | buildInfo.close(); | 514 | buildInfo.close(); |
@@ -552,7 +567,7 @@ bool RbUtilQt::installAuto() | |||
552 | ZipInstaller* installer = new ZipInstaller(this); | 567 | ZipInstaller* installer = new ZipInstaller(this); |
553 | installer->setUrl(file); | 568 | installer->setUrl(file); |
554 | installer->setLogSection("Rockbox (Base)"); | 569 | installer->setLogSection("Rockbox (Base)"); |
555 | installer->setLogVersion(settings->lastRelease(settings->curPlatform())); | 570 | installer->setLogVersion(versmap.value("rel_rev")); |
556 | if(!settings->cacheDisabled()) | 571 | if(!settings->cacheDisabled()) |
557 | installer->setCache(true); | 572 | installer->setCache(true); |
558 | installer->setMountPoint(settings->mountpoint()); | 573 | installer->setMountPoint(settings->mountpoint()); |
@@ -571,13 +586,6 @@ void RbUtilQt::install() | |||
571 | buildInfo.open(); | 586 | buildInfo.open(); |
572 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); | 587 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); |
573 | buildInfo.close(); | 588 | buildInfo.close(); |
574 | |||
575 | if(settings->curReleased()) { | ||
576 | // only set the keys if needed -- querying will yield an empty string | ||
577 | // if not set. | ||
578 | versmap.insert("rel_rev", settings->lastRelease(settings->curPlatform())); | ||
579 | versmap.insert("rel_date", ""); // FIXME: provide the release timestamp | ||
580 | } | ||
581 | installWindow->setVersionStrings(versmap); | 589 | installWindow->setVersionStrings(versmap); |
582 | 590 | ||
583 | installWindow->show(); | 591 | installWindow->show(); |