diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2009-03-27 18:09:01 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2009-03-27 18:09:01 +0000 |
commit | 75a5b9321bc9c5da20de023f84dd96dcc5297f1a (patch) | |
tree | 19c88e85a1c9e71051b5eded2f40d361db5dcb49 /rbutil | |
parent | 463c96eb77181e8d0aa94730ba177afeabc356a2 (diff) | |
download | rockbox-75a5b9321bc9c5da20de023f84dd96dcc5297f1a.tar.gz rockbox-75a5b9321bc9c5da20de023f84dd96dcc5297f1a.zip |
rbutil:
1. Make Themesite integration work again
2. Fix FS#10055 (Theme sizes are 0) and FS#10061 (Incorrect Target missmatch detected)
3. Rename platform and voicename in rbutil.ini to reflect better what they are. (modelnames from either configure or the buildserver)
4. Fix a few places where they were used incorrectly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20558 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/detect.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/installthemes.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbsettings.h | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 124 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 14 |
7 files changed, 83 insertions, 83 deletions
diff --git a/rbutil/rbutilqt/base/detect.cpp b/rbutil/rbutilqt/base/detect.cpp index c30a03ba2e..74068618f6 100644 --- a/rbutil/rbutilqt/base/detect.cpp +++ b/rbutil/rbutilqt/base/detect.cpp | |||
@@ -402,11 +402,11 @@ QString Detect::check(RbSettings* settings, bool permission) | |||
402 | 402 | ||
403 | // Check TargetId | 403 | // Check TargetId |
404 | QString installed = installedTarget(settings->mountpoint()); | 404 | QString installed = installedTarget(settings->mountpoint()); |
405 | if(!installed.isEmpty() && installed != settings->curPlatform()) | 405 | if(!installed.isEmpty() && installed != settings->curConfigure_Modelname()) |
406 | { | 406 | { |
407 | text += QObject::tr("<li>Target mismatch detected.\n" | 407 | text += QObject::tr("<li>Target mismatch detected.\n" |
408 | "Installed target: %1, selected target: %2.</li>") | 408 | "Installed target: %1, selected target: %2.</li>") |
409 | .arg(settings->name(installed), settings->curName()); | 409 | .arg(installed, settings->curName()); |
410 | } | 410 | } |
411 | 411 | ||
412 | if(!text.isEmpty()) | 412 | if(!text.isEmpty()) |
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index efdc6d0513..bb873caef7 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -101,7 +101,7 @@ void Install::accept() | |||
101 | } | 101 | } |
102 | 102 | ||
103 | QString myversion; | 103 | QString myversion; |
104 | QString buildname = settings->curPlatformName(); | 104 | QString buildname = settings->curBuildserver_Modelname(); |
105 | if(ui.radioStable->isChecked()) { | 105 | if(ui.radioStable->isChecked()) { |
106 | file = QString("%1/%2/rockbox-%3-%4.zip") | 106 | file = QString("%1/%2/rockbox-%3-%4.zip") |
107 | .arg(settings->releaseUrl(), version.value("rel_rev"), | 107 | .arg(settings->releaseUrl(), version.value("rel_rev"), |
diff --git a/rbutil/rbutilqt/installthemes.cpp b/rbutil/rbutilqt/installthemes.cpp index 5375b8ee04..3dcc1b3fad 100644 --- a/rbutil/rbutilqt/installthemes.cpp +++ b/rbutil/rbutilqt/installthemes.cpp | |||
@@ -59,8 +59,8 @@ void ThemesInstallWindow::downloadInfo() | |||
59 | themesInfo.close(); | 59 | themesInfo.close(); |
60 | 60 | ||
61 | QUrl url; | 61 | QUrl url; |
62 | url = QUrl(settings->themeUrl() + "/rbutilqt.php?res=" | 62 | url = QUrl(settings->themeUrl() + "/rbutilqt.php?target=" |
63 | + settings->curResolution()); | 63 | + settings->curConfigure_Modelname()); |
64 | qDebug() << "downloadInfo()" << url; | 64 | qDebug() << "downloadInfo()" << url; |
65 | qDebug() << url.queryItems(); | 65 | qDebug() << url.queryItems(); |
66 | if(settings->cacheOffline()) | 66 | if(settings->cacheOffline()) |
@@ -159,10 +159,10 @@ void ThemesInstallWindow::updateDetails(int row) | |||
159 | ui.themePreview->clear(); | 159 | ui.themePreview->clear(); |
160 | ui.themePreview->setText(tr("fetching preview ...")); | 160 | ui.themePreview->setText(tr("fetching preview ...")); |
161 | 161 | ||
162 | int size = 0; | 162 | double size = 0; |
163 | 163 | ||
164 | iniDetails.beginGroup(ui.listThemes->item(row)->data(Qt::UserRole).toString()); | 164 | iniDetails.beginGroup(ui.listThemes->item(row)->data(Qt::UserRole).toString()); |
165 | size += iniDetails.value("size").toInt(); | 165 | size += iniDetails.value("size").toDouble(); |
166 | qDebug() << ui.listThemes->item(row)->data(Qt::UserRole).toString() << size; | 166 | qDebug() << ui.listThemes->item(row)->data(Qt::UserRole).toString() << size; |
167 | iniDetails.endGroup(); | 167 | iniDetails.endGroup(); |
168 | ui.labelSize->setText(tr("Download size %L1 kiB").arg(size)); | 168 | ui.labelSize->setText(tr("Download size %L1 kiB").arg(size)); |
diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 5f8664e7ea..04274360e3 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp | |||
@@ -227,9 +227,9 @@ QString RbSettings::curPlatform() | |||
227 | return userSettings->value("platform").toString(); | 227 | return userSettings->value("platform").toString(); |
228 | } | 228 | } |
229 | 229 | ||
230 | QString RbSettings::curPlatformName() | 230 | QString RbSettings::curBuildserver_Modelname() |
231 | { | 231 | { |
232 | return deviceSettingCurGet("platform").toString(); | 232 | return deviceSettingCurGet("buidserver_modelname").toString(); |
233 | } | 233 | } |
234 | 234 | ||
235 | QString RbSettings::curManual() | 235 | QString RbSettings::curManual() |
@@ -253,9 +253,9 @@ QString RbSettings::curBootloaderFile() | |||
253 | return deviceSettingCurGet("bootloaderfile").toString(); | 253 | return deviceSettingCurGet("bootloaderfile").toString(); |
254 | } | 254 | } |
255 | 255 | ||
256 | QString RbSettings::curVoiceName() | 256 | QString RbSettings::curConfigure_Modelname() |
257 | { | 257 | { |
258 | return deviceSettingCurGet("voicename").toString(); | 258 | return deviceSettingCurGet("configure_modelname").toString(); |
259 | } | 259 | } |
260 | 260 | ||
261 | QString RbSettings::curLang() | 261 | QString RbSettings::curLang() |
diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index 5ee4852065..c785061ee8 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h | |||
@@ -92,12 +92,12 @@ class RbSettings : public QObject | |||
92 | 92 | ||
93 | QString curBrand(); | 93 | QString curBrand(); |
94 | QString curName(); | 94 | QString curName(); |
95 | QString curPlatform(); | 95 | QString curPlatform(); // rbutil internal target name. |
96 | QString curPlatformName(); | 96 | QString curBuildserver_Modelname(); // modelnames used by the buildserver |
97 | QString curManual(); | 97 | QString curManual(); |
98 | QString curBootloaderMethod(); | 98 | QString curBootloaderMethod(); |
99 | QString curBootloaderName(); | 99 | QString curBootloaderName(); |
100 | QString curVoiceName(); | 100 | QString curConfigure_Modelname(); // modelname from configure (used for themes, voice, rockbox-info comparing. |
101 | QString curLang(); | 101 | QString curLang(); |
102 | QString curEncoder(); | 102 | QString curEncoder(); |
103 | QString curTTS(); | 103 | QString curTTS(); |
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index df168a3f47..3bcb88514f 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -51,103 +51,103 @@ platform60=mrobe100 | |||
51 | 51 | ||
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 | buidserver_modelname=player |
55 | bootloadermethod=none | 55 | bootloadermethod=none |
56 | bootloadername= | 56 | bootloadername= |
57 | resolution=11x2x1 | 57 | resolution=11x2x1 |
58 | manualname= | 58 | manualname= |
59 | brand=Archos | 59 | brand=Archos |
60 | voicename=player | 60 | configure_modelname=player |
61 | targetid=1 | 61 | targetid=1 |
62 | encoder=lame | 62 | encoder=lame |
63 | 63 | ||
64 | [recorder] | 64 | [recorder] |
65 | name="Jukebox Recorder 6 / 10 / 15 / 20" | 65 | name="Jukebox Recorder 6 / 10 / 15 / 20" |
66 | platform=recorder | 66 | buidserver_modelname=recorder |
67 | bootloadermethod=none | 67 | bootloadermethod=none |
68 | bootloadername= | 68 | bootloadername= |
69 | resolution=112x64x1 | 69 | resolution=112x64x1 |
70 | manualname= | 70 | manualname= |
71 | brand=Archos | 71 | brand=Archos |
72 | voicename=recorder | 72 | configure_modelname=recorder |
73 | targetid=2 | 73 | targetid=2 |
74 | encoder=lame | 74 | encoder=lame |
75 | 75 | ||
76 | [recorder8mb] | 76 | [recorder8mb] |
77 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" | 77 | name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" |
78 | platform=recorder8mb | 78 | buidserver_modelname=recorder8mb |
79 | bootloadermethod=none | 79 | bootloadermethod=none |
80 | bootloadername= | 80 | bootloadername= |
81 | resolution=112x64x1 | 81 | resolution=112x64x1 |
82 | manualname=rockbox-recorder | 82 | manualname=rockbox-recorder |
83 | brand=Archos | 83 | brand=Archos |
84 | voicename=recorder | 84 | configure_modelname=recorder |
85 | targetid=2 | 85 | targetid=2 |
86 | encoder=lame | 86 | encoder=lame |
87 | 87 | ||
88 | [recorderv2] | 88 | [recorderv2] |
89 | name="Jukebox Recorder v2 (20GB)" | 89 | name="Jukebox Recorder v2 (20GB)" |
90 | platform=recorderv2 | 90 | buidserver_modelname=recorderv2 |
91 | bootloadermethod=none | 91 | bootloadermethod=none |
92 | bootloadername= | 92 | bootloadername= |
93 | resolution=112x64x1 | 93 | resolution=112x64x1 |
94 | manualname= | 94 | manualname= |
95 | brand=Archos | 95 | brand=Archos |
96 | voicename=recorderv2 | 96 | configure_modelname=recorderv2 |
97 | targetid=4 | 97 | targetid=4 |
98 | encoder=lame | 98 | encoder=lame |
99 | 99 | ||
100 | [fmrecorder] | 100 | [fmrecorder] |
101 | name="Jukebox Recorder FM" | 101 | name="Jukebox Recorder FM" |
102 | platform=fmrecorder | 102 | buidserver_modelname=fmrecorder |
103 | bootloadermethod=none | 103 | bootloadermethod=none |
104 | bootloadername= | 104 | bootloadername= |
105 | resolution=112x64x1 | 105 | resolution=112x64x1 |
106 | manualname= | 106 | manualname= |
107 | brand=Archos | 107 | brand=Archos |
108 | voicename=fmrecorder | 108 | configure_modelname=fmrecorder |
109 | targetid=3 | 109 | targetid=3 |
110 | encoder=lame | 110 | encoder=lame |
111 | 111 | ||
112 | [fmrecorder8mb] | 112 | [fmrecorder8mb] |
113 | name="Jukebox Recorder FM (with 8MiB memory)" | 113 | name="Jukebox Recorder FM (with 8MiB memory)" |
114 | platform=fmrecorder8mb | 114 | buidserver_modelname=fmrecorder8mb |
115 | bootloadermethod=none | 115 | bootloadermethod=none |
116 | bootloadername= | 116 | bootloadername= |
117 | resolution=112x64x1 | 117 | resolution=112x64x1 |
118 | manualname=rockbox-fmrecorder | 118 | manualname=rockbox-fmrecorder |
119 | brand=Archos | 119 | brand=Archos |
120 | voicename=fmrecorder | 120 | configure_modelname=fmrecorder |
121 | targetid=3 | 121 | targetid=3 |
122 | encoder=lame | 122 | encoder=lame |
123 | 123 | ||
124 | [ondiosp] | 124 | [ondiosp] |
125 | name="Ondio SP" | 125 | name="Ondio SP" |
126 | platform=ondiosp | 126 | buidserver_modelname=ondiosp |
127 | bootloadermethod=none | 127 | bootloadermethod=none |
128 | bootloadername= | 128 | bootloadername= |
129 | resolution=112x64x1 | 129 | resolution=112x64x1 |
130 | manualname= | 130 | manualname= |
131 | brand=Archos | 131 | brand=Archos |
132 | voicename=ondiosp | 132 | configure_modelname=ondiosp |
133 | targetid=7 | 133 | targetid=7 |
134 | encoder=lame | 134 | encoder=lame |
135 | 135 | ||
136 | [ondiofm] | 136 | [ondiofm] |
137 | name="Ondio FM" | 137 | name="Ondio FM" |
138 | platform=ondiofm | 138 | buidserver_modelname=ondiofm |
139 | bootloadermethod=none | 139 | bootloadermethod=none |
140 | bootloadername= | 140 | bootloadername= |
141 | resolution=112x64x1 | 141 | resolution=112x64x1 |
142 | manualname= | 142 | manualname= |
143 | brand=Archos | 143 | brand=Archos |
144 | voicename=ondiofm | 144 | configure_modelname=ondiofm |
145 | targetid=8 | 145 | targetid=8 |
146 | encoder=lame | 146 | encoder=lame |
147 | 147 | ||
148 | [h100] | 148 | [h100] |
149 | name="iHP100 / iHP110" | 149 | name="iHP100 / iHP110" |
150 | platform=h100 | 150 | buidserver_modelname=h100 |
151 | bootloadermethod=hex | 151 | bootloadermethod=hex |
152 | bootloadername=/iriver/bootloader-h100.bin | 152 | bootloadername=/iriver/bootloader-h100.bin |
153 | bootloaderfile=/ihp_100.hex | 153 | bootloaderfile=/ihp_100.hex |
@@ -155,13 +155,13 @@ resolution=160x128x2 | |||
155 | manualname=rockbox-h100 | 155 | manualname=rockbox-h100 |
156 | brand=Iriver | 156 | brand=Iriver |
157 | usbid=0x10063001 | 157 | usbid=0x10063001 |
158 | voicename=h100 | 158 | configure_modelname=h100 |
159 | targetid=11 | 159 | targetid=11 |
160 | encoder=rbspeex | 160 | encoder=rbspeex |
161 | 161 | ||
162 | [h120] | 162 | [h120] |
163 | name="iHP120 / iHP140 / H120 / H140" | 163 | name="iHP120 / iHP140 / H120 / H140" |
164 | platform=h120 | 164 | buidserver_modelname=h120 |
165 | bootloadermethod=hex | 165 | bootloadermethod=hex |
166 | bootloadername=/iriver/bootloader-h120.bin | 166 | bootloadername=/iriver/bootloader-h120.bin |
167 | bootloaderfile=/ihp_120.hex | 167 | bootloaderfile=/ihp_120.hex |
@@ -169,13 +169,13 @@ resolution=160x128x2 | |||
169 | manualname=rockbox-h100 | 169 | manualname=rockbox-h100 |
170 | brand=Iriver | 170 | brand=Iriver |
171 | usbid=0x10063002 | 171 | usbid=0x10063002 |
172 | voicename=h120 | 172 | configure_modelname=h120 |
173 | targetid=9 | 173 | targetid=9 |
174 | encoder=rbspeex | 174 | encoder=rbspeex |
175 | 175 | ||
176 | [h300] | 176 | [h300] |
177 | name="H320 / H340" | 177 | name="H320 / H340" |
178 | platform=h300 | 178 | buidserver_modelname=h300 |
179 | bootloadermethod=hex | 179 | bootloadermethod=hex |
180 | bootloadername=/iriver/bootloader-h300.bin | 180 | bootloadername=/iriver/bootloader-h300.bin |
181 | bootloaderfile=/H300.hex | 181 | bootloaderfile=/H300.hex |
@@ -183,13 +183,13 @@ resolution=220x176x16 | |||
183 | manualname=rockbox-h300 | 183 | manualname=rockbox-h300 |
184 | brand=Iriver | 184 | brand=Iriver |
185 | usbid=0x10063003 | 185 | usbid=0x10063003 |
186 | voicename=h300 | 186 | configure_modelname=h300 |
187 | targetid=10 | 187 | targetid=10 |
188 | encoder=rbspeex | 188 | encoder=rbspeex |
189 | 189 | ||
190 | [h10_5gbums] | 190 | [h10_5gbums] |
191 | name="H10 (5 / 6GB) UMS" | 191 | name="H10 (5 / 6GB) UMS" |
192 | platform=h10_5gb | 192 | buidserver_modelname=h10_5gb |
193 | bootloadermethod=mi4 | 193 | bootloadermethod=mi4 |
194 | bootloadername=/iriver/H10.mi4 | 194 | bootloadername=/iriver/H10.mi4 |
195 | bootloaderfile=/System/H10.mi4 | 195 | bootloaderfile=/System/H10.mi4 |
@@ -197,13 +197,13 @@ resolution=128x128x16 | |||
197 | manualname= | 197 | manualname= |
198 | brand=Iriver | 198 | brand=Iriver |
199 | usbid=0x41022002 | 199 | usbid=0x41022002 |
200 | voicename=h10_5gb | 200 | configure_modelname=h10_5gb |
201 | targetid=24 | 201 | targetid=24 |
202 | encoder=rbspeex | 202 | encoder=rbspeex |
203 | 203 | ||
204 | [h10_5gbmtp] | 204 | [h10_5gbmtp] |
205 | name="H10 (5 / 6GB) MTP" | 205 | name="H10 (5 / 6GB) MTP" |
206 | platform=h10_5gb | 206 | buidserver_modelname=h10_5gb |
207 | bootloadermethod=mi4 | 207 | bootloadermethod=mi4 |
208 | bootloadername=/iriver/H10_5GB-MTP/H10.mi4 | 208 | bootloadername=/iriver/H10_5GB-MTP/H10.mi4 |
209 | bootloaderfile=/System/H10.mi4 | 209 | bootloaderfile=/System/H10.mi4 |
@@ -211,13 +211,13 @@ resolution=128x128x16 | |||
211 | manualname= | 211 | manualname= |
212 | brand=Iriver | 212 | brand=Iriver |
213 | usbid=0x41022105 | 213 | usbid=0x41022105 |
214 | voicename=h10_5gb | 214 | configure_modelname=h10_5gb |
215 | targetid=24 | 215 | targetid=24 |
216 | encoder=rbspeex | 216 | encoder=rbspeex |
217 | 217 | ||
218 | [h10] | 218 | [h10] |
219 | name="H10 (20GB)" | 219 | name="H10 (20GB)" |
220 | platform=h10 | 220 | buidserver_modelname=h10 |
221 | bootloadermethod=mi4 | 221 | bootloadermethod=mi4 |
222 | bootloadername=/iriver/H10_20GC.mi4 | 222 | bootloadername=/iriver/H10_20GC.mi4 |
223 | bootloaderfile=/System/H10_20GC.mi4 | 223 | bootloaderfile=/System/H10_20GC.mi4 |
@@ -226,124 +226,124 @@ manualname= | |||
226 | brand=Iriver | 226 | brand=Iriver |
227 | usbid=0x0b7000ba | 227 | usbid=0x0b7000ba |
228 | usberror=0x41022101 | 228 | usberror=0x41022101 |
229 | voicename=h10 | 229 | configure_modelname=h10 |
230 | targetid=22 | 230 | targetid=22 |
231 | encoder=rbspeex | 231 | encoder=rbspeex |
232 | 232 | ||
233 | [ipod1g2g] | 233 | [ipod1g2g] |
234 | name="Ipod (1st / 2nd gen)" | 234 | name="Ipod (1st / 2nd gen)" |
235 | platform=ipod1g2g | 235 | buidserver_modelname=ipod1g2g |
236 | bootloadermethod=ipod | 236 | bootloadermethod=ipod |
237 | bootloadername=/ipod/bootloader-ipod1g2g.ipod | 237 | bootloadername=/ipod/bootloader-ipod1g2g.ipod |
238 | resolution=160x128x2 | 238 | resolution=160x128x2 |
239 | manualname= | 239 | manualname= |
240 | brand=Apple | 240 | brand=Apple |
241 | voicename=ipod1g2g | 241 | configure_modelname=ipod1g2g |
242 | targetid=29 | 242 | targetid=29 |
243 | encoder=rbspeex | 243 | encoder=rbspeex |
244 | 244 | ||
245 | [ipodcolor] | 245 | [ipodcolor] |
246 | name="Ipod Color / Photo / U2 (4th gen)" | 246 | name="Ipod Color / Photo / U2 (4th gen)" |
247 | platform=ipodcolor | 247 | buidserver_modelname=ipodcolor |
248 | bootloadermethod=ipod | 248 | bootloadermethod=ipod |
249 | bootloadername=/ipod/bootloader-ipodcolor.ipod | 249 | bootloadername=/ipod/bootloader-ipodcolor.ipod |
250 | resolution=220x176x16 | 250 | resolution=220x176x16 |
251 | manualname= | 251 | manualname= |
252 | brand=Apple | 252 | brand=Apple |
253 | voicename=ipodcolor | 253 | configure_modelname=ipodcolor |
254 | targetid=13 | 254 | targetid=13 |
255 | encoder=rbspeex | 255 | encoder=rbspeex |
256 | 256 | ||
257 | [ipodnano] | 257 | [ipodnano] |
258 | name="Ipod Nano (1st gen)" | 258 | name="Ipod Nano (1st gen)" |
259 | platform=ipodnano | 259 | buidserver_modelname=ipodnano |
260 | bootloadermethod=ipod | 260 | bootloadermethod=ipod |
261 | bootloadername=/ipod/bootloader-ipodnano.ipod | 261 | bootloadername=/ipod/bootloader-ipodnano.ipod |
262 | resolution=176x132x16 | 262 | resolution=176x132x16 |
263 | manualname= | 263 | manualname= |
264 | brand=Apple | 264 | brand=Apple |
265 | usbincompat=0x05ac1260 | 265 | usbincompat=0x05ac1260 |
266 | voicename=ipodnano | 266 | configure_modelname=ipodnano |
267 | targetid=14 | 267 | targetid=14 |
268 | encoder=rbspeex | 268 | encoder=rbspeex |
269 | 269 | ||
270 | [ipod4gray] | 270 | [ipod4gray] |
271 | name="Ipod (4th gen, greyscale)" | 271 | name="Ipod (4th gen, greyscale)" |
272 | platform=ipod4gray | 272 | buidserver_modelname=ipod4gray |
273 | bootloadermethod=ipod | 273 | bootloadermethod=ipod |
274 | bootloadername=/ipod/bootloader-ipod4g.ipod | 274 | bootloadername=/ipod/bootloader-ipod4g.ipod |
275 | resolution=160x128x2 | 275 | resolution=160x128x2 |
276 | manualname= | 276 | manualname= |
277 | brand=Apple | 277 | brand=Apple |
278 | voicename=ipod4gray | 278 | configure_modelname=ipod4g |
279 | targetid=17 | 279 | targetid=17 |
280 | encoder=rbspeex | 280 | encoder=rbspeex |
281 | 281 | ||
282 | [ipodvideo] | 282 | [ipodvideo] |
283 | name="Ipod Video (5th gen) 30GB" | 283 | name="Ipod Video (5th gen) 30GB" |
284 | platform=ipodvideo | 284 | buidserver_modelname=ipodvideo |
285 | bootloadermethod=ipod | 285 | bootloadermethod=ipod |
286 | bootloadername=/ipod/bootloader-ipodvideo.ipod | 286 | bootloadername=/ipod/bootloader-ipodvideo.ipod |
287 | resolution=320x240x16 | 287 | resolution=320x240x16 |
288 | manualname= | 288 | manualname= |
289 | brand=Apple | 289 | brand=Apple |
290 | voicename=ipodvideo | 290 | configure_modelname=ipodvideo |
291 | targetid=15 | 291 | targetid=15 |
292 | encoder=rbspeex | 292 | encoder=rbspeex |
293 | 293 | ||
294 | [ipodvideo64mb] | 294 | [ipodvideo64mb] |
295 | name="Ipod Video (5th gen) 60/80GB" | 295 | name="Ipod Video (5th gen) 60/80GB" |
296 | platform=ipodvideo64mb | 296 | buidserver_modelname=ipodvideo64mb |
297 | bootloadermethod=ipod | 297 | bootloadermethod=ipod |
298 | bootloadername=/ipod/bootloader-ipodvideo.ipod | 298 | bootloadername=/ipod/bootloader-ipodvideo.ipod |
299 | resolution=320x240x16 | 299 | resolution=320x240x16 |
300 | manualname= | 300 | manualname= |
301 | brand=Apple | 301 | brand=Apple |
302 | voicename=ipodvideo | 302 | configure_modelname=ipodvideo |
303 | usbincompat=0x05ac1261 | 303 | usbincompat=0x05ac1261 |
304 | targetid=15 | 304 | targetid=15 |
305 | encoder=rbspeex | 305 | encoder=rbspeex |
306 | 306 | ||
307 | [ipod3g] | 307 | [ipod3g] |
308 | name="Ipod (3rd gen)" | 308 | name="Ipod (3rd gen)" |
309 | platform=ipod3g | 309 | buidserver_modelname=ipod3g |
310 | bootloadermethod=ipod | 310 | bootloadermethod=ipod |
311 | bootloadername=/ipod/bootloader-ipod3g.ipod | 311 | bootloadername=/ipod/bootloader-ipod3g.ipod |
312 | resolution=160x128x2 | 312 | resolution=160x128x2 |
313 | manualname= | 313 | manualname= |
314 | brand=Apple | 314 | brand=Apple |
315 | usbid=0x05ac1201 | 315 | usbid=0x05ac1201 |
316 | voicename=ipod3g | 316 | configure_modelname=ipod3g |
317 | targetid=16 | 317 | targetid=16 |
318 | encoder=rbspeex | 318 | encoder=rbspeex |
319 | 319 | ||
320 | [ipodmini1g] | 320 | [ipodmini1g] |
321 | name="Ipod Mini (1st gen)" | 321 | name="Ipod Mini (1st gen)" |
322 | platform=ipodmini1g | 322 | buidserver_modelname=ipodmini1g |
323 | bootloadermethod=ipod | 323 | bootloadermethod=ipod |
324 | bootloadername=/ipod/bootloader-ipodmini.ipod | 324 | bootloadername=/ipod/bootloader-ipodmini.ipod |
325 | resolution=138x110x2 | 325 | resolution=138x110x2 |
326 | manualname=rockbox-ipodmini2g | 326 | manualname=rockbox-ipodmini2g |
327 | brand=Apple | 327 | brand=Apple |
328 | voicename=ipodmini1g | 328 | configure_modelname=ipodmini |
329 | targetid=18 | 329 | targetid=18 |
330 | encoder=rbspeex | 330 | encoder=rbspeex |
331 | 331 | ||
332 | [ipodmini2g] | 332 | [ipodmini2g] |
333 | name="Ipod Mini (2nd gen)" | 333 | name="Ipod Mini (2nd gen)" |
334 | platform=ipodmini2g | 334 | buidserver_modelname=ipodmini2g |
335 | bootloadermethod=ipod | 335 | bootloadermethod=ipod |
336 | bootloadername=/ipod/bootloader-ipodmini2g.ipod | 336 | bootloadername=/ipod/bootloader-ipodmini2g.ipod |
337 | resolution=138x110x2 | 337 | resolution=138x110x2 |
338 | manualname=rockbox-ipodmini2g | 338 | manualname=rockbox-ipodmini2g |
339 | brand=Apple | 339 | brand=Apple |
340 | voicename=ipodmini2g | 340 | configure_modelname=ipodmini2g |
341 | targetid=21 | 341 | targetid=21 |
342 | encoder=rbspeex | 342 | encoder=rbspeex |
343 | 343 | ||
344 | [iaudiox5] | 344 | [iaudiox5] |
345 | name="iAudio X5 / X5L" | 345 | name="iAudio X5 / X5L" |
346 | platform=iaudiox5 | 346 | buidserver_modelname=iaudiox5 |
347 | bootloadermethod=file | 347 | bootloadermethod=file |
348 | bootloadername=/iaudio/x5_fw.bin | 348 | bootloadername=/iaudio/x5_fw.bin |
349 | bootloaderfile=/FIRMWARE/x5_fw.bin | 349 | bootloaderfile=/FIRMWARE/x5_fw.bin |
@@ -351,26 +351,26 @@ resolution=160x128x16 | |||
351 | manualname= | 351 | manualname= |
352 | brand=Cowon | 352 | brand=Cowon |
353 | usbid=0x0e210510, 0x0e210513 | 353 | usbid=0x0e210510, 0x0e210513 |
354 | voicename=iaudiox5 | 354 | configure_modelname=x5 |
355 | targetid=12 | 355 | targetid=12 |
356 | encoder=rbspeex | 356 | encoder=rbspeex |
357 | 357 | ||
358 | [iaudiox5v] | 358 | [iaudiox5v] |
359 | name="iAudio X5V" | 359 | name="iAudio X5V" |
360 | platform=iaudiox5 | 360 | buidserver_modelname=iaudiox5 |
361 | bootloadermethod=file | 361 | bootloadermethod=file |
362 | bootloadername=/iaudio/x5v_fw.bin | 362 | bootloadername=/iaudio/x5v_fw.bin |
363 | bootloaderfile=/FIRMWARE/x5v_fw.bin | 363 | bootloaderfile=/FIRMWARE/x5v_fw.bin |
364 | resolution=160x128x2 | 364 | resolution=160x128x2 |
365 | manualname= | 365 | manualname= |
366 | brand=Cowon | 366 | brand=Cowon |
367 | voicename=iaudiox5v | 367 | configure_modelname=x5 |
368 | targetid=12 | 368 | targetid=12 |
369 | encoder=rbspeex | 369 | encoder=rbspeex |
370 | 370 | ||
371 | [iaudiom5] | 371 | [iaudiom5] |
372 | name="iAudio M5 / M5L" | 372 | name="iAudio M5 / M5L" |
373 | platform=iaudiom5 | 373 | buidserver_modelname=iaudiom5 |
374 | bootloadermethod=file | 374 | bootloadermethod=file |
375 | bootloadername=/iaudio/m5_fw.bin | 375 | bootloadername=/iaudio/m5_fw.bin |
376 | bootloaderfile=/FIRMWARE/m5_fw.bin | 376 | bootloaderfile=/FIRMWARE/m5_fw.bin |
@@ -378,13 +378,13 @@ resolution=160x128x2 | |||
378 | manualname= | 378 | manualname= |
379 | brand=Cowon | 379 | brand=Cowon |
380 | usbid=0x0e210520 | 380 | usbid=0x0e210520 |
381 | voicename=iaudiom5 | 381 | configure_modelname=m5 |
382 | targetid=28 | 382 | targetid=28 |
383 | encoder=rbspeex | 383 | encoder=rbspeex |
384 | 384 | ||
385 | [iaudiom3] | 385 | [iaudiom3] |
386 | name="iAudio M3 / M3L" | 386 | name="iAudio M3 / M3L" |
387 | platform=iaudiom3 | 387 | buidserver_modelname=iaudiom3 |
388 | bootloadermethod=file | 388 | bootloadermethod=file |
389 | bootloadername=/iaudio/cowon_m3.bin | 389 | bootloadername=/iaudio/cowon_m3.bin |
390 | bootloaderfile=/FIRMWARE/cowon_m3.bin | 390 | bootloaderfile=/FIRMWARE/cowon_m3.bin |
@@ -392,13 +392,13 @@ resolution=128x96x2 | |||
392 | manualname= | 392 | manualname= |
393 | brand=Cowon | 393 | brand=Cowon |
394 | usbid=0x0e210500 | 394 | usbid=0x0e210500 |
395 | voicename=iaudiom3 | 395 | configure_modelname=m3 |
396 | targetid=37 | 396 | targetid=37 |
397 | encoder=rbspeex | 397 | encoder=rbspeex |
398 | 398 | ||
399 | [gigabeatf] | 399 | [gigabeatf] |
400 | name="Gigabeat F / X" | 400 | name="Gigabeat F / X" |
401 | platform=gigabeatf | 401 | buidserver_modelname=gigabeatf |
402 | bootloadermethod=file | 402 | bootloadermethod=file |
403 | bootloadername=/gigabeat/FWIMG01.DAT | 403 | bootloadername=/gigabeat/FWIMG01.DAT |
404 | bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT | 404 | bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT |
@@ -406,13 +406,13 @@ resolution=240x320x16 | |||
406 | manualname= | 406 | manualname= |
407 | brand=Toshiba | 407 | brand=Toshiba |
408 | usbid=0x09300009 | 408 | usbid=0x09300009 |
409 | voicename=gigabeatf | 409 | configure_modelname=gigabeatf |
410 | targetid=20 | 410 | targetid=20 |
411 | encoder=rbspeex | 411 | encoder=rbspeex |
412 | 412 | ||
413 | [sansae200] | 413 | [sansae200] |
414 | name="Sansa E200" | 414 | name="Sansa E200" |
415 | platform=sansae200 | 415 | buidserver_modelname=sansae200 |
416 | bootloadermethod=sansa | 416 | bootloadermethod=sansa |
417 | bootloadername=/sandisk-sansa/e200/PP5022.mi4 | 417 | bootloadername=/sandisk-sansa/e200/PP5022.mi4 |
418 | resolution=176x220x16 | 418 | resolution=176x220x16 |
@@ -421,26 +421,26 @@ brand=Sandisk | |||
421 | usbid=0x07817421 | 421 | usbid=0x07817421 |
422 | usberror=0x07810720 | 422 | usberror=0x07810720 |
423 | usbincompat=0x07817422, 0x07817423 | 423 | usbincompat=0x07817422, 0x07817423 |
424 | voicename=sansae200 | 424 | configure_modelname=e200 |
425 | targetid=23 | 425 | targetid=23 |
426 | encoder=rbspeex | 426 | encoder=rbspeex |
427 | 427 | ||
428 | [sansac200] | 428 | [sansac200] |
429 | name="Sansa C200" | 429 | name="Sansa C200" |
430 | platform=sansac200 | 430 | buidserver_modelname=sansac200 |
431 | bootloadermethod=sansa | 431 | bootloadermethod=sansa |
432 | bootloadername=/sandisk-sansa/c200/firmware.mi4 | 432 | bootloadername=/sandisk-sansa/c200/firmware.mi4 |
433 | resolution=132x80x16 | 433 | resolution=132x80x16 |
434 | manualname= | 434 | manualname= |
435 | brand=Sandisk | 435 | brand=Sandisk |
436 | usbid=0x07817450, 0x07817451 | 436 | usbid=0x07817450, 0x07817451 |
437 | voicename=sansac200 | 437 | configure_modelname=c200 |
438 | targetid=30 | 438 | targetid=30 |
439 | encoder=rbspeex | 439 | encoder=rbspeex |
440 | 440 | ||
441 | [mrobe100] | 441 | [mrobe100] |
442 | name="m:robe100" | 442 | name="m:robe100" |
443 | platform=mrobe100 | 443 | buidserver_modelname=mrobe100 |
444 | bootloadermethod=mi4 | 444 | bootloadermethod=mi4 |
445 | bootloadername=/olympus/mrobe100/pp5020.mi4 | 445 | bootloadername=/olympus/mrobe100/pp5020.mi4 |
446 | bootloaderfile=/System/pp5020.mi4 | 446 | bootloaderfile=/System/pp5020.mi4 |
@@ -448,7 +448,7 @@ resolution=160x128x1 | |||
448 | manualname= | 448 | manualname= |
449 | brand=Olympus | 449 | brand=Olympus |
450 | usbid=0x07b40280 | 450 | usbid=0x07b40280 |
451 | voicename=mrobe100 | 451 | configure_modelname=mrobe100 |
452 | targetid=33 | 452 | targetid=33 |
453 | encoder=rbspeex | 453 | encoder=rbspeex |
454 | 454 | ||
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 0082fd2b6b..d069c422f6 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -511,7 +511,7 @@ bool RbUtilQt::installAuto() | |||
511 | { | 511 | { |
512 | QString file = QString("%1/%2/rockbox-%3-%4.zip") | 512 | QString file = QString("%1/%2/rockbox-%3-%4.zip") |
513 | .arg(settings->releaseUrl(), versmap.value("rel_rev"), | 513 | .arg(settings->releaseUrl(), versmap.value("rel_rev"), |
514 | settings->curPlatform(), versmap.value("rel_rev")); | 514 | settings->curBuildserver_Modelname(), versmap.value("rel_rev")); |
515 | buildInfo.open(); | 515 | buildInfo.open(); |
516 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); | 516 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); |
517 | buildInfo.close(); | 517 | buildInfo.close(); |
@@ -649,8 +649,8 @@ void RbUtilQt::installBootloader() | |||
649 | // special case for H10 pure: this player can have a different | 649 | // special case for H10 pure: this player can have a different |
650 | // bootloader file filename. This is handled here to keep the install | 650 | // bootloader file filename. This is handled here to keep the install |
651 | // class clean, though having it here is also not the nicest solution. | 651 | // class clean, though having it here is also not the nicest solution. |
652 | if(settings->curPlatformName() == "h10_ums" | 652 | if(platform == "h10_ums" |
653 | || settings->curPlatformName() == "h10_mtp") { | 653 | || platform == "h10_mtp") { |
654 | if(resolvePathCase(blfile).isEmpty()) | 654 | if(resolvePathCase(blfile).isEmpty()) |
655 | blfile = settings->mountpoint() | 655 | blfile = settings->mountpoint() |
656 | + settings->curBootloaderName().replace("H10", | 656 | + settings->curBootloaderName().replace("H10", |
@@ -681,7 +681,7 @@ void RbUtilQt::installBootloader() | |||
681 | else if(bl->installed() == BootloaderInstallBase::BootloaderOther | 681 | else if(bl->installed() == BootloaderInstallBase::BootloaderOther |
682 | && bl->capabilities() & BootloaderInstallBase::Backup) | 682 | && bl->capabilities() & BootloaderInstallBase::Backup) |
683 | { | 683 | { |
684 | QString targetFolder = settings->curPlatformName() + " Firmware Backup"; | 684 | QString targetFolder = settings->curPlatform() + " Firmware Backup"; |
685 | // remove invalid character(s) | 685 | // remove invalid character(s) |
686 | targetFolder.remove(QRegExp("[:/]")); | 686 | targetFolder.remove(QRegExp("[:/]")); |
687 | if(QMessageBox::question(this, tr("Create Bootloader backup"), | 687 | if(QMessageBox::question(this, tr("Create Bootloader backup"), |
@@ -842,7 +842,7 @@ void RbUtilQt::installVoice() | |||
842 | 842 | ||
843 | QString voiceurl = settings->voiceUrl(); | 843 | QString voiceurl = settings->voiceUrl(); |
844 | 844 | ||
845 | voiceurl += settings->curVoiceName() + "-" + | 845 | voiceurl += settings->curConfigure_Modelname() + "-" + |
846 | versmap.value("arch_date") + "-english.zip"; | 846 | versmap.value("arch_date") + "-english.zip"; |
847 | qDebug() << voiceurl; | 847 | qDebug() << voiceurl; |
848 | 848 | ||
@@ -981,8 +981,8 @@ void RbUtilQt::uninstallBootloader(void) | |||
981 | } | 981 | } |
982 | 982 | ||
983 | QString blfile = settings->mountpoint() + settings->curBootloaderFile(); | 983 | QString blfile = settings->mountpoint() + settings->curBootloaderFile(); |
984 | if(settings->curPlatformName() == "h10_ums" | 984 | if(settings->curPlatform() == "h10_ums" |
985 | || settings->curPlatformName() == "h10_mtp") { | 985 | || settings->curPlatform() == "h10_mtp") { |
986 | if(resolvePathCase(blfile).isEmpty()) | 986 | if(resolvePathCase(blfile).isEmpty()) |
987 | blfile = settings->mountpoint() | 987 | blfile = settings->mountpoint() |
988 | + settings->curBootloaderName().replace("H10", | 988 | + settings->curBootloaderName().replace("H10", |