summaryrefslogtreecommitdiff
path: root/apps/menus/main_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/menus/main_menu.c')
-rw-r--r--apps/menus/main_menu.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 8764101f73..139667cef4 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -111,7 +111,7 @@ MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config,
111/* INFO MENU */ 111/* INFO MENU */
112 112
113 113
114static bool show_credits(void) 114static int show_credits(void)
115{ 115{
116 char credits[MAX_PATH] = { '\0' }; 116 char credits[MAX_PATH] = { '\0' };
117 snprintf(credits, MAX_PATH, "%s/credits.rock", VIEWERS_DIR); 117 snprintf(credits, MAX_PATH, "%s/credits.rock", VIEWERS_DIR);
@@ -122,7 +122,7 @@ static bool show_credits(void)
122 while (IS_SYSEVENT(get_action(CONTEXT_STD, TIMEOUT_BLOCK))) 122 while (IS_SYSEVENT(get_action(CONTEXT_STD, TIMEOUT_BLOCK)))
123 ; 123 ;
124 } 124 }
125 return false; 125 return 0;
126} 126}
127 127
128#ifdef HAVE_LCD_CHARCELLS 128#ifdef HAVE_LCD_CHARCELLS
@@ -357,7 +357,7 @@ static int info_action_callback(int action, struct gui_synclist *lists)
357 } 357 }
358 return action; 358 return action;
359} 359}
360static bool show_info(void) 360static int show_info(void)
361{ 361{
362 struct info_data data = {.new_data = true }; 362 struct info_data data = {.new_data = true };
363 struct simplelist_info info; 363 struct simplelist_info info;
@@ -369,10 +369,12 @@ static bool show_info(void)
369 if(global_settings.talk_menu) 369 if(global_settings.talk_menu)
370 info.get_talk = info_speak_item; 370 info.get_talk = info_speak_item;
371 info.action_callback = info_action_callback; 371 info.action_callback = info_action_callback;
372 return simplelist_show_list(&info); 372 return (simplelist_show_list(&info)) ? 1 : 0;
373} 373}
374
375
374MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO), 376MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO),
375 (menu_function)show_info, NULL, NULL, Icon_NOICON); 377 show_info, NULL, NULL, Icon_NOICON);
376 378
377#if CONFIG_RTC 379#if CONFIG_RTC
378int time_screen(void* ignored); 380int time_screen(void* ignored);
@@ -381,11 +383,13 @@ MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU),
381#endif 383#endif
382 384
383MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), 385MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS),
384 (menu_function)show_credits, NULL, NULL, Icon_NOICON); 386 show_credits, NULL, NULL, Icon_NOICON);
387
385MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), 388MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME),
386 (menu_function)view_runtime, NULL, NULL, Icon_NOICON); 389 view_runtime, NULL, NULL, Icon_NOICON);
390
387MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), 391MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG),
388 (menu_function)debug_menu, NULL, NULL, Icon_NOICON); 392 debug_menu, NULL, NULL, Icon_NOICON);
389 393
390MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, 394MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu,
391 &show_info_item, &show_credits_item, 395 &show_info_item, &show_credits_item,