summaryrefslogtreecommitdiff
path: root/apps/main_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/main_menu.c')
-rw-r--r--apps/main_menu.c40
1 files changed, 7 insertions, 33 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c
index bce6e20976..04527f9329 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -24,7 +24,7 @@
24#include "tree.h" 24#include "tree.h"
25#include "lcd.h" 25#include "lcd.h"
26#include "font.h" 26#include "font.h"
27#include "button.h" 27#include "action.h"
28#include "kernel.h" 28#include "kernel.h"
29#include "main_menu.h" 29#include "main_menu.h"
30#include "debug_menu.h" 30#include "debug_menu.h"
@@ -237,48 +237,22 @@ bool show_info(void)
237#endif 237#endif
238 238
239 /* Wait for a key to be pushed */ 239 /* Wait for a key to be pushed */
240 key = button_get_w_tmo(HZ*5); 240 key = get_action(CONTEXT_MAINMENU,HZ*5);
241 switch(key) { 241 switch(key) {
242 242
243 case SETTINGS_OK: 243 case ACTION_STD_CANCEL:
244#ifdef SETTINGS_RC_OK
245 case SETTINGS_RC_OK:
246#endif
247#ifdef SETTINGS_OK2
248 case SETTINGS_OK2:
249#endif
250#ifdef SETTINGS_RC_OK2
251 case SETTINGS_RC_OK2:
252#endif
253#ifdef SETTINGS_RC_CANCEL
254 case SETTINGS_RC_CANCEL:
255#endif
256 case SETTINGS_CANCEL:
257 done = true; 244 done = true;
258 break; 245 break;
259 246
260#ifdef HAVE_LCD_CHARCELLS 247#ifdef HAVE_LCD_CHARCELLS
261 case SETTINGS_INC: 248 case ACTION_STD_NEXT:
262 case SETTINGS_DEC: 249 case ACTION_STD_PREV:
263#ifdef SETTINGS_RC_INC
264 case SETTINGS_RC_INC:
265#endif
266#ifdef SETTINGS_RC_DEC
267 case SETTINGS_RC_DEC:
268#endif
269 page = (page == 0) ? 1 : 0; 250 page = (page == 0) ? 1 : 0;
270 break; 251 break;
271#endif 252#endif
272 253
273#ifndef SIMULATOR 254#ifndef SIMULATOR
274#ifdef SETTINGS_RC_ACCEPT 255 case ACTION_STD_OK:
275 case SETTINGS_RC_ACCEPT:
276#endif
277#ifdef SETTINGS_ACCEPT
278 case SETTINGS_ACCEPT:
279#else
280 case SETTINGS_INC: /* Ondio */
281#endif
282 gui_syncsplash(0, true, str(LANG_DIRCACHE_BUILDING)); 256 gui_syncsplash(0, true, str(LANG_DIRCACHE_BUILDING));
283 fat_recalc_free(IF_MV(0)); 257 fat_recalc_free(IF_MV(0));
284#ifdef HAVE_MULTIVOLUME 258#ifdef HAVE_MULTIVOLUME
@@ -295,7 +269,7 @@ bool show_info(void)
295 break; 269 break;
296 } 270 }
297 } 271 }
298 272 action_signalscreenchange();
299 return false; 273 return false;
300} 274}
301 275