Commit graph

1027 commits

Author SHA1 Message Date
Jeffrey Goode
033ed87321 Fix yellow: add braces
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23918 a1c6a512-1295-4272-9138-f99709370657
2009-12-10 16:21:29 +00:00
Frank Gevaerts
4862e28b67 Fix FS#10841. Thanks to Thomas Martitz for spotting what was wrong.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23914 a1c6a512-1295-4272-9138-f99709370657
2009-12-09 20:34:06 +00:00
Jonathan Gordon
dd9fbbf7c8 fix red checkwps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23905 a1c6a512-1295-4272-9138-f99709370657
2009-12-09 07:44:08 +00:00
Jonathan Gordon
b2eb44ce0e FS#10824 - viewport/statusbar API rework.
Hopefully the only user visible changes are:
- fm and recording screens go by the statusbar setting (sbs or inbuilt)
- plugins go back to using the theme as they should for menus and lists
- splash screens might get cut a bit... entirely theme and splash dependant.. if there is a problematic one we can look at it later.
- hopefully nothing more than very minor screen flickerings... let me know exactly where they are so they can be fixed

New GUI screen rules:
* Screens assume that the theme (sbs+ui viewport+ maybe background image) are always enabled. They may be disabled on a per display basis, but MUST be re-enabled on exit
* Screens must not be coded in a way that requires a statusbar of any type.. the inbuilt bar will be removed shortly.
ALWAYS RESPECT THE USERS SETTINGS unless the screen requires the full display to fit.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23904 a1c6a512-1295-4272-9138-f99709370657
2009-12-09 07:25:46 +00:00
Tomer Shalev
8db32ddfee Skin parser: Use parse_list() when possible
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23846 a1c6a512-1295-4272-9138-f99709370657
2009-12-04 13:10:06 +00:00
Jonathan Gordon
58ca43dc9d fix FS#10674 - make skin debugger count the lines correctly so the line number in the output is actually useful!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23825 a1c6a512-1295-4272-9138-f99709370657
2009-12-03 05:36:23 +00:00
Jonathan Gordon
85bcd1eaf7 fix segfault on %Rb token
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23798 a1c6a512-1295-4272-9138-f99709370657
2009-11-30 02:16:36 +00:00
Jonathan Gordon
4966666062 fix mono recording token,
Add %bu - usb powered token


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23713 a1c6a512-1295-4272-9138-f99709370657
2009-11-22 19:09:54 +00:00
Jonathan Gordon
6c3c8a866c hopefully fix the sameplrate token
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23690 a1c6a512-1295-4272-9138-f99709370657
2009-11-22 02:10:41 +00:00
Michael Chicoine
591ef80c9c FS#10781 - Scrolling doesn't stop when entering USB screen from WPS
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23687 a1c6a512-1295-4272-9138-f99709370657
2009-11-21 21:44:24 +00:00
Thomas Martitz
19ec4ffe64 Remove a left-over check for metadata info being ready that delayed the initial draw of the wps quite a bit (most notably on slowish hwcodec). The skin engine is safe against that, so draw it instantly and make another redraw once the metadata info is ready.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23646 a1c6a512-1295-4272-9138-f99709370657
2009-11-16 01:38:36 +00:00
Thomas Martitz
cc697a8f7a Avoid two subsequent full update.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23645 a1c6a512-1295-4272-9138-f99709370657
2009-11-16 01:38:33 +00:00
Thomas Martitz
bdf2961ba3 Fix some drawing problems when displaying the WPS initially with sbs enabled. Move initial display of the wps to wps.c too. Should fix bug 3 of FS#10771.
Also change GUI_EVENT_REFRESH event handling so that the passed drawing function is always called, not only when sbs or custom ui vp are used.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23644 a1c6a512-1295-4272-9138-f99709370657
2009-11-16 01:38:30 +00:00
Tomer Shalev
ec0f4b4044 FS#10783 - WPS translation
- Use the %Sx skin tag in WPS to translate 'Next Track', 'Next', and 'of' (X of Y tracks)
- New conditional skin token 'Sr' which checks whether the currently loaded language is an RTL language (Hebrew/Arabic). It uses lang_is_rtl().
- Added Hebrew translation


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23638 a1c6a512-1295-4272-9138-f99709370657
2009-11-15 21:39:39 +00:00
Thomas Martitz
ca39b27dd4 Partly revert r23625 (the TIMEOUT_NOBLOCK change), and add a comment explaining why (or trying to, at least).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23637 a1c6a512-1295-4272-9138-f99709370657
2009-11-15 20:45:50 +00:00
Thomas Martitz
3e60fb410d Consolidate some #ifdef code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23636 a1c6a512-1295-4272-9138-f99709370657
2009-11-15 18:05:18 +00:00
Thomas Martitz
f80a6ddeae Fix crash when selecting statusbar: custom in the menus without having a valid sbs loaded.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23635 a1c6a512-1295-4272-9138-f99709370657
2009-11-15 17:44:13 +00:00
Thomas Martitz
2e82199fed Fix peakmeter from delaying the initial display of the wps. Also change HZ/100 to TIMEOUT_NOBLOCK which is more appropriater in the get_action() call below.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23625 a1c6a512-1295-4272-9138-f99709370657
2009-11-14 20:07:31 +00:00
Jeffrey Goode
0212de4c8d Add crossfade feature tag, update manual, fix crossfade WPS tag behavior
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23610 a1c6a512-1295-4272-9138-f99709370657
2009-11-11 17:38:00 +00:00
Jonathan Gordon
db4cab0e66 fix build, ? buttonbar....
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23607 a1c6a512-1295-4272-9138-f99709370657
2009-11-11 06:48:56 +00:00
Jonathan Gordon
7c440bff32 remove 3 bad viewport functions:
* viewport_set_current_vp() because if a screen wants to not use the user setting it shouldn't be dealing with the viewport manager at all (other than to disable the bars)
* viewport_ui_vp_get_state() is unused (and not needed)
* viewport_get_current_vp() because you should be using set_defaults() instead.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23606 a1c6a512-1295-4272-9138-f99709370657
2009-11-11 06:39:23 +00:00
Thomas Martitz
6db8f952dc Fall back to info vp from sbs when intersection fails (again, r23575 changed it despite it was agreed on info vp beforehand).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23604 a1c6a512-1295-4272-9138-f99709370657
2009-11-10 23:01:01 +00:00
Thomas Martitz
c5b4482ee2 Revert r23599 and r23600 and fix the early usb problem at the root. The the viewportmanager and custom statusbar was initialized too late.
Now, call it earlier and remove parts of it that caused the need to call it later. Removing that is OK since it's done again on settings loading.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23603 a1c6a512-1295-4272-9138-f99709370657
2009-11-10 20:13:24 +00:00
Teruaki Kawashima
0771686339 usb screen: show logo at center of ui viewport and try to fit logo and title to the viewoprt to avoid possible redraw issue with sbs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23601 a1c6a512-1295-4272-9138-f99709370657
2009-11-10 13:40:50 +00:00
Jonathan Gordon
c4df53571c really fix early usb this time
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23600 a1c6a512-1295-4272-9138-f99709370657
2009-11-10 07:47:57 +00:00
Jonathan Gordon
29e28a3945 hopefully fix "early usb"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23599 a1c6a512-1295-4272-9138-f99709370657
2009-11-10 04:46:52 +00:00
Jeffrey Goode
dd93ef41bb HAVE_CROSSFADE defs: fix yellow and red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23598 a1c6a512-1295-4272-9138-f99709370657
2009-11-10 04:21:40 +00:00
Frank Gevaerts
8c15799e70 Implement %Ss for playback speed
This is similar to %Sp for pitch.  The conditional form %?Ss<...> is also
supported in the same way as FS#10680; you can use

    %?Ss<%xdAa|%xdAb|>

to show an icon of a tortoise (subpicture 1 of image A) or a hare
(subpicture 2 of image A) when not playing at the normal speed.

Flyspray: FS#10681
Author: Junio C Hamano



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23591 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 17:57:17 +00:00
Frank Gevaerts
7de32efe1c Don't define pitch_speed_enum() on MAS3507D. Fixes yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23590 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 17:51:36 +00:00
Frank Gevaerts
a20d77dba0 Allow %?Sp<...> to be used as a conditional
When there are two choices (i.e. boolean), choose the first one if the
pitch is different from the normal value, and choose the second one if the
pitch is the same as the normal value.

When there are more than two choices (i.e. enum), the left half of the
choices are used to show 0..normal range, and the right half of the
choices are used to show values over that range.  The last entry is used
when it is set to the normal setting, following the rockbox convention to
use the last entry for special values.

  2 items: %?Sp<0..99 or 101..infinity|100>
  3 items: %?Sp<0..99|101..infinity|100>
  4 items: %?Sp<0..49|50..99|101..infinity|100>
  5 items: %?Sp<0..49|50..99|101..149|150..infinity|100>
  6 items: %?Sp<0..33|34..66|67..99|101..133|134..infinity|100>
  7 items: %?Sp<0..33|34..66|67..99|101..133|134..167|167..infinity|100>

This will allow two expected use cases:

 (1) %?Sp<%Sp> to show the pitch only when playing at a modified pitch.

 (2) %?Sp<%xdAa|%xdAb|> to show an icon of Darth Vader (subpicture 1
     of image A) when playing at a lower pitch than the original, and to
     show an icon of a chipmunk (subpicture 2 of image A) when playing at
     a higher pitch than the original.  When playing at a normal pitch,
     nothing is shown.

Flyspray: FS#10680
Author: Junio C Hamano



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23589 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 17:43:46 +00:00
Jonathan Gordon
6008c29e5e try that previous commit again...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23581 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 06:27:04 +00:00
Jonathan Gordon
10fcb6b183 fix segfault on remote targets where no sbs is loaded for the remote
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23580 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 06:17:56 +00:00
Jonathan Gordon
4cd805cfaf Fix the error condition to actually set the fullscreen viewport. Also remove a comment which doesnt really add anything.. the comments 15lines above it explain whats happening
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23575 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 05:15:48 +00:00
Jonathan Gordon
892332ce87 fix red.. markers need to be outside #ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23574 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 05:03:33 +00:00
Jonathan Gordon
0621afad49 Add a bunch of markers into the tokens enum to make figuring out which token isnt in the bugout output easier. ("FIXME code(80)" is alot worse than "FIXME: TOKEN_MARKER_SOUND+5")
Also, slightly reorder the enum to group misc items together


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23573 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 04:46:19 +00:00
Thomas Martitz
cc65afac0a Get font and colors from UI viewport before intersecting, instead of leaving them empty.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23526 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 22:55:02 +00:00
Thomas Martitz
e9c900d09d Fix a possiblity where viewport_set_default left the viewport unchanged. Improve comments a bit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23521 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 21:08:21 +00:00
Teruaki Kawashima
139694c7e2 Fix volume change in wps. %mv tag keeped showing volume is changed if volume is changed in wps.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23515 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 12:46:31 +00:00
Thomas Martitz
b2e64581d3 Fix player yellows and reds. I'm not sure why viewport.c was never compiled for charcell.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23513 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 07:20:41 +00:00
Thomas Martitz
c0635ba6c9 Remove wps_data.remote_wps. It's redundant with the new global curr_screen.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23512 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 07:14:02 +00:00
Thomas Martitz
6750d65f79 Reorder a bit in viewport.c so that we don't need stubs for checkwps.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23511 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 06:56:04 +00:00
Jonathan Gordon
dd1063d67c fix charcell yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23509 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 05:27:37 +00:00
Jonathan Gordon
c812614a1d Fix the WPS to work properly with the statusbar for the previous change.. Side effect is it fixes FS#10721 where %pb didnt work
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23508 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 05:24:30 +00:00
Jonathan Gordon
a7d784b1d5 Fix viewport "UI area" to work based on what was agreed on last week in the mailing lists and IRC:
* viewport_set_defaults() will always set the viewport to the intersection of the user setting and any sbs set user viewport
* viewport_set_fullscreen() will always set the viewport to the full display, take care to disable the statusbars if you use this!

This patch is from FS#10709 and contains code which will be removed once the current inbuilt statusbar is finally removed. This *may* break themes which dont use the %we or %wd token.. follow up commit to fix this coming...


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23507 a1c6a512-1295-4272-9138-f99709370657
2009-11-04 05:10:53 +00:00
Jonathan Gordon
f76b2f2046 Initial recording screen skin support (usable in .sbs skins only for now)
new skin tokens:
%Rp - does the target have recording?
%Rf - samplerate
%Re - encoder
%Rb - bitrate
%Rm - mono/stereo

Please put all bugs from these (which very probably dont work 100%) into FS#10755. And someone who knows how the recoding capabilities work please look this over... ideally the same value should be returned for the middle three tags no matter what the capabilities of the target are.
CustomWPS on the wiki for more details


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23491 a1c6a512-1295-4272-9138-f99709370657
2009-11-03 07:58:10 +00:00
Rob Purchase
24c1c75364 Add touchscreen WPS actions for volume up/down (using a button rather than the slider).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23488 a1c6a512-1295-4272-9138-f99709370657
2009-11-02 21:56:48 +00:00
Thomas Martitz
e28bfd1349 Rework how feature skin tags work (%cc currently) when used conditionally (i.e. to detect a feature).
If the feature is known to be unavailable at compile time or runtime detected, then let parsing skip over the true case. That enables parsing skins that properly put tags not available on a target within these tags. In the past the true case was parsed even if never could be true, which led to unexpected parsing failures.
Parsing %cc<%St|time format|[..]|> is now possible on target where that setting doesn't exist (the %St parser wold fail).
More of these tags are to be added, for example to indicate fm radio or recording capabilities.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23479 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 23:35:14 +00:00
Rafaël Carré
6cdb80d7df Revert r23474 "new skin token: %cx - 24 hour time format enabled in the setting.. e.g %?cx<24 hour|12 hour>"
Committed accidentally with a svn/git desynch

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23475 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 22:51:26 +00:00
Rafaël Carré
9cd15dad9d new skin token: %cx - 24 hour time format enabled in the setting.. e.g %?cx<24 hour|12 hour>
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23474 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 22:48:46 +00:00
Jonathan Gordon
e702e5dbf8 revert that last checkin... something better is coming
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23473 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 21:45:01 +00:00