Commit graph

281 commits

Author SHA1 Message Date
Jonathan Gordon
a74eefe1b2 Pressing Menu in the Rockbox Menu puts you back in the previous screen.
Hopefully simplify the code a bit


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12643 a1c6a512-1295-4272-9138-f99709370657
2007-03-06 13:35:15 +00:00
Linus Nielsen Feltzing
298c2bbd83 Allow dynamic menu items to be spoken, especially the resume/now playing item
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12614 a1c6a512-1295-4272-9138-f99709370657
2007-03-05 00:32:33 +00:00
Jonathan Gordon
97090863a6 Allow settings to have a different title in the setting screen than they
have in the menu.
Fixes the scroll speed/step settings


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12572 a1c6a512-1295-4272-9138-f99709370657
2007-03-03 14:23:03 +00:00
Jonathan Gordon
02a871780f Remove the need to double up the MENU macros in manu.h.
Icons are now used by their id which must be part of the icons_6x8 enum, 
or Icon_NOICON for none


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12571 a1c6a512-1295-4272-9138-f99709370657
2007-03-03 13:52:14 +00:00
Steve Bavin
361a60c964 Centralise icon enabling to hopefully save a few bytes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12540 a1c6a512-1295-4272-9138-f99709370657
2007-03-01 18:25:13 +00:00
Jonathan Gordon
91cb68a1fb Introducing the root menu!
Blind users: get a new voice file as there are lots of lang changes and new strings.
FS#6630 or RootMenu on the wiki for more info. complaints to /dev/null :)



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12528 a1c6a512-1295-4272-9138-f99709370657
2007-03-01 11:14:46 +00:00
Jonathan Gordon
9144be5253 returning ACTION_EXIT_AFTER_THIS_MENUITEM from a menu callback will exit
the menu when the subitem returns. Use this with the preset item context 
menus


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12501 a1c6a512-1295-4272-9138-f99709370657
2007-02-27 09:16:47 +00:00
Jonathan Gordon
2816dc9c13 Convert the radio menus to the new system.
Change the way the presets are done (in code).


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12500 a1c6a512-1295-4272-9138-f99709370657
2007-02-27 09:06:30 +00:00
Jonathan Gordon
1ba493e4b4 get the button bar working like it used to (hopefully)
Remove tabs


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12492 a1c6a512-1295-4272-9138-f99709370657
2007-02-26 08:17:07 +00:00
Jonathan Gordon
169e91daa4 woops, allow the user to quit menus
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12432 a1c6a512-1295-4272-9138-f99709370657
2007-02-21 12:28:45 +00:00
Jonathan Gordon
d563cb2567 Dont load the menu callback so often.
Send ACTION_MENUITEM_EXIT to all menus when exiting. return value is 
ignored.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12431 a1c6a512-1295-4272-9138-f99709370657
2007-02-21 12:22:07 +00:00
Jonathan Gordon
ac07222b83 Flip the order of some of the setting screens. (If any more are
backwards let me know in the thread or IRC)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12400 a1c6a512-1295-4272-9138-f99709370657
2007-02-19 03:15:48 +00:00
Jonathan Gordon
2801a87d54 Convert the EQ menus
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12398 a1c6a512-1295-4272-9138-f99709370657
2007-02-19 02:14:51 +00:00
Jonathan Gordon
40a253d464 Convert the Display menu to the new system.
http://forums.rockbox.org/index.php?topic=8703.0 for bugs...


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12351 a1c6a512-1295-4272-9138-f99709370657
2007-02-17 14:02:48 +00:00
Linus Nielsen Feltzing
6ffd8043cb Removed some unused menu code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12335 a1c6a512-1295-4272-9138-f99709370657
2007-02-16 10:40:59 +00:00
Jonathan Gordon
1ea4f0d4eb fix menu exiting bug I introduced in the last commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12325 a1c6a512-1295-4272-9138-f99709370657
2007-02-16 00:55:52 +00:00
Jonathan Gordon
f8e08f0f5e Remove the menu title on the player.
Fix the enu callbacks so ACTION_EXIT_MENUITEM is called when exiting a 
menu


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12324 a1c6a512-1295-4272-9138-f99709370657
2007-02-15 23:27:57 +00:00
Jonathan Gordon
5599d6806d Icons in the menus. Thanks midkay for them.
Any menus which dont yet show them are not converted to the new system.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12300 a1c6a512-1295-4272-9138-f99709370657
2007-02-14 06:58:30 +00:00
Jonathan Gordon
24c8da0b56 remove put_cursorxy() which is not used
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12296 a1c6a512-1295-4272-9138-f99709370657
2007-02-13 09:13:47 +00:00
Jonathan Gordon
fb62831faa * Move playback menu to the new sysetm
(http://forums.rockbox.org/index.php?topic=8703.0 if I broke any of 
those settings accidently).
* Add set_int_ex() which is the same as set_int() but adds a param which 
is a callback that returns the voice ID to talk for the selected value
* Change the "pause on headphone unplug" to use meaningful strings in 
the config instead of numbers, this setting will be reset.
* saves ~500bytes on the rec build :D


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12285 a1c6a512-1295-4272-9138-f99709370657
2007-02-12 14:22:35 +00:00
Jonathan Gordon
9bb864b82a unstatic the string buffer, fix the recording setting lang, change the
menu title... aparently im the only one who thinks it should match the 
logo...


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12233 a1c6a512-1295-4272-9138-f99709370657
2007-02-08 11:12:22 +00:00
Jonathan Gordon
217ad16850 OK, this was crazy overkill... the worst setting current
(default_codepage) will _just_ fit in 128, so 256 gives plenty of 
headroom


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12232 a1c6a512-1295-4272-9138-f99709370657
2007-02-08 10:38:28 +00:00
Jonathan Gordon
fe3cfcc9b2 Convert the sound menu to the new system
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12230 a1c6a512-1295-4272-9138-f99709370657
2007-02-08 10:28:42 +00:00
Jonathan Gordon
4718a1e752 beginning of the new menu system. This commit shouldnt break anything,
but comming ones might.. report bugs in 
http://forums.rockbox.org/index.php?topic=8703.0 and more info at 
http://www.rockbox.org/twiki/bin/view/Main/SettingsRecode


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12227 a1c6a512-1295-4272-9138-f99709370657
2007-02-08 04:33:41 +00:00
Jens Arnold
314f3b58f1 More static'ing, and a few fixes resulting from that.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11737 a1c6a512-1295-4272-9138-f99709370657
2006-12-12 22:22:21 +00:00
Jonathan Gordon
6a1161b634 dont allow the volume setting to wrap
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11445 a1c6a512-1295-4272-9138-f99709370657
2006-11-06 10:11:51 +00:00
Peter D'Hoye
a3d686f961 Somebody found a way to nest 6 menus deep. Congratulations. Fixes FS#5970
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10962 a1c6a512-1295-4272-9138-f99709370657
2006-09-16 19:51:46 +00:00
Linus Nielsen Feltzing
224c0a13eb Finally, the new button action system is here, thanks to Jonathan Gordon. Some button mappings have changed and other things may break. Comments should go to the forum, http://forums.rockbox.org/index.php?topic=5829.0 or the mailing list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10582 a1c6a512-1295-4272-9138-f99709370657
2006-08-15 12:27:07 +00:00
Shachar Liberman
f53779d2f4 Committing FS#5182 - One button hold for Horizontal screen scrolling.
=>hold RIGHT or LEFT button on a GUI based list to scroll horizontally.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10545 a1c6a512-1295-4272-9138-f99709370657
2006-08-12 13:40:49 +00:00
Kevin Ferrare
f77ac7a6a7 added support remote support for the id3 infos screen (had to slightly change the list engine to use it here as well), corrected a mistake in the french translation
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10175 a1c6a512-1295-4272-9138-f99709370657
2006-07-02 12:28:27 +00:00
Daniel Stenberg
f981ea93fb kill gcc4 warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8162 a1c6a512-1295-4272-9138-f99709370657
2005-12-05 22:44:42 +00:00
Kevin Ferrare
15046f99b3 show/hide icons now works properly in playlist viewer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7911 a1c6a512-1295-4272-9138-f99709370657
2005-11-16 17:23:49 +00:00
Kevin Ferrare
f7c97522a8 Fixed the icon for unknown file types on the archos Player, and the bug when removing the last file on the screen in filetree, added some code for playlists integration with multi-screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7800 a1c6a512-1295-4272-9138-f99709370657
2005-11-09 01:17:57 +00:00
Kevin Ferrare
cbbdc95d9c Fixed a bug in the multi-screen menus, the statusbar wasn't refreshed when coming from some custom wps that erases it ; Initial support for options in the menus
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7747 a1c6a512-1295-4272-9138-f99709370657
2005-11-04 07:18:36 +00:00
Kevin Ferrare
c43822d102 Fixed a bug whith the multi-screen menus : when entering / leaving a menu, the selected item was not voiced
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7739 a1c6a512-1295-4272-9138-f99709370657
2005-11-03 11:56:21 +00:00
Kevin Ferrare
b83dc3861e Corrected a small bug about status bar not refreshing the clock in menus on archos, added some H1x0 remote key bindings (thanks Stephan Wezel for the patch ! )
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7698 a1c6a512-1295-4272-9138-f99709370657
2005-10-31 18:38:48 +00:00
Kevin Ferrare
162ab7baeb A small visual bug fixed with menus when in some cases the status bar was not redrawn
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7695 a1c6a512-1295-4272-9138-f99709370657
2005-10-30 23:54:12 +00:00
Kevin Ferrare
2b3695f538 oops a little warning in menu.c, fixed
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7694 a1c6a512-1295-4272-9138-f99709370657
2005-10-30 22:41:29 +00:00
Kevin Ferrare
db8415c99e Partial menus support on remote (only browsing is working, changing option isn't), corrected a bug in gui_list about scrollbar beeing displayed sometimes when it musn't
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7693 a1c6a512-1295-4272-9138-f99709370657
2005-10-30 22:34:51 +00:00
Jens Arnold
1a4083d828 Adjust menu scrollbar height to the actual text height. Idea taken from patch #1306243 by Stephan Wezel.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7598 a1c6a512-1295-4272-9138-f99709370657
2005-10-08 07:38:44 +00:00
Linus Nielsen Feltzing
6c2af7c2aa On popular demand, the arrow cursor is reintroduced
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7438 a1c6a512-1295-4272-9138-f99709370657
2005-09-01 08:04:37 +00:00
Linus Nielsen Feltzing
f43216ff0b Removed the line selector option, it is now always an inverse bar (except for the Player/Studio of course)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7423 a1c6a512-1295-4272-9138-f99709370657
2005-08-30 11:10:08 +00:00
Jens Arnold
6c00e38665 Icon code cleanup, optimisation & policeing. Removed unused icons. Applied uniform icon naming scheme.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7396 a1c6a512-1295-4272-9138-f99709370657
2005-08-24 00:09:42 +00:00
Jens Arnold
f894a4c269 4-shades greyscale graphics core for iriver H1x0. 4-grey rockbox logo and light grey background in splash() boxes. Simplified the splash() box creation as the new graphics core does clipping. Adapted screendump feature and added flexible preprocessing to construct the bmp header. Rockboy now uses 4-grey mode as well. 4-grey support for win32 simulator. Fixed win32 player sim to not use double bitmap conversion via a recorder-like framebuffer, and correctly display double-height text. X11 simulator temporarily adapted. The display won't be distorted, but it still shows b&w only.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7046 a1c6a512-1295-4272-9138-f99709370657
2005-07-06 22:58:02 +00:00
Jens Arnold
7e11acbce9 Second part of graphics api rework. Bitmap drawing and text output converted; some code cleanup and more optimisations.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6906 a1c6a512-1295-4272-9138-f99709370657
2005-06-28 23:15:47 +00:00
Jens Arnold
04daef17a1 First part of graphics api rework. Special functions, parameter handling, pixel functions, lines and filled primitives done for black & white core, main display.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6856 a1c6a512-1295-4272-9138-f99709370657
2005-06-24 22:33:21 +00:00
Jens Arnold
da2b45f2e5 When exiting the context menu with the menu button, call the main menu. Mainly useful on Ondio which can't have both main menu and context menu bound in wps. Holding MODE on Ondio will now bring up the wps context menu instead of the main menu.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6840 a1c6a512-1295-4272-9138-f99709370657
2005-06-23 10:11:10 +00:00
Marcoen Hirschberg
fb369b063b Make remote-control code more complete
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6696 a1c6a512-1295-4272-9138-f99709370657
2005-06-12 20:18:37 +00:00
Marcoen Hirschberg
c19e0f0d02 Add remote control support to tree and menu. Move defines from wps.c to wps.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6692 a1c6a512-1295-4272-9138-f99709370657
2005-06-12 16:10:17 +00:00
Marcoen Hirschberg
7527bfb4d6 center-scrolling: start scrolling when the cursor is at 2/3 of the screen. There is still a bug when the fontsize changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6678 a1c6a512-1295-4272-9138-f99709370657
2005-06-11 17:35:30 +00:00
Jens Arnold
fa924f1b05 Don't swallow button events. It's unnecessary and maybe even confusing.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6486 a1c6a512-1295-4272-9138-f99709370657
2005-05-17 17:38:07 +00:00
Jens Arnold
cef15c6efc FM preset menu: Set cursor to the current preset on enter. Added a generic function to the menu system which allows for setting the position.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6264 a1c6a512-1295-4272-9138-f99709370657
2005-04-10 17:36:55 +00:00
Jens Arnold
5265edda08 Removed remnants of buttonbar code for units without recorder keypad.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5563 a1c6a512-1295-4272-9138-f99709370657
2005-01-13 19:37:34 +00:00
Linus Nielsen Feltzing
ae75ea8858 Patch #1016041 by Eric Lassauge
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5561 a1c6a512-1295-4272-9138-f99709370657
2005-01-13 10:48:44 +00:00
Linus Nielsen Feltzing
e88f8b1ffe Deleting the last menu item no longer gives a negative cursor position
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5307 a1c6a512-1295-4272-9138-f99709370657
2004-10-19 09:07:08 +00:00
Jens Arnold
1f0908dfaf Removed button bar for devices with no F buttons (Ondio)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5237 a1c6a512-1295-4272-9138-f99709370657
2004-10-09 20:54:15 +00:00
Björn Stenberg
d6b47ece14 Don't exit menus on repeat.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5167 a1c6a512-1295-4272-9138-f99709370657
2004-10-05 06:35:54 +00:00
Björn Stenberg
6c33c51a4c Redesigned the button handling. The code now uses symbolic function defines instead of checking for specific buttons. This makes it easier to add support for new devices with different button layouts.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5091 a1c6a512-1295-4272-9138-f99709370657
2004-09-19 21:58:37 +00:00
Jens Arnold
8fb336148f Const policed pointer arguments to functions, part 3
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4999 a1c6a512-1295-4272-9138-f99709370657
2004-08-18 01:09:31 +00:00
Linus Nielsen Feltzing
ade5d7b848 First step in revamping the USB event handling, paving the way for the upcoming SYS_POWER_OFF event
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4951 a1c6a512-1295-4272-9138-f99709370657
2004-07-26 16:06:59 +00:00
Jörg Hohensohn
b1403ee024 New way of defining menus and options allows to declare them static const, which saves the code to runtime-assemble them. Rockbox just got 6 KB smaller.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4931 a1c6a512-1295-4272-9138-f99709370657
2004-07-23 23:01:20 +00:00
Linus Nielsen Feltzing
82586a69e6 Added menu_insert()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4826 a1c6a512-1295-4272-9138-f99709370657
2004-07-05 14:26:58 +00:00
Linus Nielsen Feltzing
49ea16e2eb Fixed the bug that caused the menu cursor to start at the first line every time
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4500 a1c6a512-1295-4272-9138-f99709370657
2004-04-14 06:04:38 +00:00
Linus Nielsen Feltzing
361dd29cad Cleaned up the menu drawing code, and fixed a bug where the menu entry wasn't spoken if the menu scrolled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4481 a1c6a512-1295-4272-9138-f99709370657
2004-04-09 17:47:18 +00:00
Jörg Hohensohn
3aa99e14cd Step 4 of voice UI:
- "talkbox" functionality added, but yet without thumbnail recording
- menu under "general settings" to configure voice
- directories and folders can be voiced as a numbers


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4440 a1c6a512-1295-4272-9138-f99709370657
2004-03-27 00:11:01 +00:00
Linus Nielsen Feltzing
77936e6ec5 First shot at a nice little button bar at the bottom of the recorder LCD. Enable Button Bar in the Display settings. Only the dir browser uses it at the moment.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4391 a1c6a512-1295-4272-9138-f99709370657
2004-03-16 13:44:56 +00:00
Jörg Hohensohn
4f36ea8fbf First step of the voice-UI: the menus can talk. You need a "voicefont" file in .rockbox to use this.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4381 a1c6a512-1295-4272-9138-f99709370657
2004-03-14 21:33:53 +00:00
Linus Nielsen Feltzing
10b92c44b3 First step towards context sensitive and configurable menus, by Brent Coutts
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4370 a1c6a512-1295-4272-9138-f99709370657
2004-03-12 10:20:33 +00:00
Hardeep Sidhu
107ebc5ba9 Modified playlist handling to allow for multiple playlists to be edited at the same time. Added support in playlist viewer for viewing/editing playlists on disk (accessed via ON+PLAY->Playlist->View on a playlist). Added menu in playlist viewer for changing a few settings and saving playlist. Added File Options menu in playlist viewer ON+PLAY menu.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4276 a1c6a512-1295-4272-9138-f99709370657
2004-01-26 17:05:21 +00:00
Björn Stenberg
461d6e347e Added a splash to indicate battery charging if user tries to shut off while plugged in.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4104 a1c6a512-1295-4272-9138-f99709370657
2003-12-04 00:08:25 +00:00
Daniel Stenberg
1c8f80a0cb yellow build is bad
green build is good


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4056 a1c6a512-1295-4272-9138-f99709370657
2003-11-20 07:48:57 +00:00
Linus Nielsen Feltzing
f1659a3957 Wrapping backwards in menus didn't work well when using a large font
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4055 a1c6a512-1295-4272-9138-f99709370657
2003-11-20 01:51:15 +00:00
Björn Stenberg
d1a6fa113d Addded option to hide icons in dir browser. (Patch #728377)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3731 a1c6a512-1295-4272-9138-f99709370657
2003-06-05 09:38:26 +00:00
Björn Stenberg
942bc9449e Only redraw the status line when info actually changed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3588 a1c6a512-1295-4272-9138-f99709370657
2003-04-23 11:26:25 +00:00
Linus Nielsen Feltzing
e43b78ac46 Magnus Öman's long awaited inverted cursor patch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3565 a1c6a512-1295-4272-9138-f99709370657
2003-04-16 00:12:31 +00:00
Björn Stenberg
074ca2eeb6 Bug fix: Menu returned wrong value if USB was connected during menu->f2/f3.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3435 a1c6a512-1295-4272-9138-f99709370657
2003-03-12 20:06:51 +00:00
Kjell Ericson
5cd393c772 New onplay-menu for the Player.
The menu_run() function is split into two functions, where the new menu_run() works like before, and the new function menu_show() returns the menu item number you selected.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3180 a1c6a512-1295-4272-9138-f99709370657
2003-01-29 08:26:11 +00:00
Kjell Ericson
767d604bcd Removed unnecessary calls to lcd_stop_scroll().
Changed all lcd_scroll_pause() to lcd_stop_scroll().
Updated the tree system for new scroll-behaviour.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3154 a1c6a512-1295-4272-9138-f99709370657
2003-01-23 14:28:16 +00:00
Daniel Stenberg
541fa6ac3a menu_run() does not need to do lcd_update()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3089 a1c6a512-1295-4272-9138-f99709370657
2003-01-15 08:32:56 +00:00
Kjell Ericson
c11b90fa49 Adapted player code for new Rocklatin character set.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3051 a1c6a512-1295-4272-9138-f99709370657
2003-01-10 09:55:50 +00:00
Mats Lidell
1873987315 Use status_set...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2661 a1c6a512-1295-4272-9138-f99709370657
2002-10-15 12:56:05 +00:00
Linus Nielsen Feltzing
0a4b247080 The player firmware now autodetects the LCD type. No need for two player versions anymore
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2658 a1c6a512-1295-4272-9138-f99709370657
2002-10-15 12:25:57 +00:00
Robert Hak
749ae8adae f2 quickscreen now reachable from f1 menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2613 a1c6a512-1295-4272-9138-f99709370657
2002-10-14 09:42:55 +00:00
Mats Lidell
d21d179010 Special case for simulator removed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2576 a1c6a512-1295-4272-9138-f99709370657
2002-10-11 11:07:17 +00:00
Björn Stenberg
8fb7312650 Only show scrollbar when needed. (Björn Fischer)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2406 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 19:41:23 +00:00
Björn Stenberg
a4c3b03f15 Removed lcd_getfontsize(). Removed font parameters to lcd_putsxy and lcd_getstringsize.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2403 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 18:04:15 +00:00
Björn Stenberg
b1b8bd4dd1 Moved on_screen, f2_screen, f3_screen and handle_usb (renamed usb_screen) to a new file: screens.c.
typedef Menu replaced with a bool.
All code now calls usb_screen() for usb handling.
Nearly all code now deals with USB connect/disconnect properly.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2401 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 17:22:12 +00:00
Björn Stenberg
b0cd912f55 Added proper quickscreen to F3 in menus
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2399 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 14:52:23 +00:00
Björn Stenberg
bed3d3f7e0 New full ISO-8859-1 system font.
Added font loading from dir browser.
Changed default font location to /.rockbox/default.fnt.
Code-policed font code.
Removed old font tools.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2347 a1c6a512-1295-4272-9138-f99709370657
2002-09-20 08:07:51 +00:00
Eric Linenberg
038df5cdc9 Daniel,
The following patch makes loadable fonts actually work (finally!).
It took me quite a while, but I finally figured out why the sim
worked and the target didn't: the SH1 processor won't read
longwords from a shortword alignment... I had to rev the .fnt
file to version 1.1 (requires remaking *.fnt files) in order
to fix this.  Please apply the following patch completely.
It's diffed against the latest CVS.

I've also attached rockbox-fonts-1.1.tar.gz which includes
known working *.fnt files, including a courB08 system.fnt,
for demonstration.

Now the real work can begin...  Although the new
system.fnt will work fine, if you try going to a really
big font (try copying courB14.fnt to system.fnt), then
you will find that it comes up and works in tree mode,
but will crash the system when going into WPS
mode...  I'm sure this is because of the low-level
lcd_bitmap not clipping properly when given a too-large
bitmap, which the characters become.  I haven't yet
tried to debug the low-level driver.  Of course, it all
works on the sim...

So the apps developers will now have to make sure that
all apps screen sizes may vary according to the loaded font.
The font height can be gotten through the lcd_getfontsize API.

Files patched in fonts-6.patch

1. apps/menu.c - LCD_PROPFONTS error (2nd resubmission on this, please checkin)

2. firmware/font.c - fixes and reformatting.  Please check this in as is,
my vi editor requires more reformatting changes since I left tabs in the
file, these are removed now (2nd resubmission on this, please checkin)

3. firmware/fonts.h - doc change on .fnt file format, .fnt version
number incremented.

4. firmware/loadfont.c - fixes to load font properly, typedefs
removed.

5. firmware/system.c - lcd_setfont(FONT_SYSFIXED) before
issuing error, otherwise font may not exist.

6. tools/bdf2c - fixes for correct output when filename starts
with a number, as well as when no DEFAULT_CHAR in .bdf
file.  (2nd resubmission on this, please checkin)

7. tools/writerbf.c - fixes for bugfixed fontfile format.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2294 a1c6a512-1295-4272-9138-f99709370657
2002-09-16 03:18:49 +00:00
Daniel Stenberg
93b231c693 Greg Haerr's new loadable font. No more #ifdef font-style, removed old
propfont and loadable font code. New font file format.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2269 a1c6a512-1295-4272-9138-f99709370657
2002-09-12 13:33:59 +00:00
Björn Stenberg
3b97474978 lcd_puts() now clears to end-of-line
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2252 a1c6a512-1295-4272-9138-f99709370657
2002-09-09 23:57:00 +00:00
Eric Linenberg
c076b27dfc Added menu wrap. It works on the recorder, but I can't test on the player... hopefully it plays okay!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2165 a1c6a512-1295-4272-9138-f99709370657
2002-09-04 04:21:10 +00:00
Björn Stenberg
90851c5492 Clear button queue when leaving menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2135 a1c6a512-1295-4272-9138-f99709370657
2002-09-02 14:50:37 +00:00
Björn Stenberg
40d866bd9e Fixed build errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2113 a1c6a512-1295-4272-9138-f99709370657
2002-09-01 20:08:08 +00:00
Justin Heiner
b5025a8c40 USB Related:
Consolidated some more of the USB code in the WPS.
    Have backlight turn offf when USB Connected.
menu.c:
    LINE_X was set wrong for player.
settings_menu.c / wps-display.c:
    Added 1 Line ID3+. Has progress bar & Kbps.
    Renamed some of the WPS options to be more readable.
wps.c / wps-display.c
    Fixed problem with FF/REW when 'Remaining Time' is on.
    Added %pb to the WPS mix. Player progress bar thingy.
    Thanks to whoever fixed my PLAYER_PROGRESS function :-)
    Changed how volume changes on player (works better now).
    General cleanup of Custom WPS code.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2091 a1c6a512-1295-4272-9138-f99709370657
2002-08-31 04:58:35 +00:00
Markus Braun
000c2db035 Added scrollbar to tree view and menus.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2084 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 13:49:32 +00:00
Daniel Stenberg
49984facc1 properly remember DISK_CHANGE status and return that to menu parents,
also when coming back from the USB screen set back the status bar state
before redrawing the menu.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1953 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 12:57:00 +00:00
Daniel Stenberg
aa458aa9d8 MENU_DISK_CHANGED is the new value for telling disk content might have
changed


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1949 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 12:41:25 +00:00
Daniel Stenberg
b285076925 Remade the menu system slightly. All functions invoked from menus now use
the Menu typedef as return type, and *ALL* menus that intercept USB connect
can then return MENU_REFRESH_DIR so that the parent (any parent really) that
do file or dir-accesses knows that and can do the refresh. If no refresh
is needed by the parent, MENU_OK is returned.

Somewhat biggish commit this close to 1.3, but we need to sort out this
refresh-after-usb-connected business.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1948 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 12:32:52 +00:00
Justin Heiner
0a3589d129 OK, a (hopefully) successful attempt at getting rid of the yellows that I created by removing the other yellows
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1938 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 02:45:39 +00:00
Justin Heiner
edf6b80547 Forgot to #ifdef something
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1937 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 02:26:22 +00:00
Justin Heiner
2630245cb9 Added NSauzede's patch to detect USB while in a Menu. It also adds the USB icon to the player while in USB mode.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1935 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 02:17:00 +00:00
Daniel Stenberg
a8e89fd693 when we want to stop the scroll and clear the screen, it is a lot better
to first pause the scroll (stop puts back text on screen) and then clear
the screen.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1931 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 21:45:22 +00:00
Markus Braun
5e4c1d2ad8 enabled status bar in menus on recorders
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1822 a1c6a512-1295-4272-9138-f99709370657
2002-08-20 19:37:00 +00:00
Björn Stenberg
71f71ef837 Removed warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1667 a1c6a512-1295-4272-9138-f99709370657
2002-08-11 09:20:53 +00:00
Björn Stenberg
cd225736f9 First version of loadable fonts patch by Alex Gitelman
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1666 a1c6a512-1295-4272-9138-f99709370657
2002-08-11 09:17:47 +00:00
Björn Stenberg
cbc717941d Added key repeat for up/down on recorder
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1660 a1c6a512-1295-4272-9138-f99709370657
2002-08-10 09:04:55 +00:00
Daniel Stenberg
7cdf5c8cab player sim uses big font now, adjust the cursor routine
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1634 a1c6a512-1295-4272-9138-f99709370657
2002-08-09 09:13:00 +00:00
Linus Nielsen Feltzing
8fa021785b Scrolling menus by Justin Heiner
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1515 a1c6a512-1295-4272-9138-f99709370657
2002-08-02 07:59:25 +00:00
Linus Nielsen Feltzing
a552f4c99d Menus now also exits with F1 on recorder
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1468 a1c6a512-1295-4272-9138-f99709370657
2002-07-27 19:53:26 +00:00
Daniel Stenberg
c4be1ee9f9 simulated player text lines are moved down 8 pixels to make room for icons
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1079 a1c6a512-1295-4272-9138-f99709370657
2002-06-19 13:00:14 +00:00
Robert Hak
4164f58471 increased lines on menu display
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1021 a1c6a512-1295-4272-9138-f99709370657
2002-06-16 23:27:58 +00:00
Daniel Stenberg
e35f8eb603 made the player simulator get a "nice" cursor too!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1009 a1c6a512-1295-4272-9138-f99709370657
2002-06-15 11:39:36 +00:00
Daniel Stenberg
698ebc8412 hehe, we better clear at y*8 not y*6 ;-)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@997 a1c6a512-1295-4272-9138-f99709370657
2002-06-14 09:10:36 +00:00
Daniel Stenberg
17f8390c44 the cursor is now only 4 pixels wide
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@995 a1c6a512-1295-4272-9138-f99709370657
2002-06-14 09:03:08 +00:00
Daniel Stenberg
bf603f98cb made to use the new cursor bitmap on the recorder, so put_cursorxy() is
now a better way to position the cursor


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@993 a1c6a512-1295-4272-9138-f99709370657
2002-06-14 08:47:44 +00:00
Björn Stenberg
9314a68db6 Replaced - cursor with more suitable char for player
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@848 a1c6a512-1295-4272-9138-f99709370657
2002-05-31 09:04:51 +00:00
Robert Hak
c501ac7be2 corrected the curson not being drawn for the recorder
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@814 a1c6a512-1295-4272-9138-f99709370657
2002-05-30 08:06:42 +00:00
Björn Stenberg
4caebab366 Fixed draw bug. Removed wrapping.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@796 a1c6a512-1295-4272-9138-f99709370657
2002-05-29 14:25:06 +00:00
Björn Stenberg
60fad547e0 MENU exits menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@791 a1c6a512-1295-4272-9138-f99709370657
2002-05-29 12:28:08 +00:00
Björn Stenberg
f76cee7943 Menu now supports scrolling
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@769 a1c6a512-1295-4272-9138-f99709370657
2002-05-28 15:35:33 +00:00
Björn Stenberg
856a13a2d2 Adapted to modified button_get() call
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@760 a1c6a512-1295-4272-9138-f99709370657
2002-05-28 12:10:12 +00:00
Björn Stenberg
2ac057241a Added support for nested menus
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@707 a1c6a512-1295-4272-9138-f99709370657
2002-05-26 17:03:17 +00:00
Björn Stenberg
1c21296a5a Cut away some single-use functions
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@673 a1c6a512-1295-4272-9138-f99709370657
2002-05-23 14:11:42 +00:00
Björn Stenberg
c42644d2f4 Removed cursor flicker
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@648 a1c6a512-1295-4272-9138-f99709370657
2002-05-21 15:04:23 +00:00
Björn Stenberg
b21a3bd240 Abstracted the menu interface
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@641 a1c6a512-1295-4272-9138-f99709370657
2002-05-21 14:25:45 +00:00
Robert Hak
b97a2f5e0d minor changes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@639 a1c6a512-1295-4272-9138-f99709370657
2002-05-21 08:48:44 +00:00
Robert Hak
dfba210850 minor changes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@638 a1c6a512-1295-4272-9138-f99709370657
2002-05-21 08:47:34 +00:00
Robert Hak
7ec9aa3bd8 made the logo display a true splash screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@631 a1c6a512-1295-4272-9138-f99709370657
2002-05-18 11:41:37 +00:00
Daniel Stenberg
1c0c861451 moved from the simulator dir
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@614 a1c6a512-1295-4272-9138-f99709370657
2002-05-17 12:22:24 +00:00