diff options
author | Kevin Ferrare <kevin@rockbox.org> | 2005-10-31 18:38:48 +0000 |
---|---|---|
committer | Kevin Ferrare <kevin@rockbox.org> | 2005-10-31 18:38:48 +0000 |
commit | b83dc3861e5552a802767f37cb97d6b41c9f01cc (patch) | |
tree | dcfe714d3aa403127617e7668deacb1acc795e6a /apps | |
parent | 65fe5f144d939533e29f0e07b99915a7d997d448 (diff) | |
download | rockbox-b83dc3861e5552a802767f37cb97d6b41c9f01cc.tar.gz rockbox-b83dc3861e5552a802767f37cb97d6b41c9f01cc.zip |
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 ! )
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7698 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menu.c | 12 | ||||
-rw-r--r-- | apps/menu.h | 7 | ||||
-rw-r--r-- | apps/onplay.c | 8 | ||||
-rw-r--r-- | apps/tree.c | 6 | ||||
-rw-r--r-- | apps/tree.h | 3 |
5 files changed, 28 insertions, 8 deletions
diff --git a/apps/menu.c b/apps/menu.c index 4c394bc578..90a3c89d75 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -43,7 +43,6 @@ | |||
43 | 43 | ||
44 | #ifdef HAVE_LCD_BITMAP | 44 | #ifdef HAVE_LCD_BITMAP |
45 | #include "icons.h" | 45 | #include "icons.h" |
46 | //#include "widgets.h" | ||
47 | #endif | 46 | #endif |
48 | 47 | ||
49 | /* gui api */ | 48 | /* gui api */ |
@@ -157,7 +156,12 @@ int menu_show(int m) | |||
157 | #ifdef MENU_RC_ENTER | 156 | #ifdef MENU_RC_ENTER |
158 | case MENU_RC_ENTER: | 157 | case MENU_RC_ENTER: |
159 | #endif | 158 | #endif |
159 | #ifdef MENU_RC_ENTER2 | ||
160 | case MENU_RC_ENTER2: | ||
161 | #endif | ||
160 | return gui_synclist_get_sel_pos(&(menus[m].synclist)); | 162 | return gui_synclist_get_sel_pos(&(menus[m].synclist)); |
163 | |||
164 | |||
161 | case MENU_EXIT: | 165 | case MENU_EXIT: |
162 | #ifdef MENU_EXIT2 | 166 | #ifdef MENU_EXIT2 |
163 | case MENU_EXIT2: | 167 | case MENU_EXIT2: |
@@ -168,7 +172,10 @@ int menu_show(int m) | |||
168 | #ifdef MENU_RC_EXIT | 172 | #ifdef MENU_RC_EXIT |
169 | case MENU_RC_EXIT: | 173 | case MENU_RC_EXIT: |
170 | #endif | 174 | #endif |
171 | lcd_stop_scroll(); | 175 | #ifdef MENU_RC_EXIT_MENU |
176 | case MENU_RC_EXIT_MENU: | ||
177 | #endif | ||
178 | //lcd_stop_scroll(); | ||
172 | exit = true; | 179 | exit = true; |
173 | break; | 180 | break; |
174 | 181 | ||
@@ -177,6 +184,7 @@ int menu_show(int m) | |||
177 | return MENU_ATTACHED_USB; | 184 | return MENU_ATTACHED_USB; |
178 | break; | 185 | break; |
179 | } | 186 | } |
187 | gui_syncstatusbar_draw(&statusbars, false); | ||
180 | } | 188 | } |
181 | return MENU_SELECTED_EXIT; | 189 | return MENU_SELECTED_EXIT; |
182 | } | 190 | } |
diff --git a/apps/menu.h b/apps/menu.h index afc65a5b9b..08cd70fcda 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -31,8 +31,11 @@ | |||
31 | #define MENU_ENTER BUTTON_RIGHT | 31 | #define MENU_ENTER BUTTON_RIGHT |
32 | #define MENU_ENTER2 BUTTON_SELECT | 32 | #define MENU_ENTER2 BUTTON_SELECT |
33 | 33 | ||
34 | #define MENU_RC_EXIT BUTTON_RC_STOP | 34 | #define MENU_RC_EXIT BUTTON_RC_STOP |
35 | #define MENU_RC_ENTER BUTTON_RC_ON | 35 | #define MENU_RC_EXIT_MENU BUTTON_RC_MODE |
36 | #define MENU_RC_ENTER BUTTON_RC_ON | ||
37 | #define MENU_RC_ENTER2 BUTTON_RC_MENU | ||
38 | |||
36 | 39 | ||
37 | #elif CONFIG_KEYPAD == RECORDER_PAD | 40 | #elif CONFIG_KEYPAD == RECORDER_PAD |
38 | 41 | ||
diff --git a/apps/onplay.c b/apps/onplay.c index 76bc72a048..df23c42443 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2002 Björn Stenberg | 10 | * Copyright (C) 2002 Bj�n Stenberg |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * 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) | |||
510 | { | 510 | { |
511 | (void)menu; | 511 | (void)menu; |
512 | 512 | ||
513 | if (key == MENU_EXIT_MENU) | 513 | if (key == MENU_EXIT_MENU |
514 | #ifdef MENU_RC_EXIT_MENU | ||
515 | || key == MENU_RC_EXIT_MENU | ||
516 | #endif | ||
517 | ) | ||
514 | exit_to_main = true; | 518 | exit_to_main = true; |
515 | 519 | ||
516 | return key; | 520 | return key; |
diff --git a/apps/tree.c b/apps/tree.c index 46981ed452..4134c942d8 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -683,7 +683,11 @@ static bool dirbrowse(void) | |||
683 | case TREE_RC_MENU: | 683 | case TREE_RC_MENU: |
684 | #endif | 684 | #endif |
685 | #ifdef TREE_MENU_PRE | 685 | #ifdef TREE_MENU_PRE |
686 | if (lastbutton != TREE_MENU_PRE) | 686 | if (lastbutton != TREE_MENU_PRE |
687 | #ifdef TREE_RC_MENU_PRE | ||
688 | && lastbutton != TREE_RC_MENU_PRE | ||
689 | #endif | ||
690 | ) | ||
687 | break; | 691 | break; |
688 | #endif | 692 | #endif |
689 | /* don't enter menu from plugin browser */ | 693 | /* don't enter menu from plugin browser */ |
diff --git a/apps/tree.h b/apps/tree.h index 00d22c4d24..ae2cc0bc00 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -53,7 +53,8 @@ | |||
53 | #define TREE_RC_EXIT BUTTON_RC_STOP | 53 | #define TREE_RC_EXIT BUTTON_RC_STOP |
54 | #define TREE_RC_RUN (BUTTON_RC_MENU | BUTTON_REL) | 54 | #define TREE_RC_RUN (BUTTON_RC_MENU | BUTTON_REL) |
55 | #define TREE_RC_RUN_PRE BUTTON_RC_MENU | 55 | #define TREE_RC_RUN_PRE BUTTON_RC_MENU |
56 | #define TREE_RC_MENU BUTTON_RC_MODE | 56 | #define TREE_RC_MENU ( BUTTON_RC_MODE | BUTTON_REL) |
57 | #define TREE_RC_MENU_PRE BUTTON_RC_MODE | ||
57 | #define TREE_RC_WPS (BUTTON_RC_ON | BUTTON_REL) | 58 | #define TREE_RC_WPS (BUTTON_RC_ON | BUTTON_REL) |
58 | #define TREE_RC_WPS_PRE BUTTON_RC_ON | 59 | #define TREE_RC_WPS_PRE BUTTON_RC_ON |
59 | #define TREE_RC_CONTEXT (BUTTON_RC_ON | BUTTON_REPEAT) | 60 | #define TREE_RC_CONTEXT (BUTTON_RC_ON | BUTTON_REPEAT) |