diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-20 21:00:43 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-26 18:30:27 +0200 |
commit | f419128a6b371d2752553ef3850f10c2cdf46912 (patch) | |
tree | 9b88dd45a000e3c86a0a89f20f1d1da368e5a9b2 /rbutil/rbutilqt | |
parent | 40e306ba3776a90cc8670e792961edfe89b28115 (diff) | |
download | rockbox-f419128a6b371d2752553ef3850f10c2cdf46912.tar.gz rockbox-f419128a6b371d2752553ef3850f10c2cdf46912.zip |
Show player picture left of device configuration.
After shrinking the size of the Rockbox logo shown and making the selected
device display two lines there is now enough room to also show an icon of the
player. The icon is scaled depending on the application font size, so for
setups configured with a larger font it still should show up in a reasonable
size.
Change-Id: I8f62f3292c62f820309157db73741b57fd6371ef
Diffstat (limited to 'rbutil/rbutilqt')
56 files changed, 137 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index eddfb26b34..fde43d27dd 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp | |||
@@ -59,6 +59,7 @@ const static struct { | |||
59 | { SystemInfo::CurName, ":platform:/name", "" }, | 59 | { SystemInfo::CurName, ":platform:/name", "" }, |
60 | { SystemInfo::CurBuildserverModel, ":platform:/buildserver_modelname", "" }, | 60 | { SystemInfo::CurBuildserverModel, ":platform:/buildserver_modelname", "" }, |
61 | { SystemInfo::CurConfigureModel, ":platform:/configure_modelname", "" }, | 61 | { SystemInfo::CurConfigureModel, ":platform:/configure_modelname", "" }, |
62 | { SystemInfo::CurPlayerPicture, ":platform:/playerpic", "" }, | ||
62 | }; | 63 | }; |
63 | 64 | ||
64 | //! pointer to setting object to NULL | 65 | //! pointer to setting object to NULL |
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index 9eddd5ed38..0e603f865e 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h | |||
@@ -63,6 +63,7 @@ class SystemInfo : public QObject | |||
63 | CurName, | 63 | CurName, |
64 | CurBuildserverModel, | 64 | CurBuildserverModel, |
65 | CurConfigureModel, | 65 | CurConfigureModel, |
66 | CurPlayerPicture, | ||
66 | }; | 67 | }; |
67 | 68 | ||
68 | enum PlatformType { | 69 | enum PlatformType { |
diff --git a/rbutil/rbutilqt/icons/players/archosfmrecorder-small.png b/rbutil/rbutilqt/icons/players/archosfmrecorder-small.png new file mode 100644 index 0000000000..e9e1e6a982 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/archosfmrecorder-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/archosondiofm-small.png b/rbutil/rbutilqt/icons/players/archosondiofm-small.png new file mode 100644 index 0000000000..8ac3f16ae4 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/archosondiofm-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/archosondiosp-small.png b/rbutil/rbutilqt/icons/players/archosondiosp-small.png new file mode 100644 index 0000000000..c96c0cb9bb --- /dev/null +++ b/rbutil/rbutilqt/icons/players/archosondiosp-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/archosplayer-small.png b/rbutil/rbutilqt/icons/players/archosplayer-small.png new file mode 100644 index 0000000000..87d6cec6a5 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/archosplayer-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/archosrecorder-small.png b/rbutil/rbutilqt/icons/players/archosrecorder-small.png new file mode 100644 index 0000000000..9e4f5b7d92 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/archosrecorder-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/archosrecorderv2-small.png b/rbutil/rbutilqt/icons/players/archosrecorderv2-small.png new file mode 100644 index 0000000000..e9e1e6a982 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/archosrecorderv2-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/cowond2-small.png b/rbutil/rbutilqt/icons/players/cowond2-small.png new file mode 100644 index 0000000000..b365fc36b0 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/cowond2-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/fonts-small.png b/rbutil/rbutilqt/icons/players/fonts-small.png new file mode 100644 index 0000000000..4c7cdcb426 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/fonts-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/gigabeatfx-small.png b/rbutil/rbutilqt/icons/players/gigabeatfx-small.png new file mode 100644 index 0000000000..6d3744f106 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/gigabeatfx-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/gigabeats-small.png b/rbutil/rbutilqt/icons/players/gigabeats-small.png new file mode 100644 index 0000000000..48e905bcb7 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/gigabeats-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/gogearhdd1630-small.png b/rbutil/rbutilqt/icons/players/gogearhdd1630-small.png new file mode 100644 index 0000000000..ff7b097942 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/gogearhdd1630-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/gogearhdd6330-small.png b/rbutil/rbutilqt/icons/players/gogearhdd6330-small.png new file mode 100644 index 0000000000..5b7af846b1 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/gogearhdd6330-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/gogearsa9200-small.png b/rbutil/rbutilqt/icons/players/gogearsa9200-small.png new file mode 100644 index 0000000000..5d8f70a220 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/gogearsa9200-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/hifimanhm60x-small.png b/rbutil/rbutilqt/icons/players/hifimanhm60x-small.png new file mode 100644 index 0000000000..1220a5c46d --- /dev/null +++ b/rbutil/rbutilqt/icons/players/hifimanhm60x-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/hifimanhm801-small.png b/rbutil/rbutilqt/icons/players/hifimanhm801-small.png new file mode 100644 index 0000000000..1a9751661d --- /dev/null +++ b/rbutil/rbutilqt/icons/players/hifimanhm801-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/iaudiom3-small.png b/rbutil/rbutilqt/icons/players/iaudiom3-small.png new file mode 100644 index 0000000000..b72cb7dcc2 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/iaudiom3-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/iaudiom5-small.png b/rbutil/rbutilqt/icons/players/iaudiom5-small.png new file mode 100644 index 0000000000..40cfff4f01 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/iaudiom5-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/iaudiox5-small.png b/rbutil/rbutilqt/icons/players/iaudiox5-small.png new file mode 100644 index 0000000000..e95e434fd5 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/iaudiox5-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/ipod1g2g-small.png b/rbutil/rbutilqt/icons/players/ipod1g2g-small.png new file mode 100644 index 0000000000..a573751c2f --- /dev/null +++ b/rbutil/rbutilqt/icons/players/ipod1g2g-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/ipod3g-small.png b/rbutil/rbutilqt/icons/players/ipod3g-small.png new file mode 100644 index 0000000000..3efc1de071 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/ipod3g-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/ipod4g-small.png b/rbutil/rbutilqt/icons/players/ipod4g-small.png new file mode 100644 index 0000000000..76cd554090 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/ipod4g-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/ipodcolor-small.png b/rbutil/rbutilqt/icons/players/ipodcolor-small.png new file mode 100644 index 0000000000..8d530137c8 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/ipodcolor-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/ipodmini1g-small.png b/rbutil/rbutilqt/icons/players/ipodmini1g-small.png new file mode 100644 index 0000000000..39f91bdde5 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/ipodmini1g-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/ipodnano1g-small.png b/rbutil/rbutilqt/icons/players/ipodnano1g-small.png new file mode 100644 index 0000000000..71be0b8ed2 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/ipodnano1g-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/ipodnano2g-small.png b/rbutil/rbutilqt/icons/players/ipodnano2g-small.png new file mode 100644 index 0000000000..413c041f7b --- /dev/null +++ b/rbutil/rbutilqt/icons/players/ipodnano2g-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/ipodvideo-small.png b/rbutil/rbutilqt/icons/players/ipodvideo-small.png new file mode 100644 index 0000000000..40155ba14f --- /dev/null +++ b/rbutil/rbutilqt/icons/players/ipodvideo-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/iriverh10-small.png b/rbutil/rbutilqt/icons/players/iriverh10-small.png new file mode 100644 index 0000000000..8ffe9162d3 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/iriverh10-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/iriverh100-small.png b/rbutil/rbutilqt/icons/players/iriverh100-small.png new file mode 100644 index 0000000000..cc13ecf4c6 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/iriverh100-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png b/rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png new file mode 100644 index 0000000000..c034586398 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/iriverh10_5gb-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/iriverh300-small.png b/rbutil/rbutilqt/icons/players/iriverh300-small.png new file mode 100644 index 0000000000..3c5657bf00 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/iriverh300-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/mpiohd200-small.png b/rbutil/rbutilqt/icons/players/mpiohd200-small.png new file mode 100644 index 0000000000..d82ba6c015 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/mpiohd200-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/mpiohd300-small.png b/rbutil/rbutilqt/icons/players/mpiohd300-small.png new file mode 100644 index 0000000000..744dfc09c0 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/mpiohd300-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/mrobe100-small.png b/rbutil/rbutilqt/icons/players/mrobe100-small.png new file mode 100644 index 0000000000..3ab6206a73 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/mrobe100-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/mrobe500-small.png b/rbutil/rbutilqt/icons/players/mrobe500-small.png new file mode 100644 index 0000000000..6c08b15495 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/mrobe500-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/samsungyh820-small.png b/rbutil/rbutilqt/icons/players/samsungyh820-small.png new file mode 100644 index 0000000000..27702e5c61 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/samsungyh820-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/samsungyh920-small.png b/rbutil/rbutilqt/icons/players/samsungyh920-small.png new file mode 100644 index 0000000000..0188b4186a --- /dev/null +++ b/rbutil/rbutilqt/icons/players/samsungyh920-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/samsungyh925-small.png b/rbutil/rbutilqt/icons/players/samsungyh925-small.png new file mode 100644 index 0000000000..733bc6fbbd --- /dev/null +++ b/rbutil/rbutilqt/icons/players/samsungyh925-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/samsungypr0-small.png b/rbutil/rbutilqt/icons/players/samsungypr0-small.png new file mode 100644 index 0000000000..2183eec0ba --- /dev/null +++ b/rbutil/rbutilqt/icons/players/samsungypr0-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/sansac200-small.png b/rbutil/rbutilqt/icons/players/sansac200-small.png new file mode 100644 index 0000000000..4678c607c1 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/sansac200-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/sansaclip-small.png b/rbutil/rbutilqt/icons/players/sansaclip-small.png new file mode 100644 index 0000000000..a4e1c4a69b --- /dev/null +++ b/rbutil/rbutilqt/icons/players/sansaclip-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/sansaclipplus-small.png b/rbutil/rbutilqt/icons/players/sansaclipplus-small.png new file mode 100644 index 0000000000..edb7691ae8 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/sansaclipplus-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/sansaclipzip-small.png b/rbutil/rbutilqt/icons/players/sansaclipzip-small.png new file mode 100644 index 0000000000..bc1f2a3fd0 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/sansaclipzip-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/sansaconnect-small.png b/rbutil/rbutilqt/icons/players/sansaconnect-small.png new file mode 100644 index 0000000000..af348466ee --- /dev/null +++ b/rbutil/rbutilqt/icons/players/sansaconnect-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/sansae200-small.png b/rbutil/rbutilqt/icons/players/sansae200-small.png new file mode 100644 index 0000000000..530456be1c --- /dev/null +++ b/rbutil/rbutilqt/icons/players/sansae200-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/sansafuze-small.png b/rbutil/rbutilqt/icons/players/sansafuze-small.png new file mode 100644 index 0000000000..8cef62abc6 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/sansafuze-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/sansafuzeplus-small.png b/rbutil/rbutilqt/icons/players/sansafuzeplus-small.png new file mode 100644 index 0000000000..6d7336f1ec --- /dev/null +++ b/rbutil/rbutilqt/icons/players/sansafuzeplus-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/source-small.png b/rbutil/rbutilqt/icons/players/source-small.png new file mode 100644 index 0000000000..4c7cdcb426 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/source-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/vibe500-small.png b/rbutil/rbutilqt/icons/players/vibe500-small.png new file mode 100644 index 0000000000..901ac676e9 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/vibe500-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/vx747-small.png b/rbutil/rbutilqt/icons/players/vx747-small.png new file mode 100644 index 0000000000..940babd485 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/vx747-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/icons/players/vx777-small.png b/rbutil/rbutilqt/icons/players/vx777-small.png new file mode 100644 index 0000000000..2466b9d504 --- /dev/null +++ b/rbutil/rbutilqt/icons/players/vx777-small.png | |||
Binary files differ | |||
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index 6f620f382a..547da12845 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -116,6 +116,7 @@ bootloadername= | |||
116 | manualname= | 116 | manualname= |
117 | brand=Archos | 117 | brand=Archos |
118 | configure_modelname=archosplayer | 118 | configure_modelname=archosplayer |
119 | playerpic=archosplayer | ||
119 | encoder=lame | 120 | encoder=lame |
120 | 121 | ||
121 | [archosrecorder] | 122 | [archosrecorder] |
@@ -126,6 +127,7 @@ bootloadername= | |||
126 | manualname= | 127 | manualname= |
127 | brand=Archos | 128 | brand=Archos |
128 | configure_modelname=archosrecorder | 129 | configure_modelname=archosrecorder |
130 | playerpic=archosrecorder | ||
129 | encoder=lame | 131 | encoder=lame |
130 | 132 | ||
131 | [archosrecorder.8mb] | 133 | [archosrecorder.8mb] |
@@ -136,6 +138,7 @@ bootloadername= | |||
136 | manualname=recorder | 138 | manualname=recorder |
137 | brand=Archos | 139 | brand=Archos |
138 | configure_modelname=archosrecorder | 140 | configure_modelname=archosrecorder |
141 | playerpic=archosrecorder | ||
139 | encoder=lame | 142 | encoder=lame |
140 | 143 | ||
141 | [archosrecorderv2] | 144 | [archosrecorderv2] |
@@ -146,6 +149,7 @@ bootloadername= | |||
146 | manualname= | 149 | manualname= |
147 | brand=Archos | 150 | brand=Archos |
148 | configure_modelname=archosrecorderv2 | 151 | configure_modelname=archosrecorderv2 |
152 | playerpic=archosrecorderv2 | ||
149 | encoder=lame | 153 | encoder=lame |
150 | 154 | ||
151 | [archosfmrecorder] | 155 | [archosfmrecorder] |
@@ -156,6 +160,7 @@ bootloadername= | |||
156 | manualname= | 160 | manualname= |
157 | brand=Archos | 161 | brand=Archos |
158 | configure_modelname=archosfmrecorder | 162 | configure_modelname=archosfmrecorder |
163 | playerpic=archosfmrecorder | ||
159 | encoder=lame | 164 | encoder=lame |
160 | 165 | ||
161 | [archosfmrecorder.8mb] | 166 | [archosfmrecorder.8mb] |
@@ -166,6 +171,7 @@ bootloadername= | |||
166 | manualname=archosfmrecorder | 171 | manualname=archosfmrecorder |
167 | brand=Archos | 172 | brand=Archos |
168 | configure_modelname=archosfmrecorder | 173 | configure_modelname=archosfmrecorder |
174 | playerpic=archosfmrecorder | ||
169 | encoder=lame | 175 | encoder=lame |
170 | 176 | ||
171 | [archosondiosp] | 177 | [archosondiosp] |
@@ -176,6 +182,7 @@ bootloadername= | |||
176 | manualname= | 182 | manualname= |
177 | brand=Archos | 183 | brand=Archos |
178 | configure_modelname=archosondiosp | 184 | configure_modelname=archosondiosp |
185 | playerpic=archosondiosp | ||
179 | encoder=lame | 186 | encoder=lame |
180 | 187 | ||
181 | [archosondiofm] | 188 | [archosondiofm] |
@@ -186,6 +193,7 @@ bootloadername= | |||
186 | manualname= | 193 | manualname= |
187 | brand=Archos | 194 | brand=Archos |
188 | configure_modelname=archosondiofm | 195 | configure_modelname=archosondiofm |
196 | playerpic=archosondiofm | ||
189 | encoder=lame | 197 | encoder=lame |
190 | 198 | ||
191 | [iriverh100] | 199 | [iriverh100] |
@@ -199,6 +207,7 @@ manualname=iriverh100 | |||
199 | brand=Iriver | 207 | brand=Iriver |
200 | usbid=0x10063001 | 208 | usbid=0x10063001 |
201 | configure_modelname=iriverh100 | 209 | configure_modelname=iriverh100 |
210 | playerpic=iriverh100 | ||
202 | encoder=rbspeex | 211 | encoder=rbspeex |
203 | 212 | ||
204 | [iriverh120] | 213 | [iriverh120] |
@@ -212,6 +221,7 @@ manualname=iriverh100 | |||
212 | brand=Iriver | 221 | brand=Iriver |
213 | usbid=0x10063002 | 222 | usbid=0x10063002 |
214 | configure_modelname=iriverh120 | 223 | configure_modelname=iriverh120 |
224 | playerpic=iriverh100 | ||
215 | encoder=rbspeex | 225 | encoder=rbspeex |
216 | 226 | ||
217 | [iriverh300] | 227 | [iriverh300] |
@@ -225,6 +235,7 @@ manualname=iriverh300 | |||
225 | brand=Iriver | 235 | brand=Iriver |
226 | usbid=0x10063003 | 236 | usbid=0x10063003 |
227 | configure_modelname=iriverh300 | 237 | configure_modelname=iriverh300 |
238 | playerpic=iriverh300 | ||
228 | encoder=rbspeex | 239 | encoder=rbspeex |
229 | 240 | ||
230 | [iriverh10_5gb] | 241 | [iriverh10_5gb] |
@@ -237,6 +248,7 @@ manualname= | |||
237 | brand=Iriver | 248 | brand=Iriver |
238 | usbid=0x41022002 | 249 | usbid=0x41022002 |
239 | configure_modelname=iriverh10_5gb | 250 | configure_modelname=iriverh10_5gb |
251 | playerpic=iriverh10_5gb | ||
240 | encoder=rbspeex | 252 | encoder=rbspeex |
241 | 253 | ||
242 | [iriverh10_5gb.mtp] | 254 | [iriverh10_5gb.mtp] |
@@ -249,6 +261,7 @@ manualname= | |||
249 | brand=Iriver | 261 | brand=Iriver |
250 | usbid=0x41022105, 0x41022102 | 262 | usbid=0x41022105, 0x41022102 |
251 | configure_modelname=iriverh10_5gb | 263 | configure_modelname=iriverh10_5gb |
264 | playerpic=iriverh10_5gb | ||
252 | encoder=rbspeex | 265 | encoder=rbspeex |
253 | 266 | ||
254 | [iriverh10] | 267 | [iriverh10] |
@@ -262,6 +275,7 @@ brand=Iriver | |||
262 | usbid=0x0b7000ba | 275 | usbid=0x0b7000ba |
263 | usberror=0x41022101 | 276 | usberror=0x41022101 |
264 | configure_modelname=iriverh10 | 277 | configure_modelname=iriverh10 |
278 | playerpic=iriverh10 | ||
265 | encoder=rbspeex | 279 | encoder=rbspeex |
266 | 280 | ||
267 | [ipod1g2g] | 281 | [ipod1g2g] |
@@ -272,6 +286,7 @@ bootloadername=/ipod/bootloader-ipod1g2g.ipod | |||
272 | manualname= | 286 | manualname= |
273 | brand=Apple | 287 | brand=Apple |
274 | configure_modelname=ipod1g2g | 288 | configure_modelname=ipod1g2g |
289 | playerpic=ipod1g2g | ||
275 | encoder=rbspeex | 290 | encoder=rbspeex |
276 | 291 | ||
277 | [ipodcolor] | 292 | [ipodcolor] |
@@ -282,6 +297,7 @@ bootloadername=/ipod/bootloader-ipodcolor.ipod | |||
282 | manualname= | 297 | manualname= |
283 | brand=Apple | 298 | brand=Apple |
284 | configure_modelname=ipodcolor | 299 | configure_modelname=ipodcolor |
300 | playerpic=ipodcolor | ||
285 | encoder=rbspeex | 301 | encoder=rbspeex |
286 | 302 | ||
287 | [ipodnano1g] | 303 | [ipodnano1g] |
@@ -292,6 +308,7 @@ bootloadername=/ipod/bootloader-ipodnano1g.ipod | |||
292 | manualname= | 308 | manualname= |
293 | brand=Apple | 309 | brand=Apple |
294 | configure_modelname=ipodnano1g | 310 | configure_modelname=ipodnano1g |
311 | playerpic=ipodnano1g | ||
295 | encoder=rbspeex | 312 | encoder=rbspeex |
296 | 313 | ||
297 | [ipodnano2g] | 314 | [ipodnano2g] |
@@ -302,6 +319,7 @@ bootloadername=/ipod/bootloader-ipodnano2g.ipodx | |||
302 | manualname= | 319 | manualname= |
303 | brand=Apple | 320 | brand=Apple |
304 | configure_modelname=ipodnano2g | 321 | configure_modelname=ipodnano2g |
322 | playerpic=ipodnano2g | ||
305 | encoder=rbspeex | 323 | encoder=rbspeex |
306 | 324 | ||
307 | [ipod4g] | 325 | [ipod4g] |
@@ -312,6 +330,7 @@ bootloadername=/ipod/bootloader-ipod4g.ipod | |||
312 | manualname= | 330 | manualname= |
313 | brand=Apple | 331 | brand=Apple |
314 | configure_modelname=ipod4g | 332 | configure_modelname=ipod4g |
333 | playerpic=ipod4g | ||
315 | encoder=rbspeex | 334 | encoder=rbspeex |
316 | 335 | ||
317 | [ipodvideo] | 336 | [ipodvideo] |
@@ -322,6 +341,7 @@ bootloadername=/ipod/bootloader-ipodvideo.ipod | |||
322 | manualname= | 341 | manualname= |
323 | brand=Apple | 342 | brand=Apple |
324 | configure_modelname=ipodvideo | 343 | configure_modelname=ipodvideo |
344 | playerpic=ipodvideo | ||
325 | encoder=rbspeex | 345 | encoder=rbspeex |
326 | 346 | ||
327 | [ipodclassic] | 347 | [ipodclassic] |
@@ -344,6 +364,7 @@ manualname= | |||
344 | brand=Apple | 364 | brand=Apple |
345 | usbid=0x05ac1201 | 365 | usbid=0x05ac1201 |
346 | configure_modelname=ipod3g | 366 | configure_modelname=ipod3g |
367 | playerpic=ipod3g | ||
347 | encoder=rbspeex | 368 | encoder=rbspeex |
348 | 369 | ||
349 | [ipodmini1g] | 370 | [ipodmini1g] |
@@ -353,6 +374,7 @@ bootloadermethod=ipod | |||
353 | bootloadername=/ipod/bootloader-ipodmini1g.ipod | 374 | bootloadername=/ipod/bootloader-ipodmini1g.ipod |
354 | brand=Apple | 375 | brand=Apple |
355 | configure_modelname=ipodmini1g | 376 | configure_modelname=ipodmini1g |
377 | playerpic=ipodmini1g | ||
356 | encoder=rbspeex | 378 | encoder=rbspeex |
357 | 379 | ||
358 | [ipodmini2g] | 380 | [ipodmini2g] |
@@ -363,6 +385,7 @@ bootloadername=/ipod/bootloader-ipodmini2g.ipod | |||
363 | manualname=ipodmini1g | 385 | manualname=ipodmini1g |
364 | brand=Apple | 386 | brand=Apple |
365 | configure_modelname=ipodmini2g | 387 | configure_modelname=ipodmini2g |
388 | playerpic=ipodmini1g | ||
366 | encoder=rbspeex | 389 | encoder=rbspeex |
367 | 390 | ||
368 | [iaudiox5] | 391 | [iaudiox5] |
@@ -375,6 +398,7 @@ manualname= | |||
375 | brand=Cowon | 398 | brand=Cowon |
376 | usbid=0x0e210510, 0x0e210513 | 399 | usbid=0x0e210510, 0x0e210513 |
377 | configure_modelname=iaudiox5 | 400 | configure_modelname=iaudiox5 |
401 | playerpic=iaudiox5 | ||
378 | encoder=rbspeex | 402 | encoder=rbspeex |
379 | 403 | ||
380 | [iaudiox5.v] | 404 | [iaudiox5.v] |
@@ -386,6 +410,7 @@ bootloaderfile=/FIRMWARE/x5v_fw.bin | |||
386 | manualname= | 410 | manualname= |
387 | brand=Cowon | 411 | brand=Cowon |
388 | configure_modelname=iaudiox5 | 412 | configure_modelname=iaudiox5 |
413 | playerpic=iaudiox5 | ||
389 | encoder=rbspeex | 414 | encoder=rbspeex |
390 | 415 | ||
391 | [iaudiom5] | 416 | [iaudiom5] |
@@ -398,6 +423,7 @@ manualname= | |||
398 | brand=Cowon | 423 | brand=Cowon |
399 | usbid=0x0e210520 | 424 | usbid=0x0e210520 |
400 | configure_modelname=iaudiom5 | 425 | configure_modelname=iaudiom5 |
426 | playerpic=iaudiom5 | ||
401 | encoder=rbspeex | 427 | encoder=rbspeex |
402 | 428 | ||
403 | [iaudiom3] | 429 | [iaudiom3] |
@@ -410,6 +436,7 @@ manualname= | |||
410 | brand=Cowon | 436 | brand=Cowon |
411 | usbid=0x0e210500 | 437 | usbid=0x0e210500 |
412 | configure_modelname=iaudiom3 | 438 | configure_modelname=iaudiom3 |
439 | playerpic=iaudiom3 | ||
413 | encoder=rbspeex | 440 | encoder=rbspeex |
414 | 441 | ||
415 | [gigabeatfx] | 442 | [gigabeatfx] |
@@ -422,6 +449,7 @@ manualname= | |||
422 | brand=Toshiba | 449 | brand=Toshiba |
423 | usbid=0x09300009 | 450 | usbid=0x09300009 |
424 | configure_modelname=gigabeatfx | 451 | configure_modelname=gigabeatfx |
452 | playerpic=gigabeatfx | ||
425 | encoder=rbspeex | 453 | encoder=rbspeex |
426 | 454 | ||
427 | [gigabeats] | 455 | [gigabeats] |
@@ -432,6 +460,7 @@ manualname= | |||
432 | brand=Toshiba | 460 | brand=Toshiba |
433 | usbid=0x09300010 | 461 | usbid=0x09300010 |
434 | configure_modelname=gigabeats | 462 | configure_modelname=gigabeats |
463 | playerpic=gigabeats | ||
435 | encoder=rbspeex | 464 | encoder=rbspeex |
436 | status=disabled | 465 | status=disabled |
437 | 466 | ||
@@ -445,6 +474,7 @@ brand=Sandisk | |||
445 | usbid=0x07817421 | 474 | usbid=0x07817421 |
446 | usberror=0x07817420 | 475 | usberror=0x07817420 |
447 | configure_modelname=sansae200 | 476 | configure_modelname=sansae200 |
477 | playerpic=sansae200 | ||
448 | encoder=rbspeex | 478 | encoder=rbspeex |
449 | 479 | ||
450 | [sansac200] | 480 | [sansac200] |
@@ -456,6 +486,7 @@ manualname= | |||
456 | brand=Sandisk | 486 | brand=Sandisk |
457 | usbid=0x07817450, 0x07817451 | 487 | usbid=0x07817450, 0x07817451 |
458 | configure_modelname=sansac200 | 488 | configure_modelname=sansac200 |
489 | playerpic=sansac200 | ||
459 | encoder=rbspeex | 490 | encoder=rbspeex |
460 | 491 | ||
461 | [sansae200v2] | 492 | [sansae200v2] |
@@ -470,6 +501,7 @@ brand=Sandisk | |||
470 | usbid=0x07817423 | 501 | usbid=0x07817423 |
471 | usberror=0x07817422 | 502 | usberror=0x07817422 |
472 | configure_modelname=sansae200v2 | 503 | configure_modelname=sansae200v2 |
504 | playerpic=sansae200 | ||
473 | encoder=rbspeex | 505 | encoder=rbspeex |
474 | 506 | ||
475 | [sansac200v2] | 507 | [sansac200v2] |
@@ -484,6 +516,7 @@ brand=Sandisk | |||
484 | usbid=0x07817452 | 516 | usbid=0x07817452 |
485 | usberror=0x07817451 | 517 | usberror=0x07817451 |
486 | configure_modelname=sansac200v2 | 518 | configure_modelname=sansac200v2 |
519 | playerpic=sansac200 | ||
487 | encoder=rbspeex | 520 | encoder=rbspeex |
488 | 521 | ||
489 | [sansafuze] | 522 | [sansafuze] |
@@ -498,6 +531,7 @@ brand=Sandisk | |||
498 | usbid=0x078174c1 | 531 | usbid=0x078174c1 |
499 | usberror=0x078174c0 | 532 | usberror=0x078174c0 |
500 | configure_modelname=sansafuze | 533 | configure_modelname=sansafuze |
534 | playerpic=sansafuze | ||
501 | encoder=rbspeex | 535 | encoder=rbspeex |
502 | 536 | ||
503 | [sansafuzev2] | 537 | [sansafuzev2] |
@@ -512,6 +546,7 @@ brand=Sandisk | |||
512 | usbid=0x078174c3 | 546 | usbid=0x078174c3 |
513 | usberror=0x078174c2 | 547 | usberror=0x078174c2 |
514 | configure_modelname=sansafuzev2 | 548 | configure_modelname=sansafuzev2 |
549 | playerpic=sansafuze | ||
515 | encoder=rbspeex | 550 | encoder=rbspeex |
516 | 551 | ||
517 | [sansafuzeplus] | 552 | [sansafuzeplus] |
@@ -526,6 +561,7 @@ brand=Sandisk | |||
526 | usbid=0x078174e1 | 561 | usbid=0x078174e1 |
527 | usberror= | 562 | usberror= |
528 | configure_modelname=sansafuzeplus | 563 | configure_modelname=sansafuzeplus |
564 | playerpic=sansafuzeplus | ||
529 | encoder=rbspeex | 565 | encoder=rbspeex |
530 | 566 | ||
531 | [sansam200v4] | 567 | [sansam200v4] |
@@ -540,6 +576,7 @@ brand=Sandisk | |||
540 | usbid= | 576 | usbid= |
541 | usberror= | 577 | usberror= |
542 | configure_modelname=sansam200v4 | 578 | configure_modelname=sansam200v4 |
579 | playerpic=sansam200v4 | ||
543 | encoder=rbspeex | 580 | encoder=rbspeex |
544 | status=disabled | 581 | status=disabled |
545 | 582 | ||
@@ -555,6 +592,7 @@ brand=Sandisk | |||
555 | usbid=0x07817433 | 592 | usbid=0x07817433 |
556 | usberror=0x07817432 | 593 | usberror=0x07817432 |
557 | configure_modelname=sansaclip | 594 | configure_modelname=sansaclip |
595 | playerpic=sansaclip | ||
558 | encoder=rbspeex | 596 | encoder=rbspeex |
559 | 597 | ||
560 | [sansaclipv2] | 598 | [sansaclipv2] |
@@ -569,6 +607,7 @@ brand=Sandisk | |||
569 | usbid=0x07817435 | 607 | usbid=0x07817435 |
570 | usberror=0x07817434 | 608 | usberror=0x07817434 |
571 | configure_modelname=sansaclipv2 | 609 | configure_modelname=sansaclipv2 |
610 | playerpic=sansaclip | ||
572 | encoder=rbspeex | 611 | encoder=rbspeex |
573 | 612 | ||
574 | [sansaclipplus] | 613 | [sansaclipplus] |
@@ -583,6 +622,7 @@ brand=Sandisk | |||
583 | usbid=0x078174d1 | 622 | usbid=0x078174d1 |
584 | usberror=0x078174d0 | 623 | usberror=0x078174d0 |
585 | configure_modelname=sansaclipplus | 624 | configure_modelname=sansaclipplus |
625 | playerpic=sansaclipplus | ||
586 | encoder=rbspeex | 626 | encoder=rbspeex |
587 | 627 | ||
588 | [sansaclipzip] | 628 | [sansaclipzip] |
@@ -597,6 +637,7 @@ brand=Sandisk | |||
597 | usbid=0x078174e5 | 637 | usbid=0x078174e5 |
598 | usberror=0x078174e4 | 638 | usberror=0x078174e4 |
599 | configure_modelname=sansaclipzip | 639 | configure_modelname=sansaclipzip |
640 | playerpic=sansaclipzip | ||
600 | encoder=rbspeex | 641 | encoder=rbspeex |
601 | 642 | ||
602 | [mrobe100] | 643 | [mrobe100] |
@@ -609,6 +650,7 @@ manualname= | |||
609 | brand=Olympus | 650 | brand=Olympus |
610 | usbid=0x07b40280 | 651 | usbid=0x07b40280 |
611 | configure_modelname=mrobe100 | 652 | configure_modelname=mrobe100 |
653 | playerpic=mrobe100 | ||
612 | encoder=rbspeex | 654 | encoder=rbspeex |
613 | 655 | ||
614 | [ondavx747] | 656 | [ondavx747] |
@@ -622,6 +664,7 @@ manualname= | |||
622 | brand=Onda | 664 | brand=Onda |
623 | usbid=0x07c4a4a5 | 665 | usbid=0x07c4a4a5 |
624 | configure_modelname=ondavx747 | 666 | configure_modelname=ondavx747 |
667 | playerpic=vx747 | ||
625 | encoder=rbspeex | 668 | encoder=rbspeex |
626 | status=disabled | 669 | status=disabled |
627 | 670 | ||
@@ -636,6 +679,7 @@ manualname= | |||
636 | brand=Onda | 679 | brand=Onda |
637 | usbid=0x07c4a4a5 | 680 | usbid=0x07c4a4a5 |
638 | configure_modelname=ondavx747p | 681 | configure_modelname=ondavx747p |
682 | playerpic=vx747 | ||
639 | encoder=rbspeex | 683 | encoder=rbspeex |
640 | status=disabled | 684 | status=disabled |
641 | 685 | ||
@@ -650,6 +694,7 @@ manualname= | |||
650 | brand=Onda | 694 | brand=Onda |
651 | usbid=0x07c4a4a5 | 695 | usbid=0x07c4a4a5 |
652 | configure_modelname=ondavx777 | 696 | configure_modelname=ondavx777 |
697 | playerpic=vx777 | ||
653 | encoder=rbspeex | 698 | encoder=rbspeex |
654 | status=disabled | 699 | status=disabled |
655 | 700 | ||
@@ -663,6 +708,7 @@ manualname= | |||
663 | brand=Samsung | 708 | brand=Samsung |
664 | usbid=0x04e85023 | 709 | usbid=0x04e85023 |
665 | configure_modelname=samsungyh820 | 710 | configure_modelname=samsungyh820 |
711 | playerpic=samsungyh820 | ||
666 | encoder=rbspeex | 712 | encoder=rbspeex |
667 | 713 | ||
668 | [samsungyh920] | 714 | [samsungyh920] |
@@ -675,6 +721,7 @@ manualname= | |||
675 | brand=Samsung | 721 | brand=Samsung |
676 | usbid=0x04e85022, 0x04e8501d | 722 | usbid=0x04e85022, 0x04e8501d |
677 | configure_modelname=samsungyh920 | 723 | configure_modelname=samsungyh920 |
724 | playerpic=samsungyh920 | ||
678 | encoder=rbspeex | 725 | encoder=rbspeex |
679 | 726 | ||
680 | [samsungyh925] | 727 | [samsungyh925] |
@@ -687,6 +734,7 @@ manualname= | |||
687 | brand=Samsung | 734 | brand=Samsung |
688 | usbid=0x04e85024 | 735 | usbid=0x04e85024 |
689 | configure_modelname=samsungyh925 | 736 | configure_modelname=samsungyh925 |
737 | playerpic=samsungyh925 | ||
690 | encoder=rbspeex | 738 | encoder=rbspeex |
691 | 739 | ||
692 | [cowond2] | 740 | [cowond2] |
@@ -701,6 +749,7 @@ brand=Cowon | |||
701 | usbid=0x0e210800, 0x0e210860, 0x0e210870, 0x0e210880, 0x0e210890 | 749 | usbid=0x0e210800, 0x0e210860, 0x0e210870, 0x0e210880, 0x0e210890 |
702 | usberror=0x0e210801, 0x0e210861, 0x0e210871, 0x0e210881, 0x0e210891 | 750 | usberror=0x0e210801, 0x0e210861, 0x0e210871, 0x0e210881, 0x0e210891 |
703 | configure_modelname=cowond2 | 751 | configure_modelname=cowond2 |
752 | playerpic=cowond2 | ||
704 | encoder=rbspeex | 753 | encoder=rbspeex |
705 | status=disabled | 754 | status=disabled |
706 | 755 | ||
@@ -715,6 +764,7 @@ brand=Packard Bell | |||
715 | usbid=0x04098038 | 764 | usbid=0x04098038 |
716 | usberror=0x04098039 | 765 | usberror=0x04098039 |
717 | configure_modelname=vibe500 | 766 | configure_modelname=vibe500 |
767 | playerpic=vibe500 | ||
718 | encoder=rbspeex | 768 | encoder=rbspeex |
719 | 769 | ||
720 | [mpiohd200] | 770 | [mpiohd200] |
@@ -728,6 +778,7 @@ manualname= | |||
728 | brand=MPIO | 778 | brand=MPIO |
729 | usbid=0x27351004 | 779 | usbid=0x27351004 |
730 | configure_modelname=mpiohd200 | 780 | configure_modelname=mpiohd200 |
781 | playerpic=mpiohd200 | ||
731 | encoder=rbspeex | 782 | encoder=rbspeex |
732 | 783 | ||
733 | [mpiohd300] | 784 | [mpiohd300] |
@@ -741,6 +792,7 @@ manualname= | |||
741 | brand=MPIO | 792 | brand=MPIO |
742 | usbid=0x27351005 | 793 | usbid=0x27351005 |
743 | configure_modelname=mpiohd300 | 794 | configure_modelname=mpiohd300 |
795 | playerpic=mpiohd300 | ||
744 | encoder=rbspeex | 796 | encoder=rbspeex |
745 | 797 | ||
746 | [gogearhdd1630] | 798 | [gogearhdd1630] |
@@ -753,6 +805,7 @@ manualname= | |||
753 | brand=Philips | 805 | brand=Philips |
754 | usbid=0x0471014c | 806 | usbid=0x0471014c |
755 | configure_modelname=gogearhdd1630 | 807 | configure_modelname=gogearhdd1630 |
808 | playerpic=gogearhdd1630 | ||
756 | encoder=rbspeex | 809 | encoder=rbspeex |
757 | 810 | ||
758 | [gogearhdd6330] | 811 | [gogearhdd6330] |
@@ -765,6 +818,7 @@ manualname= | |||
765 | brand=Philips | 818 | brand=Philips |
766 | usbid=0x0471014b | 819 | usbid=0x0471014b |
767 | configure_modelname=gogearhdd6330 | 820 | configure_modelname=gogearhdd6330 |
821 | playerpic=gogearhdd6330 | ||
768 | encoder=rbspeex | 822 | encoder=rbspeex |
769 | 823 | ||
770 | [gogearsa9200] | 824 | [gogearsa9200] |
@@ -776,6 +830,7 @@ manualname= | |||
776 | brand=Philips | 830 | brand=Philips |
777 | usbid=0x0471014f | 831 | usbid=0x0471014f |
778 | configure_modelname=gogearsa9200 | 832 | configure_modelname=gogearsa9200 |
833 | playerpic=gogearsa9200 | ||
779 | encoder=rbspeex | 834 | encoder=rbspeex |
780 | status=disabled | 835 | status=disabled |
781 | 836 | ||
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 27efcea6db..575859fd46 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -364,20 +364,28 @@ void RbUtilQt::updateDevice() | |||
364 | ui.menuA_ctions->setEnabled(configurationValid); | 364 | ui.menuA_ctions->setEnabled(configurationValid); |
365 | 365 | ||
366 | // displayed device info | 366 | // displayed device info |
367 | QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); | ||
368 | QString brand = SystemInfo::value(SystemInfo::CurBrand).toString(); | 367 | QString brand = SystemInfo::value(SystemInfo::CurBrand).toString(); |
369 | QString name = SystemInfo::value(SystemInfo::CurName).toString() + | 368 | QString name |
370 | " (" + ServerInfo::value(ServerInfo::CurStatus).toString() + ")"; | 369 | = QString("%1 (%2)").arg(SystemInfo::value(SystemInfo::CurName).toString(), |
370 | ServerInfo::value(ServerInfo::CurStatus).toString()); | ||
371 | ui.labelDevice->setText(tr("<b>%1 %2</b>").arg(brand, name)); | ||
372 | |||
373 | QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); | ||
371 | QString mountdisplay = QDir::toNativeSeparators(mountpoint); | 374 | QString mountdisplay = QDir::toNativeSeparators(mountpoint); |
372 | QString label = Utils::filesystemName(mountpoint); | 375 | if(!mountdisplay.isEmpty()) { |
373 | if(!label.isEmpty()) | 376 | QString label = Utils::filesystemName(mountpoint); |
374 | mountdisplay += " (" + label + ")"; | 377 | if(!label.isEmpty()) mountdisplay += QString(" (%1)").arg(label); |
378 | ui.labelMountpoint->setText(tr("<b>%1</b>").arg(mountdisplay)); | ||
379 | } | ||
380 | else { | ||
381 | mountdisplay = "(unknown)"; | ||
382 | } | ||
375 | 383 | ||
376 | if(name.isEmpty()) name = "<none>"; | 384 | QPixmap pm; |
377 | if(mountpoint.isEmpty()) | 385 | QString m = SystemInfo::value(SystemInfo::CurPlayerPicture).toString(); |
378 | mountpoint = "<invalid>"; | 386 | pm.load(":/icons/players/" + m + "-small.png"); |
379 | ui.labelDevice->setText(tr("<b>%1 %2</b>").arg(brand, name)); | 387 | pm = pm.scaledToHeight(QFontMetrics(QApplication::font()).height() * 3); |
380 | ui.labelMountpoint->setText(tr("<b>%1</b>").arg(mountdisplay)); | 388 | ui.labelPlayerPic->setPixmap(pm); |
381 | 389 | ||
382 | // hide quickstart buttons if no release available | 390 | // hide quickstart buttons if no release available |
383 | bool installable = !ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty(); | 391 | bool installable = !ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty(); |
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc index 2dd317032e..5305a98434 100644 --- a/rbutil/rbutilqt/rbutilqt.qrc +++ b/rbutil/rbutilqt/rbutilqt.qrc | |||
@@ -42,6 +42,56 @@ | |||
42 | <file>icons/wizard.jpg</file> | 42 | <file>icons/wizard.jpg</file> |
43 | <file alias="icons/rockbox-clef.svg">../../docs/logo/rockbox-clef.svg</file> | 43 | <file alias="icons/rockbox-clef.svg">../../docs/logo/rockbox-clef.svg</file> |
44 | </qresource> | 44 | </qresource> |
45 | <qresource> | ||
46 | <file>icons/players/archosfmrecorder-small.png</file> | ||
47 | <file>icons/players/archosondiofm-small.png</file> | ||
48 | <file>icons/players/archosondiosp-small.png</file> | ||
49 | <file>icons/players/archosplayer-small.png</file> | ||
50 | <file>icons/players/archosrecorder-small.png</file> | ||
51 | <file>icons/players/archosrecorderv2-small.png</file> | ||
52 | <file>icons/players/cowond2-small.png</file> | ||
53 | <file>icons/players/gigabeatfx-small.png</file> | ||
54 | <file>icons/players/gigabeats-small.png</file> | ||
55 | <file>icons/players/gogearhdd1630-small.png</file> | ||
56 | <file>icons/players/gogearhdd6330-small.png</file> | ||
57 | <file>icons/players/gogearsa9200-small.png</file> | ||
58 | <file>icons/players/hifimanhm60x-small.png</file> | ||
59 | <file>icons/players/hifimanhm801-small.png</file> | ||
60 | <file>icons/players/iaudiom3-small.png</file> | ||
61 | <file>icons/players/iaudiom5-small.png</file> | ||
62 | <file>icons/players/iaudiox5-small.png</file> | ||
63 | <file>icons/players/ipod1g2g-small.png</file> | ||
64 | <file>icons/players/ipod3g-small.png</file> | ||
65 | <file>icons/players/ipod4g-small.png</file> | ||
66 | <file>icons/players/ipodcolor-small.png</file> | ||
67 | <file>icons/players/ipodmini1g-small.png</file> | ||
68 | <file>icons/players/ipodnano1g-small.png</file> | ||
69 | <file>icons/players/ipodnano2g-small.png</file> | ||
70 | <file>icons/players/ipodvideo-small.png</file> | ||
71 | <file>icons/players/iriverh100-small.png</file> | ||
72 | <file>icons/players/iriverh10_5gb-small.png</file> | ||
73 | <file>icons/players/iriverh10-small.png</file> | ||
74 | <file>icons/players/iriverh300-small.png</file> | ||
75 | <file>icons/players/mpiohd200-small.png</file> | ||
76 | <file>icons/players/mpiohd300-small.png</file> | ||
77 | <file>icons/players/mrobe100-small.png</file> | ||
78 | <file>icons/players/mrobe500-small.png</file> | ||
79 | <file>icons/players/samsungyh820-small.png</file> | ||
80 | <file>icons/players/samsungyh920-small.png</file> | ||
81 | <file>icons/players/samsungyh925-small.png</file> | ||
82 | <file>icons/players/samsungypr0-small.png</file> | ||
83 | <file>icons/players/sansac200-small.png</file> | ||
84 | <file>icons/players/sansaclipplus-small.png</file> | ||
85 | <file>icons/players/sansaclip-small.png</file> | ||
86 | <file>icons/players/sansaclipzip-small.png</file> | ||
87 | <file>icons/players/sansaconnect-small.png</file> | ||
88 | <file>icons/players/sansae200-small.png</file> | ||
89 | <file>icons/players/sansafuzeplus-small.png</file> | ||
90 | <file>icons/players/sansafuze-small.png</file> | ||
91 | <file>icons/players/vibe500-small.png</file> | ||
92 | <file>icons/players/vx747-small.png</file> | ||
93 | <file>icons/players/vx777-small.png</file> | ||
94 | </qresource> | ||
45 | <qresource prefix="/ini"> | 95 | <qresource prefix="/ini"> |
46 | <file>rbutil.ini</file> | 96 | <file>rbutil.ini</file> |
47 | </qresource> | 97 | </qresource> |
diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui index 3ee52d6f7b..561a9aa3ae 100644 --- a/rbutil/rbutilqt/rbutilqtfrm.ui +++ b/rbutil/rbutilqt/rbutilqtfrm.ui | |||
@@ -97,7 +97,17 @@ | |||
97 | </property> | 97 | </property> |
98 | </spacer> | 98 | </spacer> |
99 | </item> | 99 | </item> |
100 | <item row="0" column="3"> | 100 | <item row="0" column="0" rowspan="2"> |
101 | <widget class="QLabel" name="labelPlayerPic"> | ||
102 | <property name="text"> | ||
103 | <string/> | ||
104 | </property> | ||
105 | <property name="scaledContents"> | ||
106 | <bool>true</bool> | ||
107 | </property> | ||
108 | </widget> | ||
109 | </item> | ||
110 | <item row="0" column="4" rowspan="2"> | ||
101 | <widget class="QPushButton" name="buttonChangeDevice"> | 111 | <widget class="QPushButton" name="buttonChangeDevice"> |
102 | <property name="text"> | 112 | <property name="text"> |
103 | <string>&Change</string> | 113 | <string>&Change</string> |