? actions.patch ? fixed_settings.patch ? h100 ? h300 ? ipod ? non_lcd_backlight.patch ? pitchscreen.patch ? recorder ? startup_volume.patch ? title.patch ? tools/codepages ? tools/ipod_fw ? tools/mkboot ? tools/rdf2binary ? tools/uclpack Index: apps/action.h =================================================================== RCS file: /cvsroot/rockbox/apps/action.h,v retrieving revision 1.6 diff -u -r1.6 action.h --- apps/action.h 16 Aug 2006 13:25:44 -0000 1.6 +++ apps/action.h 17 Aug 2006 04:53:34 -0000 @@ -40,11 +40,18 @@ CONTEXT_ID3DB = 5, /* Add new contexts here, no need to explicitly define a value for them */ CONTEXT_LIST, - CONTEXT_SETTINGS, /* options style settings, like from menus */ - CONTEXT_SETTINGSGRAPHICAL, /* screens like eq config and colour chooser */ + CONTEXT_SETTINGS, /* regular setting screens (and debug screens) */ + /* bellow are setting screens which may need to redefine the standard + setting screen keys, targets should return the CONTEXT_SETTINGS + keymap unless they are not adequate for the screen + NOTE: uses ACTION_STD_[NEXT|PREV] so make sure they are there also */ + CONTEXT_SETTINGS_EQ, /* requires all the ACTION_SETTING_* */ + CONTEXT_SETTINGS_COLOURCHOOSER, /* requires all the ACTION_SETTING_* */ + CONTEXT_SETTINGS_TIME, /* requires all the ACTION_SETTING_* */ + CONTEXT_SETTINGS_BOOKMARKS, + CONTEXT_SETTINGS_ALARM, CONTEXT_YESNOSCREEN, /*NOTE: make sure your target has this and ACTION_YESNO_ACCEPT */ - CONTEXT_BOOKMARKSCREEN, /*NOTE: requires the action_setting_* mappings also */ CONTEXT_QUICKSCREEN, /* uses ACTION_QS_ defines below */ CONTEXT_PITCHSCREEN, /* uses ACTION_PS_ defines below */ }; @@ -116,15 +123,17 @@ /* settings */ ACTION_SETTINGS_INC, ACTION_SETTINGS_INCREPEAT, + ACTION_SETTINGS_INCBIGSTEP, ACTION_SETTINGS_DEC, ACTION_SETTINGS_DECREPEAT, + ACTION_SETTINGS_DECBIGSTEP, + ACTION_SETTINGS_RESET, + ACTION_SETTINGS_SELECT, + ACTION_SETTINGS_EXIT, /* yesno screen */ ACTION_YESNO_ACCEPT, - - /* bookmark screen */ - ACTION_BMARK_DELETE, - + /* quickscreen */ ACTION_QS_LEFT, ACTION_QS_RIGHT, Index: apps/alarm_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/alarm_menu.c,v retrieving revision 1.13 diff -u -r1.13 alarm_menu.c --- apps/alarm_menu.c 15 Aug 2006 12:49:22 -0000 1.13 +++ apps/alarm_menu.c 17 Aug 2006 04:53:34 -0000 @@ -85,7 +85,7 @@ screens[i].puts(0, 1, buf); gui_textarea_update(&screens[i]); } - button = get_action(CONTEXT_SETTINGS,HZ); + button = get_action(CONTEXT_SETTINGS_ALARM,HZ); switch(button) { case ACTION_STD_OK: Index: apps/bookmark.c =================================================================== RCS file: /cvsroot/rockbox/apps/bookmark.c,v retrieving revision 1.51 diff -u -r1.51 bookmark.c --- apps/bookmark.c 15 Aug 2006 12:27:04 -0000 1.51 +++ apps/bookmark.c 17 Aug 2006 04:53:35 -0000 @@ -458,11 +458,12 @@ while(!done) { /* Wait for a key to be pushed */ - key = get_action(CONTEXT_SETTINGS,TIMEOUT_BLOCK); + key = get_action(CONTEXT_SETTINGS_BOOKMARKS,TIMEOUT_BLOCK); switch(key) { #ifdef HAVE_LCD_BITMAP case ACTION_STD_NEXT: + case ACTION_STD_NEXTREPEAT: return bookmark_load(global_bookmark_file_name, false); #endif case ACTION_STD_OK: @@ -577,7 +578,7 @@ #endif bookmark_count = get_bookmark_count(bookmark_file_name); - + action_signalscreenchange(); while(true) { if(bookmark_id < 0) @@ -615,10 +616,10 @@ } /* waiting for the user to click a button */ - key = get_action(CONTEXT_BOOKMARKSCREEN,TIMEOUT_BLOCK); + key = get_action(CONTEXT_SETTINGS_BOOKMARKS,TIMEOUT_BLOCK); switch(key) { - case ACTION_STD_OK: + case ACTION_SETTINGS_SELECT: /* User wants to use this bookmark */ #ifdef HAVE_LCD_BITMAP if (global_settings.statusbar) @@ -635,7 +636,7 @@ action_signalscreenchange(); return bookmark; - case ACTION_BMARK_DELETE: + case ACTION_SETTINGS_RESET: /* User wants to delete this bookmark */ delete_bookmark(bookmark_file_name, bookmark_id); bookmark_id_prev=-2; @@ -652,7 +653,7 @@ bookmark_id++; break; - case ACTION_STD_CANCEL: + case ACTION_SETTINGS_EXIT: #ifdef HAVE_LCD_BITMAP FOR_NB_SCREENS(i) screens[i].setmargins(x, y); Index: apps/eq_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/eq_menu.c,v retrieving revision 1.23 diff -u -r1.23 eq_menu.c --- apps/eq_menu.c 15 Aug 2006 12:27:04 -0000 1.23 +++ apps/eq_menu.c 17 Aug 2006 04:53:39 -0000 @@ -619,7 +619,7 @@ screens[i].update(); } - button = get_action(CONTEXT_SETTINGSGRAPHICAL,TIMEOUT_BLOCK); + button = get_action(CONTEXT_SETTINGS_EQ,TIMEOUT_BLOCK); switch (button) { case ACTION_SETTINGS_DEC: @@ -638,23 +638,19 @@ *(setting) = max; break; -#ifdef EQ_BTN_MODIFIER - case EQ_BTN_MODIFIER | EQ_BTN_INCREMENT: - case EQ_BTN_MODIFIER | EQ_BTN_INCREMENT | BUTTON_REPEAT: + case ACTION_SETTINGS_INCBIGSTEP: *(setting) += fast_step; has_changed = true; if (*(setting) > max) *(setting) = max; break; - case EQ_BTN_MODIFIER | EQ_BTN_DECREMENT: - case EQ_BTN_MODIFIER | EQ_BTN_DECREMENT | BUTTON_REPEAT: + case ACTION_SETTINGS_DECBIGSTEP: *(setting) -= fast_step; has_changed = true; if (*(setting) < min) *(setting) = min; break; -#endif case ACTION_STD_PREV: case ACTION_STD_PREVREPEAT: @@ -670,13 +666,13 @@ current_band = 0; /* wrap around */ break; - case ACTION_STD_OK: + case ACTION_SETTINGS_SELECT: mode++; if (mode > Q) mode = GAIN; /* wrap around */ break; - case ACTION_STD_CANCEL: + case ACTION_SETTINGS_EXIT: exit_request = true; result = false; break; Index: apps/screens.c =================================================================== RCS file: /cvsroot/rockbox/apps/screens.c,v retrieving revision 1.164 diff -u -r1.164 screens.c --- apps/screens.c 16 Aug 2006 14:14:16 -0000 1.164 +++ apps/screens.c 17 Aug 2006 04:53:42 -0000 @@ -916,7 +916,7 @@ say_time(cursorpos, tm); } - button = get_action(CONTEXT_SETTINGS,HZ/2); + button = get_action(CONTEXT_SETTINGS_TIME,HZ/2); switch ( button ) { case ACTION_STD_PREV: cursorpos = (cursorpos + 6 - 1) % 6; @@ -925,6 +925,7 @@ cursorpos = (cursorpos + 6 + 1) % 6; break; case ACTION_SETTINGS_INC: + case ACTION_SETTINGS_INCREPEAT: *valptr = (*valptr + steps - min + 1) % steps + min; if(*valptr == 0) @@ -932,6 +933,7 @@ say_time(cursorpos, tm); break; case ACTION_SETTINGS_DEC: + case ACTION_SETTINGS_DECREPEAT: *valptr = (*valptr + steps - min - 1) % steps + min; if(*valptr == 0) @@ -939,11 +941,11 @@ say_time(cursorpos, tm); break; - case ACTION_STD_OK: + case ACTION_SETTINGS_EXIT: done = true; break; - case ACTION_STD_CANCEL: + case ACTION_SETTINGS_RESET: done = true; tm->tm_year = -1; break; Index: apps/gui/color_picker.c =================================================================== RCS file: /cvsroot/rockbox/apps/gui/color_picker.c,v retrieving revision 1.11 diff -u -r1.11 color_picker.c --- apps/gui/color_picker.c 15 Aug 2006 12:27:05 -0000 1.11 +++ apps/gui/color_picker.c 17 Aug 2006 04:53:43 -0000 @@ -184,14 +184,16 @@ draw_screen(&screens[i], title, rgb_val, newcolor, slider); } - button = get_action(CONTEXT_SETTINGSGRAPHICAL,TIMEOUT_BLOCK); + button = get_action(CONTEXT_SETTINGS_COLOURCHOOSER,TIMEOUT_BLOCK); switch (button) { case ACTION_STD_PREV: + case ACTION_STD_PREVREPEAT: slider = (slider+2)%3; break; case ACTION_STD_NEXT: + case ACTION_STD_NEXTREPEAT: slider = (slider+1)%3; break; @@ -207,7 +209,7 @@ rgb_val[slider]--; break; - case ACTION_STD_OK: + case ACTION_SETTINGS_EXIT: if ((banned_color!=-1) && (banned_color == newcolor)) { gui_syncsplash(HZ*2,true,str(LANG_COLOR_UNACCEPTABLE)); @@ -217,7 +219,7 @@ exit = 1; break; - case ACTION_STD_CANCEL: + case ACTION_SETTINGS_RESET: exit = 1; break; Index: apps/keymaps/keymap-h1x0_h3x0.c =================================================================== RCS file: /cvsroot/rockbox/apps/keymaps/keymap-h1x0_h3x0.c,v retrieving revision 1.4 diff -u -r1.4 keymap-h1x0_h3x0.c --- apps/keymaps/keymap-h1x0_h3x0.c 16 Aug 2006 14:14:16 -0000 1.4 +++ apps/keymaps/keymap-h1x0_h3x0.c 17 Aug 2006 04:53:43 -0000 @@ -38,7 +38,7 @@ /* CONTEXT_CUSTOM's used in this file... CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) - +CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens */ @@ -100,8 +100,8 @@ }; /* button_context_listtree */ const struct button_mapping button_context_tree[] = { - { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, - { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, + { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, + { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_listtree */ @@ -116,7 +116,7 @@ { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_ON|BUTTON_RIGHT }, { ACTION_TREE_PGRIGHT, BUTTON_ON|BUTTON_RIGHT, BUTTON_RIGHT|BUTTON_REL }, { ACTION_TREE_PGRIGHT, BUTTON_ON|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; const struct button_mapping button_context_listtree_scroll_without_combo[] = { @@ -128,7 +128,7 @@ { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; const struct button_mapping button_context_settings[] = { @@ -136,13 +136,17 @@ { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE }, + { ACTION_SETTINGS_EXIT, BUTTON_OFF, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_settings */ -const struct button_mapping button_context_settingsgraphical[] = { +const struct button_mapping button_context_settings_right_is_inc[] = { { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, @@ -153,19 +157,39 @@ { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST -}; /* button_context_settingsgraphical */ +}; /* button_context_settings_right_is_inc */ + +const struct button_mapping button_context_settings_eq[] = { + { ACTION_SETTINGS_SELECT, BUTTON_SELECT, BUTTON_NONE }, + { ACTION_SETTINGS_EXIT, BUTTON_OFF, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), +}; /* button_context_settings_eq */ + +const struct button_mapping button_context_settings_colourchooser[] = { + { ACTION_SETTINGS_RESET, BUTTON_OFF, BUTTON_NONE }, + { ACTION_SETTINGS_EXIT, BUTTON_ON, BUTTON_NONE }, + { ACTION_SETTINGS_EXIT, BUTTON_SELECT, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), +}; /* button_context_settings_colourchooser */ const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, { ACTION_YESNO_ACCEPT, BUTTON_RC_ON, BUTTON_NONE }, LAST_ITEM_IN_LIST -}; /* button_context_settings_yesno */ +}; /* button_context_yesno */ + +const struct button_mapping button_context_settings_time[] = { + { ACTION_SETTINGS_EXIT, BUTTON_ON, BUTTON_NONE }, + { ACTION_SETTINGS_RESET, BUTTON_OFF, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), +}; /* button_context_settings_time */ const struct button_mapping button_context_bmark[] = { - { ACTION_BMARK_DELETE, BUTTON_REC, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL), -}; /* button_context_settings_bmark */ + { ACTION_SETTINGS_RESET, BUTTON_REC, BUTTON_NONE }, + { ACTION_SETTINGS_EXIT, BUTTON_OFF, BUTTON_NONE }, + { ACTION_SETTINGS_SELECT, BUTTON_SELECT, BUTTON_NONE }, + LAST_ITEM_IN_LIST, +}; /* button_context_bmark */ const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, @@ -361,8 +385,7 @@ return remote_button_context_listtree; - case CONTEXT_YESNOSCREEN: - case CONTEXT_BOOKMARKSCREEN: + case CONTEXT_YESNOSCREEN: ; /* fall out of the switch */ } return remote_button_context_std; @@ -387,19 +410,25 @@ if (global_settings.hold_lr_for_scroll_in_list) return button_context_listtree_scroll_without_combo; else return button_context_listtree_scroll_with_combo; - case CONTEXT_CUSTOM|1: - return button_context_tree; - case CONTEXT_SETTINGSGRAPHICAL: - return button_context_settingsgraphical; + case CONTEXT_CUSTOM|CONTEXT_TREE: + return button_context_tree; case CONTEXT_SETTINGS: return button_context_settings; + case CONTEXT_CUSTOM|CONTEXT_SETTINGS: + return button_context_settings_right_is_inc; + case CONTEXT_SETTINGS_TIME: + return button_context_settings_time; + case CONTEXT_SETTINGS_EQ: + return button_context_settings_eq; + case CONTEXT_SETTINGS_COLOURCHOOSER: + return button_context_settings_colourchooser; + case CONTEXT_SETTINGS_BOOKMARKS: + return button_context_bmark; case CONTEXT_YESNOSCREEN: return button_context_yesno; - case CONTEXT_BOOKMARKSCREEN: - return button_context_bmark; case CONTEXT_QUICKSCREEN: return button_context_quickscreen; case CONTEXT_PITCHSCREEN: