1 | Index: themes/G.A.N.T./music-ui.xml |
---|
2 | =================================================================== |
---|
3 | --- themes/G.A.N.T./music-ui.xml (revision 12807) |
---|
4 | +++ themes/G.A.N.T./music-ui.xml (working copy) |
---|
5 | @@ -476,56 +476,62 @@ |
---|
6 | <value>Artist:</value> |
---|
7 | </textarea> |
---|
8 | |
---|
9 | + <textarea name="sort_artist_label" draworder="1" align="right"> |
---|
10 | + <area>15,190,170,30</area> |
---|
11 | + <font>labels</font> |
---|
12 | + <value>Sort Artist:</value> |
---|
13 | + </textarea> |
---|
14 | + |
---|
15 | <textarea name="album_label" draworder="1" align="right"> |
---|
16 | - <area>15,190,170,30</area> |
---|
17 | + <area>15,230,170,30</area> |
---|
18 | <font>labels</font> |
---|
19 | <value>Album:</value> |
---|
20 | </textarea> |
---|
21 | |
---|
22 | <textarea name="title_text" draworder="1" align="right"> |
---|
23 | - <area>15,230,170,30</area> |
---|
24 | + <area>15,270,170,30</area> |
---|
25 | <font>labels</font> |
---|
26 | <value>Title:</value> |
---|
27 | </textarea> |
---|
28 | |
---|
29 | <textarea name="genre_label" draworder="1" align="right"> |
---|
30 | - <area>15,270,170,30</area> |
---|
31 | + <area>15,310,170,30</area> |
---|
32 | <font>labels</font> |
---|
33 | <value>Genre:</value> |
---|
34 | </textarea> |
---|
35 | |
---|
36 | <textarea name="year_label" draworder="1" align="right"> |
---|
37 | - <area>15,310,170,30</area> |
---|
38 | + <area>15,350,170,30</area> |
---|
39 | <font>labels</font> |
---|
40 | <value>Year:</value> |
---|
41 | </textarea> |
---|
42 | |
---|
43 | <textarea name="track_label" draworder="1" align="right"> |
---|
44 | - <area>365,310,170,30</area> |
---|
45 | + <area>365,350,170,30</area> |
---|
46 | <font>labels</font> |
---|
47 | <value>Track No.:</value> |
---|
48 | </textarea> |
---|
49 | |
---|
50 | <textarea name="rating_label" draworder="1" align="right"> |
---|
51 | - <area>15,350,170,30</area> |
---|
52 | + <area>15,390,170,30</area> |
---|
53 | <font>labels</font> |
---|
54 | <value>Rating:</value> |
---|
55 | </textarea> |
---|
56 | |
---|
57 | <textarea name="playcount_label" draworder="1" align="right"> |
---|
58 | - <area>420,390,300,30</area> |
---|
59 | + <area>420,430,300,30</area> |
---|
60 | <font>labels</font> |
---|
61 | <value>Play Count:</value> |
---|
62 | </textarea> |
---|
63 | |
---|
64 | <textarea name="lastplay_label" draworder="1" align="right"> |
---|
65 | - <area>15,390,170,30</area> |
---|
66 | + <area>15,430,170,30</area> |
---|
67 | <font>labels</font> |
---|
68 | <value>Last Play:</value> |
---|
69 | </textarea> |
---|
70 | |
---|
71 | <textarea name="filename_label" draworder="1" align="right"> |
---|
72 | - <area>15,430,170,30</area> |
---|
73 | + <area>15,470,170,30</area> |
---|
74 | <font>labels</font> |
---|
75 | <value>Filename:</value> |
---|
76 | </textarea> |
---|
77 | @@ -567,54 +573,58 @@ |
---|
78 | <image function="pushed" filename="mm_blankbutton_pushed.png"></image> |
---|
79 | </pushbutton> |
---|
80 | |
---|
81 | + <remoteedit name="searchartist_edit" draworder="1" align="left"> |
---|
82 | + <area>195,190,525,35</area> |
---|
83 | + <font>display</font> |
---|
84 | + </remoteedit> |
---|
85 | |
---|
86 | <remoteedit name="album_edit" draworder="1" align="left"> |
---|
87 | - <area>195,190,525,35</area> |
---|
88 | + <area>195,230,525,35</area> |
---|
89 | <font>display</font> |
---|
90 | </remoteedit> |
---|
91 | |
---|
92 | <pushbutton name="searchalbum_button" draworder="2"> |
---|
93 | - <position>725,190</position> |
---|
94 | + <position>725,230</position> |
---|
95 | <image function="on" filename="mm_blankbutton_on.png"></image> |
---|
96 | <image function="off" filename="mm_blankbutton_off.png"></image> |
---|
97 | <image function="pushed" filename="mm_blankbutton_pushed.png"></image> |
---|
98 | </pushbutton> |
---|
99 | |
---|
100 | <remoteedit name="title_edit" draworder="1" align="left"> |
---|
101 | - <area>195,230,525,35</area> |
---|
102 | + <area>195,270,525,35</area> |
---|
103 | <font>display</font> |
---|
104 | </remoteedit> |
---|
105 | |
---|
106 | <remoteedit name="genre_edit" draworder="1" align="left"> |
---|
107 | - <area>195,270,525,35</area> |
---|
108 | + <area>195,310,525,35</area> |
---|
109 | <font>display</font> |
---|
110 | </remoteedit> |
---|
111 | |
---|
112 | <pushbutton name="searchgenre_button" draworder="2"> |
---|
113 | - <position>725,270</position> |
---|
114 | + <position>725,310</position> |
---|
115 | <image function="on" filename="mm_blankbutton_on.png"></image> |
---|
116 | <image function="off" filename="mm_blankbutton_off.png"></image> |
---|
117 | <image function="pushed" filename="mm_blankbutton_pushed.png"></image> |
---|
118 | </pushbutton> |
---|
119 | |
---|
120 | <remoteedit name="year_edit" draworder="1" align="left"> |
---|
121 | - <area>195,310,175,35</area> |
---|
122 | + <area>195,350,175,35</area> |
---|
123 | <font>display</font> |
---|
124 | </remoteedit> |
---|
125 | |
---|
126 | <remoteedit name="track_edit" draworder="1" align="left"> |
---|
127 | - <area>545,310,175,35</area> |
---|
128 | + <area>545,350,175,35</area> |
---|
129 | <font>display</font> |
---|
130 | </remoteedit> |
---|
131 | |
---|
132 | <repeatedimage name="rating_image" draworder="1" fleximage="no"> |
---|
133 | <filename>mm_rating.png</filename> |
---|
134 | - <position>190,360</position> |
---|
135 | + <position>190,400</position> |
---|
136 | <orientation>LeftToRight</orientation> |
---|
137 | </repeatedimage> |
---|
138 | |
---|
139 | <selector name="rating_button" draworder="0"> |
---|
140 | - <area>420,350,30,30</area> |
---|
141 | + <area>420,390,30,30</area> |
---|
142 | <font>display</font> |
---|
143 | <image function="on" filename="mm_leftright_on.png"></image> |
---|
144 | <image function="off" filename="mm_leftright_off.png"></image> |
---|
145 | @@ -622,17 +632,17 @@ |
---|
146 | </selector> |
---|
147 | |
---|
148 | <textarea name="playcount_text" draworder="1" align="left"> |
---|
149 | - <area>725,390,400,30</area> |
---|
150 | + <area>725,430,400,30</area> |
---|
151 | <font>display</font> |
---|
152 | </textarea> |
---|
153 | |
---|
154 | <textarea name="lastplay_text" draworder="1" align="left"> |
---|
155 | - <area>195,390,400,30</area> |
---|
156 | + <area>195,430,400,30</area> |
---|
157 | <font>display</font> |
---|
158 | </textarea> |
---|
159 | |
---|
160 | <textarea name="filename_text" draworder="1" align="left"> |
---|
161 | - <area>195,430,550,100</area> |
---|
162 | + <area>195,470,550,100</area> |
---|
163 | <multiline>yes</multiline> |
---|
164 | <font>display</font> |
---|
165 | </textarea> |
---|
166 | @@ -642,6 +652,155 @@ |
---|
167 | --> |
---|
168 | |
---|
169 | <textbutton name="done_button" draworder="0"> |
---|
170 | + <position>350,550</position> |
---|
171 | + <font>display</font> |
---|
172 | + <image function="on" filename="text_button_on.png"></image> |
---|
173 | + <image function="off" filename="text_button_off.png"></image> |
---|
174 | + <image function="pushed" filename="text_button_pushed.png"></image> |
---|
175 | + </textbutton> |
---|
176 | + |
---|
177 | |
---|
178 | Index: themes/blue/music-ui.xml |
---|
179 | =================================================================== |
---|
180 | --- themes/blue/music-ui.xml (revision 12807) |
---|
181 | +++ themes/blue/music-ui.xml (working copy) |
---|
182 | @@ -410,56 +410,62 @@ |
---|
183 | <value>Artist:</value> |
---|
184 | </textarea> |
---|
185 | |
---|
186 | - <textarea name="album_label" draworder="1" align="right"> |
---|
187 | + <textarea name="sort_artist_label" draworder="1" align="right"> |
---|
188 | <area>15,190,170,30</area> |
---|
189 | <font>labels</font> |
---|
190 | + <value>Sort Artist:</value> |
---|
191 | + </textarea> |
---|
192 | + |
---|
193 | + <textarea name="album_label" draworder="1" align="right"> |
---|
194 | + <area>15,230,170,30</area> |
---|
195 | + <font>labels</font> |
---|
196 | <value>Album:</value> |
---|
197 | </textarea> |
---|
198 | |
---|
199 | <textarea name="title_text" draworder="1" align="right"> |
---|
200 | - <area>15,230,170,30</area> |
---|
201 | + <area>15,270,170,30</area> |
---|
202 | <font>labels</font> |
---|
203 | <value>Title:</value> |
---|
204 | </textarea> |
---|
205 | |
---|
206 | <textarea name="genre_label" draworder="1" align="right"> |
---|
207 | - <area>15,270,170,30</area> |
---|
208 | + <area>15,310,170,30</area> |
---|
209 | <font>labels</font> |
---|
210 | <value>Genre:</value> |
---|
211 | </textarea> |
---|
212 | |
---|
213 | <textarea name="year_label" draworder="1" align="right"> |
---|
214 | - <area>15,310,170,30</area> |
---|
215 | + <area>15,350,170,30</area> |
---|
216 | <font>labels</font> |
---|
217 | <value>Year:</value> |
---|
218 | </textarea> |
---|
219 | |
---|
220 | <textarea name="track_label" draworder="1" align="right"> |
---|
221 | - <area>365,310,170,30</area> |
---|
222 | + <area>365,350,170,30</area> |
---|
223 | <font>labels</font> |
---|
224 | <value>Track No.:</value> |
---|
225 | </textarea> |
---|
226 | |
---|
227 | <textarea name="rating_label" draworder="1" align="right"> |
---|
228 | - <area>15,350,170,30</area> |
---|
229 | + <area>15,390,170,30</area> |
---|
230 | <font>labels</font> |
---|
231 | <value>Rating:</value> |
---|
232 | </textarea> |
---|
233 | |
---|
234 | <textarea name="playcount_label" draworder="1" align="right"> |
---|
235 | - <area>420,390,300,30</area> |
---|
236 | + <area>420,430,300,30</area> |
---|
237 | <font>labels</font> |
---|
238 | <value>Play Count:</value> |
---|
239 | </textarea> |
---|
240 | |
---|
241 | <textarea name="lastplay_label" draworder="1" align="right"> |
---|
242 | - <area>15,390,170,30</area> |
---|
243 | + <area>15,430,170,30</area> |
---|
244 | <font>labels</font> |
---|
245 | <value>Last Play:</value> |
---|
246 | </textarea> |
---|
247 | |
---|
248 | <textarea name="filename_label" draworder="1" align="right"> |
---|
249 | - <area>15,430,170,30</area> |
---|
250 | + <area>15,470,170,30</area> |
---|
251 | <font>labels</font> |
---|
252 | <value>Filename:</value> |
---|
253 | </textarea> |
---|
254 | @@ -501,54 +507,58 @@ |
---|
255 | <image function="pushed" filename="mm_blankbutton_pushed.png"></image> |
---|
256 | </pushbutton> |
---|
257 | |
---|
258 | + <remoteedit name="searchartist_edit" draworder="1" align="left"> |
---|
259 | + <area>195,190,525,35</area> |
---|
260 | + <font>display</font> |
---|
261 | + </remoteedit> |
---|
262 | |
---|
263 | <remoteedit name="album_edit" draworder="1" align="left"> |
---|
264 | - <area>195,190,525,35</area> |
---|
265 | + <area>195,230,525,35</area> |
---|
266 | <font>display</font> |
---|
267 | </remoteedit> |
---|
268 | |
---|
269 | <pushbutton name="searchalbum_button" draworder="2"> |
---|
270 | - <position>725,190</position> |
---|
271 | + <position>725,230</position> |
---|
272 | <image function="on" filename="mm_blankbutton_on.png"></image> |
---|
273 | <image function="off" filename="mm_blankbutton_off.png"></image> |
---|
274 | <image function="pushed" filename="mm_blankbutton_pushed.png"></image> |
---|
275 | </pushbutton> |
---|
276 | |
---|
277 | <remoteedit name="title_edit" draworder="1" align="left"> |
---|
278 | - <area>195,230,525,35</area> |
---|
279 | + <area>195,270,525,35</area> |
---|
280 | <font>display</font> |
---|
281 | </remoteedit> |
---|
282 | |
---|
283 | <remoteedit name="genre_edit" draworder="1" align="left"> |
---|
284 | - <area>195,270,525,35</area> |
---|
285 | + <area>195,310,525,35</area> |
---|
286 | <font>display</font> |
---|
287 | </remoteedit> |
---|
288 | |
---|
289 | <pushbutton name="searchgenre_button" draworder="2"> |
---|
290 | - <position>725,270</position> |
---|
291 | + <position>725,310</position> |
---|
292 | <image function="on" filename="mm_blankbutton_on.png"></image> |
---|
293 | <image function="off" filename="mm_blankbutton_off.png"></image> |
---|
294 | <image function="pushed" filename="mm_blankbutton_pushed.png"></image> |
---|
295 | </pushbutton> |
---|
296 | |
---|
297 | <remoteedit name="year_edit" draworder="1" align="left"> |
---|
298 | - <area>195,310,175,35</area> |
---|
299 | + <area>195,350,175,35</area> |
---|
300 | <font>display</font> |
---|
301 | </remoteedit> |
---|
302 | |
---|
303 | <remoteedit name="track_edit" draworder="1" align="left"> |
---|
304 | - <area>545,310,175,35</area> |
---|
305 | + <area>545,350,175,35</area> |
---|
306 | <font>display</font> |
---|
307 | </remoteedit> |
---|
308 | |
---|
309 | <repeatedimage name="rating_image" draworder="1" fleximage="no"> |
---|
310 | <filename>mm_rating.png</filename> |
---|
311 | - <position>190,360</position> |
---|
312 | + <position>190,400</position> |
---|
313 | <orientation>LeftToRight</orientation> |
---|
314 | </repeatedimage> |
---|
315 | |
---|
316 | <selector name="rating_button" draworder="0"> |
---|
317 | - <area>420,350,30,30</area> |
---|
318 | + <area>420,390,30,30</area> |
---|
319 | <font>display</font> |
---|
320 | <image function="on" filename="mm_leftright_on.png"></image> |
---|
321 | <image function="off" filename="mm_leftright_off.png"></image> |
---|
322 | @@ -556,17 +566,17 @@ |
---|
323 | </selector> |
---|
324 | |
---|
325 | <textarea name="playcount_text" draworder="1" align="left"> |
---|
326 | - <area>725,390,400,30</area> |
---|
327 | + <area>725,430,400,30</area> |
---|
328 | <font>display</font> |
---|
329 | </textarea> |
---|
330 | |
---|
331 | <textarea name="lastplay_text" draworder="1" align="left"> |
---|
332 | - <area>195,390,400,30</area> |
---|
333 | + <area>195,430,400,30</area> |
---|
334 | <font>display</font> |
---|
335 | </textarea> |
---|
336 | |
---|
337 | <textarea name="filename_text" draworder="1" align="left"> |
---|
338 | - <area>195,430,550,100</area> |
---|
339 | + <area>195,470,550,100</area> |
---|
340 | <multiline>yes</multiline> |
---|
341 | <font>display</font> |
---|
342 | </textarea> |
---|
343 | @@ -576,7 +586,7 @@ |
---|
344 | --> |
---|
345 | |
---|
346 | <textbutton name="done_button" draworder="0"> |
---|
347 | - <position>350,540</position> |
---|
348 | + <position>350,550</position> |
---|
349 | <font>display</font> |
---|
350 | <image function="on" filename="text_button_on.png"></image> |
---|
351 | <image function="off" filename="text_button_off.png"></image> |
---|
352 | |
---|
353 | Index: themes/default-wide/music-ui.xml |
---|
354 | =================================================================== |
---|
355 | --- themes/default-wide/music-ui.xml (revision 12807) |
---|
356 | +++ themes/default-wide/music-ui.xml (working copy) |
---|
357 | @@ -474,22 +474,22 @@ |
---|
358 | <value>Artist:</value> |
---|
359 | </textarea> |
---|
360 | |
---|
361 | - <textarea name="album_label" draworder="1" align="right"> |
---|
362 | + <textarea name="sort_artist_label" draworder="1" align="right"> |
---|
363 | <area>0,190,250,30</area> |
---|
364 | <font>labels</font> |
---|
365 | - <value>Album:</value> |
---|
366 | + <value>Sort Artist:</value> |
---|
367 | </textarea> |
---|
368 | |
---|
369 | - <textarea name="title_text" draworder="1" align="right"> |
---|
370 | + <textarea name="album_label" draworder="1" align="right"> |
---|
371 | <area>0,230,250,30</area> |
---|
372 | <font>labels</font> |
---|
373 | - <value>Title:</value> |
---|
374 | + <value>Album:</value> |
---|
375 | </textarea> |
---|
376 | |
---|
377 | - <textarea name="track_label" draworder="1" align="right"> |
---|
378 | + <textarea name="title_text" draworder="1" align="right"> |
---|
379 | <area>0,270,250,30</area> |
---|
380 | <font>labels</font> |
---|
381 | - <value>Track No.:</value> |
---|
382 | + <value>Title:</value> |
---|
383 | </textarea> |
---|
384 | |
---|
385 | <textarea name="genre_label" draworder="1" align="right"> |
---|
386 | @@ -504,6 +504,12 @@ |
---|
387 | <value>Year:</value> |
---|
388 | </textarea> |
---|
389 | |
---|
390 | + <textarea name="track_label" draworder="1" align="right"> |
---|
391 | + <area>365,350,250,30</area> |
---|
392 | + <font>labels</font> |
---|
393 | + <value>Track No.:</value> |
---|
394 | + </textarea> |
---|
395 | + |
---|
396 | <textarea name="rating_label" draworder="1" align="right"> |
---|
397 | <area>0,390,250,30</area> |
---|
398 | <font>labels</font> |
---|
399 | @@ -511,19 +517,19 @@ |
---|
400 | </textarea> |
---|
401 | |
---|
402 | <textarea name="playcount_label" draworder="1" align="right"> |
---|
403 | - <area>0,430,250,30</area> |
---|
404 | + <area>420,430,250,30</area> |
---|
405 | <font>labels</font> |
---|
406 | <value>Play Count:</value> |
---|
407 | </textarea> |
---|
408 | |
---|
409 | <textarea name="lastplay_label" draworder="1" align="right"> |
---|
410 | - <area>0,470,250,30</area> |
---|
411 | + <area>0,430,250,30</area> |
---|
412 | <font>labels</font> |
---|
413 | <value>Last Play:</value> |
---|
414 | </textarea> |
---|
415 | |
---|
416 | <textarea name="filename_label" draworder="1" align="right"> |
---|
417 | - <area>0,510,250,138</area> |
---|
418 | + <area>0,470,250,138</area> |
---|
419 | <font>labels</font> |
---|
420 | <value>Filename:</value> |
---|
421 | </textarea> |
---|
422 | @@ -564,24 +570,24 @@ |
---|
423 | <image function="pushed" filename="mm_blankbutton_pushed.png"></image> |
---|
424 | </pushbutton> |
---|
425 | |
---|
426 | + <remoteedit name="searchartist_edit" draworder="1" align="left"> |
---|
427 | + <area>260,190,525,35</area> |
---|
428 | + <font>display</font> |
---|
429 | + </remoteedit> |
---|
430 | + |
---|
431 | <remoteedit name="album_edit" draworder="1" align="left"> |
---|
432 | - <area>260,190,782,35</area> |
---|
433 | + <area>260,230,782,35</area> |
---|
434 | <font>display</font> |
---|
435 | </remoteedit> |
---|
436 | |
---|
437 | <pushbutton name="searchalbum_button" draworder="2"> |
---|
438 | - <position>1048,190</position> |
---|
439 | + <position>1048,230</position> |
---|
440 | <image function="on" filename="mm_blankbutton_on.png"></image> |
---|
441 | <image function="off" filename="mm_blankbutton_off.png"></image> |
---|
442 | <image function="pushed" filename="mm_blankbutton_pushed.png"></image> |
---|
443 | </pushbutton> |
---|
444 | |
---|
445 | <remoteedit name="title_edit" draworder="1" align="left"> |
---|
446 | - <area>260,230,782,35</area> |
---|
447 | - <font>display</font> |
---|
448 | - </remoteedit> |
---|
449 | - |
---|
450 | - <remoteedit name="track_edit" draworder="1" align="left"> |
---|
451 | <area>260,270,782,35</area> |
---|
452 | <font>display</font> |
---|
453 | </remoteedit> |
---|
454 | @@ -603,6 +609,11 @@ |
---|
455 | <font>display</font> |
---|
456 | </remoteedit> |
---|
457 | |
---|
458 | + <remoteedit name="track_edit" draworder="1" align="left"> |
---|
459 | + <area>545,350,175,35</area> |
---|
460 | + <font>display</font> |
---|
461 | + </remoteedit> |
---|
462 | + |
---|
463 | <repeatedimage name="rating_image" draworder="1" fleximage="no"> |
---|
464 | <filename>mm_rating.png</filename> |
---|
465 | <position>260,400</position> |
---|
466 | @@ -618,17 +629,17 @@ |
---|
467 | </selector> |
---|
468 | |
---|
469 | <textarea name="playcount_text" draworder="1" align="left"> |
---|
470 | - <area>260,430,122,30</area> |
---|
471 | + <area>725,430,122,30</area> |
---|
472 | <font>display</font> |
---|
473 | </textarea> |
---|
474 | |
---|
475 | <textarea name="lastplay_text" draworder="1" align="left"> |
---|
476 | - <area>260,470,400,30</area> |
---|
477 | + <area>260,430,400,30</area> |
---|
478 | <font>display</font> |
---|
479 | </textarea> |
---|
480 | |
---|
481 | <textarea name="filename_text" draworder="1" align="left"> |
---|
482 | - <area>260,510,782,138</area> |
---|
483 | + <area>260,470,552,100</area> |
---|
484 | <multiline>yes</multiline> |
---|
485 | <font>display</font> |
---|
486 | </textarea> |
---|
487 | @@ -638,7 +649,7 @@ |
---|
488 | --> |
---|
489 | |
---|
490 | <textbutton name="done_button" draworder="0"> |
---|
491 | - <position>260,576</position> |
---|
492 | + <position>260,556</position> |
---|
493 | <font>display</font> |
---|
494 | <image function="on" filename="text_button_on.png"></image> |
---|
495 | <image function="off" filename="text_button_off.png"></image> |
---|
496 | |
---|