len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bring back the Battery:Charging splash if you try turning off certain

Browse source 
targets with AC connected


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10628 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2006-08-17 08:57:38 +00:00
parent b80266c456
commit 30f237303b
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/keymaps/keymap-h1x0_h3x0.c
View file

@ -72,7 +72,7 @@ const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
{ ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_ON }, { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_ON },
{ ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_ON }, { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_ON },
{ ACTION_WPS_STOP, BUTTON_OFF, BUTTON_NONE }, { ACTION_WPS_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF },
{ ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
{ ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REL, BUTTON_UP }, { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REL, BUTTON_UP },
@ -100,8 +100,9 @@ const struct button_mapping button_context_listtree[] = {
}; /* button_context_listtree */ }; /* button_context_listtree */
const struct button_mapping button_context_tree[] = { const struct button_mapping button_context_tree[] = {
{ ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON },
{ ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF },
{ ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
}; /* button_context_listtree */ }; /* button_context_listtree */

18
apps/tree.c
View file

@ -662,17 +662,19 @@ static bool dirbrowse(void)
} }
#endif #endif
} }
break;
/* ??
#if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) #if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING)
case TREE_OFF | BUTTON_REPEAT: {
if (charger_inserted()) { static int last_off = 0;
charging_splash(); if (current_tick - last_off < 50) {
restore = true; if (charger_inserted()) {
charging_splash();
restore = true;
}
} }
break; last_off = current_tick;
}
#endif #endif
*/ break; /* case ACTION_TREE_STOP: */
case ACTION_STD_MENU: case ACTION_STD_MENU:
/* don't enter menu from plugin browser */ /* don't enter menu from plugin browser */
if (*tc.dirfilter < NUM_FILTER_MODES) if (*tc.dirfilter < NUM_FILTER_MODES)