diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-25 17:48:38 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-25 17:48:38 +0000 |
commit | 6343111e00da93a8b792b4e6245184be31b8feff (patch) | |
tree | 531790bb8bebad377717a66f390f097da83a91de | |
parent | 07894de36dd2af7054db87fc00dc953f73c72f0d (diff) | |
download | rockbox-6343111e00da93a8b792b4e6245184be31b8feff.tar.gz rockbox-6343111e00da93a8b792b4e6245184be31b8feff.zip |
Remove "needsbootloader" configuration value as it is implicitly available from "bootloadermethod". Explicitly use bootloadermethod "none" if no bootloader is needed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19855 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/rbsettings.cpp | 15 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.h | 13 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 47 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 6 |
4 files changed, 19 insertions, 62 deletions
diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 28e507fd6a..45e61bee51 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp | |||
@@ -81,23 +81,12 @@ QString RbSettings::curVersion() | |||
81 | { | 81 | { |
82 | return userSettings->value("rbutil_version").toString(); | 82 | return userSettings->value("rbutil_version").toString(); |
83 | } | 83 | } |
84 | 84 | ||
85 | bool RbSettings::cacheOffline() | 85 | bool RbSettings::cacheOffline() |
86 | { | 86 | { |
87 | return userSettings->value("offline").toBool(); | 87 | return userSettings->value("offline").toBool(); |
88 | } | 88 | } |
89 | 89 | ||
90 | bool RbSettings::curNeedsBootloader() | ||
91 | { | ||
92 | QString result = deviceSettingCurGet("needsbootloader", "").toString(); | ||
93 | if( result == "no") | ||
94 | { | ||
95 | return false; | ||
96 | } | ||
97 | else | ||
98 | return true; | ||
99 | } | ||
100 | |||
101 | QString RbSettings::mountpoint() | 90 | QString RbSettings::mountpoint() |
102 | { | 91 | { |
103 | return userSettings->value("mountpoint").toString(); | 92 | return userSettings->value("mountpoint").toString(); |
@@ -228,7 +217,7 @@ QString RbSettings::curManual() | |||
228 | 217 | ||
229 | QString RbSettings::curBootloaderMethod() | 218 | QString RbSettings::curBootloaderMethod() |
230 | { | 219 | { |
231 | return deviceSettingCurGet("bootloadermethod").toString(); | 220 | return deviceSettingCurGet("bootloadermethod", "none").toString(); |
232 | } | 221 | } |
233 | 222 | ||
234 | QString RbSettings::curBootloaderName() | 223 | QString RbSettings::curBootloaderName() |
diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index beea602977..afa1900e7b 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h | |||
@@ -79,7 +79,7 @@ class RbSettings : public QObject | |||
79 | int encoderComplexity(QString enc); | 79 | int encoderComplexity(QString enc); |
80 | double encoderVolume(QString enc); | 80 | double encoderVolume(QString enc); |
81 | bool encoderNarrowband(QString enc); | 81 | bool encoderNarrowband(QString enc); |
82 | 82 | ||
83 | QStringList allPlatforms(); | 83 | QStringList allPlatforms(); |
84 | QString name(QString plattform); | 84 | QString name(QString plattform); |
85 | QString brand(QString plattform); | 85 | QString brand(QString plattform); |
@@ -88,8 +88,7 @@ class RbSettings : public QObject | |||
88 | QMap<int, QString> usbIdMap(); | 88 | QMap<int, QString> usbIdMap(); |
89 | QMap<int, QString> usbIdErrorMap(); | 89 | QMap<int, QString> usbIdErrorMap(); |
90 | QMap<int, QString> usbIdIncompatMap(); | 90 | QMap<int, QString> usbIdIncompatMap(); |
91 | 91 | ||
92 | bool curNeedsBootloader(); | ||
93 | QString curBrand(); | 92 | QString curBrand(); |
94 | QString curName(); | 93 | QString curName(); |
95 | QString curPlatform(); | 94 | QString curPlatform(); |
@@ -135,21 +134,21 @@ class RbSettings : public QObject | |||
135 | void setEncoderNarrowband(QString enc,bool nb); | 134 | void setEncoderNarrowband(QString enc,bool nb); |
136 | 135 | ||
137 | private: | 136 | private: |
138 | 137 | ||
139 | //! helper function to get an entry in the current platform section | 138 | //! helper function to get an entry in the current platform section |
140 | QVariant deviceSettingCurGet(QString entry,QString def=""); | 139 | QVariant deviceSettingCurGet(QString entry,QString def=""); |
141 | //! helper function to get an entry out of a group in the userSettings | 140 | //! helper function to get an entry out of a group in the userSettings |
142 | QVariant userSettingsGroupGet(QString group,QString entry,QVariant def=""); | 141 | QVariant userSettingsGroupGet(QString group,QString entry,QVariant def=""); |
143 | //! helper function to set an entry in a group in the userSettings | 142 | //! helper function to set an entry in a group in the userSettings |
144 | void userSettingsGroupSet(QString group,QString entry,QVariant value); | 143 | void userSettingsGroupSet(QString group,QString entry,QVariant value); |
145 | 144 | ||
146 | 145 | ||
147 | //! private copy constructors to prvent copying | 146 | //! private copy constructors to prvent copying |
148 | RbSettings& operator= (const RbSettings& other) | 147 | RbSettings& operator= (const RbSettings& other) |
149 | { (void)other; return *this; } | 148 | { (void)other; return *this; } |
150 | RbSettings(const RbSettings& other) :QObject() | 149 | RbSettings(const RbSettings& other) :QObject() |
151 | { (void)other; } | 150 | { (void)other; } |
152 | 151 | ||
153 | //! pointers to our setting objects | 152 | //! pointers to our setting objects |
154 | QSettings *devices; | 153 | QSettings *devices; |
155 | QSettings *userSettings; | 154 | QSettings *userSettings; |
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index fb500d4345..8bd93f0ca1 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -52,8 +52,7 @@ 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 | needsbootloader=no | 55 | bootloadermethod=none |
56 | bootloadermethod= | ||
57 | bootloadername= | 56 | bootloadername= |
58 | resolution=11x2x1 | 57 | resolution=11x2x1 |
59 | manualname= | 58 | manualname= |
@@ -65,8 +64,7 @@ encoder=lame | |||
65 | [recorder] | 64 | [recorder] |
66 | name="Jukebox Recorder 6 / 10 / 15 / 20" | 65 | name="Jukebox Recorder 6 / 10 / 15 / 20" |
67 | platform=recorder | 66 | platform=recorder |
68 | needsbootloader=no | 67 | bootloadermethod=none |
69 | bootloadermethod= | ||
70 | bootloadername= | 68 | bootloadername= |
71 | resolution=112x64x1 | 69 | resolution=112x64x1 |
72 | manualname= | 70 | manualname= |
@@ -78,8 +76,7 @@ encoder=lame | |||
78 | [recorder8mb] | 76 | [recorder8mb] |
79 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" | 77 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" |
80 | platform=recorder8mb | 78 | platform=recorder8mb |
81 | needsbootloader=no | 79 | bootloadermethod=none |
82 | bootloadermethod= | ||
83 | bootloadername= | 80 | bootloadername= |
84 | resolution=112x64x1 | 81 | resolution=112x64x1 |
85 | manualname=rockbox-recorder | 82 | manualname=rockbox-recorder |
@@ -91,8 +88,7 @@ encoder=lame | |||
91 | [recorderv2] | 88 | [recorderv2] |
92 | name="Jukebox Recorder v2 (20GB)" | 89 | name="Jukebox Recorder v2 (20GB)" |
93 | platform=recorderv2 | 90 | platform=recorderv2 |
94 | needsbootloader=no | 91 | bootloadermethod=none |
95 | bootloadermethod= | ||
96 | bootloadername= | 92 | bootloadername= |
97 | resolution=112x64x1 | 93 | resolution=112x64x1 |
98 | manualname= | 94 | manualname= |
@@ -104,8 +100,7 @@ encoder=lame | |||
104 | [fmrecorder] | 100 | [fmrecorder] |
105 | name="Jukebox Recorder FM" | 101 | name="Jukebox Recorder FM" |
106 | platform=fmrecorder | 102 | platform=fmrecorder |
107 | needsbootloader=no | 103 | bootloadermethod=none |
108 | bootloadermethod= | ||
109 | bootloadername= | 104 | bootloadername= |
110 | resolution=112x64x1 | 105 | resolution=112x64x1 |
111 | manualname= | 106 | manualname= |
@@ -117,8 +112,7 @@ encoder=lame | |||
117 | [fmrecorder8mb] | 112 | [fmrecorder8mb] |
118 | name="Jukebox Recorder FM (with 8MiB memory)" | 113 | name="Jukebox Recorder FM (with 8MiB memory)" |
119 | platform=fmrecorder8mb | 114 | platform=fmrecorder8mb |
120 | needsbootloader=no | 115 | bootloadermethod=none |
121 | bootloadermethod= | ||
122 | bootloadername= | 116 | bootloadername= |
123 | resolution=112x64x1 | 117 | resolution=112x64x1 |
124 | manualname=rockbox-fmrecorder | 118 | manualname=rockbox-fmrecorder |
@@ -130,8 +124,7 @@ encoder=lame | |||
130 | [ondiosp] | 124 | [ondiosp] |
131 | name="Ondio SP" | 125 | name="Ondio SP" |
132 | platform=ondiosp | 126 | platform=ondiosp |
133 | needsbootloader=no | 127 | bootloadermethod=none |
134 | bootloadermethod= | ||
135 | bootloadername= | 128 | bootloadername= |
136 | resolution=112x64x1 | 129 | resolution=112x64x1 |
137 | manualname= | 130 | manualname= |
@@ -143,8 +136,7 @@ encoder=lame | |||
143 | [ondiofm] | 136 | [ondiofm] |
144 | name="Ondio FM" | 137 | name="Ondio FM" |
145 | platform=ondiofm | 138 | platform=ondiofm |
146 | needsbootloader=no | 139 | bootloadermethod=none |
147 | bootloadermethod= | ||
148 | bootloadername= | 140 | bootloadername= |
149 | resolution=112x64x1 | 141 | resolution=112x64x1 |
150 | manualname= | 142 | manualname= |
@@ -156,7 +148,6 @@ encoder=lame | |||
156 | [h100] | 148 | [h100] |
157 | name="iHP100 / iHP110" | 149 | name="iHP100 / iHP110" |
158 | platform=h100 | 150 | platform=h100 |
159 | needsbootloader=yes | ||
160 | bootloadermethod=hex | 151 | bootloadermethod=hex |
161 | bootloadername=/iriver/bootloader-h100.bin | 152 | bootloadername=/iriver/bootloader-h100.bin |
162 | bootloaderfile=/ihp_100.hex | 153 | bootloaderfile=/ihp_100.hex |
@@ -171,7 +162,6 @@ encoder=rbspeex | |||
171 | [h120] | 162 | [h120] |
172 | name="iHP120 / iHP140 / H120 / H140" | 163 | name="iHP120 / iHP140 / H120 / H140" |
173 | platform=h120 | 164 | platform=h120 |
174 | needsbootloader=yes | ||
175 | bootloadermethod=hex | 165 | bootloadermethod=hex |
176 | bootloadername=/iriver/bootloader-h120.bin | 166 | bootloadername=/iriver/bootloader-h120.bin |
177 | bootloaderfile=/ihp_120.hex | 167 | bootloaderfile=/ihp_120.hex |
@@ -186,7 +176,6 @@ encoder=rbspeex | |||
186 | [h300] | 176 | [h300] |
187 | name="H320 / H340" | 177 | name="H320 / H340" |
188 | platform=h300 | 178 | platform=h300 |
189 | needsbootloader=yes | ||
190 | bootloadermethod=hex | 179 | bootloadermethod=hex |
191 | bootloadername=/iriver/bootloader-h300.bin | 180 | bootloadername=/iriver/bootloader-h300.bin |
192 | bootloaderfile=/H300.hex | 181 | bootloaderfile=/H300.hex |
@@ -201,7 +190,6 @@ encoder=rbspeex | |||
201 | [h10_5gbums] | 190 | [h10_5gbums] |
202 | name="H10 (5 / 6GB) UMS" | 191 | name="H10 (5 / 6GB) UMS" |
203 | platform=h10_5gb | 192 | platform=h10_5gb |
204 | needsbootloader=yes | ||
205 | bootloadermethod=mi4 | 193 | bootloadermethod=mi4 |
206 | bootloadername=/iriver/H10.mi4 | 194 | bootloadername=/iriver/H10.mi4 |
207 | bootloaderfile=/System/H10.mi4 | 195 | bootloaderfile=/System/H10.mi4 |
@@ -216,7 +204,6 @@ encoder=rbspeex | |||
216 | [h10_5gbmtp] | 204 | [h10_5gbmtp] |
217 | name="H10 (5 / 6GB) MTP" | 205 | name="H10 (5 / 6GB) MTP" |
218 | platform=h10_5gb | 206 | platform=h10_5gb |
219 | needsbootloader=yes | ||
220 | bootloadermethod=mi4 | 207 | bootloadermethod=mi4 |
221 | bootloadername=/iriver/H10_5GB-MTP/H10.mi4 | 208 | bootloadername=/iriver/H10_5GB-MTP/H10.mi4 |
222 | bootloaderfile=/System/H10.mi4 | 209 | bootloaderfile=/System/H10.mi4 |
@@ -231,7 +218,6 @@ encoder=rbspeex | |||
231 | [h10] | 218 | [h10] |
232 | name="H10 (20GB)" | 219 | name="H10 (20GB)" |
233 | platform=h10 | 220 | platform=h10 |
234 | needsbootloader=yes | ||
235 | bootloadermethod=mi4 | 221 | bootloadermethod=mi4 |
236 | bootloadername=/iriver/H10_20GC.mi4 | 222 | bootloadername=/iriver/H10_20GC.mi4 |
237 | bootloaderfile=/System/H10_20GC.mi4 | 223 | bootloaderfile=/System/H10_20GC.mi4 |
@@ -247,7 +233,6 @@ encoder=rbspeex | |||
247 | [ipod1g2g] | 233 | [ipod1g2g] |
248 | name="Ipod (1st / 2nd gen)" | 234 | name="Ipod (1st / 2nd gen)" |
249 | platform=ipod1g2g | 235 | platform=ipod1g2g |
250 | needsbootloader=yes | ||
251 | bootloadermethod=ipod | 236 | bootloadermethod=ipod |
252 | bootloadername=/ipod/bootloader-ipod1g2g.ipod | 237 | bootloadername=/ipod/bootloader-ipod1g2g.ipod |
253 | resolution=160x128x2 | 238 | resolution=160x128x2 |
@@ -260,7 +245,6 @@ encoder=rbspeex | |||
260 | [ipodcolor] | 245 | [ipodcolor] |
261 | name="Ipod Colour / Photo / U2 (4th gen)" | 246 | name="Ipod Colour / Photo / U2 (4th gen)" |
262 | platform=ipodcolor | 247 | platform=ipodcolor |
263 | needsbootloader=yes | ||
264 | bootloadermethod=ipod | 248 | bootloadermethod=ipod |
265 | bootloadername=/ipod/bootloader-ipodcolor.ipod | 249 | bootloadername=/ipod/bootloader-ipodcolor.ipod |
266 | resolution=220x176x16 | 250 | resolution=220x176x16 |
@@ -273,7 +257,6 @@ encoder=rbspeex | |||
273 | [ipodnano] | 257 | [ipodnano] |
274 | name="Ipod Nano (1st gen)" | 258 | name="Ipod Nano (1st gen)" |
275 | platform=ipodnano | 259 | platform=ipodnano |
276 | needsbootloader=yes | ||
277 | bootloadermethod=ipod | 260 | bootloadermethod=ipod |
278 | bootloadername=/ipod/bootloader-ipodnano.ipod | 261 | bootloadername=/ipod/bootloader-ipodnano.ipod |
279 | resolution=176x132x16 | 262 | resolution=176x132x16 |
@@ -287,7 +270,6 @@ encoder=rbspeex | |||
287 | [ipod4gray] | 270 | [ipod4gray] |
288 | name="Ipod (4th gen, greyscale)" | 271 | name="Ipod (4th gen, greyscale)" |
289 | platform=ipod4gray | 272 | platform=ipod4gray |
290 | needsbootloader=yes | ||
291 | bootloadermethod=ipod | 273 | bootloadermethod=ipod |
292 | bootloadername=/ipod/bootloader-ipod4g.ipod | 274 | bootloadername=/ipod/bootloader-ipod4g.ipod |
293 | resolution=160x128x2 | 275 | resolution=160x128x2 |
@@ -300,7 +282,6 @@ encoder=rbspeex | |||
300 | [ipodvideo] | 282 | [ipodvideo] |
301 | name="Ipod Video (5th gen) 30GB" | 283 | name="Ipod Video (5th gen) 30GB" |
302 | platform=ipodvideo | 284 | platform=ipodvideo |
303 | needsbootloader=yes | ||
304 | bootloadermethod=ipod | 285 | bootloadermethod=ipod |
305 | bootloadername=/ipod/bootloader-ipodvideo.ipod | 286 | bootloadername=/ipod/bootloader-ipodvideo.ipod |
306 | resolution=320x240x16 | 287 | resolution=320x240x16 |
@@ -313,7 +294,6 @@ encoder=rbspeex | |||
313 | [ipodvideo64mb] | 294 | [ipodvideo64mb] |
314 | name="Ipod Video (5th gen) 60/80GB" | 295 | name="Ipod Video (5th gen) 60/80GB" |
315 | platform=ipodvideo64mb | 296 | platform=ipodvideo64mb |
316 | needsbootloader=yes | ||
317 | bootloadermethod=ipod | 297 | bootloadermethod=ipod |
318 | bootloadername=/ipod/bootloader-ipodvideo.ipod | 298 | bootloadername=/ipod/bootloader-ipodvideo.ipod |
319 | resolution=320x240x16 | 299 | resolution=320x240x16 |
@@ -327,7 +307,6 @@ encoder=rbspeex | |||
327 | [ipod3g] | 307 | [ipod3g] |
328 | name="Ipod (3rd gen)" | 308 | name="Ipod (3rd gen)" |
329 | platform=ipod3g | 309 | platform=ipod3g |
330 | needsbootloader=yes | ||
331 | bootloadermethod=ipod | 310 | bootloadermethod=ipod |
332 | bootloadername=/ipod/bootloader-ipod3g.ipod | 311 | bootloadername=/ipod/bootloader-ipod3g.ipod |
333 | resolution=160x128x2 | 312 | resolution=160x128x2 |
@@ -341,7 +320,6 @@ encoder=rbspeex | |||
341 | [ipodmini1g] | 320 | [ipodmini1g] |
342 | name="Ipod Mini (1st gen)" | 321 | name="Ipod Mini (1st gen)" |
343 | platform=ipodmini1g | 322 | platform=ipodmini1g |
344 | needsbootloader=yes | ||
345 | bootloadermethod=ipod | 323 | bootloadermethod=ipod |
346 | bootloadername=/ipod/bootloader-ipodmini.ipod | 324 | bootloadername=/ipod/bootloader-ipodmini.ipod |
347 | resolution=138x110x2 | 325 | resolution=138x110x2 |
@@ -354,7 +332,6 @@ encoder=rbspeex | |||
354 | [ipodmini2g] | 332 | [ipodmini2g] |
355 | name="Ipod Mini (2nd gen)" | 333 | name="Ipod Mini (2nd gen)" |
356 | platform=ipodmini2g | 334 | platform=ipodmini2g |
357 | needsbootloader=yes | ||
358 | bootloadermethod=ipod | 335 | bootloadermethod=ipod |
359 | bootloadername=/ipod/bootloader-ipodmini2g.ipod | 336 | bootloadername=/ipod/bootloader-ipodmini2g.ipod |
360 | resolution=138x110x2 | 337 | resolution=138x110x2 |
@@ -367,7 +344,6 @@ encoder=rbspeex | |||
367 | [iaudiox5] | 344 | [iaudiox5] |
368 | name="iAudio X5 / X5L" | 345 | name="iAudio X5 / X5L" |
369 | platform=iaudiox5 | 346 | platform=iaudiox5 |
370 | needsbootloader=yes | ||
371 | bootloadermethod=file | 347 | bootloadermethod=file |
372 | bootloadername=/iaudio/x5_fw.bin | 348 | bootloadername=/iaudio/x5_fw.bin |
373 | bootloaderfile=/FIRMWARE/x5_fw.bin | 349 | bootloaderfile=/FIRMWARE/x5_fw.bin |
@@ -382,7 +358,6 @@ encoder=rbspeex | |||
382 | [iaudiox5v] | 358 | [iaudiox5v] |
383 | name="iAudio X5V" | 359 | name="iAudio X5V" |
384 | platform=iaudiox5 | 360 | platform=iaudiox5 |
385 | needsbootloader=yes | ||
386 | bootloadermethod=file | 361 | bootloadermethod=file |
387 | bootloadername=/iaudio/x5v_fw.bin | 362 | bootloadername=/iaudio/x5v_fw.bin |
388 | bootloaderfile=/FIRMWARE/x5v_fw.bin | 363 | bootloaderfile=/FIRMWARE/x5v_fw.bin |
@@ -396,7 +371,6 @@ encoder=rbspeex | |||
396 | [iaudiom5] | 371 | [iaudiom5] |
397 | name="iAudio M5 / M5L" | 372 | name="iAudio M5 / M5L" |
398 | platform=iaudiom5 | 373 | platform=iaudiom5 |
399 | needsbootloader=yes | ||
400 | bootloadermethod=file | 374 | bootloadermethod=file |
401 | bootloadername=/iaudio/m5_fw.bin | 375 | bootloadername=/iaudio/m5_fw.bin |
402 | bootloaderfile=/FIRMWARE/m5_fw.bin | 376 | bootloaderfile=/FIRMWARE/m5_fw.bin |
@@ -411,7 +385,6 @@ encoder=rbspeex | |||
411 | [iaudiom3] | 385 | [iaudiom3] |
412 | name="iAudio M3 / M3L" | 386 | name="iAudio M3 / M3L" |
413 | platform=iaudiom3 | 387 | platform=iaudiom3 |
414 | needsbootloader=yes | ||
415 | bootloadermethod=file | 388 | bootloadermethod=file |
416 | bootloadername=/iaudio/cowon_m3.bin | 389 | bootloadername=/iaudio/cowon_m3.bin |
417 | bootloaderfile=/FIRMWARE/cowon_m3.bin | 390 | bootloaderfile=/FIRMWARE/cowon_m3.bin |
@@ -426,7 +399,6 @@ encoder=rbspeex | |||
426 | [gigabeatf] | 399 | [gigabeatf] |
427 | name="Gigabeat F / X" | 400 | name="Gigabeat F / X" |
428 | platform=gigabeatf | 401 | platform=gigabeatf |
429 | needsbootloader=yes | ||
430 | bootloadermethod=file | 402 | bootloadermethod=file |
431 | bootloadername=/gigabeat/FWIMG01.DAT | 403 | bootloadername=/gigabeat/FWIMG01.DAT |
432 | bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT | 404 | bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT |
@@ -441,7 +413,6 @@ encoder=rbspeex | |||
441 | [sansae200] | 413 | [sansae200] |
442 | name="Sansa E200" | 414 | name="Sansa E200" |
443 | platform=sansae200 | 415 | platform=sansae200 |
444 | needsbootloader=yes | ||
445 | bootloadermethod=sansa | 416 | bootloadermethod=sansa |
446 | bootloadername=/sandisk-sansa/e200/PP5022.mi4 | 417 | bootloadername=/sandisk-sansa/e200/PP5022.mi4 |
447 | resolution=176x220x16 | 418 | resolution=176x220x16 |
@@ -457,7 +428,6 @@ encoder=rbspeex | |||
457 | [sansac200] | 428 | [sansac200] |
458 | name="Sansa C200" | 429 | name="Sansa C200" |
459 | platform=sansac200 | 430 | platform=sansac200 |
460 | needsbootloader=yes | ||
461 | bootloadermethod=sansa | 431 | bootloadermethod=sansa |
462 | bootloadername=/sandisk-sansa/c200/firmware.mi4 | 432 | bootloadername=/sandisk-sansa/c200/firmware.mi4 |
463 | resolution=132x80x16 | 433 | resolution=132x80x16 |
@@ -471,7 +441,6 @@ encoder=rbspeex | |||
471 | [mrobe100] | 441 | [mrobe100] |
472 | name="m:robe100" | 442 | name="m:robe100" |
473 | platform=mrobe100 | 443 | platform=mrobe100 |
474 | needsbootloader=yes | ||
475 | bootloadermethod=mi4 | 444 | bootloadermethod=mi4 |
476 | bootloadername=/olympus/mrobe100/pp5020.mi4 | 445 | bootloadername=/olympus/mrobe100/pp5020.mi4 |
477 | bootloaderfile=/System/pp5020.mi4 | 446 | bootloaderfile=/System/pp5020.mi4 |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 5ef43b6732..585ea17e78 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -315,7 +315,7 @@ void RbUtilQt::updateSettings() | |||
315 | 315 | ||
316 | void RbUtilQt::updateDevice() | 316 | void RbUtilQt::updateDevice() |
317 | { | 317 | { |
318 | if(!settings->curNeedsBootloader() ) { | 318 | if(settings->curBootloaderMethod() == "none" ) { |
319 | ui.buttonBootloader->setEnabled(false); | 319 | ui.buttonBootloader->setEnabled(false); |
320 | ui.buttonRemoveBootloader->setEnabled(false); | 320 | ui.buttonRemoveBootloader->setEnabled(false); |
321 | ui.labelBootloader->setEnabled(false); | 321 | ui.labelBootloader->setEnabled(false); |
@@ -333,7 +333,7 @@ void RbUtilQt::updateDevice() | |||
333 | ui.buttonRemoveBootloader->setEnabled(true); | 333 | ui.buttonRemoveBootloader->setEnabled(true); |
334 | } | 334 | } |
335 | } | 335 | } |
336 | 336 | ||
337 | // displayed device info | 337 | // displayed device info |
338 | QString mountpoint = settings->mountpoint(); | 338 | QString mountpoint = settings->mountpoint(); |
339 | QString brand = settings->curBrand(); | 339 | QString brand = settings->curBrand(); |
@@ -457,7 +457,7 @@ bool RbUtilQt::smallInstallInner() | |||
457 | return true; | 457 | return true; |
458 | } | 458 | } |
459 | // Bootloader | 459 | // Bootloader |
460 | if(settings->curNeedsBootloader()) | 460 | if(settings->curBootloaderMethod() != "none") |
461 | { | 461 | { |
462 | m_error = false; | 462 | m_error = false; |
463 | m_installed = false; | 463 | m_installed = false; |