Commit graph

353 commits

Author SHA1 Message Date
Jonathan Gordon
562437b8e7 Fix FS#1159 - stack overflow in the skin engine when there is too many nested conditionals
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28167 a1c6a512-1295-4272-9138-f99709370657
2010-09-26 06:43:33 +00:00
Jonathan Gordon
2c8204cd91 Hopefully fix FS#11630 where the wps backdrop would be shown instead of the menu one
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28116 a1c6a512-1295-4272-9138-f99709370657
2010-09-19 11:49:33 +00:00
Frank Gevaerts
f366090562 Make disabling HAVE_PITCHSCREEN actually work without breaking the build
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28102 a1c6a512-1295-4272-9138-f99709370657
2010-09-17 20:28:47 +00:00
Jonathan Gordon
10b6861bfd fix red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28094 a1c6a512-1295-4272-9138-f99709370657
2010-09-16 14:01:43 +00:00
Jonathan Gordon
fbb008331d skin engine: completly rework the sbs title handing code
This hopefully fixes the remaining data aborts and freezes when loading skins caused by the somewhat nasty list/sbs title handling code.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28093 a1c6a512-1295-4272-9138-f99709370657
2010-09-16 12:56:51 +00:00
Jonathan Gordon
71379cafb1 fix errors, warnings, tabs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28075 a1c6a512-1295-4272-9138-f99709370657
2010-09-14 12:21:56 +00:00
Jonathan Gordon
46142b91cd new file got lost
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28074 a1c6a512-1295-4272-9138-f99709370657
2010-09-14 11:59:52 +00:00
Jonathan Gordon
9928e3418f Another major skin backend update/hopefully bugfix:
Skins are now more self contained in the skin manager which in the future might allow on demand skin loading (i.e smaller skin buffers)
Skin backdrops are also managed more intelegently (fixes a bug where you can get a crazy backdrop loaded if a .sbs fails to load)

the rockbox_default rescue theme is now called rockbox_failsafe to better express what it actually is.

This commit hopefully/maybe fixes the heavily reported data aborts, so please check if you are getting them

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28073 a1c6a512-1295-4272-9138-f99709370657
2010-09-14 11:56:50 +00:00
Jonathan Gordon
a1612bbd1a fix warning
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28010 a1c6a512-1295-4272-9138-f99709370657
2010-09-06 13:36:23 +00:00
Jonathan Gordon
4caa8326ab 2 new touch region options... "settings_inc" and "settings_dec" which will increase or decrease most of the available settings. To use it put the config name of the setting as the next param after settings_inc... i.e %T(0, 0, 32, 32, settings_inc, repeat)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28009 a1c6a512-1295-4272-9138-f99709370657
2010-09-06 13:33:49 +00:00
Jonathan Gordon
dbde63bfec progressbars are drawn inside viewports so all coords are viewport relative. so fix - for the x coord to be 0 instead of vp->x which never made sense (woops from 18months ago :p )
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27998 a1c6a512-1295-4272-9138-f99709370657
2010-09-05 10:23:09 +00:00
Jonathan Gordon
216ed29e4d fix FS#11588 - %t(0) inside conditionals wasnt making that subline skip
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27983 a1c6a512-1295-4272-9138-f99709370657
2010-09-02 11:43:33 +00:00
Fred Bauer
55704d8942 font_table[].name wasn't filled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27963 a1c6a512-1295-4272-9138-f99709370657
2010-09-01 05:21:39 +00:00
Jonathan Gordon
4dd6b14453 Should fix the line alternator issue described in http://forums.rockbox.org/index.php?topic=25545
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27956 a1c6a512-1295-4272-9138-f99709370657
2010-08-31 02:19:48 +00:00
Bertrik Sikken
a290ce4222 tcc77x targets: various minor cleanups
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27913 a1c6a512-1295-4272-9138-f99709370657
2010-08-28 10:17:19 +00:00
Fred Bauer
cf8f526d16 change get_glyph_size() to font_glyphs_to_bufsize(). fixes a bug when font glyph buffer < font header
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27911 a1c6a512-1295-4272-9138-f99709370657
2010-08-27 18:25:23 +00:00
Jonathan Gordon
0d040838be fix errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27883 a1c6a512-1295-4272-9138-f99709370657
2010-08-25 14:23:31 +00:00
Jonathan Gordon
faaf431d32 Accept FS#11567 by Fred Bauer - better memory management for the skin fonts
%Fl now takes an optional 3rd param which is the number of glyphs to cache (default to 256). the smaller the number, the less ram will be used (i.e using 15 for a font which only shown numbers is a good idea)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27882 a1c6a512-1295-4272-9138-f99709370657
2010-08-25 14:11:38 +00:00
Jonathan Gordon
74ec011bb8 New skin tag: %if(<tag>, <operator>, <operand> [,option count]) which lets you do very simple logical comparissons on other tags.
<tag> is the tag to check against
<operator> is the comparisson to do, any one of... =, !=, >, >=, <, <=    (when comparring against a string tag like %ia only = and != work, and it is done NOT case sensitive)
<operand> is either another tag, a number, or text.
[option count] is an optinal number to use for the few tags which scale to the amount of options when used as a conditional (i.e %?pv<a|b|c|d> would have 4 options)

example: %?if(%pv, >=, 0)<Warning.. volume clipping|coool...>
That says "If the value from %pv (volume) is greater than or equal to 0 then display the warning line, otherwise the cool line."
%?if(%ia, =, %Ia)<same artist>   <= this artist and next artist are the same.

some tags might need a touch of tweaking to work better with this. experiment and have fun

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27846 a1c6a512-1295-4272-9138-f99709370657
2010-08-19 13:49:32 +00:00
Jonathan Gordon
0be2426528 Make %pb without any params work as expected
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27827 a1c6a512-1295-4272-9138-f99709370657
2010-08-16 12:07:39 +00:00
Jonathan Gordon
a71db516f2 fix FS#11542 - %t() not working
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27826 a1c6a512-1295-4272-9138-f99709370657
2010-08-16 10:40:50 +00:00
Jonathan Gordon
e8bbbdffd4 fix FS#11519 - clock tags wernt updating like they should
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27822 a1c6a512-1295-4272-9138-f99709370657
2010-08-15 14:35:34 +00:00
Jonathan Gordon
eda80390d5 A bunch of new features for the bar type tags (%pb, %pv, %bl, etc):
* the bar orientation (horiz/vert) is now chosen based on the width and heigt values (or can be forced).
* the fill direction can now be inverted (fill right to left, or top to bottom is considered inverted)
* It can now draw a slider type bar instead of a fill type (or indeed a slider with a fill type)

To configure the new bar, any (or all) of the following params can be used after the bmp filename (order makes no difference either):
invert - cause the bar to fill in the inverted direction
vertical - draw a vertical bar (not needed if the height > width)
horizontal - draw a horizontal bar (this is obviously the default)
nofill - dont draw the filling bar (this still draws the outline, obviously pointless without the slider param)
slider - draw an image for the slider. The next param MUST be the label of the image to draw. No option to use a subimage here, so the whole image needs to be the image you want on the slider. 

example: %pb(0,0,-,-,-,nofill, slider, slider_image, invert) - draw a boring horizontal progressbar which doesnt fill and only draws the image "slider_image" which moves right to left.

the slider type might need some tweaking. let us know how it goes


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27821 a1c6a512-1295-4272-9138-f99709370657
2010-08-15 14:13:36 +00:00
Magnus Holmgren
ac2c69ccae Allow 'long' labels with single-argument %xd too. The label need to be at least 3 chars long (2 chars are treated as a single-letter-label image with a subimage).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27820 a1c6a512-1295-4272-9138-f99709370657
2010-08-15 07:08:23 +00:00
Jonathan Gordon
a9d752b1bd *really* fix the last warning
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27817 a1c6a512-1295-4272-9138-f99709370657
2010-08-14 15:31:04 +00:00
Jonathan Gordon
d23d7a1686 last warning and fix manual
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27816 a1c6a512-1295-4272-9138-f99709370657
2010-08-14 15:27:46 +00:00
Jonathan Gordon
b9093f22dd fix warnings and errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27815 a1c6a512-1295-4272-9138-f99709370657
2010-08-14 15:23:07 +00:00
Jonathan Gordon
dc3778a685 Rework the skin playlist viewer so it uses the same drawing code as everything else. This should mean that all text tags now work as expected. The 2nd code param is no longer needed so drop it (you can use conditionals and sublines and stuff in the one code param.
example: %Vp(1, %?it<%in -%it|%fn>) <- show the next tracks strating from the first next track and show info if it is avilable or the filename.
Basic cuesheet support here, and will load upcoming track tags from the database if you have load to ram enabled.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27814 a1c6a512-1295-4272-9138-f99709370657
2010-08-14 15:17:59 +00:00
Jonathan Gordon
ff8d43ddad Change %xl/%xd to use proper labels instead of single letter labels. i.e %xl(playmode, playmode.bmp, 0, 0, 4) ... %xd(playmode, %mm). You can of course still use one letter labels if you really want. %xd(Aa) will only work with one letter labels.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27813 a1c6a512-1295-4272-9138-f99709370657
2010-08-14 11:40:20 +00:00
Jonathan Gordon
863d239aa2 Change %xd to allow for a number to be used to specify the subimage. i.e %xd(Ac) can now we written as %xd(A, 3). subimage count start at 1 so a=1, b=2 etc.
Also adds the possibility to specify a set of params which a tag can have (i.e a tag or a integer)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27812 a1c6a512-1295-4272-9138-f99709370657
2010-08-14 11:17:49 +00:00
Thomas Martitz
e60de9e5bb Fix backdrops from sbs not being loaded correctly (caused by r27791).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27802 a1c6a512-1295-4272-9138-f99709370657
2010-08-13 15:09:20 +00:00
Thomas Martitz
71610fbf62 Backdrop dir needs to go through get_user_file_path()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27791 a1c6a512-1295-4272-9138-f99709370657
2010-08-12 17:32:59 +00:00
Jonathan Gordon
70ebe46d74 New feature for the %xl (image load) tag. If you give it the filename __list_icons__ it will use the list icon strip instead of loading a different bmp.
example:
%xl(I, __list_icons__, 0, 0)
%xd(I, %Li)

^ display the list icon at position 0,0 in that viewport. (you can of course %xd(Ia) if you really wanted also.)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27787 a1c6a512-1295-4272-9138-f99709370657
2010-08-12 13:27:10 +00:00
Magnus Holmgren
6d7900e330 When using the tag argument in %%xd(): 1) clear the image first, so that images with transparency can be used; 2) allow things like battery level or volume, where a value is limited to the number of sub-images.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27786 a1c6a512-1295-4272-9138-f99709370657
2010-08-12 10:01:46 +00:00
Magnus Holmgren
c6078fe2a8 Slightly change bl (battery level) when used in an enum: if the enum contained 10 items, bl would return 11 if the battery level was 100 percent (the enum would then display the last entry). Now bl returns a value within the given range. Themes may need to be updated to look as intended.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27784 a1c6a512-1295-4272-9138-f99709370657
2010-08-12 09:25:26 +00:00
Magnus Holmgren
113764d9c0 Fix FS#11175. playlist_peek() wasn't thread safe (due to a static filename buffer), so frequent calls from the main thread would cause the audio thread to buffer the wrong track.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27773 a1c6a512-1295-4272-9138-f99709370657
2010-08-11 19:01:50 +00:00
Jonathan Gordon
489962dc4e Fix FS#11526 - %Vf(<hex>) was acceptable on grey remotes with colour main
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27768 a1c6a512-1295-4272-9138-f99709370657
2010-08-10 14:15:03 +00:00
Jonathan Gordon
1b53b99b75 Accept FS#11523 by Fred Bauer - fix a bug where the skin fonts dont check the correct path so it would load the same font twice when it shouldnt.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27766 a1c6a512-1295-4272-9138-f99709370657
2010-08-10 13:36:14 +00:00
Jonathan Gordon
f3a6d2476a Dont redraw the AA every single update, only when needed
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27719 a1c6a512-1295-4272-9138-f99709370657
2010-08-05 12:45:46 +00:00
Jonathan Gordon
3f8e7fc26f New feature for the %xd() (display a preloaded image) skin tag.
It can now automatically load the correct subimage from a strip (assuming the strip is in the correct order)  by giving a tag for the 2nd param.
example: %xd(F, %mp) which is equivilant to %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
You can also set the subimage offset.. i.e %xd(E, %mm, -1) which means "show nothing for the first value of %mm and use the bitmap strip for the remaining values"

if a tag+offset is <0 or greater than the number of subimages in a strip he image is cleared (I'm open to changing this if someone has a better idea)

cabbiev2.176x220x16.wps is an example of how to use this

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27717 a1c6a512-1295-4272-9138-f99709370657
2010-08-05 11:28:48 +00:00
Jonathan Gordon
ee4f8a9a6b Allow viewport labels to be mostly free text instead of only one character. If this is useful the same will be done for images
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27665 a1c6a512-1295-4272-9138-f99709370657
2010-08-02 12:50:23 +00:00
Thomas Martitz
9c0b2479f7 Rockbox as an application: add get_user_file_path().
For RaaA it evaluates user paths at runtime. For everything but codecs/plugins it will give the path under $HOME/.config/rockbox.org if write access is needed or if the file/folder in question exists there (otherwise it gives /usr/local/share/rockbox).
This allows for installing themes under $HOME as well as having config.cfg and other important files there while installing the application (and default themes) under /usr/local.

On the DAPs it's a no-op, returing /.rockbox directly.

Not converted to use get_user_file_path() are plugins themselves, because RaaA doesn't build plugins yet.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27656 a1c6a512-1295-4272-9138-f99709370657
2010-08-01 16:15:27 +00:00
Jonathan Gordon
9e2cd39d52 Fix FS#11508 - remote LCD targets crash because the remote wps fails to load
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27653 a1c6a512-1295-4272-9138-f99709370657
2010-08-01 11:37:02 +00:00
Jonathan Gordon
52e67f3366 woopsies
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27651 a1c6a512-1295-4272-9138-f99709370657
2010-08-01 10:48:27 +00:00
Jonathan Gordon
bb45110de2 woopsies
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27650 a1c6a512-1295-4272-9138-f99709370657
2010-08-01 10:43:29 +00:00
Jonathan Gordon
6dc4d65aa1 FS#11507 - fix 'track starting/ending' tags, and minor timeout cleanup
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27649 a1c6a512-1295-4272-9138-f99709370657
2010-08-01 10:40:29 +00:00
Bertrik Sikken
57933f2bc6 Make some global function/variables local (by making them static)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27631 a1c6a512-1295-4272-9138-f99709370657
2010-07-30 23:47:49 +00:00
Jonathan Gordon
e63e19b507 Fix Database red, move the cuesheet->token code into the skin engine
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27616 a1c6a512-1295-4272-9138-f99709370657
2010-07-29 13:23:33 +00:00
Jonathan Gordon
37d605a578 fix touchscreen errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27614 a1c6a512-1295-4272-9138-f99709370657
2010-07-29 12:48:59 +00:00
Jonathan Gordon
2d31d77a8b FS#11470 - new skin code, finally svn uses the new parser from the theme editor. This means that a skin that passes the editor WILL pass svn and checkwps (unless the target runs out of skin buffer or something.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27613 a1c6a512-1295-4272-9138-f99709370657
2010-07-29 12:37:48 +00:00
Thomas Martitz
ee166960b4 The previous commit was broken, not only because of the red. Fix it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27532 a1c6a512-1295-4272-9138-f99709370657
2010-07-23 16:33:16 +00:00
Thomas Martitz
a0e83f3821 Make %tx work as intended, so that it ignores the true case for non-RDS targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27531 a1c6a512-1295-4272-9138-f99709370657
2010-07-23 16:24:12 +00:00
Jonathan Gordon
bb236ce89c prevent the parser crashing if a font fails to load and is refresencd in more than one viewport
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27443 a1c6a512-1295-4272-9138-f99709370657
2010-07-16 01:05:24 +00:00
Rafaël Carré
bc48fed0e7 skin engine: fix simulator builds
include the needed headers before checking DEBUG_SKIN_ENGINE

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27390 a1c6a512-1295-4272-9138-f99709370657
2010-07-11 16:54:02 +00:00
Rafaël Carré
4b94912628 enable skin debug only in the simulator
it's controled by sim --debugwps option

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27389 a1c6a512-1295-4272-9138-f99709370657
2010-07-11 16:46:54 +00:00
Jonathan Gordon
adc9cb1adc Allow the progressbar and volume touch regions to be reverse by prepending them with ! (so full is the left/top instead of right/bottom)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27013 a1c6a512-1295-4272-9138-f99709370657
2010-06-21 12:43:08 +00:00
Jonathan Gordon
a398c2846a Touchregion support for the Base Skin and FM Skins. display obviously needs to be in stylus mode for this to work. Just about all screens should be mostly useable if your sbs has the next/prev/select/cancel/menu regions defined.
Plenty of room to add new action abilities if they are wanted.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27004 a1c6a512-1295-4272-9138-f99709370657
2010-06-21 06:04:19 +00:00
Jonathan Gordon
8a798179fc woops, this chaneg too
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26992 a1c6a512-1295-4272-9138-f99709370657
2010-06-20 13:21:41 +00:00
Jonathan Gordon
9a7a542de2 first step of making touch regions usable in all skins, not just the WPS.. no user viewable changes just yet
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26854 a1c6a512-1295-4272-9138-f99709370657
2010-06-15 08:38:23 +00:00
Jonathan Gordon
f98ea7142e FS#11096 - fix the "last touch" tag from being true on boot
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26852 a1c6a512-1295-4272-9138-f99709370657
2010-06-15 06:55:18 +00:00
Jonathan Gordon
ee6aca9860 add a hotkey option to the wps touchregion.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26740 a1c6a512-1295-4272-9138-f99709370657
2010-06-10 13:05:23 +00:00
Jonathan Gordon
9cf09f33aa crappy editor and crappy svn missing crappy merge crappy crappy 2am crappy
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26728 a1c6a512-1295-4272-9138-f99709370657
2010-06-09 16:17:17 +00:00
Jonathan Gordon
9ac4b44610 SKIN BREAK: %pb, %bl and %pv (bar types) changed so the image is the last param instead of the first. skin updater, skins and manual all updated.
NEW PARSER: add an 'N' param type which will accept any number of strings, will cause very big problems if this isnt the last param for a tag.



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26727 a1c6a512-1295-4272-9138-f99709370657
2010-06-09 16:15:01 +00:00
Teruaki Kawashima
bc58b7d984 some clean up. add checks for terminating ')'.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26723 a1c6a512-1295-4272-9138-f99709370657
2010-06-09 14:06:42 +00:00
Jonathan Gordon
c2a79aae16 fix %pb and other progressbars which are shown one line down from where they should be in viewports
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26698 a1c6a512-1295-4272-9138-f99709370657
2010-06-08 15:26:25 +00:00
Jonathan Gordon
2d62a570e3 Fix yellow and all the shipped themes that show AA
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26697 a1c6a512-1295-4272-9138-f99709370657
2010-06-08 15:17:39 +00:00
Jonathan Gordon
50356d8387 The real reason to change the %C was to remove a very nasty hack!
%CL - load the AA
%C - check if AA is avilable
%Cd - display the AA


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26696 a1c6a512-1295-4272-9138-f99709370657
2010-06-08 15:09:32 +00:00
Jonathan Gordon
2309d6d1e1 change to %Cd to display albumart (instead of %C to make it more consistant with %Vd/%Vl and %xd/%xl)
Also assume ; in skins are for sublines.. this means if you want ; in text you need to manually escape it (%;) far less false positives then


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26693 a1c6a512-1295-4272-9138-f99709370657
2010-06-08 14:52:03 +00:00
Teruaki Kawashima
e6c9691f0b don't disable backdrop when the file name starts with 'd', e.g. %X(dock.bmp).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26689 a1c6a512-1295-4272-9138-f99709370657
2010-06-08 13:31:39 +00:00
Jonathan Gordon
fa99c614b9 hopefully fix the problem with lines in viewports being pushed down one line.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26682 a1c6a512-1295-4272-9138-f99709370657
2010-06-08 07:24:42 +00:00
Jonathan Gordon
bb417260b2 this probably fixes FS#11373
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26658 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 12:40:59 +00:00
Jonathan Gordon
fe72cbe6ac Fix FS#11370 - BEWARE when useing viewport colours.
%Vf() and %Vb() need to be straight after the %V() or else the colours wont be set on the viewport (but on the line instead). This means scrolling lines dont work.

To make sure the colours are used for the whole viewport dont leave any gaps between %V and %Vf/%Vb. (of course, if you want a single line to be a different colour then use the %Vf as normal.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26656 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 11:45:02 +00:00
Jonathan Gordon
4c040943bb off by one. FS#11369
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26655 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 11:13:56 +00:00
Jonathan Gordon
04fd0ce374 fix FS#11368 - %V was eating the whole line so the %Vf() and %Vb() tags were being ignored
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26653 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 10:47:21 +00:00
Jonathan Gordon
4a9398e3fc make %t work
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26649 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 07:32:28 +00:00
Jonathan Gordon
0d8fb6015c make the parser work with the changed %Cl format.
%Cl(x, y, width, height [,xalign flag] [, yalign flag])
xalign can be l,c,r (or - to keep default)
yalign can be t,c,b

xalign must be there if you want to use a yalign flag


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26646 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 04:40:46 +00:00
Jonathan Gordon
32455131e7 fix errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26642 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 03:55:40 +00:00
Jonathan Gordon
5b0521c9aa Changeover to the new skin format. SkinBreakingChange in the wiki has the runown of the changes.
Major changes are paramerterised tags now use %tag(param,param), colours are removed from the %V() tag, %Vi gets a required (but can be -) label as its first param).

utils/skinupdater/ has a program to update individual skins, and a perl script to update a whole zip.
Themesite will be unusable for the time being (you should be able to upload new themes once it updates checkwps though).

I obviously havnt tested every updated wps in this change so let me know if one doesnt load


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26641 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 03:44:11 +00:00
Jonathan Gordon
28833f09e2 don't draw the presets on the FM frequency bar, they look like crap. This will come back when they are configurable shortly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26628 a1c6a512-1295-4272-9138-f99709370657
2010-06-06 13:23:52 +00:00
Jonathan Gordon
b8d98fcc19 Change cuesheet handling so the id3 info is not spoofed anymore. If something wants the subtracks info it is easy to get to. This makes next track display in the skins show the next subtrack if we are in a cuesheet
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26611 a1c6a512-1295-4272-9138-f99709370657
2010-06-06 06:28:40 +00:00
Teruaki Kawashima
6e39dc9e27 Correct reusing buffers if the backdrop file is already loaded.
FS#11305 by myself.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26510 a1c6a512-1295-4272-9138-f99709370657
2010-06-03 13:32:12 +00:00
Jonathan Gordon
22b12cafbb draw markers on the FM frequency bar for presets (like cuesheet markers in the WPS).
seems nice but if it ends up looking crap we can revert..


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26429 a1c6a512-1295-4272-9138-f99709370657
2010-05-31 11:12:15 +00:00
Jonathan Gordon
dda102ed4a fix the %Ti (preset index) not working with conditionls correctly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26246 a1c6a512-1295-4272-9138-f99709370657
2010-05-24 09:18:03 +00:00
Jonathan Gordon
dcbf4bbdea make radioart work in the sbs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26221 a1c6a512-1295-4272-9138-f99709370657
2010-05-21 02:35:11 +00:00
Jonathan Gordon
f531adc312 pass pointers around instead of coping whole structs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26197 a1c6a512-1295-4272-9138-f99709370657
2010-05-20 15:27:17 +00:00
Teruaki Kawashima
7042d9516b skin_tokne.c: move WPS_TOKEN_TRACK_STARTING and WPS_TOKEN_TRACK_ENDING to get_id3_token().
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26193 a1c6a512-1295-4272-9138-f99709370657
2010-05-20 13:41:22 +00:00
Teruaki Kawashima
0a4eda4d46 skin_parser.c: fix possibile overflow in parse_setting_and_lang(). simplify comparison of string in parameter in parse_touchregion().
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26168 a1c6a512-1295-4272-9138-f99709370657
2010-05-19 15:47:54 +00:00
Jonathan Gordon
0a7a7ce213 count is being used as the value of the last item to show, so rename it to not be confusing
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26096 a1c6a512-1295-4272-9138-f99709370657
2010-05-17 04:08:07 +00:00
Jonathan Gordon
908a5b6a7b the fm presets list should wrap.. so make that work
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26095 a1c6a512-1295-4272-9138-f99709370657
2010-05-17 02:29:20 +00:00
Alexander Levin
53a858b36c Rearrange statements for a small binsize reduction; delete unneeded braces
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26089 a1c6a512-1295-4272-9138-f99709370657
2010-05-16 15:05:58 +00:00
Jonathan Gordon
caa4f54e42 fix a minor fms presetlist viewer bug with displaying prev when you are on the first playlist
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26087 a1c6a512-1295-4272-9138-f99709370657
2010-05-16 13:32:43 +00:00
Jonathan Gordon
7d5e0d7375 FS#11263 - Radio Art support! %C and %Cl tags work in the radio screen and Base Skin when the radio is running.
put your station images in .rockbox/fmpresets/<preset name>.bmp or .jpg. Must be in preset mode and the preset name must match the filename


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26078 a1c6a512-1295-4272-9138-f99709370657
2010-05-16 11:13:42 +00:00
Alexander Levin
edb6bedddb Format FM frequency depending on the regional settings (FS#11273)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26069 a1c6a512-1295-4272-9138-f99709370657
2010-05-15 21:47:30 +00:00
Alexander Levin
230f0405eb Correct detection of the absence of the current preset
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25990 a1c6a512-1295-4272-9138-f99709370657
2010-05-13 08:36:38 +00:00
Jonathan Gordon
182d13e3ab fix the freq bar after music plays
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25983 a1c6a512-1295-4272-9138-f99709370657
2010-05-13 06:59:16 +00:00
Jonathan Gordon
3fbe4d275e fix FS#11264 - frequency bar and presets not working in the sbs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25982 a1c6a512-1295-4272-9138-f99709370657
2010-05-13 06:56:21 +00:00
Alexander Levin
6e294e2fc6 Avoid duplicated code, create a formatting function for FM frequency
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25973 a1c6a512-1295-4272-9138-f99709370657
2010-05-12 21:44:24 +00:00
Jonathan Gordon
a5d8d21596 fix the last of the reds, and make RDS tags actually work (and add them to the hardcoded radio skin)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25966 a1c6a512-1295-4272-9138-f99709370657
2010-05-12 11:44:09 +00:00
Jonathan Gordon
7b931f0a5a fix red and yellow (most of it anyway)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25965 a1c6a512-1295-4272-9138-f99709370657
2010-05-12 10:59:20 +00:00
Jonathan Gordon
1bd072c92d FS#10853 - Skin support in the radio screen! Check CustomWPS for the new tags
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25964 a1c6a512-1295-4272-9138-f99709370657
2010-05-12 10:38:00 +00:00