len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: Get rid of configure_modelname in rbutil.ini.

Browse source 
The target selection string used for configure is the same as the
internally used player string, minus the (optional) variant suffix.
Don't duplicate things, simply strip the suffix.

Change-Id: Ic34bd5f933fab0d837adce0d0ae9c403868d720d
This commit is contained in:
Dominik Riebeling 2020-11-28 20:28:51 +01:00
parent 10f05b3b27
commit 78a01db47c
5 changed files with 2 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rbutil/rbutilqt/base/systeminfo.cpp
View file

@ -59,7 +59,6 @@ const static struct {
{ SystemInfo::Encoder, ":platform:/encoder", "" }, { SystemInfo::Encoder, ":platform:/encoder", "" },
{ SystemInfo::Brand, ":platform:/brand", "" }, { SystemInfo::Brand, ":platform:/brand", "" },
{ SystemInfo::Name, ":platform:/name", "" }, { SystemInfo::Name, ":platform:/name", "" },
{ SystemInfo::ConfigureModel, ":platform:/configure_modelname", "" },
{ SystemInfo::PlayerPicture, ":platform:/playerpic", "" }, { SystemInfo::PlayerPicture, ":platform:/playerpic", "" },
}; };

1
rbutil/rbutilqt/base/systeminfo.h
View file

@ -72,7 +72,6 @@ class SystemInfo : public QObject
Encoder, Encoder,
Brand, Brand,
Name, Name,
ConfigureModel,
PlayerPicture, PlayerPicture,
}; };

2
rbutil/rbutilqt/base/utils.cpp
View file

@ -381,7 +381,7 @@ QString Utils::checkEnvironment(bool permission)
RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString()); RockboxInfo rbinfo(RbSettings::value(RbSettings::Mountpoint).toString());
QString installed = rbinfo.target(); QString installed = rbinfo.target();
if(!installed.isEmpty() && installed != if(!installed.isEmpty() && installed !=
SystemInfo::platformValue(SystemInfo::ConfigureModel).toString()) RbSettings::value(RbSettings::CurrentPlatform).toString().split(".").at(0))
{ {
text += tr("<li>Target mismatch detected.<br/>" text += tr("<li>Target mismatch detected.<br/>"
"Installed target: %1<br/>Selected target: %2.</li>") "Installed target: %1<br/>Selected target: %2.</li>")

64
rbutil/rbutilqt/rbutil.ini
View file

@ -147,7 +147,6 @@ bootloadername=
manualname= manualname=
brand=Archos brand=Archos
usbid=0x05ab0031 usbid=0x05ab0031
configure_modelname=archosplayer
playerpic=archosplayer playerpic=archosplayer
encoder=lame encoder=lame
@ -158,7 +157,6 @@ bootloadername=
manualname= manualname=
brand=Archos brand=Archos
usbid=0x05ab0031,0x05ab0060 usbid=0x05ab0031,0x05ab0060
configure_modelname=archosrecorder
playerpic=archosrecorder playerpic=archosrecorder
encoder=lame encoder=lame
@ -169,7 +167,6 @@ bootloadername=
manualname=archosfmrecorder manualname=archosfmrecorder
brand=Archos brand=Archos
usbid=0x05ab0060 usbid=0x05ab0060
configure_modelname=archosrecorderv2
playerpic=archosrecorderv2 playerpic=archosrecorderv2
encoder=lame encoder=lame
@ -180,7 +177,6 @@ bootloadername=
manualname= manualname=
brand=Archos brand=Archos
usbid=0x05ab0060 usbid=0x05ab0060
configure_modelname=archosfmrecorder
playerpic=archosfmrecorder playerpic=archosfmrecorder
encoder=lame encoder=lame
@ -191,7 +187,6 @@ bootloadername=
manualname= manualname=
brand=Archos brand=Archos
usbid=0x058f9330 usbid=0x058f9330
configure_modelname=archosondiosp
playerpic=archosondiosp playerpic=archosondiosp
encoder=lame encoder=lame
@ -202,7 +197,6 @@ bootloadername=
manualname= manualname=
brand=Archos brand=Archos
usbid=0x058f9330 usbid=0x058f9330
configure_modelname=archosondiofm
playerpic=archosondiofm playerpic=archosondiofm
encoder=lame encoder=lame
@ -215,7 +209,6 @@ bootloaderfilter=*.hex *.zip
manualname=iriverh100 manualname=iriverh100
brand=Iriver brand=Iriver
usbid=0x10063001 usbid=0x10063001
configure_modelname=iriverh100
playerpic=iriverh100 playerpic=iriverh100
encoder=rbspeex encoder=rbspeex
@ -228,7 +221,6 @@ bootloaderfilter=*.hex *.zip
manualname=iriverh100 manualname=iriverh100
brand=Iriver brand=Iriver
usbid=0x10063002 usbid=0x10063002
configure_modelname=iriverh120
playerpic=iriverh100 playerpic=iriverh100
encoder=rbspeex encoder=rbspeex
@ -241,7 +233,6 @@ bootloaderfilter=*.hex *.zip
manualname=iriverh300 manualname=iriverh300
brand=Iriver brand=Iriver
usbid=0x10063003 usbid=0x10063003
configure_modelname=iriverh300
playerpic=iriverh300 playerpic=iriverh300
encoder=rbspeex encoder=rbspeex
@ -253,7 +244,6 @@ bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
manualname= manualname=
brand=Iriver brand=Iriver
usbid=0x41022002 usbid=0x41022002
configure_modelname=iriverh10_5gb
playerpic=iriverh10_5gb playerpic=iriverh10_5gb
encoder=rbspeex encoder=rbspeex
@ -265,7 +255,6 @@ bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
manualname= manualname=
brand=Iriver brand=Iriver
usbid=0x41022105, 0x41022102 usbid=0x41022105, 0x41022102
configure_modelname=iriverh10_5gb
playerpic=iriverh10_5gb playerpic=iriverh10_5gb
encoder=rbspeex encoder=rbspeex
@ -278,7 +267,6 @@ manualname=
brand=Iriver brand=Iriver
usbid=0x0b7000ba usbid=0x0b7000ba
usberror=0x41022101 usberror=0x41022101
configure_modelname=iriverh10
playerpic=iriverh10 playerpic=iriverh10
encoder=rbspeex encoder=rbspeex
@ -289,7 +277,6 @@ bootloadername=/ipod/bootloader-ipod1g2g.ipod
manualname= manualname=
brand=Apple brand=Apple
; no usb ; no usb
configure_modelname=ipod1g2g
playerpic=ipod1g2g playerpic=ipod1g2g
encoder=rbspeex encoder=rbspeex
@ -300,7 +287,6 @@ bootloadername=/ipod/bootloader-ipodcolor.ipod
manualname= manualname=
brand=Apple brand=Apple
usbid=0x05ac1204 usbid=0x05ac1204
configure_modelname=ipodcolor
playerpic=ipodcolor playerpic=ipodcolor
encoder=rbspeex encoder=rbspeex
@ -311,7 +297,6 @@ bootloadername=/ipod/bootloader-ipodnano1g.ipod
manualname= manualname=
brand=Apple brand=Apple
usbid=0x05ac120a usbid=0x05ac120a
configure_modelname=ipodnano1g
playerpic=ipodnano1g playerpic=ipodnano1g
encoder=rbspeex encoder=rbspeex
@ -322,7 +307,6 @@ bootloadername=/ipod/bootloader-ipodnano2g.ipodx
manualname= manualname=
brand=Apple brand=Apple
usbid=0x05ac1260 usbid=0x05ac1260
configure_modelname=ipodnano2g
playerpic=ipodnano2g playerpic=ipodnano2g
encoder=rbspeex encoder=rbspeex
@ -333,7 +317,6 @@ bootloadername=/ipod/bootloader-ipod4g.ipod
manualname= manualname=
brand=Apple brand=Apple
usbid=0x05ac1203 usbid=0x05ac1203
configure_modelname=ipod4g
playerpic=ipod4g playerpic=ipod4g
encoder=rbspeex encoder=rbspeex
@ -344,7 +327,6 @@ bootloadername=/ipod/bootloader-ipodvideo.ipod
manualname= manualname=
brand=Apple brand=Apple
usbid=0x05ac1209 usbid=0x05ac1209
configure_modelname=ipodvideo
playerpic=ipodvideo playerpic=ipodvideo
encoder=rbspeex encoder=rbspeex
@ -355,7 +337,6 @@ bootloadername=/ipod/bootloader-ipod6g.ipod
manualname= manualname=
brand=Apple brand=Apple
usbid=0x05ac1261 usbid=0x05ac1261
configure_modelname=ipod6g
playerpic=ipod6g playerpic=ipod6g
encoder=rbspeex encoder=rbspeex
@ -366,7 +347,6 @@ bootloadername=/ipod/bootloader-ipod3g.ipod
manualname= manualname=
brand=Apple brand=Apple
usbid=0x05ac1201 usbid=0x05ac1201
configure_modelname=ipod3g
playerpic=ipod3g playerpic=ipod3g
encoder=rbspeex encoder=rbspeex
@ -376,7 +356,6 @@ bootloadermethod=ipod
bootloadername=/ipod/bootloader-ipodmini1g.ipod bootloadername=/ipod/bootloader-ipodmini1g.ipod
brand=Apple brand=Apple
usbid=0x05ac1205 usbid=0x05ac1205
configure_modelname=ipodmini1g
playerpic=ipodmini1g playerpic=ipodmini1g
encoder=rbspeex encoder=rbspeex
@ -387,7 +366,6 @@ bootloadername=/ipod/bootloader-ipodmini2g.ipod
manualname=ipodmini1g manualname=ipodmini1g
brand=Apple brand=Apple
usbid=0x05ac1205 usbid=0x05ac1205
configure_modelname=ipodmini2g
playerpic=ipodmini1g playerpic=ipodmini1g
encoder=rbspeex encoder=rbspeex
@ -399,7 +377,6 @@ bootloaderfile=/FIRMWARE/x5_fw.bin
manualname= manualname=
brand=Cowon brand=Cowon
usbid=0x0e210510, 0x0e210513 usbid=0x0e210510, 0x0e210513
configure_modelname=iaudiox5
playerpic=iaudiox5 playerpic=iaudiox5
encoder=rbspeex encoder=rbspeex
@ -411,7 +388,6 @@ bootloaderfile=/FIRMWARE/x5v_fw.bin
manualname= manualname=
brand=Cowon brand=Cowon
usbid=0x0e210510, 0x0e210513 usbid=0x0e210510, 0x0e210513
configure_modelname=iaudiox5
playerpic=iaudiox5 playerpic=iaudiox5
encoder=rbspeex encoder=rbspeex
@ -423,7 +399,6 @@ bootloaderfile=/FIRMWARE/m5_fw.bin
manualname= manualname=
brand=Cowon brand=Cowon
usbid=0x0e210520 usbid=0x0e210520
configure_modelname=iaudiom5
playerpic=iaudiom5 playerpic=iaudiom5
encoder=rbspeex encoder=rbspeex
@ -435,7 +410,6 @@ bootloaderfile=/FIRMWARE/cowon_m3.bin
manualname= manualname=
brand=Cowon brand=Cowon
usbid=0x0e210500 usbid=0x0e210500
configure_modelname=iaudiom3
playerpic=iaudiom3 playerpic=iaudiom3
encoder=rbspeex encoder=rbspeex
@ -447,7 +421,6 @@ bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT
manualname= manualname=
brand=Toshiba brand=Toshiba
usbid=0x09300009 usbid=0x09300009
configure_modelname=gigabeatfx
playerpic=gigabeatfx playerpic=gigabeatfx
encoder=rbspeex encoder=rbspeex
@ -457,7 +430,6 @@ bootloadermethod=none
manualname= manualname=
brand=Toshiba brand=Toshiba
usbid=0x09300010 usbid=0x09300010
configure_modelname=gigabeats
playerpic=gigabeats playerpic=gigabeats
encoder=rbspeex encoder=rbspeex
status=disabled status=disabled
@ -470,7 +442,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x07817421 usbid=0x07817421
usberror=0x07817420 usberror=0x07817420
configure_modelname=sansae200
playerpic=sansae200 playerpic=sansae200
encoder=rbspeex encoder=rbspeex
@ -481,7 +452,6 @@ bootloadername=/sandisk-sansa/c200/firmware.mi4
manualname= manualname=
brand=Sandisk brand=Sandisk
usbid=0x07817450, 0x07817451 usbid=0x07817450, 0x07817451
configure_modelname=sansac200
playerpic=sansac200 playerpic=sansac200
encoder=rbspeex encoder=rbspeex
@ -495,7 +465,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x07817423 usbid=0x07817423
usberror=0x07817422 usberror=0x07817422
configure_modelname=sansae200v2
playerpic=sansae200 playerpic=sansae200
encoder=rbspeex encoder=rbspeex
@ -509,7 +478,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x07817453 usbid=0x07817453
usberror=0x07817452 usberror=0x07817452
configure_modelname=sansac200v2
playerpic=sansac200 playerpic=sansac200
encoder=rbspeex encoder=rbspeex
@ -523,7 +491,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x078174c1 usbid=0x078174c1
usberror=0x078174c0 usberror=0x078174c0
configure_modelname=sansafuze
playerpic=sansafuze playerpic=sansafuze
encoder=rbspeex encoder=rbspeex
@ -537,7 +504,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x078174c3 usbid=0x078174c3
usberror=0x078174c2 usberror=0x078174c2
configure_modelname=sansafuzev2
playerpic=sansafuze playerpic=sansafuze
encoder=rbspeex encoder=rbspeex
@ -551,7 +517,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x078174e1 usbid=0x078174e1
usberror= usberror=
configure_modelname=sansafuzeplus
playerpic=sansafuzeplus playerpic=sansafuzeplus
encoder=rbspeex encoder=rbspeex
@ -565,7 +530,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid= usbid=
usberror= usberror=
configure_modelname=sansam200v4
playerpic=sansam200v4 playerpic=sansam200v4
encoder=rbspeex encoder=rbspeex
status=disabled status=disabled
@ -580,7 +544,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x07817433 usbid=0x07817433
usberror=0x07817432 usberror=0x07817432
configure_modelname=sansaclip
playerpic=sansaclip playerpic=sansaclip
encoder=rbspeex encoder=rbspeex
@ -594,7 +557,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x07817435 usbid=0x07817435
usberror=0x07817434 usberror=0x07817434
configure_modelname=sansaclipv2
playerpic=sansaclip playerpic=sansaclip
encoder=rbspeex encoder=rbspeex
@ -608,7 +570,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x078174d1 usbid=0x078174d1
usberror=0x078174d0 usberror=0x078174d0
configure_modelname=sansaclipplus
playerpic=sansaclipplus playerpic=sansaclipplus
encoder=rbspeex encoder=rbspeex
@ -622,7 +583,6 @@ manualname=
brand=Sandisk brand=Sandisk
usbid=0x078174e5 usbid=0x078174e5
usberror=0x078174e4 usberror=0x078174e4
configure_modelname=sansaclipzip
playerpic=sansaclipzip playerpic=sansaclipzip
encoder=rbspeex encoder=rbspeex
@ -634,7 +594,6 @@ bootloaderfile=/System/pp5020.mi4
manualname= manualname=
brand=Olympus brand=Olympus
usbid=0x07b40280 usbid=0x07b40280
configure_modelname=mrobe100
playerpic=mrobe100 playerpic=mrobe100
encoder=rbspeex encoder=rbspeex
@ -647,7 +606,6 @@ bootloaderfilter=*.hxf *.zip
manualname= manualname=
brand=Onda brand=Onda
usbid=0x07c4a4a5 usbid=0x07c4a4a5
configure_modelname=ondavx747
playerpic=vx747 playerpic=vx747
encoder=rbspeex encoder=rbspeex
status=disabled status=disabled
@ -661,7 +619,6 @@ bootloaderfilter=*.hxf *.zip
manualname= manualname=
brand=Onda brand=Onda
usbid=0x07c4a4a5 usbid=0x07c4a4a5
configure_modelname=ondavx747p
playerpic=vx747 playerpic=vx747
encoder=rbspeex encoder=rbspeex
status=disabled status=disabled
@ -675,7 +632,6 @@ bootloaderfilter=*.hxf *.zip
manualname= manualname=
brand=Onda brand=Onda
usbid=0x07c4a4a5 usbid=0x07c4a4a5
configure_modelname=ondavx777
playerpic=vx777 playerpic=vx777
encoder=rbspeex encoder=rbspeex
status=disabled status=disabled
@ -688,7 +644,6 @@ bootloaderfile=/SYSTEM/FW_YH820.mi4
manualname= manualname=
brand=Samsung brand=Samsung
usbid=0x04e85023 usbid=0x04e85023
configure_modelname=samsungyh820
playerpic=samsungyh820 playerpic=samsungyh820
encoder=rbspeex encoder=rbspeex
@ -700,7 +655,6 @@ bootloaderfile=/SYSTEM/FW_YH920.mi4, /SYSTEM/PP5020.mi4
manualname= manualname=
brand=Samsung brand=Samsung
usbid=0x04e85022, 0x04e8501d usbid=0x04e85022, 0x04e8501d
configure_modelname=samsungyh920
playerpic=samsungyh920 playerpic=samsungyh920
encoder=rbspeex encoder=rbspeex
@ -712,7 +666,6 @@ bootloaderfile=/SYSTEM/FW_YH925.mi4
manualname= manualname=
brand=Samsung brand=Samsung
usbid=0x04e85024 usbid=0x04e85024
configure_modelname=samsungyh925
playerpic=samsungyh925 playerpic=samsungyh925
encoder=rbspeex encoder=rbspeex
@ -726,7 +679,6 @@ manualname=
brand=Cowon brand=Cowon
usbid=0x0e210800, 0x0e210860, 0x0e210870, 0x0e210880, 0x0e210890 usbid=0x0e210800, 0x0e210860, 0x0e210870, 0x0e210880, 0x0e210890
usberror=0x0e210801, 0x0e210861, 0x0e210871, 0x0e210881, 0x0e210891 usberror=0x0e210801, 0x0e210861, 0x0e210871, 0x0e210881, 0x0e210891
configure_modelname=cowond2
playerpic=cowond2 playerpic=cowond2
encoder=rbspeex encoder=rbspeex
status=disabled status=disabled
@ -740,7 +692,6 @@ manualname=
brand=Packard Bell brand=Packard Bell
usbid=0x04098038 usbid=0x04098038
usberror=0x04098039 usberror=0x04098039
configure_modelname=vibe500
playerpic=vibe500 playerpic=vibe500
encoder=rbspeex encoder=rbspeex
@ -753,7 +704,6 @@ bootloaderfilter=*.bin *.zip
manualname= manualname=
brand=MPIO brand=MPIO
usbid=0x27351004 usbid=0x27351004
configure_modelname=mpiohd200
playerpic=mpiohd200 playerpic=mpiohd200
encoder=rbspeex encoder=rbspeex
@ -766,7 +716,6 @@ bootloaderfilter=*.bin *.zip
manualname= manualname=
brand=MPIO brand=MPIO
usbid=0x27351005 usbid=0x27351005
configure_modelname=mpiohd300
playerpic=mpiohd300 playerpic=mpiohd300
encoder=rbspeex encoder=rbspeex
@ -778,7 +727,6 @@ bootloaderfile=/System/FWImage.ebn
manualname= manualname=
brand=Philips brand=Philips
usbid=0x0471014c usbid=0x0471014c
configure_modelname=gogearhdd1630
playerpic=gogearhdd1630 playerpic=gogearhdd1630
encoder=rbspeex encoder=rbspeex
@ -790,7 +738,6 @@ bootloaderfile=/System/FWImage.ebn
manualname= manualname=
brand=Philips brand=Philips
usbid=0x0471014b usbid=0x0471014b
configure_modelname=gogearhdd6330
playerpic=gogearhdd6330 playerpic=gogearhdd6330
encoder=rbspeex encoder=rbspeex
@ -801,7 +748,6 @@ bootloaderfile=/System/FWImage.ebn
manualname= manualname=
brand=Philips brand=Philips
usbid=0x0471014f usbid=0x0471014f
configure_modelname=gogearsa9200
playerpic=gogearsa9200 playerpic=gogearsa9200
encoder=rbspeex encoder=rbspeex
status=disabled status=disabled
@ -816,7 +762,6 @@ manualname=
brand=Creative brand=Creative
usbid=0x041e2020 usbid=0x041e2020
usberror= usberror=
configure_modelname=creativezenxfi3
playerpic=creativezenxfi3 playerpic=creativezenxfi3
encoder=rbspeex encoder=rbspeex
@ -830,7 +775,6 @@ manualname=
brand=xDuoo brand=xDuoo
usbid=0x0525a4a5 usbid=0x0525a4a5
usberror= usberror=
configure_modelname=xduoox3
playerpic=xduoox3 playerpic=xduoox3
encoder=rbspeex encoder=rbspeex
@ -844,7 +788,6 @@ manualname=
brand=xDuoo brand=xDuoo
usbid=0xc502003c ; shared with X20 usbid=0xc502003c ; shared with X20
usberror= usberror=
configure_modelname=xduoox3ii
playerpic=xduoox3ii playerpic=xduoox3ii
encoder=rbspeex encoder=rbspeex
@ -858,7 +801,6 @@ manualname=
brand=xDuoo brand=xDuoo
usbid=0xc502003c ; shared with X3ii usbid=0xc502003c ; shared with X3ii
usberror= usberror=
configure_modelname=xduoox20
playerpic=xduoox20 playerpic=xduoox20
encoder=rbspeex encoder=rbspeex
@ -872,7 +814,6 @@ manualname=
brand=AGPTek brand=AGPTek
usbid=0xc5020029 usbid=0xc5020029
usberror= usberror=
configure_modelname=agptekrocker
playerpic=agptekrocker playerpic=agptekrocker
encoder=rbspeex encoder=rbspeex
@ -886,7 +827,6 @@ manualname=
brand=AIGO/EROS brand=AIGO/EROS
usbid=0xc5020023 ; shared across EROS Q/K series usbid=0xc5020023 ; shared across EROS Q/K series
usberror= usberror=
configure_modelname=aigoerosq
playerpic=aigoerosq playerpic=aigoerosq
encoder=rbspeex encoder=rbspeex
@ -900,7 +840,6 @@ manualname=
brand=AIGO/EROS brand=AIGO/EROS
usbid=0xc5020023 ; shared across EROS Q/K series usbid=0xc5020023 ; shared across EROS Q/K series
usberror= usberror=
configure_modelname=aigoerosq
playerpic=aigoerosk playerpic=aigoerosk
encoder=rbspeex encoder=rbspeex
@ -914,7 +853,6 @@ manualname=aigoerosk
brand=AGPTek brand=AGPTek
usbid=0xc5020023 ; shared across EROS Q / K series usbid=0xc5020023 ; shared across EROS Q / K series
usberror= usberror=
configure_modelname=aigoerosq
playerpic=aigoerosk playerpic=aigoerosk
encoder=rbspeex encoder=rbspeex
@ -928,7 +866,6 @@ manualname=aigoerosq
brand=Surfans brand=Surfans
usbid=0xc5020023 ; shared across EROS Q / K series usbid=0xc5020023 ; shared across EROS Q / K series
usberror= usberror=
configure_modelname=aigoerosq
playerpic=aigoerosk playerpic=aigoerosk
encoder=rbspeex encoder=rbspeex
@ -942,7 +879,6 @@ manualname=erosq
brand=HIFI WALKER brand=HIFI WALKER
usbid=0xc5020023 ; shared across EROS Q / K series usbid=0xc5020023 ; shared across EROS Q / K series
usberror= usberror=
configure_modelname=aigoerosq
playerpic=aigoerosq playerpic=aigoerosq
encoder=rbspeex encoder=rbspeex

2
rbutil/rbutilqt/themesinstallwindow.cpp
View file

@ -86,7 +86,7 @@ void ThemesInstallWindow::downloadInfo()
QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString();
infoUrl.replace("%TARGET%", infoUrl.replace("%TARGET%",
SystemInfo::platformValue(SystemInfo::ConfigureModel).toString()); RbSettings::value(RbSettings::CurrentPlatform).toString().split(".").at(0));
infoUrl.replace("%REVISION%", installInfo.revision()); infoUrl.replace("%REVISION%", installInfo.revision());
infoUrl.replace("%RELEASE%", installInfo.release()); infoUrl.replace("%RELEASE%", installInfo.release());
infoUrl.replace("%RBUTILVER%", VERSION); infoUrl.replace("%RBUTILVER%", VERSION);