Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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 ! )

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7698 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Kevin Ferrare 2005-10-31 18:38:48 +00:00
parent 65fe5f144d
commit b83dc3861e
5 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/menu.c
View file

@ -43,7 +43,6 @@
#ifdef HAVE_LCD_BITMAP
#include "icons.h"
//#include "widgets.h"
#endif
/* gui api */
@ -156,8 +155,13 @@ int menu_show(int m)
#endif
#ifdef MENU_RC_ENTER
case MENU_RC_ENTER:
#endif
#ifdef MENU_RC_ENTER2
case MENU_RC_ENTER2:
#endif
return gui_synclist_get_sel_pos(&(menus[m].synclist));
case MENU_EXIT:
#ifdef MENU_EXIT2
case MENU_EXIT2:
@ -168,7 +172,10 @@ int menu_show(int m)
#ifdef MENU_RC_EXIT
case MENU_RC_EXIT:
#endif
lcd_stop_scroll();
#ifdef MENU_RC_EXIT_MENU
case MENU_RC_EXIT_MENU:
#endif
//lcd_stop_scroll();
exit = true;
break;
@ -177,6 +184,7 @@ int menu_show(int m)
return MENU_ATTACHED_USB;
break;
}
gui_syncstatusbar_draw(&statusbars, false);
}
return MENU_SELECTED_EXIT;
}

7
apps/menu.h
View file

@ -31,8 +31,11 @@
#define MENU_ENTER BUTTON_RIGHT
#define MENU_ENTER2 BUTTON_SELECT
#define MENU_RC_EXIT BUTTON_RC_STOP
#define MENU_RC_ENTER BUTTON_RC_ON
#define MENU_RC_EXIT BUTTON_RC_STOP
#define MENU_RC_EXIT_MENU BUTTON_RC_MODE
#define MENU_RC_ENTER BUTTON_RC_ON
#define MENU_RC_ENTER2 BUTTON_RC_MENU
#elif CONFIG_KEYPAD == RECORDER_PAD

8
apps/onplay.c
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2002 Björn Stenberg
* Copyright (C) 2002 Bj<EFBFBD>n Stenberg
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
@ -510,7 +510,11 @@ static int onplay_callback(int key, int menu)
{
(void)menu;
if (key == MENU_EXIT_MENU)
if (key == MENU_EXIT_MENU
#ifdef MENU_RC_EXIT_MENU
|| key == MENU_RC_EXIT_MENU
#endif
)
exit_to_main = true;
return key;

6
apps/tree.c
View file

@ -683,7 +683,11 @@ static bool dirbrowse(void)
case TREE_RC_MENU:
#endif
#ifdef TREE_MENU_PRE
if (lastbutton != TREE_MENU_PRE)
if (lastbutton != TREE_MENU_PRE
#ifdef TREE_RC_MENU_PRE
&& lastbutton != TREE_RC_MENU_PRE
#endif
)
break;
#endif
/* don't enter menu from plugin browser */

3
apps/tree.h
View file

@ -53,7 +53,8 @@
#define TREE_RC_EXIT BUTTON_RC_STOP
#define TREE_RC_RUN (BUTTON_RC_MENU | BUTTON_REL)
#define TREE_RC_RUN_PRE BUTTON_RC_MENU
#define TREE_RC_MENU BUTTON_RC_MODE
#define TREE_RC_MENU ( BUTTON_RC_MODE | BUTTON_REL)
#define TREE_RC_MENU_PRE BUTTON_RC_MODE
#define TREE_RC_WPS (BUTTON_RC_ON | BUTTON_REL)
#define TREE_RC_WPS_PRE BUTTON_RC_ON
#define TREE_RC_CONTEXT (BUTTON_RC_ON | BUTTON_REPEAT)