Commit graph

153 commits

Author SHA1 Message Date
Jens Arnold
178c565beb Stop/shutdown logic rework in browsers and menus. Recorder V1: Double-Off shutdown is now possible from menus and sub-browsers as well. Player, other targets which are always powered during charging: Attempted shutdown from menu with charger plugged now displays the charging splash.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13079 a1c6a512-1295-4272-9138-f99709370657
2007-04-09 13:39:37 +00:00
Jonathan Gordon
9e95e306cd fix yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13069 a1c6a512-1295-4272-9138-f99709370657
2007-04-08 06:15:34 +00:00
Jonathan Gordon
21b415df56 Give all menus using the old API a nice title and icons (except plugins)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13068 a1c6a512-1295-4272-9138-f99709370657
2007-04-08 05:52:47 +00:00
Jonathan Gordon
a053e58894 minor actions cleanup:
- CONTEXT_MAINMENU is not actually needed, use CONTEXT_TREE which does the same actions
- (gigabeat) use vol+/- in the lists to control volume (every list!) (FS#6982 in a better way)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13062 a1c6a512-1295-4272-9138-f99709370657
2007-04-08 01:33:01 +00:00
Peter D'Hoye
d2b305571e Check if a new version got installed after usb disconnect and ask if user wants to reboot. Causes disk spinup before showing the usb logo. Also fixes do_menu() not returning to root_menu after usb disconnect.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12972 a1c6a512-1295-4272-9138-f99709370657
2007-03-30 21:54:48 +00:00
Jonathan Gordon
91e726a1c1 Move all valid menu return codes to a single file (root_menu.h) so we don't need to rely on GO_TO_ROOT == MENU_ATTACHED_USB.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12937 a1c6a512-1295-4272-9138-f99709370657
2007-03-27 06:38:11 +00:00
Jonathan Gordon
1f5ee2a366 convert the xobox menu to the new API so it can be used as an example for plugin devs
Includes some fixes in the api to handle this.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12907 a1c6a512-1295-4272-9138-f99709370657
2007-03-25 14:31:56 +00:00
Jonathan Gordon
5b61ebe84e Remove buffer overflow in solatiare menu
Make the old api -> new api wrapper in the menu safer.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12831 a1c6a512-1295-4272-9138-f99709370657
2007-03-18 11:01:23 +00:00
Jonathan Gordon
e54d8e1388 Remove the exit_value variable.. set the MENU_FUNC_CHECK_RETVAL fla and
return 1 if you want your funciton to quit the menus.
save settings after clearing the background so it persists


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12827 a1c6a512-1295-4272-9138-f99709370657
2007-03-18 07:03:43 +00:00
Jonathan Gordon
b5e587c081 Fix improper shift and mask order causing FS#6842
Set start_selected if exiting do_menu() early from more places


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12826 a1c6a512-1295-4272-9138-f99709370657
2007-03-18 06:31:33 +00:00
Jonathan Gordon
3d39c4de28 Fix it dropping back to the file browser.
Fix yellow


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12823 a1c6a512-1295-4272-9138-f99709370657
2007-03-17 14:16:11 +00:00
Jonathan Gordon
208136d1ea Reload the menu if do_menu() is called while another menu is running
(fixes crashing coming out of rec settings from fm menu)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12822 a1c6a512-1295-4272-9138-f99709370657
2007-03-17 14:10:51 +00:00
Jonathan Gordon
daf66940b1 Unify the way functions are called from menus.
Optionally, the functions return value can be checked for a value to 
tell the menu to quit.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12821 a1c6a512-1295-4272-9138-f99709370657
2007-03-17 12:33:34 +00:00
Jonathan Gordon
b1a626949e put action_signalscreenchange(); in before exiting do_menu(), fixes
FS#6829


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12774 a1c6a512-1295-4272-9138-f99709370657
2007-03-15 05:40:18 +00:00
Jonathan Gordon
5dffaf74f5 This one should not have been "fixed"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12773 a1c6a512-1295-4272-9138-f99709370657
2007-03-15 05:09:18 +00:00
Jonathan Gordon
b35c1d8d35 Change anywhere where do_menu()'s return value was checked and expected
a bool to appear the same as the old API. Possibly fixes some bugs, but 
doubtful.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12772 a1c6a512-1295-4272-9138-f99709370657
2007-03-15 04:42:10 +00:00
Jens Arnold
b1646abc18 Fix 64 bit warnings for real.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12683 a1c6a512-1295-4272-9138-f99709370657
2007-03-08 06:30:15 +00:00
Jonathan Gordon
7cb46f2f3e Really fix the yellow this time
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12682 a1c6a512-1295-4272-9138-f99709370657
2007-03-08 04:20:28 +00:00
Jonathan Gordon
fe3fa144c6 fix yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12681 a1c6a512-1295-4272-9138-f99709370657
2007-03-08 00:51:20 +00:00
Jonathan Gordon
1005195cb6 dont crash if play is pressed in menus using the old api
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12671 a1c6a512-1295-4272-9138-f99709370657
2007-03-07 13:24:29 +00:00
Jonathan Gordon
3452146217 Make the old menu aPI use the new API. Both are avialable to core and
rocks, but use the new API unless you absolutly have to use the old one 
(and file a FS bug if you do)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12670 a1c6a512-1295-4272-9138-f99709370657
2007-03-07 13:00:46 +00:00
Jonathan Gordon
43b2d091ba Fix the various bugs associated with pressing MENU to move in and out of
the Rockbox Menu


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12666 a1c6a512-1295-4272-9138-f99709370657
2007-03-07 10:13:07 +00:00
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