Commit graph

133 commits

Author SHA1 Message Date
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
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é
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
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
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
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
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
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
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
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
Jonathan Gordon
efd1f4e49f Make it possible to move the UI viewport using conditional viewports.
%Vi|<label>|<Usual %Vi params>|  <- specify the possible viewports to use
%VI<label> <- make the UI viewport use the %Vi definition with the <label> label.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25826 a1c6a512-1295-4272-9138-f99709370657
2010-05-05 13:48:50 +00:00
Jonathan Gordon
4c65a1970e Make battery level (%bl) work with the bmp bars drawer like %pb and %pv
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25710 a1c6a512-1295-4272-9138-f99709370657
2010-04-25 11:32:51 +00:00
Alexander Levin
847a0fd56c Fix grammar in the comment (make code non offending :-)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25695 a1c6a512-1295-4272-9138-f99709370657
2010-04-21 19:59:49 +00:00
Jonathan Gordon
34cd2c31ae really fix "%pv|something else" this time
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25684 a1c6a512-1295-4272-9138-f99709370657
2010-04-20 07:17:59 +00:00
Jonathan Gordon
58a0393154 2 quick fixes
1) fix %pv| where the | is for a conditional break and not for long form %pv
2) only draw bmp-bars if they are enabled (by a conditional or always on.)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25677 a1c6a512-1295-4272-9138-f99709370657
2010-04-19 08:43:42 +00:00
Jonathan Gordon
69710e54f1 fix escaped chars being displayed twice in the playlist viewer (i.e %> showing as >> )
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25663 a1c6a512-1295-4272-9138-f99709370657
2010-04-17 12:45:52 +00:00
Jonathan Gordon
99a2299654 allow %pb and %pv (long form) to be put inside conditionals (i.ee not eat the whole line).
If this causes your theme to break you need to add a # after the line.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25616 a1c6a512-1295-4272-9138-f99709370657
2010-04-13 07:32:00 +00:00
Jonathan Gordon
a1c0d5597f shuld fix red and yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25585 a1c6a512-1295-4272-9138-f99709370657
2010-04-11 11:40:47 +00:00
Jonathan Gordon
4421746357 Rework how progressbars are managed so you can have as many bars in a viewport as you want (!).
Change %pv (volume) to be able to be drawn in the same style as %pb (using a line or a bmp). %pv - no change, %pv|bmp|x|y|width|height| exactly like %pb
DO NOT use %?pv|....| because it will draw when you dont want it to!


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25584 a1c6a512-1295-4272-9138-f99709370657
2010-04-11 11:18:45 +00:00
Jonathan Gordon
d2e2c2ad96 2 new tags:
%pS - track is starting.
%pE - track is ending. both can optionally have a number straight after to change how long that tag should stay true for (e.g %pS10 will stay true for the first 10s of the track)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25239 a1c6a512-1295-4272-9138-f99709370657
2010-03-18 07:08:49 +00:00
Jonathan Gordon
d384f8d064 rearrange the skin loading to remove some code dupe
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25196 a1c6a512-1295-4272-9138-f99709370657
2010-03-15 07:35:27 +00:00
Jonathan Gordon
1a8f29ca33 fix the remote font not working when there is no .rsbs loaded
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25195 a1c6a512-1295-4272-9138-f99709370657
2010-03-15 07:12:33 +00:00
Jonathan Gordon
0f69a8152f fiddle with the skin debug output so the load lines arnt shown unless debugwps is enabled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25162 a1c6a512-1295-4272-9138-f99709370657
2010-03-14 11:32:03 +00:00
Teruaki Kawashima
1fbdd91333 skin: don't calculate id3->elapsed+state->ff_rewind_count each time. remove trailing spaces.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25045 a1c6a512-1295-4272-9138-f99709370657
2010-03-06 14:14:44 +00:00
Jonathan Gordon
a9b5f4d810 cleanup statusbar+base skin relationship...
* remove the "custom" option from the statusbar setting. if a sbs file is set then statusbar setting is ignored, no other user visible change there.
* new tag, %wi  - use to draw the inbuilt statusbar in the current viewport


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25038 a1c6a512-1295-4272-9138-f99709370657
2010-03-06 00:29:46 +00:00
Jonathan Gordon
d9adfa1c73 FS#11072 - display the filename of the skin begin parsed in the debug output
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25003 a1c6a512-1295-4272-9138-f99709370657
2010-03-03 08:30:31 +00:00
Jonathan Gordon
779d4e3ff7 remove some gremlins... viewport_set_*() sets the font to the UI font for that screen which is bad for the parser.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25002 a1c6a512-1295-4272-9138-f99709370657
2010-03-03 05:57:15 +00:00
Jonathan Gordon
25d9771ebc make %Fl (font load) more consistant with bmp loading and require the whole filename, i.e require the .fnt.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25001 a1c6a512-1295-4272-9138-f99709370657
2010-03-03 05:43:02 +00:00
Jonathan Gordon
f37b5078f6 undo that last undo, make the font loader more forgiving to user errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24994 a1c6a512-1295-4272-9138-f99709370657
2010-03-03 00:53:07 +00:00