Commit graph

317 commits

Author SHA1 Message Date
Jonathan Gordon
d336eb30f8 skin_engine: Automatically create touch regions for skin bars
skin bars now automatically create the touch region the same size
as the bar on touchscreen targets. This means touches will
magically "just work" for reveresed bars (rtl or otherwise).

~5% padding is added on all 4 sides of the region rectangle but
this may need to be tweaked.

Please consider the 'progressbar' and 'volume' touchregion actions
to be deprecated.

Kudos to my new wife for figuring out the bleedingly obvious way to
do this!

Change-Id: I997a7bcaa70fce9885808aae27953c7676e9c2ff
2012-07-05 11:15:16 +10:00
Jonathan Gordon
41fb990720 Fix the classic_statusbar sbs' to actually work
Change-Id: I8573903b879cd451d7b0d6033dd0eca4cc86bc5a
2012-06-26 10:17:06 +10:00
Marcin Bukat
5785cfb741 Add fms to cabbiev2 by default
Currently we have only fms for 160x128x2 and all others will
fallback to built in one.

Change-Id: I43efa2795e1ab62185e2e25b6c8c4979c87c4299
2012-06-25 22:07:43 +02:00
Thomas Martitz
bc7ff53eab wpsbuild.pl: Fix FS#12706 - paths for backdrops and icons were not properly constructed.
Change-Id: I90b92241501f61e6b1de5305ff6482a9ddbdf722
2012-06-25 08:54:21 +02:00
Marcin Bukat
cd1b6a1183 Fix cabbiev2 on iaudio x5 remote
Change-Id: I00c597ac5ac40865f943b6c2f488196727bad13c
2012-06-17 15:36:45 +02:00
Thomas Martitz
ba5802ed88 WPSLIST: Add some more forgotten wps entries.
Fixes cabbiev2 for clip/clip+ (FS#12698) and others.

Change-Id: I1ff71db145ac9662551e50029a605776abb5af36
2012-06-15 11:08:05 +02:00
Akio Idehara
3254fb72c6 Bring back iAudio M3 cabbiev2 support
This patch brings back iAudio M3 cabbiev2 (128x96x2) support again.

Change-Id: Ibb9ccc6f0d0acde5b99e2c41e08da3999129f817
Reviewed-on: http://gerrit.rockbox.org/274
Reviewed-by: Thomas Martitz <kugel@rockbox.org>
2012-06-15 10:57:35 +02:00
Thomas Martitz
0cef275ab7 wpsbuild.pl: Remove superflous debug statement.
Change-Id: Ic32a6737053ca98d9db479488125b2c6bbd13384
2012-06-10 21:45:34 +02:00
Thomas Martitz
66b6fdbb73 wpsbuild: Rewrite to fix various issues and support .fms
wpsbuild.pl is enhanced to produce fallback themes that were previously
hardcoded in buildzip.pl. It also recognizes resolution strings as
regular expressions now so you can specify resolution dependant settings
as <setting>.<regex>: <value> (needed to support single themes on multiple
resolutions). The WPSBUILD syntax completely changed as
well and it includes the fallback themes as well. Ultimately wpsbuild is
also able to install .fms files.

Change-Id: Idf5994f17b9750983d7bc3ef583540a8cdae1dde
2012-06-10 21:20:36 +02:00
Thomas Martitz
300ff4c952 cabbiev2: Add logo.xcf to image sources.
logo.xcf contains the grey logo found on many main backdrops.

Change-Id: I532ff1f71baabfe8aa9cfb23aac9c16e3c5dcc14
2012-06-10 20:34:28 +02:00
Marcin Bukat
c029c77796 fix fms backdrop filename
Change-Id: I78468cb720a0c8df222b32d685ae1d919e1a8f7e
2012-05-20 12:15:36 +02:00
Bertrik Sikken
cc0c6744fa Use 8x8 icons for clip zip cabbiev2
Change-Id: Ic790ea0042314fdb4b1e13954e3f149a3b7c993f
Reviewed-on: http://gerrit.rockbox.org/198
Reviewed-by: Thomas Martitz <kugel@rockbox.org>
2012-05-20 12:02:04 +02:00
Bertrik Sikken
d206afbe6b FS#12390 - Sansa Clip Zip Cabbiev2 Port by Stephen Carroll
Change-Id: I49ce0bfdc228bed55d47b5e743a7fa87ccd4da8a
Reviewed-on: http://gerrit.rockbox.org/197
Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>
Reviewed-by: Thomas Martitz <kugel@rockbox.org>
2012-05-20 12:01:41 +02:00
Marcin Bukat
143d2b5bac Cabbiev2 .fms for 160x128x2
Change-Id: Iceb5dc4c7029d0f2bb5cc96b4cd0058b27f7b58e
2012-05-20 11:23:31 +02:00
Jonathan Gordon
34031cba5b skin_engine: Clean up %x() handling - beware theme issues
Internally remove some hacks around how %x() is handled.
%x() inside the default viewport will no longer work if
other viewports are used, so if you are using viewports and
%x() make sure it is in a viewport!

Change-Id: I8ecab805d55fc0f8476ff0516cba38e23400aa20
2012-02-28 23:51:01 +11:00
Thomas Martitz
b907f2fd23 lcd_color/cabbiev2: New iconset in multiple sizes
The new iconset features transparency which can be more easier generated
from svgs and looks better. For for bigger displays there are new sizes.

The bmps are the generated from the SVGs added to the tree and
create-icons-from-tango.pl is updated to enable easy generation.

rockbox-clef.svg is changed to have a bit more border.

NOTE: Icons for greyscale are unchanged. Someone needs to update them, I don't know how to do it.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31059 a1c6a512-1295-4272-9138-f99709370657
2011-11-26 16:01:11 +00:00
Thomas Martitz
69f4245d9d Cabbiev2/RaaA: Add nice shadow to the icons on the popup in the WPS.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31058 a1c6a512-1295-4272-9138-f99709370657
2011-11-26 14:47:41 +00:00
Thomas Martitz
2e945b5c6a Cabbiev2/RaaA: Update progressbar images (using transparency).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31057 a1c6a512-1295-4272-9138-f99709370657
2011-11-26 14:42:13 +00:00
Thomas Martitz
f8578c089a Cabbiev2/RaaA: Add volume slider pop to the WPS.
It's as big as the usual popup and makes it easier to control the volume. Also makes our fine-grained volume changes more visible.
popup.xcf is updated to contain the volume layers.

Idea and some skin code taken from FS#12254.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31056 a1c6a512-1295-4272-9138-f99709370657
2011-11-26 14:34:04 +00:00
Thomas Martitz
65c46e8d77 Cabbiev2/RaaA: r30298 forgot about 480x800. Fix pause, ffwd and rewind touch actions in the WPS.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31053 a1c6a512-1295-4272-9138-f99709370657
2011-11-25 19:21:51 +00:00
Thomas Martitz
c01ad7f333 Cabbiev2/RaaA: Improved popup icons for the WPS, featurung real shadows.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31052 a1c6a512-1295-4272-9138-f99709370657
2011-11-25 19:12:08 +00:00
Jonathan Gordon
a7d8dd41b5 Fix mistaken changes in r30219
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30298 a1c6a512-1295-4272-9138-f99709370657
2011-08-14 13:14:58 +00:00
Jonathan Gordon
969903b5fe Change the way the %Tl() (touch region) tag is done to remove dodgey 1-char settings.
check the manual...
%Tl(..., &action) -> %Tl(..., action, repeat_press)
%Tl(..., *action) -> %Tl(..., action, long_press)
%Tl(..., !action) -> %Tl(..., action, reverse_bar)
and a new allow_while_lock to make the region fire when softlocked

these options must all be after the action name, but otherwise the order doesnt matter. And for the setting_inc/dec/set action the setting name must follow the action name, *then* the options

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30219 a1c6a512-1295-4272-9138-f99709370657
2011-07-28 12:53:22 +00:00
Dominik Riebeling
f56e453f60 Remove all themes but Cabbiev2.
As discussed remove all other themes from svn since they are available through
the theme website so there is no need to ship them with every Rockbox download
/ installation.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30158 a1c6a512-1295-4272-9138-f99709370657
2011-07-18 19:25:34 +00:00
Alex Parker
b1424fc257 Touchscreen WPS changes:
* Change play/pause button so that it shows the click action and not the current state. During ffwd/rew the ffwd/rew status is still shown.
 * Make ffwd/rew buttons always be shown on 480x800 and 320x480 targets. 240x400 needs further clean up first.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29398 a1c6a512-1295-4272-9138-f99709370657
2011-02-25 20:14:56 +00:00
Thomas Jarosch
7d4f3a7861 Add cabbie theme for 800x480
Theme was quickly ported by kugel from 480x800 theme.

Still has viewport bugs: Brings up the context menu
every time one touches the rew/ff buttons.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29253 a1c6a512-1295-4272-9138-f99709370657
2011-02-08 21:13:57 +00:00
Robert Menes
fedd1f3bc1 Add progress bar graphic for CabbieV2 for 128x160x16 LCDs.
Part of FS#10937 by Michael Carr and Stephen Carroll.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29019 a1c6a512-1295-4272-9138-f99709370657
2011-01-10 02:53:36 +00:00
Robert Menes
8b59b03404 Commit part of FS#10937: CabbieV2 port for the Philips GoGear
SA9200 (128x160x16 LCD). Ported by Michael Carr with cleanup
by Stephen Carroll.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29018 a1c6a512-1295-4272-9138-f99709370657
2011-01-09 22:10:29 +00:00
Jonathan Gordon
52b17b1553 fix FS#11784 - classic_statusbar.sbs needed alignemtn fixing to show the whole time
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28863 a1c6a512-1295-4272-9138-f99709370657
2010-12-20 10:58:03 +00:00
Thomas Martitz
4523db1333 Small improvements for the on screen popup on 320x480 cabbiev2 wps.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28599 a1c6a512-1295-4272-9138-f99709370657
2010-11-14 19:20:25 +00:00
Thomas Martitz
61a8d50c13 Add a few cabbiev2 source images in the biggest scale I've found. I've used them for the 320x480 and 480x800 ports. Hopefully makes porting cabbiev2 easier.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28598 a1c6a512-1295-4272-9138-f99709370657
2010-11-14 18:58:54 +00:00
Thomas Martitz
997316e213 Make the grey background of the images brighter to better match existing cabbiev2 WPSes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28596 a1c6a512-1295-4272-9138-f99709370657
2010-11-14 17:31:39 +00:00
Thomas Martitz
5e81da60fb Better quality images for the 320x480x16 cabbiev2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28595 a1c6a512-1295-4272-9138-f99709370657
2010-11-14 17:03:32 +00:00
Jonathan Gordon
e1c9eb31f7 FS#11669 - extra > in the skin
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28246 a1c6a512-1295-4272-9138-f99709370657
2010-10-12 09:45:11 +00:00
Jonathan Gordon
a5ba1bf4fb cabbie 320x480 WIP sbs:
Add a playlist viewer, AA and a resumeplayback touch region. (resumeplayback is the bottom right corner, even when AA isnt present or no music is playing)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28225 a1c6a512-1295-4272-9138-f99709370657
2010-10-10 05:30:41 +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
1a92ff0994 3rd time lucky
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28008 a1c6a512-1295-4272-9138-f99709370657
2010-09-06 12:30:56 +00:00
Jonathan Gordon
e7c1598d13 woops, wrong dimensions
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28007 a1c6a512-1295-4272-9138-f99709370657
2010-09-06 12:30:03 +00:00
Jonathan Gordon
1ab74404e6 Add a work-in-progress 320x400 touch enabled sbs.
Very basic, please help!
top left corner is menu, top right is context menu, otherwise use the UI viewport to move around. bottom area is eventually going to be a touch panel region (and track display if music is playing).
99% sure you cant do a popup region above the UI viewport which is why I've stolen the bottom region

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28006 a1c6a512-1295-4272-9138-f99709370657
2010-09-06 12:27:38 +00:00
Jonathan Gordon
2e1988b263 Small cabbie update by Hayden Pearce for cabbiev2.176x220x16
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27984 a1c6a512-1295-4272-9138-f99709370657
2010-09-02 11:43:40 +00:00
Michael Chicoine
1eb3970d05 Further upgrades of Cabbiev2 wps files to viewports - FS#11490 by HAyden Pearce and me
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27856 a1c6a512-1295-4272-9138-f99709370657
2010-08-21 23:39:19 +00:00
Marianne Arnold
56229d5866 The 128x96x2 cabbiev2.wps (Iaudio remote and M3) used more than one viewport but drew the progressbar in the default one where it wouldn't be updated with the new parser anymore. Put it into a viewport too and rearrange the rest of the code to the same order as displayed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27806 a1c6a512-1295-4272-9138-f99709370657
2010-08-14 07:27:59 +00:00
Thomas Martitz
4bca51b5b7 Cabbiev2 480x800 port, very similar to the 320x480 one.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27794 a1c6a512-1295-4272-9138-f99709370657
2010-08-12 19:06:40 +00:00
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