Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
24084 commits 17 branches 142 tags 291 MiB
Commit graph

1145 commits

Author SHA1 Message Date
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
Jonathan Gordon
1759a299f1 fix FS#11100 - statusbar would show up on multiscreen targets if either screen had it enabled 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25159 a1c6a512-1295-4272-9138-f99709370657
 2010-03-13 22:26:03 +00:00
Torne Wuff
86dc6c1204 Change USB HID mode string from just "Multimedia Mode" (or similar) to say "USB keypad mode: Multimedia" (or similar). 
This will hopefully reduce the huge confusion from new users who think that multimedia mode means it's doing MTP or some other thing which is not MSC.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25132 a1c6a512-1295-4272-9138-f99709370657
 2010-03-12 17:32:24 +00:00
Thomas Martitz
61320ce0eb Make mini2440 compile again. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25081 a1c6a512-1295-4272-9138-f99709370657
 2010-03-08 23:43:11 +00:00
Jonathan Gordon
0376208a48 revert r25054 - tags which have an off and a list of option should have off as the first not last option. also fix it so the no icon position actually works. 
you can use %?Li<no|yes> if you want to.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25063 a1c6a512-1295-4272-9138-f99709370657
 2010-03-07 21:07:41 +00:00
Teruaki Kawashima
ce92b8bf34 Slightly change how %Li works when used as a conditional. last part is selected if and only if icon is not presented (i.e. is no icon) so that it can be used like true/false type conditional tag, e.g. "%?Li<Icon|No Icon>". 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25054 a1c6a512-1295-4272-9138-f99709370657
 2010-03-07 13:39:19 +00:00
Teruaki Kawashima
f50885534e Pass width instead of x+width to ab_draw_markers()/cue_draw_markers() and don't recalculate the width in these functions. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25053 a1c6a512-1295-4272-9138-f99709370657
 2010-03-07 12:51:23 +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
Magnus Holmgren
a14f4acb0c Restore the 'read_disk' flag for settings_apply that was removed in r24922. It is still needed to prevent uncessary disk I/O for fonts etc. Should fix FS#11071 (I haven't tested it on a HD-based player). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25042 a1c6a512-1295-4272-9138-f99709370657
 2010-03-06 12:14:12 +00:00
Jonathan Gordon
f1b209c057 fix yellow 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25039 a1c6a512-1295-4272-9138-f99709370657
 2010-03-06 00:37:01 +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
Thomas Martitz
4cdcb63de1 Don't call this two, it's uneeded (and would crash since they're INIT_ATTR). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25015 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 23:38:46 +00:00
Thomas Martitz
f8edc32589 FS#10756 - Free unused init code 
Introduce a new .init section for initialisation code, so that it can be copied to an area which is later overwritten before calling. The stack/bss can then overwrite that code, effectively freeing the code size that the initialisation routines need. Gives a few kB ram usage back.
Only implemented for PP and as3525 so far. More targets could be added, as well as more functions.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25013 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 23:20:32 +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
b8eb44d7db fix FS#10926 - backlight turning off stops track info being updated 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24998 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 02:20:40 +00:00
Jonathan Gordon
e89f0dc8a6 Fix FS#11058 - conditionl viewports cause sublines to go a bit crazy 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24997 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 02:10:26 +00:00
Jonathan Gordon
6a6df5a1eb some small debug info fixes, add %Li and %lt and make uppercase subimage labels display correctly 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24996 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 01:38:25 +00:00
Jonathan Gordon
cc4363ad18 remove a nonsense outdate warning. there is no token limit anymore 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24995 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 00:54:41 +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
Jonathan Gordon
9e611b1b00 revert r24989 ad r24990 which are cuasing segfaults... they were working fine for me though :( (stupid font stuff is cursed!) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24993 a1c6a512-1295-4272-9138-f99709370657
 2010-03-02 21:47:35 +00:00
Jonathan Gordon
04e0d6c12c fix %pb when the height isnt given and it is in a viewport with a user font (so the height is calculated on the font height at display time) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24991 a1c6a512-1295-4272-9138-f99709370657
 2010-03-02 08:47:45 +00:00
Jonathan Gordon
3f09d7eed1 fix red 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24990 a1c6a512-1295-4272-9138-f99709370657
 2010-03-02 08:32:55 +00:00
Jonathan Gordon
34f51ccb04 * Make the user font count more sane 
* font 2-9 in the skins will always be user fonts in the skins
* init the skinfonts array so it doesnt think id 'x' is used already
* make the parser work with FONT_UI untill the very end, even on remote fonts


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24989 a1c6a512-1295-4272-9138-f99709370657
 2010-03-02 08:24:50 +00:00
Thomas Martitz
3b52937c8a Revert r24958. It didn't fix anything (in fact, the problem described didn't exist). Increase MAXFONTS by 1 to allow for remote screen targets to load fonts 2-9. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24983 a1c6a512-1295-4272-9138-f99709370657
 2010-03-01 15:16:05 +00:00
Bertrik Sikken
7ab1cd7b1b Save some RAM by changing a char[] into a const char * in struct afmt_entry. Make other fields const too. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24970 a1c6a512-1295-4272-9138-f99709370657
 2010-02-28 14:13:35 +00:00
Teruaki Kawashima
38efc71615 set viewport to default one just for safe. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24969 a1c6a512-1295-4272-9138-f99709370657
 2010-02-28 14:12:41 +00:00
Jonathan Gordon
6434e760fc move a #ifdef so the full amount of user choosable skin fonts are avilable on non remote targets (i.e 2-9 inclusive) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24958 a1c6a512-1295-4272-9138-f99709370657
 2010-02-28 08:48:04 +00:00
Jonathan Gordon
8717c1eaa1 redo r24943. the font mappings are not needed once the skin is finished parsing so using the skin buffer there is a waste and overcomplicates things. 
Also that commit breaks plain %pb so make sure you dont use %pb inside a viewport with a font number > 1


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24957 a1c6a512-1295-4272-9138-f99709370657
 2010-02-28 08:36:13 +00:00
Michael Giacomelli
1fefb48e87 Fix System/Running Time to reset the running time whenever a charger or USB cable is inserted, not just when the cable is inserted in the running time screen. Should now make the running time actually be the amount of time rockbox has run since the battery was last charged, which is as far as I can tell the original idea behind the runtime menu. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24954 a1c6a512-1295-4272-9138-f99709370657
 2010-02-27 22:47:49 +00:00
Thomas Martitz
ea4eadc582 Add playlist viewer screen to %cs. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24953 a1c6a512-1295-4272-9138-f99709370657
 2010-02-27 21:24:50 +00:00
Thomas Martitz
81ebf2be6f Fix dead parts of the wps when leaving it. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24952 a1c6a512-1295-4272-9138-f99709370657
 2010-02-27 21:19:34 +00:00
Nils Wallménius
722ae97836 Set missing svn properties 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24947 a1c6a512-1295-4272-9138-f99709370657
 2010-02-27 18:07:38 +00:00
Nils Wallménius
519b3e25b8 mark array as const and use ARRAYLEN macro for calculating length of the array 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24946 a1c6a512-1295-4272-9138-f99709370657
 2010-02-27 17:46:51 +00:00
Thomas Martitz
226308663f Store the list of fonts in a linked list instead of in a static array (together with the base filename) and load all fonts in a second step. This aids debugging missing fonts, skips fonts that are not used in viewports, and is preparation of a resizable (on boot) skin buffer. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24943 a1c6a512-1295-4272-9138-f99709370657
 2010-02-27 16:51:51 +00:00
Jonathan Gordon
92f0aa85fc fix 64bit warning 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24923 a1c6a512-1295-4272-9138-f99709370657
 2010-02-26 08:43:26 +00:00
Jonathan Gordon
4c6b3551b5 split the theme settings apply() sutff out of settings_apply(). this should fix splashes not being loc'ed, statusbar over the splash (fixed in sim, not on my mini2g though), and the supposed boot time slowdown. 
What this also does is remove a bunch of unnecessary settings_Apply()'s from the ipod accessory code, and causes all non-skin settings to get applied each time (this includes font and langs which we wernt doing to stop disk access)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24922 a1c6a512-1295-4272-9138-f99709370657
 2010-02-26 08:01:41 +00:00
Jonathan Gordon
321148124a Fix the list showing an empty line at the bottom if the sbs is handling the title 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24919 a1c6a512-1295-4272-9138-f99709370657
 2010-02-26 06:45:50 +00:00
Jonathan Gordon
cf6be66db6 small change to how the quickscreen fixes its viewports 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24918 a1c6a512-1295-4272-9138-f99709370657
 2010-02-26 06:17:04 +00:00
Jonathan Gordon
466e5d9aa4 2 new tags for the base skin. 
%Lt - the title text for the current list
%Li - the icon number. Same order as the CustomIcons list, except the first icon is the "no icon" icon.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24917 a1c6a512-1295-4272-9138-f99709370657
 2010-02-26 03:45:41 +00:00
Teruaki Kawashima
51bc09e88e Quickscreen: add more check for case that qs item is not set. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24901 a1c6a512-1295-4272-9138-f99709370657
 2010-02-25 06:01:53 +00:00
Jonathan Gordon
31fb4f6ff6 Change how touchscreen regions work slightly... "It modifies the behaviour of touch buttons to be more similar to the way gui buttons operate in desktop applications. Upon a touch press event, the button at the touch position is armed. Upon a touch repeat or release, the button at the touch position is triggered only if it is armed. Upon release (and wps entry), all buttons are disarmed. E.g. when you touch press on an empty area, then while pressing drag your finger on a button, then release the button, the button is not triggered." 
Author: Jens Theeß 
Flyspray: FS#10982


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24876 a1c6a512-1295-4272-9138-f99709370657
 2010-02-24 06:19:25 +00:00
Jonathan Gordon
6c4b80c67b make the parser spit out filenames of images it cant load 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24875 a1c6a512-1295-4272-9138-f99709370657
 2010-02-24 06:15:55 +00:00
Jonathan Gordon
0acb38b61c some minor changes to checkwps, shouldn't change anything 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24874 a1c6a512-1295-4272-9138-f99709370657
 2010-02-24 05:58:16 +00:00
Tomer Shalev
9d268d796c Quickscreen: Hande case where not all quick settings are defines 
This happens in Archos Recorder, see quick_screen_f3(), which caused crash
(FS#11037), due to top item not defined.
The commit explicitly sets items[QUICKSCREEN_TOP] to NULL, and also draws an
arrow only if the item is defined.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24871 a1c6a512-1295-4272-9138-f99709370657
 2010-02-23 21:30:16 +00:00
Teruaki Kawashima
d151371836 correct checking size in function get_image_filename. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24844 a1c6a512-1295-4272-9138-f99709370657
 2010-02-22 06:00:49 +00:00
Frank Gevaerts
84a4a1d5cc statusbar_position should also return enum statusbar_values if it's a macro 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24833 a1c6a512-1295-4272-9138-f99709370657
 2010-02-21 22:05:32 +00:00