Commit graph

274 commits

Author SHA1 Message Date
Thomas Martitz
11b95cd423 Fix conditiona viewports logic
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27732 a1c6a512-1295-4272-9138-f99709370657
2010-08-06 00:39:38 +00:00
Thomas Martitz
814d06b59c Cabbiev2 320x480 touchscreen support.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27731 a1c6a512-1295-4272-9138-f99709370657
2010-08-05 23:43:05 +00:00
Thomas Martitz
e4dc4f8913 Revert accidental change to cabbiev2.176x220x16.wps and apply it to cabbiev2.320x480x16.wps as intended.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27725 a1c6a512-1295-4272-9138-f99709370657
2010-08-05 18:53:56 +00:00
Thomas Martitz
af708fd544 Cabbiev2 for 320x480.
TODO: Touch regions, battery and hold button icons

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27722 a1c6a512-1295-4272-9138-f99709370657
2010-08-05 17:54:36 +00:00
Thomas Martitz
c112b7897e Fix leading slash regex in wpsbuild.pl
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27721 a1c6a512-1295-4272-9138-f99709370657
2010-08-05 14:31:07 +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
Thomas Martitz
240923a801 Rockbox as an application: Commit current Android port progress.
General state is: Rockbox is usable (plays music, saves configuration, touchscreen works too).
Problems:
 - Playing music in the background (i.e. when switching to another app) doesn't work reliably, but I'm working on that now.
 - no cabbiev2 (only some preliminary files for it), no other default theme.
 - screen flickers sometimes if the updates are too frequent
 - no multi screen apk/package
 - strange behavior when a phone call comes in

The java files (and the eclipse project) resides in android/, which is also supposed to be the build folder.
I've put a small README in there for instructions. There are some steps needed after the make part, which are described there,
and which eclipse mostly handles. But there ought to be some script/makefile rules which do that instead in the future.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27668 a1c6a512-1295-4272-9138-f99709370657
2010-08-02 20:34:47 +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
Marianne Arnold
341fae73ca Fix broken cabbiev2 for the c200 screen (in r27574) as pointed out by Sascha Wilde in IRC.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27592 a1c6a512-1295-4272-9138-f99709370657
2010-07-28 12:58:15 +00:00
Thomas Martitz
767c4effc1 FS#11490 by Hayden Pearce
Fix cabbiev2.320x240x16.wps Hold

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27577 a1c6a512-1295-4272-9138-f99709370657
2010-07-26 16:57:38 +00:00
Thomas Martitz
7a835975e4 Fix cabbiev2.220x176x16.wps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27576 a1c6a512-1295-4272-9138-f99709370657
2010-07-26 15:20:22 +00:00
Jonathan Gordon
bd77d021f0 FS#11490 - Viewportify most of the shipped cabbiev2 wps' By Hayden Pearce. Spot a mistake? mention in the tracker page
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27574 a1c6a512-1295-4272-9138-f99709370657
2010-07-26 12:07:48 +00:00
Jonathan Gordon
c1a42ff44d update classic_statusbar to the new syntax
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26826 a1c6a512-1295-4272-9138-f99709370657
2010-06-13 13:16:41 +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
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
1956c72b62 the updater uncondiotnally changed ; to %; which meant alternating lines stopped working.. hopefully this fixes them
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26648 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 07:00:10 +00:00
Jonathan Gordon
c0a289cf46 undo accidental commit from the big one
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26645 a1c6a512-1295-4272-9138-f99709370657
2010-06-07 04:31:05 +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
Rafaël Carré
aeb5618ae4 cabbiev2 128x64x1 (r)wps:
integrate back modifications made by bertrik for clipv1 into iriver remote wps
don't show decibel value when changing volume (too complex for me)
delete 'sansaclip' specific version so the wps is used on all clips

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26586 a1c6a512-1295-4272-9138-f99709370657
2010-06-05 16:01:46 +00:00
Rafaël Carré
f04c742f40 cabbiev2 128x64x1 wps (iriver remote wps): add more info to the screen
With the change to 8 pixels font we can add "Next song" info (%It/%Fn)
Also move the tag info 2 pixels down

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26508 a1c6a512-1295-4272-9138-f99709370657
2010-06-03 09:22:00 +00:00
Rafaël Carré
1dc7f490c9 Use a different remote font than the main LCD font
Works for both wps config and settings
Only change targets with LCD_REMOTE_HEIGHT <= 64 (irivers) to use
08-Rockfont

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26505 a1c6a512-1295-4272-9138-f99709370657
2010-06-03 07:30:01 +00:00
Marianne Arnold
5359d240e3 Cabbiev2: make the playlist position and playing time info actually show up as planned in the 128x128 colour port.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25745 a1c6a512-1295-4272-9138-f99709370657
2010-04-27 23:02:00 +00:00
Marianne Arnold
7e9537c834 Cabbiev2 port for the mpio HD20's 128x128 greyscale screen - mixing the same size colour version with the same width greyscale version (code could be cleaned up though). Add the necessary changes to let it be included automatically and used as default WPS. Menu backdrop and dedicated icons are missing but the inbuilt ones are still there - same as on the M3.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25744 a1c6a512-1295-4272-9138-f99709370657
2010-04-27 22:59:32 +00:00
Thomas Martitz
d401d7bc55 Fix wpsbuild to properly generate "-" for theme related settings (to get the default values/no file for filename settings).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24813 a1c6a512-1295-4272-9138-f99709370657
2010-02-21 19:10:57 +00:00
Jonathan Gordon
29a51621d3 basic touchscreen support in the mini2440's cabbie file. play/repmode/shuffle buttons do their thing, battery goes to the menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24282 a1c6a512-1295-4272-9138-f99709370657
2010-01-19 07:26:20 +00:00
Tomer Shalev
2f2213d63e WPS: Revert some of r24193 as decided in FS#10882.
This commit reverts having the track progress bar mirrored horizontally. This
is done because the code that makes the progress bar sensitive to language
direction conflicts with direction of buttons used to control playback, i.e.
progress bar fills to the left, but pressing long left makes it move to the
right, towards the beginning of the track.
The code that swap the progress bar direction was not (and will not be)
committed.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24196 a1c6a512-1295-4272-9138-f99709370657
2010-01-07 17:16:33 +00:00
Jonathan Gordon
91e6b06be9 RTL language enhancements by Tomers Shalev and I.
3 new tokens:
%ax - the next token should follow the language direction (what that means is defined by the individual tokens)
%aL - align left on LTR language (same as %al), right on RTL languages
%aR - align right on LTR language (same as %ar), left on RTL languages

This commit adds %ax support to the %V and %Cl tokens. 


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24193 a1c6a512-1295-4272-9138-f99709370657
2010-01-07 07:34:15 +00:00
Michael Chicoine
2581cf4909 Fix wpsbuild.pl so that rockbox_default wps is built
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24187 a1c6a512-1295-4272-9138-f99709370657
2010-01-05 17:21:30 +00:00
Tomer Shalev
98676a9107 FS#10879 - Cabbie: Fix usage of spaces to position strings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24120 a1c6a512-1295-4272-9138-f99709370657
2009-12-28 20:10:24 +00:00
Bertrik Sikken
9879cc6523 Rename wps/cabbiev2.128x64x1.clip.wps to wps/cabbiev2.128x64x1.sansaclip.wps to match recent target renames.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24118 a1c6a512-1295-4272-9138-f99709370657
2009-12-27 16:57:47 +00:00
Tomer Shalev
5210cdc2e3 Cabbie 320x240: Fix usage of spaces to position strings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24117 a1c6a512-1295-4272-9138-f99709370657
2009-12-26 20:53:12 +00:00
Marianne Arnold
c074c76211 Make the classic_statusbar.sbs more classic. Icons, position of numbers, charging animation (only tested on a colour display so far), volume as before but gets a 'clipping' icon on targets that allow more than 0dB, add channels indicator in the rec screen. The only difference on swcodec should be the disk activity indicator on flash targets (for now). On hwcodec there are small differences in the recording screen - quality display is simply using the system font (no wasting another bitmap on a slightly less taller Q), frequency uses icons now (keeping the differences between the sbs files smaller and with the small 'k' it's easier to understand, but debateable). Since the animation makes use of the viewport colour (shades) parameters, a classic_statusbar.grey.sbs was needed - reusing the colour one didn't work correctly anyways. The difference between Recorders (RTC) and Ondios (disk activity) is achieved through the 112x64x1.sbs file itself.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23775 a1c6a512-1295-4272-9138-f99709370657
2009-11-28 16:37:33 +00:00
Jonathan Gordon
9b3619c1e6 remove the %Rh token which doesnt exist anymore (was "is target hwcodec" which we dont need)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23691 a1c6a512-1295-4272-9138-f99709370657
2009-11-22 04:24:16 +00:00
Jonathan Gordon
6ec176cc8e fix mono and hwcodec classic_statusbar so they actually load
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23673 a1c6a512-1295-4272-9138-f99709370657
2009-11-20 07:05:22 +00:00
Jonathan Gordon
9848d4beec initial hwcodec/112x64x1 sbs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23657 a1c6a512-1295-4272-9138-f99709370657
2009-11-17 19:27:32 +00:00
Marianne Arnold
3f6f60afd7 Classic_statusbar.sbs images: make them proper 1-bit bitmaps, so that they work as expected with foreground and background colour and backdrops. I'd like to see the result being closer to the original too which also means small fixes to these images too but first things first.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23656 a1c6a512-1295-4272-9138-f99709370657
2009-11-17 19:10:38 +00:00
Jonathan Gordon
3fe99aa9bf add some bmp strips needed for the rec screen which wernt already added...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23647 a1c6a512-1295-4272-9138-f99709370657
2009-11-16 03:51:41 +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
Tomer Shalev
b7ff814dd3 FS#10782 - WPS: Rename 'Next Song' to 'Next Track'
All Cabbie themes use to convention 'Next Track', except cabbiev2.176x220x16,
which uses 'Next Song'. DancePuffDuo.176x220x1 also uses this unconventional
phrase. This patch rename these terms in order to achieve a better consistency.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23626 a1c6a512-1295-4272-9138-f99709370657
2009-11-14 20:17:02 +00:00
Jonathan Gordon
ad72fce1a5 fix the icons so the correct ones are shown
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23585 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 07:57:51 +00:00
Jonathan Gordon
2f3868b87d very initial recording sbs support... also remote sbs using the same skin code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23584 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 07:10:39 +00:00
Jonathan Gordon
6b31dc4337 redo these bitmaps as 1bit bmp's so they show correclty on all displays
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23583 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 07:08:25 +00:00
Jonathan Gordon
451f9d58f3 more minor classic_statusbar.sbs changes... display the rec/fm mode correctly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23482 a1c6a512-1295-4272-9138-f99709370657
2009-11-02 01:14:16 +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
Jonathan Gordon
cb8527d073 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@23472 a1c6a512-1295-4272-9138-f99709370657
2009-11-01 21:35:35 +00:00
Michael Chicoine
a521c5fc67 Revert battery conditional change in r23415, duplicated graphic was for unknown battery level
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23416 a1c6a512-1295-4272-9138-f99709370657
2009-10-30 03:01:33 +00:00
Michael Chicoine
536ae24791 Correct battery conditional and disk access icon
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23415 a1c6a512-1295-4272-9138-f99709370657
2009-10-30 00:47:25 +00:00
Michael Chicoine
f31c1ffd8c Remove svn:executable from wps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23401 a1c6a512-1295-4272-9138-f99709370657
2009-10-29 12:33:33 +00:00