summaryrefslogtreecommitdiffstats
path: root/apps/bookmark.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2006-08-21 07:03:15 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2006-08-21 07:03:15 +0000
commitd12f81ddd4a0cdd76d08540b70068b3cb2c985ed (patch)
treeb821bfb025155f3c631920333549543622db3548 /apps/bookmark.c
parentc8e69dfb71d936b4bc5e18f6246ac126c629f772 (diff)
downloadrockbox-d12f81ddd4a0cdd76d08540b70068b3cb2c985ed.tar.gz
rockbox-d12f81ddd4a0cdd76d08540b70068b3cb2c985ed.tar.bz2
rockbox-d12f81ddd4a0cdd76d08540b70068b3cb2c985ed.zip
fixed the settings action context, time/eq/colour chooser/dbug screens
should all work correctly again git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10670 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/bookmark.c')
-rw-r--r--apps/bookmark.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c
index 8c30ec1466..412ecdea6e 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -571,7 +571,7 @@ static char* select_bookmark(const char* bookmark_file_name)
#endif
bookmark_count = get_bookmark_count(bookmark_file_name);
-
+ action_signalscreenchange();
while(true)
{
if(bookmark_id < 0)
@@ -612,7 +612,7 @@ static char* select_bookmark(const char* bookmark_file_name)
key = get_action(CONTEXT_BOOKMARKSCREEN,TIMEOUT_BLOCK);
switch(key)
{
- case ACTION_STD_OK:
+ case ACTION_BMS_SELECT:
/* User wants to use this bookmark */
#ifdef HAVE_LCD_BITMAP
if (global_settings.statusbar)
@@ -629,7 +629,7 @@ static char* select_bookmark(const char* bookmark_file_name)
action_signalscreenchange();
return bookmark;
- case ACTION_BMARK_DELETE:
+ case ACTION_BMS_DELETE:
/* User wants to delete this bookmark */
delete_bookmark(bookmark_file_name, bookmark_id);
bookmark_id_prev=-2;
@@ -638,15 +638,17 @@ static char* select_bookmark(const char* bookmark_file_name)
bookmark_id = bookmark_count -1;
break;
- case ACTION_SETTINGS_DEC:
+ case ACTION_STD_PREV:
+ case ACTION_STD_PREVREPEAT:
bookmark_id--;
break;
- case ACTION_SETTINGS_INC:
+ case ACTION_STD_NEXT:
+ case ACTION_STD_NEXTREPEAT:
bookmark_id++;
break;
- case ACTION_STD_CANCEL:
+ case ACTION_BMS_EXIT:
#ifdef HAVE_LCD_BITMAP
FOR_NB_SCREENS(i)
screens[i].setmargins(x, y);