diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/enc_config.c | 4 | ||||
-rw-r--r-- | apps/menu.h | 7 | ||||
-rw-r--r-- | apps/menus/display_menu.c | 24 | ||||
-rw-r--r-- | apps/menus/eq_menu.c | 15 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 23 | ||||
-rw-r--r-- | apps/menus/playlist_menu.c | 8 | ||||
-rw-r--r-- | apps/menus/plugin_menu.c | 15 | ||||
-rw-r--r-- | apps/menus/radio_menu.c | 25 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 40 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 28 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 56 | ||||
-rw-r--r-- | apps/menus/time_menu.c | 8 | ||||
-rw-r--r-- | apps/onplay.c | 54 | ||||
-rw-r--r-- | apps/plugins/imageviewer/imageviewer.c | 4 | ||||
-rw-r--r-- | apps/plugins/lib/playback_control.c | 14 | ||||
-rw-r--r-- | apps/plugins/text_viewer/tv_menu.c | 61 | ||||
-rw-r--r-- | apps/radio/presets.c | 8 |
17 files changed, 191 insertions, 203 deletions
diff --git a/apps/enc_config.c b/apps/enc_config.c index 9d83bf7b19..b70ac03888 100644 --- a/apps/enc_config.c +++ b/apps/enc_config.c | |||
@@ -194,8 +194,8 @@ static bool mp3_enc_bitrate(struct menucallback_data *data) | |||
194 | 194 | ||
195 | /* mp3_enc configuration menu */ | 195 | /* mp3_enc configuration menu */ |
196 | MENUITEM_FUNCTION_W_PARAM(mp3_bitrate, 0, ID2P(LANG_BITRATE), | 196 | MENUITEM_FUNCTION_W_PARAM(mp3_bitrate, 0, ID2P(LANG_BITRATE), |
197 | mp3_enc_bitrate, | 197 | mp3_enc_bitrate, &menu_callback_data, |
198 | &menu_callback_data, enc_menuitem_callback, Icon_NOICON); | 198 | enc_menuitem_callback, Icon_NOICON); |
199 | MAKE_MENU( mp3_enc_menu, ID2P(LANG_ENCODER_SETTINGS), | 199 | MAKE_MENU( mp3_enc_menu, ID2P(LANG_ENCODER_SETTINGS), |
200 | enc_menuitem_enteritem, Icon_NOICON, | 200 | enc_menuitem_enteritem, Icon_NOICON, |
201 | &mp3_bitrate); | 201 | &mp3_bitrate); |
diff --git a/apps/menu.h b/apps/menu.h index acdc8e987f..1f017b0c49 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -195,8 +195,7 @@ int do_menu(const struct menu_item_ex *menu, int *start_selected, | |||
195 | When the user selects this item the function will be run, | 195 | When the user selects this item the function will be run, |
196 | if MENU_FUNC_CHECK_RETVAL is set, the return value | 196 | if MENU_FUNC_CHECK_RETVAL is set, the return value |
197 | will be checked, returning 1 will exit do_menu(); */ | 197 | will be checked, returning 1 will exit do_menu(); */ |
198 | #define MENUITEM_FUNCTION(name, flags, str, func, reserved, \ | 198 | #define MENUITEM_FUNCTION(name, flags, str, func, callback, icon) \ |
199 | callback, icon) \ | ||
200 | static const struct menu_callback_with_desc name##_ = {callback,str,icon}; \ | 199 | static const struct menu_callback_with_desc name##_ = {callback,str,icon}; \ |
201 | static const struct menu_func name##__ = {(void*)func}; \ | 200 | static const struct menu_func name##__ = {(void*)func}; \ |
202 | /* should be const, but recording_settings wont let us do that */ \ | 201 | /* should be const, but recording_settings wont let us do that */ \ |
@@ -205,14 +204,14 @@ int do_menu(const struct menu_item_ex *menu, int *start_selected, | |||
205 | { .function = & name##__}, {.callback_and_desc = & name##_}}; | 204 | { .function = & name##__}, {.callback_and_desc = & name##_}}; |
206 | 205 | ||
207 | /* As above, except the text is dynamic */ | 206 | /* As above, except the text is dynamic */ |
208 | #define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, reserved, \ | 207 | #define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, \ |
209 | text_callback, voice_callback, \ | 208 | text_callback, voice_callback, \ |
210 | text_cb_data, callback, icon) \ | 209 | text_cb_data, callback, icon) \ |
211 | static const struct menu_get_name_and_icon name##_ \ | 210 | static const struct menu_get_name_and_icon name##_ \ |
212 | = {callback,text_callback,voice_callback,text_cb_data,icon}; \ | 211 | = {callback,text_callback,voice_callback,text_cb_data,icon}; \ |
213 | static const struct menu_func name##__ = {(void*)func}; \ | 212 | static const struct menu_func name##__ = {(void*)func}; \ |
214 | const struct menu_item_ex name = \ | 213 | const struct menu_item_ex name = \ |
215 | { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ | 214 | { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ |
216 | { .function = & name##__}, {.menu_get_name_and_icon = & name##_}}; | 215 | { .function = & name##__}, {.menu_get_name_and_icon = & name##_}}; |
217 | 216 | ||
218 | /* Use this to put a function call into the menu. | 217 | /* Use this to put a function call into the menu. |
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index d7993fdbda..e70c4ee98a 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -168,8 +168,8 @@ MENUITEM_SETTING(bl_selective_actions, | |||
168 | selectivebacklight_callback); | 168 | selectivebacklight_callback); |
169 | 169 | ||
170 | MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS), | 170 | MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS), |
171 | selectivebacklight_set_mask, NULL, | 171 | selectivebacklight_set_mask, selectivebacklight_callback, |
172 | selectivebacklight_callback, Icon_Menu_setting); | 172 | Icon_Menu_setting); |
173 | 173 | ||
174 | MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE), | 174 | MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE), |
175 | NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask); | 175 | NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask); |
@@ -520,18 +520,17 @@ static bool history_interval(void) | |||
520 | INT, names, 4, NULL ); | 520 | INT, names, 4, NULL ); |
521 | } | 521 | } |
522 | 522 | ||
523 | MENUITEM_FUNCTION(histogram, 0, | 523 | MENUITEM_FUNCTION(histogram, 0, ID2P(LANG_HISTOGRAM_INTERVAL), |
524 | ID2P(LANG_HISTOGRAM_INTERVAL), | 524 | history_interval, NULL, Icon_Menu_setting); |
525 | history_interval, NULL, NULL, Icon_Menu_setting); | ||
526 | 525 | ||
527 | #endif | 526 | #endif |
528 | 527 | ||
529 | MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), | 528 | MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), |
530 | peak_meter_scale, NULL, NULL, Icon_NOICON); | 529 | peak_meter_scale, NULL, Icon_NOICON); |
531 | MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), | 530 | MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), |
532 | peak_meter_min, NULL, NULL, Icon_NOICON); | 531 | peak_meter_min, NULL, Icon_NOICON); |
533 | MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), | 532 | MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), |
534 | peak_meter_max, NULL, NULL, Icon_NOICON); | 533 | peak_meter_max, NULL, Icon_NOICON); |
535 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, | 534 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, |
536 | &peak_meter_release, &peak_meter_hold, | 535 | &peak_meter_release, &peak_meter_hold, |
537 | &peak_meter_clip_hold, | 536 | &peak_meter_clip_hold, |
@@ -575,10 +574,11 @@ static int line_padding_callback(int action, | |||
575 | 574 | ||
576 | MENUITEM_SETTING(touch_mode, &global_settings.touch_mode, touch_mode_callback); | 575 | MENUITEM_SETTING(touch_mode, &global_settings.touch_mode, touch_mode_callback); |
577 | 576 | ||
578 | MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, | 577 | MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, |
579 | NULL, NULL, Icon_NOICON); | 578 | ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, NULL, Icon_NOICON); |
580 | MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), reset_mapping, | 579 | MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, |
581 | NULL, NULL, Icon_NOICON); | 580 | ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), |
581 | reset_mapping, NULL, Icon_NOICON); | ||
582 | MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback); | 582 | MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback); |
583 | 583 | ||
584 | MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON, &list_line_padding, &touch_mode, | 584 | MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON, &list_line_padding, &touch_mode, |
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index b2baf8871d..59dcc59ff0 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c | |||
@@ -222,8 +222,8 @@ static int eq_do_simple_menu(void * param) | |||
222 | } | 222 | } |
223 | return 0; | 223 | return 0; |
224 | } | 224 | } |
225 | MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN), eq_do_simple_menu, | 225 | MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN), |
226 | NULL, NULL, Icon_Submenu); | 226 | eq_do_simple_menu, NULL, Icon_Submenu); |
227 | 227 | ||
228 | static void selection_to_banditem(int selection, int expanded_band, int *band, int *item) | 228 | static void selection_to_banditem(int selection, int expanded_band, int *band, int *item) |
229 | { | 229 | { |
@@ -426,7 +426,7 @@ static int eq_do_advanced_menu(void * param) | |||
426 | return 0; | 426 | return 0; |
427 | } | 427 | } |
428 | MENUITEM_FUNCTION(advanced_menu, 0, ID2P(LANG_EQUALIZER_ADVANCED), | 428 | MENUITEM_FUNCTION(advanced_menu, 0, ID2P(LANG_EQUALIZER_ADVANCED), |
429 | eq_do_advanced_menu, NULL, NULL, Icon_EQ); | 429 | eq_do_advanced_menu, NULL, Icon_EQ); |
430 | 430 | ||
431 | enum eq_slider_mode { | 431 | enum eq_slider_mode { |
432 | GAIN, | 432 | GAIN, |
@@ -783,13 +783,12 @@ static int eq_save_preset(void) | |||
783 | static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG }; | 783 | static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG }; |
784 | 784 | ||
785 | MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), | 785 | MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), |
786 | eq_menu_graphical, NULL, lowlatency_callback, | 786 | eq_menu_graphical, lowlatency_callback, Icon_EQ); |
787 | Icon_EQ); | ||
788 | MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), | 787 | MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), |
789 | eq_save_preset, NULL, NULL, Icon_NOICON); | 788 | eq_save_preset, NULL, Icon_NOICON); |
790 | MENUITEM_FUNCTION_W_PARAM(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), | 789 | MENUITEM_FUNCTION_W_PARAM(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), |
791 | browse_folder, (void*)&eqs, lowlatency_callback, | 790 | browse_folder, (void*)&eqs, |
792 | Icon_NOICON); | 791 | lowlatency_callback, Icon_NOICON); |
793 | 792 | ||
794 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, | 793 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, |
795 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, | 794 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, |
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index ce174e1d90..a5a4ebc75a 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -91,15 +91,18 @@ static int write_settings_file(void* param) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | MENUITEM_FUNCTION_W_PARAM(browse_configs, 0, ID2P(LANG_CUSTOM_CFG), | 93 | MENUITEM_FUNCTION_W_PARAM(browse_configs, 0, ID2P(LANG_CUSTOM_CFG), |
94 | browse_folder, (void*)&config, NULL, Icon_NOICON); | 94 | browse_folder, (void*)&config, NULL, Icon_NOICON); |
95 | MENUITEM_FUNCTION_W_PARAM(save_settings_item, 0, ID2P(LANG_SAVE_SETTINGS), | 95 | MENUITEM_FUNCTION_W_PARAM(save_settings_item, 0, ID2P(LANG_SAVE_SETTINGS), |
96 | write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, Icon_NOICON); | 96 | write_settings_file, (void*)SETTINGS_SAVE_ALL, |
97 | NULL, Icon_NOICON); | ||
97 | MENUITEM_FUNCTION_W_PARAM(save_theme_item, 0, ID2P(LANG_SAVE_THEME), | 98 | MENUITEM_FUNCTION_W_PARAM(save_theme_item, 0, ID2P(LANG_SAVE_THEME), |
98 | write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, Icon_NOICON); | 99 | write_settings_file, (void*)SETTINGS_SAVE_THEME, |
100 | NULL, Icon_NOICON); | ||
99 | MENUITEM_FUNCTION_W_PARAM(save_sound_item, 0, ID2P(LANG_SAVE_SOUND), | 101 | MENUITEM_FUNCTION_W_PARAM(save_sound_item, 0, ID2P(LANG_SAVE_SOUND), |
100 | write_settings_file, (void*)SETTINGS_SAVE_SOUND, NULL, Icon_NOICON); | 102 | write_settings_file, (void*)SETTINGS_SAVE_SOUND, |
103 | NULL, Icon_NOICON); | ||
101 | MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET), | 104 | MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET), |
102 | reset_settings, NULL, NULL, Icon_NOICON); | 105 | reset_settings, NULL, Icon_NOICON); |
103 | 106 | ||
104 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, | 107 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, |
105 | &browse_configs, &reset_settings_item, | 108 | &browse_configs, &reset_settings_item, |
@@ -466,22 +469,22 @@ static int show_info(void) | |||
466 | 469 | ||
467 | 470 | ||
468 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO), | 471 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO), |
469 | show_info, NULL, NULL, Icon_NOICON); | 472 | show_info, NULL, Icon_NOICON); |
470 | 473 | ||
471 | #if CONFIG_RTC | 474 | #if CONFIG_RTC |
472 | int time_screen(void* ignored); | 475 | int time_screen(void* ignored); |
473 | MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), | 476 | MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), |
474 | time_screen, NULL, NULL, Icon_Menu_setting ); | 477 | time_screen, NULL, Icon_Menu_setting ); |
475 | #endif | 478 | #endif |
476 | 479 | ||
477 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), | 480 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), |
478 | show_credits, NULL, NULL, Icon_NOICON); | 481 | show_credits, NULL, Icon_NOICON); |
479 | 482 | ||
480 | MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), | 483 | MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), |
481 | view_runtime, NULL, NULL, Icon_NOICON); | 484 | view_runtime, NULL, Icon_NOICON); |
482 | 485 | ||
483 | MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), | 486 | MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), |
484 | debug_menu, NULL, NULL, Icon_NOICON); | 487 | debug_menu, NULL, Icon_NOICON); |
485 | 488 | ||
486 | MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, | 489 | MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, |
487 | &show_info_item, &show_credits_item, | 490 | &show_info_item, &show_credits_item, |
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index fe19aa8d59..9db87aa7a5 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c | |||
@@ -143,12 +143,12 @@ static int playlist_view_(void) | |||
143 | return 0; | 143 | return 0; |
144 | } | 144 | } |
145 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), | 145 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), |
146 | create_playlist, NULL, NULL, Icon_NOICON); | 146 | create_playlist, NULL, Icon_NOICON); |
147 | MENUITEM_FUNCTION(view_cur_playlist, 0, | 147 | MENUITEM_FUNCTION(view_cur_playlist, 0, |
148 | ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | 148 | ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), |
149 | playlist_view_, NULL, NULL, Icon_NOICON); | 149 | playlist_view_, NULL, Icon_NOICON); |
150 | MENUITEM_FUNCTION_W_PARAM(save_playlist, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), | 150 | MENUITEM_FUNCTION_W_PARAM(save_playlist, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), |
151 | save_playlist_screen, NULL, NULL, Icon_NOICON); | 151 | save_playlist_screen, NULL, NULL, Icon_NOICON); |
152 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); | 152 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); |
153 | static int clear_catalog_directory(void) | 153 | static int clear_catalog_directory(void) |
154 | { | 154 | { |
@@ -158,7 +158,7 @@ static int clear_catalog_directory(void) | |||
158 | return false; | 158 | return false; |
159 | } | 159 | } |
160 | MENUITEM_FUNCTION(clear_catalog_directory_item, 0, ID2P(LANG_RESET_PLAYLISTCAT_DIR), | 160 | MENUITEM_FUNCTION(clear_catalog_directory_item, 0, ID2P(LANG_RESET_PLAYLISTCAT_DIR), |
161 | clear_catalog_directory, NULL, NULL, Icon_file_view_menu); | 161 | clear_catalog_directory, NULL, Icon_file_view_menu); |
162 | 162 | ||
163 | /* Playlist viewer settings submenu */ | 163 | /* Playlist viewer settings submenu */ |
164 | MENUITEM_SETTING(show_icons, &global_settings.playlist_viewer_icons, NULL); | 164 | MENUITEM_SETTING(show_icons, &global_settings.playlist_viewer_icons, NULL); |
diff --git a/apps/menus/plugin_menu.c b/apps/menus/plugin_menu.c index 7edfc7acc6..cbc1ce03f2 100644 --- a/apps/menus/plugin_menu.c +++ b/apps/menus/plugin_menu.c | |||
@@ -93,14 +93,15 @@ static int menu_callback(int action, | |||
93 | return action; | 93 | return action; |
94 | } | 94 | } |
95 | 95 | ||
96 | #define ITEM_FLAG (MENU_FUNC_USEPARAM|MENU_FUNC_CHECK_RETVAL) | 96 | #define ITEM_FLAG (MENU_FUNC_CHECK_RETVAL) |
97 | |||
98 | MENUITEM_FUNCTION_W_PARAM(games_item, ITEM_FLAG, ID2P(LANG_PLUGIN_GAMES), | ||
99 | plugins_menu, (void*)GAMES, NULL, Icon_Folder); | ||
100 | MENUITEM_FUNCTION_W_PARAM(apps_item, ITEM_FLAG, ID2P(LANG_PLUGIN_APPS), | ||
101 | plugins_menu, (void*)APPS, NULL, Icon_Folder); | ||
102 | MENUITEM_FUNCTION_W_PARAM(demos_item, ITEM_FLAG, ID2P(LANG_PLUGIN_DEMOS), | ||
103 | plugins_menu, (void*)DEMOS, NULL, Icon_Folder); | ||
97 | 104 | ||
98 | MENUITEM_FUNCTION(games_item, ITEM_FLAG, ID2P(LANG_PLUGIN_GAMES), | ||
99 | plugins_menu, (void*)GAMES, NULL, Icon_Folder); | ||
100 | MENUITEM_FUNCTION(apps_item, ITEM_FLAG, ID2P(LANG_PLUGIN_APPS), | ||
101 | plugins_menu, (void*)APPS, NULL, Icon_Folder); | ||
102 | MENUITEM_FUNCTION(demos_item, ITEM_FLAG, ID2P(LANG_PLUGIN_DEMOS), | ||
103 | plugins_menu, (void*)DEMOS, NULL, Icon_Folder); | ||
104 | 105 | ||
105 | MAKE_MENU(plugin_menu, ID2P(LANG_PLUGINS), &menu_callback, | 106 | MAKE_MENU(plugin_menu, ID2P(LANG_PLUGINS), &menu_callback, |
106 | Icon_Plugin, | 107 | Icon_Plugin, |
diff --git a/apps/menus/radio_menu.c b/apps/menus/radio_menu.c index b0bdb98569..9fd25aa503 100644 --- a/apps/menus/radio_menu.c +++ b/apps/menus/radio_menu.c | |||
@@ -52,7 +52,7 @@ static int fm_recording_screen(void) | |||
52 | } | 52 | } |
53 | 53 | ||
54 | MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), | 54 | MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), |
55 | fm_recording_screen, NULL, NULL, Icon_Recording); | 55 | fm_recording_screen, NULL, Icon_Recording); |
56 | #endif /* defined(HAVE_FMRADIO_REC) */ | 56 | #endif /* defined(HAVE_FMRADIO_REC) */ |
57 | 57 | ||
58 | #if defined(HAVE_FMRADIO_REC) | 58 | #if defined(HAVE_FMRADIO_REC) |
@@ -65,25 +65,25 @@ static int fm_recording_settings(void) | |||
65 | } | 65 | } |
66 | 66 | ||
67 | MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), | 67 | MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), |
68 | fm_recording_settings, NULL, NULL, Icon_Recording); | 68 | fm_recording_settings, NULL, Icon_Recording); |
69 | #endif /* defined(HAVE_FMRADIO_REC) */ | 69 | #endif /* defined(HAVE_FMRADIO_REC) */ |
70 | #endif /* HAVE_RECORDING */ | 70 | #endif /* HAVE_RECORDING */ |
71 | 71 | ||
72 | #ifndef FM_PRESET | 72 | #ifndef FM_PRESET |
73 | MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_PRESET), | 73 | MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_PRESET), |
74 | handle_radio_presets, NULL, NULL, Icon_NOICON); | 74 | handle_radio_presets, NULL, Icon_NOICON); |
75 | #endif | 75 | #endif |
76 | #ifndef FM_PRESET_ADD | 76 | #ifndef FM_PRESET_ADD |
77 | MENUITEM_FUNCTION(radio_addpreset_item, 0, ID2P(LANG_FM_ADD_PRESET), | 77 | MENUITEM_FUNCTION(radio_addpreset_item, 0, ID2P(LANG_FM_ADD_PRESET), |
78 | handle_radio_add_preset, NULL, NULL, Icon_NOICON); | 78 | handle_radio_add_preset, NULL, Icon_NOICON); |
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | MENUITEM_FUNCTION(presetload_item, 0, ID2P(LANG_FM_PRESET_LOAD), | 81 | MENUITEM_FUNCTION(presetload_item, 0, ID2P(LANG_FM_PRESET_LOAD), |
82 | preset_list_load, NULL, NULL, Icon_NOICON); | 82 | preset_list_load, NULL, Icon_NOICON); |
83 | MENUITEM_FUNCTION(presetsave_item, 0, ID2P(LANG_FM_PRESET_SAVE), | 83 | MENUITEM_FUNCTION(presetsave_item, 0, ID2P(LANG_FM_PRESET_SAVE), |
84 | preset_list_save, NULL, NULL, Icon_NOICON); | 84 | preset_list_save, NULL, Icon_NOICON); |
85 | MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR), | 85 | MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR), |
86 | preset_list_clear, NULL, NULL, Icon_NOICON); | 86 | preset_list_clear, NULL, Icon_NOICON); |
87 | 87 | ||
88 | MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL); | 88 | MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL); |
89 | MENUITEM_SETTING(force_mono, &global_settings.fm_force_mono, NULL); | 89 | MENUITEM_SETTING(force_mono, &global_settings.fm_force_mono, NULL); |
@@ -120,15 +120,14 @@ static int toggle_radio_mode(void) | |||
120 | RADIO_PRESET_MODE : RADIO_SCAN_MODE; | 120 | RADIO_PRESET_MODE : RADIO_SCAN_MODE; |
121 | return 0; | 121 | return 0; |
122 | } | 122 | } |
123 | MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, | 123 | MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, toggle_radio_mode, |
124 | toggle_radio_mode, NULL, | 124 | get_mode_text, mode_speak_item, |
125 | get_mode_text, mode_speak_item, | 125 | NULL, NULL, Icon_NOICON); |
126 | NULL, NULL, Icon_NOICON); | ||
127 | #endif | 126 | #endif |
128 | 127 | ||
129 | MENUITEM_FUNCTION_W_PARAM(scan_presets_item, 0, | 128 | MENUITEM_FUNCTION_W_PARAM(scan_presets_item, 0, |
130 | ID2P(LANG_FM_SCAN_PRESETS), | 129 | ID2P(LANG_FM_SCAN_PRESETS), |
131 | presets_scan, NULL, NULL, Icon_NOICON); | 130 | presets_scan, NULL, NULL, Icon_NOICON); |
132 | 131 | ||
133 | MAKE_MENU(radio_settings_menu, ID2P(LANG_FM_MENU), NULL, | 132 | MAKE_MENU(radio_settings_menu, ID2P(LANG_FM_MENU), NULL, |
134 | Icon_Radio_screen, | 133 | Icon_Radio_screen, |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index fc450c7921..5439c861f4 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -94,8 +94,8 @@ static int recsource_func(void) | |||
94 | &global_settings.rec_source, INT, names, | 94 | &global_settings.rec_source, INT, names, |
95 | n_opts, NULL ); | 95 | n_opts, NULL ); |
96 | } | 96 | } |
97 | MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), | 97 | MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE), |
98 | recsource_func, NULL, recmenu_callback, Icon_Menu_setting); | 98 | recsource_func, recmenu_callback, Icon_Menu_setting); |
99 | 99 | ||
100 | /* Makes an options list from a source list of options and indexes */ | 100 | /* Makes an options list from a source list of options and indexes */ |
101 | static void make_options_from_indexes(const struct opt_items *src_names, | 101 | static void make_options_from_indexes(const struct opt_items *src_names, |
@@ -188,7 +188,7 @@ static int recfrequency_func(void) | |||
188 | return ret; | 188 | return ret; |
189 | } /* recfrequency */ | 189 | } /* recfrequency */ |
190 | MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_FREQUENCY), | 190 | MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_FREQUENCY), |
191 | recfrequency_func, NULL, NULL, Icon_Menu_setting); | 191 | recfrequency_func, NULL, Icon_Menu_setting); |
192 | 192 | ||
193 | 193 | ||
194 | static int recchannels_func(void) | 194 | static int recchannels_func(void) |
@@ -229,7 +229,7 @@ static int recchannels_func(void) | |||
229 | return ret; | 229 | return ret; |
230 | } | 230 | } |
231 | MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS), | 231 | MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS), |
232 | recchannels_func, NULL, NULL, Icon_Menu_setting); | 232 | recchannels_func, NULL, Icon_Menu_setting); |
233 | 233 | ||
234 | static int recmonomode_func(void) | 234 | static int recmonomode_func(void) |
235 | { | 235 | { |
@@ -249,7 +249,7 @@ static int recmonomode_func(void) | |||
249 | return ret; | 249 | return ret; |
250 | } | 250 | } |
251 | MENUITEM_FUNCTION(recmonomode, 0, ID2P(LANG_RECORDING_MONO_MODE), | 251 | MENUITEM_FUNCTION(recmonomode, 0, ID2P(LANG_RECORDING_MONO_MODE), |
252 | recmonomode_func, NULL, NULL, Icon_Menu_setting); | 252 | recmonomode_func, NULL, Icon_Menu_setting); |
253 | 253 | ||
254 | static int recformat_func(void) | 254 | static int recformat_func(void) |
255 | { | 255 | { |
@@ -273,11 +273,10 @@ static int recformat_func(void) | |||
273 | return res; | 273 | return res; |
274 | } /* recformat */ | 274 | } /* recformat */ |
275 | MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_FORMAT), | 275 | MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_FORMAT), |
276 | recformat_func, NULL, NULL, Icon_Menu_setting); | 276 | recformat_func, NULL, Icon_Menu_setting); |
277 | 277 | ||
278 | MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), | 278 | MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), |
279 | enc_global_config_menu, | 279 | enc_global_config_menu, NULL, Icon_Submenu); |
280 | NULL, NULL, Icon_Submenu); | ||
281 | 280 | ||
282 | static int recmenu_callback(int action, | 281 | static int recmenu_callback(int action, |
283 | const struct menu_item_ex *this_item, | 282 | const struct menu_item_ex *this_item, |
@@ -311,8 +310,8 @@ static int clear_rec_directory(void) | |||
311 | splash(HZ, ID2P(LANG_RESET_DONE_CLEAR)); | 310 | splash(HZ, ID2P(LANG_RESET_DONE_CLEAR)); |
312 | return false; | 311 | return false; |
313 | } | 312 | } |
314 | MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR), | 313 | MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR), |
315 | clear_rec_directory, NULL, NULL, Icon_Folder); | 314 | clear_rec_directory, NULL, Icon_Folder); |
316 | 315 | ||
317 | MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); | 316 | MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL); |
318 | 317 | ||
@@ -350,10 +349,10 @@ static int agc_cliptime_func(void) | |||
350 | &global_settings.rec_agc_cliptime, | 349 | &global_settings.rec_agc_cliptime, |
351 | INT, names, 5, NULL ); | 350 | INT, names, 5, NULL ); |
352 | } | 351 | } |
353 | MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), | 352 | MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET), |
354 | agc_preset_func, NULL, NULL, Icon_Menu_setting); | 353 | agc_preset_func, NULL, Icon_Menu_setting); |
355 | MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME), | 354 | MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME), |
356 | agc_cliptime_func, NULL, NULL, Icon_Menu_setting); | 355 | agc_cliptime_func, NULL, Icon_Menu_setting); |
357 | #endif /* HAVE_AGC */ | 356 | #endif /* HAVE_AGC */ |
358 | 357 | ||
359 | /** Rec trigger **/ | 358 | /** Rec trigger **/ |
@@ -571,18 +570,19 @@ int rectrigger(void) | |||
571 | settings_save(); | 570 | settings_save(); |
572 | return 0; | 571 | return 0; |
573 | } | 572 | } |
574 | MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), | 573 | MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER), |
575 | rectrigger, NULL, NULL, Icon_Menu_setting); | 574 | rectrigger, NULL, Icon_Menu_setting); |
576 | 575 | ||
577 | static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG}; | 576 | static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG}; |
578 | MENUITEM_FUNCTION_W_PARAM(browse_recconfigs, 0, ID2P(LANG_CUSTOM_CFG), | 577 | MENUITEM_FUNCTION_W_PARAM(browse_recconfigs, 0, ID2P(LANG_CUSTOM_CFG), |
579 | browse_folder, (void*)&rec_config_browse, NULL, Icon_Config); | 578 | browse_folder, (void*)&rec_config_browse, |
579 | NULL, Icon_Config); | ||
580 | static int write_settings_file(void) | 580 | static int write_settings_file(void) |
581 | { | 581 | { |
582 | return settings_save_config(SETTINGS_SAVE_RECPRESETS); | 582 | return settings_save_config(SETTINGS_SAVE_RECPRESETS); |
583 | } | 583 | } |
584 | MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), | 584 | MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), |
585 | write_settings_file, NULL, NULL, Icon_Config); | 585 | write_settings_file, NULL, Icon_Config); |
586 | 586 | ||
587 | MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), | 587 | MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), |
588 | NULL, Icon_Recording, | 588 | NULL, Icon_Recording, |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 0b7e55d95b..9d1314c269 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -151,22 +151,20 @@ MENUITEM_SETTING(tagcache_ram, &global_settings.tagcache_ram, NULL); | |||
151 | #endif | 151 | #endif |
152 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); | 152 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); |
153 | MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), | 153 | MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), |
154 | (int(*)(void))tagcache_rebuild_with_splash, | 154 | (int(*)(void))tagcache_rebuild_with_splash, NULL, Icon_NOICON); |
155 | NULL, NULL, Icon_NOICON); | ||
156 | MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), | 155 | MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), |
157 | (int(*)(void))tagcache_update_with_splash, | 156 | (int(*)(void))tagcache_update_with_splash, NULL, Icon_NOICON); |
158 | NULL, NULL, Icon_NOICON); | ||
159 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); | 157 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); |
160 | 158 | ||
161 | MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), | 159 | MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), |
162 | tagtree_export, NULL, | 160 | tagtree_export, |
163 | NULL, Icon_NOICON); | 161 | NULL, Icon_NOICON); |
164 | 162 | ||
165 | MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), | 163 | MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), |
166 | tagtree_import, NULL, | 164 | tagtree_import, |
167 | NULL, Icon_NOICON); | 165 | NULL, Icon_NOICON); |
168 | MENUITEM_FUNCTION(tc_paths, 0, ID2P(LANG_SELECT_DATABASE_DIRS), | 166 | MENUITEM_FUNCTION(tc_paths, 0, ID2P(LANG_SELECT_DATABASE_DIRS), |
169 | dirs_to_scan, NULL, NULL, Icon_NOICON); | 167 | dirs_to_scan, NULL, Icon_NOICON); |
170 | 168 | ||
171 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, | 169 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, |
172 | #ifdef HAVE_TC_RAMCACHE | 170 | #ifdef HAVE_TC_RAMCACHE |
@@ -201,7 +199,7 @@ static int clear_start_directory(void) | |||
201 | return false; | 199 | return false; |
202 | } | 200 | } |
203 | MENUITEM_FUNCTION(clear_start_directory_item, 0, ID2P(LANG_RESET_START_DIR), | 201 | MENUITEM_FUNCTION(clear_start_directory_item, 0, ID2P(LANG_RESET_START_DIR), |
204 | clear_start_directory, NULL, NULL, Icon_file_view_menu); | 202 | clear_start_directory, NULL, Icon_file_view_menu); |
205 | static int fileview_callback(int action, | 203 | static int fileview_callback(int action, |
206 | const struct menu_item_ex *this_item, | 204 | const struct menu_item_ex *this_item, |
207 | struct gui_synclist *this_list) | 205 | struct gui_synclist *this_list) |
@@ -406,8 +404,8 @@ MENUITEM_SETTING(bt_selective_actions, | |||
406 | &global_settings.bt_selective_softlock_actions, | 404 | &global_settings.bt_selective_softlock_actions, |
407 | selectivesoftlock_callback); | 405 | selectivesoftlock_callback); |
408 | MENUITEM_FUNCTION(sel_softlock_mask, 0, ID2P(LANG_SETTINGS), | 406 | MENUITEM_FUNCTION(sel_softlock_mask, 0, ID2P(LANG_SETTINGS), |
409 | selectivesoftlock_set_mask, NULL, | 407 | selectivesoftlock_set_mask, selectivesoftlock_callback, |
410 | selectivesoftlock_callback, Icon_Menu_setting); | 408 | Icon_Menu_setting); |
411 | 409 | ||
412 | MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE), | 410 | MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE), |
413 | NULL, Icon_Menu_setting, &bt_selective_actions, &sel_softlock_mask); | 411 | NULL, Icon_Menu_setting, &bt_selective_actions, &sel_softlock_mask); |
@@ -572,7 +570,7 @@ static int sleeptimer_duration_cb(int action, | |||
572 | 570 | ||
573 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | 571 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); |
574 | MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | 572 | MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); |
575 | MENUITEM_FUNCTION_DYNTEXT(sleeptimer_toggle, 0, toggle_sleeptimer, NULL, | 573 | MENUITEM_FUNCTION_DYNTEXT(sleeptimer_toggle, 0, toggle_sleeptimer, |
576 | sleep_timer_getname, sleep_timer_voice, NULL, | 574 | sleep_timer_getname, sleep_timer_voice, NULL, |
577 | NULL, Icon_NOICON); | 575 | NULL, Icon_NOICON); |
578 | MENUITEM_SETTING(sleeptimer_duration, | 576 | MENUITEM_SETTING(sleeptimer_duration, |
@@ -762,7 +760,7 @@ static void wps_plugin_cb(void) | |||
762 | } | 760 | } |
763 | MENUITEM_FUNCTION(wps_set_context_plugin, 0, | 761 | MENUITEM_FUNCTION(wps_set_context_plugin, 0, |
764 | ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN), | 762 | ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN), |
765 | wps_plugin_cb, NULL, NULL, Icon_Plugin); | 763 | wps_plugin_cb, NULL, Icon_Plugin); |
766 | 764 | ||
767 | /* WPS_CONTEXT_PLUGIN */ | 765 | /* WPS_CONTEXT_PLUGIN */ |
768 | /***********************************/ | 766 | /***********************************/ |
@@ -785,7 +783,7 @@ MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, | |||
785 | static struct browse_folder_info langs = { LANG_DIR, SHOW_LNG }; | 783 | static struct browse_folder_info langs = { LANG_DIR, SHOW_LNG }; |
786 | 784 | ||
787 | MENUITEM_FUNCTION_W_PARAM(browse_langs, 0, ID2P(LANG_LANGUAGE), | 785 | MENUITEM_FUNCTION_W_PARAM(browse_langs, 0, ID2P(LANG_LANGUAGE), |
788 | browse_folder, (void*)&langs, NULL, Icon_Language); | 786 | browse_folder, (void*)&langs, NULL, Icon_Language); |
789 | 787 | ||
790 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | 788 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, |
791 | Icon_General_settings_menu, | 789 | Icon_General_settings_menu, |
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index de81169c66..60a2a27ef4 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c | |||
@@ -62,7 +62,7 @@ static int clear_main_backdrop(void) | |||
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
64 | MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), | 64 | MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), |
65 | clear_main_backdrop, NULL, NULL, Icon_NOICON); | 65 | clear_main_backdrop, NULL, Icon_NOICON); |
66 | #endif | 66 | #endif |
67 | #ifdef HAVE_LCD_COLOR | 67 | #ifdef HAVE_LCD_COLOR |
68 | 68 | ||
@@ -130,19 +130,19 @@ static int reset_color(void) | |||
130 | return 0; | 130 | return 0; |
131 | } | 131 | } |
132 | MENUITEM_FUNCTION_W_PARAM(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), | 132 | MENUITEM_FUNCTION_W_PARAM(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), |
133 | set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); | 133 | set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); |
134 | MENUITEM_FUNCTION_W_PARAM(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), | 134 | MENUITEM_FUNCTION_W_PARAM(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), |
135 | set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); | 135 | set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); |
136 | MENUITEM_FUNCTION_W_PARAM(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR), | 136 | MENUITEM_FUNCTION_W_PARAM(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR), |
137 | set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); | 137 | set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); |
138 | MENUITEM_FUNCTION_W_PARAM(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR), | 138 | MENUITEM_FUNCTION_W_PARAM(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR), |
139 | set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); | 139 | set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); |
140 | MENUITEM_FUNCTION_W_PARAM(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR), | 140 | MENUITEM_FUNCTION_W_PARAM(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR), |
141 | set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); | 141 | set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); |
142 | MENUITEM_FUNCTION_W_PARAM(set_sep_col, 0, ID2P(LANG_LIST_SEPARATOR_COLOR), | 142 | MENUITEM_FUNCTION_W_PARAM(set_sep_col, 0, ID2P(LANG_LIST_SEPARATOR_COLOR), |
143 | set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); | 143 | set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); |
144 | MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), | 144 | MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), |
145 | reset_color, NULL, NULL, Icon_NOICON); | 145 | reset_color, NULL, Icon_NOICON); |
146 | 146 | ||
147 | MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU), | 147 | MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU), |
148 | NULL, Icon_NOICON, | 148 | NULL, Icon_NOICON, |
@@ -323,32 +323,25 @@ int browse_folder(void *param) | |||
323 | return rockbox_browse(&browse); | 323 | return rockbox_browse(&browse); |
324 | } | 324 | } |
325 | 325 | ||
326 | MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, | 326 | MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, ID2P(LANG_CUSTOM_FONT), |
327 | ID2P(LANG_CUSTOM_FONT), | 327 | browse_folder, (void*)&fonts, NULL, Icon_Font); |
328 | browse_folder, (void*)&fonts, NULL, Icon_Font); | ||
329 | 328 | ||
330 | MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, | 329 | MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, ID2P(LANG_BASE_SKIN), |
331 | ID2P(LANG_BASE_SKIN), | 330 | browse_folder, (void*)&sbs, NULL, Icon_Wps); |
332 | browse_folder, (void*)&sbs, NULL, Icon_Wps); | ||
333 | #if CONFIG_TUNER | 331 | #if CONFIG_TUNER |
334 | MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, | 332 | MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, ID2P(LANG_RADIOSCREEN), |
335 | ID2P(LANG_RADIOSCREEN), | 333 | browse_folder, (void*)&fms, NULL, Icon_Wps); |
336 | browse_folder, (void*)&fms, NULL, Icon_Wps); | ||
337 | #endif | 334 | #endif |
338 | MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, | 335 | MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, ID2P(LANG_WHILE_PLAYING), |
339 | ID2P(LANG_WHILE_PLAYING), | 336 | browse_folder, (void*)&wps, NULL, Icon_Wps); |
340 | browse_folder, (void*)&wps, NULL, Icon_Wps); | ||
341 | #ifdef HAVE_REMOTE_LCD | 337 | #ifdef HAVE_REMOTE_LCD |
342 | MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, | 338 | MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, ID2P(LANG_REMOTE_WHILE_PLAYING), |
343 | ID2P(LANG_REMOTE_WHILE_PLAYING), | 339 | browse_folder, (void*)&rwps, NULL, Icon_Wps); |
344 | browse_folder, (void*)&rwps, NULL, Icon_Wps); | 340 | MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, ID2P(LANG_REMOTE_BASE_SKIN), |
345 | MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, | 341 | browse_folder, (void*)&rsbs, NULL, Icon_Wps); |
346 | ID2P(LANG_REMOTE_BASE_SKIN), | ||
347 | browse_folder, (void*)&rsbs, NULL, Icon_Wps); | ||
348 | #if CONFIG_TUNER | 342 | #if CONFIG_TUNER |
349 | MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, | 343 | MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, ID2P(LANG_REMOTE_RADIOSCREEN), |
350 | ID2P(LANG_REMOTE_RADIOSCREEN), | 344 | browse_folder, (void*)&rfms, NULL, Icon_Wps); |
351 | browse_folder, (void*)&rfms, NULL, Icon_Wps); | ||
352 | #endif | 345 | #endif |
353 | #endif | 346 | #endif |
354 | 347 | ||
@@ -373,9 +366,8 @@ static int showicons_callback(int action, | |||
373 | } | 366 | } |
374 | 367 | ||
375 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); | 368 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); |
376 | MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, | 369 | MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, ID2P(LANG_CUSTOM_THEME), |
377 | ID2P(LANG_CUSTOM_THEME), | 370 | browse_folder, (void*)&themes, NULL, Icon_Config); |
378 | browse_folder, (void*)&themes, NULL, Icon_Config); | ||
379 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); | 371 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); |
380 | #if LCD_DEPTH > 1 | 372 | #if LCD_DEPTH > 1 |
381 | MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); | 373 | MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); |
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index e37e2b5637..abf9c23cd0 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c | |||
@@ -81,12 +81,12 @@ static int timedate_set(void) | |||
81 | return result; | 81 | return result; |
82 | } | 82 | } |
83 | 83 | ||
84 | MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), | 84 | MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), |
85 | timedate_set, NULL, NULL, Icon_NOICON); | 85 | timedate_set, NULL, Icon_NOICON); |
86 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); | 86 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); |
87 | #ifdef HAVE_RTC_ALARM | 87 | #ifdef HAVE_RTC_ALARM |
88 | MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), | 88 | MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), |
89 | alarm_screen, NULL, NULL, Icon_NOICON); | 89 | alarm_screen, NULL, Icon_NOICON); |
90 | #if CONFIG_TUNER || defined(HAVE_RECORDING) | 90 | #if CONFIG_TUNER || defined(HAVE_RECORDING) |
91 | 91 | ||
92 | #if CONFIG_TUNER && !defined(HAVE_RECORDING) | 92 | #if CONFIG_TUNER && !defined(HAVE_RECORDING) |
@@ -139,7 +139,7 @@ static int alarm_setting(void) | |||
139 | } | 139 | } |
140 | 140 | ||
141 | MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), | 141 | MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), |
142 | alarm_setting, NULL, alarm_callback, Icon_Menu_setting); | 142 | alarm_setting, alarm_callback, Icon_Menu_setting); |
143 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ | 143 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ |
144 | 144 | ||
145 | #endif /* HAVE_RTC_ALARM */ | 145 | #endif /* HAVE_RTC_ALARM */ |
diff --git a/apps/onplay.c b/apps/onplay.c index 9976e5f085..ec38ad9132 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -158,11 +158,11 @@ static int bookmark_menu_callback(int action, | |||
158 | struct gui_synclist *this_list); | 158 | struct gui_synclist *this_list); |
159 | MENUITEM_FUNCTION(bookmark_create_menu_item, 0, | 159 | MENUITEM_FUNCTION(bookmark_create_menu_item, 0, |
160 | ID2P(LANG_BOOKMARK_MENU_CREATE), | 160 | ID2P(LANG_BOOKMARK_MENU_CREATE), |
161 | bookmark_create_menu, NULL, | 161 | bookmark_create_menu, |
162 | bookmark_menu_callback, Icon_Bookmark); | 162 | bookmark_menu_callback, Icon_Bookmark); |
163 | MENUITEM_FUNCTION(bookmark_load_menu_item, 0, | 163 | MENUITEM_FUNCTION(bookmark_load_menu_item, 0, |
164 | ID2P(LANG_BOOKMARK_MENU_LIST), | 164 | ID2P(LANG_BOOKMARK_MENU_LIST), |
165 | bookmark_load_menu_wrapper, NULL, | 165 | bookmark_load_menu_wrapper, |
166 | bookmark_menu_callback, Icon_Bookmark); | 166 | bookmark_menu_callback, Icon_Bookmark); |
167 | MAKE_ONPLAYMENU(bookmark_menu, ID2P(LANG_BOOKMARK_MENU), | 167 | MAKE_ONPLAYMENU(bookmark_menu, ID2P(LANG_BOOKMARK_MENU), |
168 | bookmark_menu_callback, Icon_Bookmark, | 168 | bookmark_menu_callback, Icon_Bookmark, |
@@ -482,15 +482,15 @@ static int wps_view_cur_playlist(void) | |||
482 | } | 482 | } |
483 | 483 | ||
484 | MENUITEM_FUNCTION(wps_view_cur_playlist_item, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | 484 | MENUITEM_FUNCTION(wps_view_cur_playlist_item, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), |
485 | wps_view_cur_playlist, NULL, NULL, Icon_NOICON); | 485 | wps_view_cur_playlist, NULL, Icon_NOICON); |
486 | MENUITEM_FUNCTION(search_playlist_item, 0, ID2P(LANG_SEARCH_IN_PLAYLIST), | 486 | MENUITEM_FUNCTION(search_playlist_item, 0, ID2P(LANG_SEARCH_IN_PLAYLIST), |
487 | search_playlist, NULL, NULL, Icon_Playlist); | 487 | search_playlist, NULL, Icon_Playlist); |
488 | MENUITEM_FUNCTION(playlist_save_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), | 488 | MENUITEM_FUNCTION(playlist_save_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), |
489 | save_playlist, NULL, NULL, Icon_Playlist); | 489 | save_playlist, NULL, Icon_Playlist); |
490 | MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST), | 490 | MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST), |
491 | shuffle_playlist, NULL, NULL, Icon_Playlist); | 491 | shuffle_playlist, NULL, Icon_Playlist); |
492 | MENUITEM_FUNCTION(playing_time_item, 0, ID2P(LANG_PLAYING_TIME), | 492 | MENUITEM_FUNCTION(playing_time_item, 0, ID2P(LANG_PLAYING_TIME), |
493 | playing_time, NULL, NULL, Icon_Playlist); | 493 | playing_time, NULL, Icon_Playlist); |
494 | MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), | 494 | MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), |
495 | NULL, Icon_Playlist, | 495 | NULL, Icon_Playlist, |
496 | &wps_view_cur_playlist_item, &search_playlist_item, | 496 | &wps_view_cur_playlist_item, &search_playlist_item, |
@@ -807,16 +807,16 @@ static bool set_catalogdir(void) | |||
807 | return false; | 807 | return false; |
808 | } | 808 | } |
809 | MENUITEM_FUNCTION(set_catalogdir_item, 0, ID2P(LANG_SET_AS_PLAYLISTCAT_DIR), | 809 | MENUITEM_FUNCTION(set_catalogdir_item, 0, ID2P(LANG_SET_AS_PLAYLISTCAT_DIR), |
810 | set_catalogdir, NULL, clipboard_callback, Icon_Playlist); | 810 | set_catalogdir, clipboard_callback, Icon_Playlist); |
811 | 811 | ||
812 | static int cat_playlist_callback(int action, | 812 | static int cat_playlist_callback(int action, |
813 | const struct menu_item_ex *this_item, | 813 | const struct menu_item_ex *this_item, |
814 | struct gui_synclist *this_list); | 814 | struct gui_synclist *this_list); |
815 | 815 | ||
816 | MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_CATALOG_ADD_TO), | 816 | MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_CATALOG_ADD_TO), |
817 | cat_add_to_a_playlist, 0, NULL, Icon_Playlist); | 817 | cat_add_to_a_playlist, NULL, Icon_Playlist); |
818 | MENUITEM_FUNCTION(cat_add_to_new, 0, ID2P(LANG_CATALOG_ADD_TO_NEW), | 818 | MENUITEM_FUNCTION(cat_add_to_new, 0, ID2P(LANG_CATALOG_ADD_TO_NEW), |
819 | cat_add_to_a_new_playlist, 0, NULL, Icon_Playlist); | 819 | cat_add_to_a_new_playlist, NULL, Icon_Playlist); |
820 | MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_CATALOG), | 820 | MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_CATALOG), |
821 | cat_playlist_callback, Icon_Playlist, | 821 | cat_playlist_callback, Icon_Playlist, |
822 | &cat_add_to_list, &cat_add_to_new, &set_catalogdir_item); | 822 | &cat_add_to_list, &cat_add_to_new, &set_catalogdir_item); |
@@ -1481,7 +1481,7 @@ static int ratingitem_callback(int action, | |||
1481 | return action; | 1481 | return action; |
1482 | } | 1482 | } |
1483 | MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING), | 1483 | MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING), |
1484 | set_rating_inline, NULL, | 1484 | set_rating_inline, |
1485 | ratingitem_callback, Icon_Questionmark); | 1485 | ratingitem_callback, Icon_Questionmark); |
1486 | #endif | 1486 | #endif |
1487 | MENUITEM_RETURNVALUE(plugin_item, ID2P(LANG_OPEN_PLUGIN), | 1487 | MENUITEM_RETURNVALUE(plugin_item, ID2P(LANG_OPEN_PLUGIN), |
@@ -1514,7 +1514,7 @@ static int view_cue_item_callback(int action, | |||
1514 | return action; | 1514 | return action; |
1515 | } | 1515 | } |
1516 | MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET), | 1516 | MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET), |
1517 | view_cue, NULL, view_cue_item_callback, Icon_NOICON); | 1517 | view_cue, view_cue_item_callback, Icon_NOICON); |
1518 | 1518 | ||
1519 | 1519 | ||
1520 | static int browse_id3_wrapper(void) | 1520 | static int browse_id3_wrapper(void) |
@@ -1531,10 +1531,10 @@ static int browse_id3_wrapper(void) | |||
1531 | 1531 | ||
1532 | /* CONTEXT_WPS items */ | 1532 | /* CONTEXT_WPS items */ |
1533 | MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO), | 1533 | MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO), |
1534 | browse_id3_wrapper, NULL, NULL, Icon_NOICON); | 1534 | browse_id3_wrapper, NULL, Icon_NOICON); |
1535 | #ifdef HAVE_PITCHCONTROL | 1535 | #ifdef HAVE_PITCHCONTROL |
1536 | MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), | 1536 | MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), |
1537 | gui_syncpitchscreen_run, NULL, NULL, Icon_Audio); | 1537 | gui_syncpitchscreen_run, NULL, Icon_Audio); |
1538 | #endif | 1538 | #endif |
1539 | 1539 | ||
1540 | /* CONTEXT_[TREE|ID3DB] items */ | 1540 | /* CONTEXT_[TREE|ID3DB] items */ |
@@ -1543,19 +1543,19 @@ static int clipboard_callback(int action, | |||
1543 | struct gui_synclist *this_list); | 1543 | struct gui_synclist *this_list); |
1544 | 1544 | ||
1545 | MENUITEM_FUNCTION(rename_file_item, 0, ID2P(LANG_RENAME), | 1545 | MENUITEM_FUNCTION(rename_file_item, 0, ID2P(LANG_RENAME), |
1546 | rename_file, NULL, clipboard_callback, Icon_NOICON); | 1546 | rename_file, clipboard_callback, Icon_NOICON); |
1547 | MENUITEM_FUNCTION(clipboard_cut_item, 0, ID2P(LANG_CUT), | 1547 | MENUITEM_FUNCTION(clipboard_cut_item, 0, ID2P(LANG_CUT), |
1548 | clipboard_cut, NULL, clipboard_callback, Icon_NOICON); | 1548 | clipboard_cut, clipboard_callback, Icon_NOICON); |
1549 | MENUITEM_FUNCTION(clipboard_copy_item, 0, ID2P(LANG_COPY), | 1549 | MENUITEM_FUNCTION(clipboard_copy_item, 0, ID2P(LANG_COPY), |
1550 | clipboard_copy, NULL, clipboard_callback, Icon_NOICON); | 1550 | clipboard_copy, clipboard_callback, Icon_NOICON); |
1551 | MENUITEM_FUNCTION(clipboard_paste_item, 0, ID2P(LANG_PASTE), | 1551 | MENUITEM_FUNCTION(clipboard_paste_item, 0, ID2P(LANG_PASTE), |
1552 | clipboard_paste, NULL, clipboard_callback, Icon_NOICON); | 1552 | clipboard_paste, clipboard_callback, Icon_NOICON); |
1553 | MENUITEM_FUNCTION(delete_file_item, 0, ID2P(LANG_DELETE), | 1553 | MENUITEM_FUNCTION(delete_file_item, 0, ID2P(LANG_DELETE), |
1554 | delete_file_dir, NULL, clipboard_callback, Icon_NOICON); | 1554 | delete_file_dir, clipboard_callback, Icon_NOICON); |
1555 | MENUITEM_FUNCTION(delete_dir_item, 0, ID2P(LANG_DELETE_DIR), | 1555 | MENUITEM_FUNCTION(delete_dir_item, 0, ID2P(LANG_DELETE_DIR), |
1556 | delete_file_dir, NULL, clipboard_callback, Icon_NOICON); | 1556 | delete_file_dir, clipboard_callback, Icon_NOICON); |
1557 | MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR), | 1557 | MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR), |
1558 | create_dir, NULL, clipboard_callback, Icon_NOICON); | 1558 | create_dir, clipboard_callback, Icon_NOICON); |
1559 | 1559 | ||
1560 | /* other items */ | 1560 | /* other items */ |
1561 | static bool list_viewers(void) | 1561 | static bool list_viewers(void) |
@@ -1579,7 +1579,7 @@ static bool onplay_load_plugin(void *param) | |||
1579 | } | 1579 | } |
1580 | 1580 | ||
1581 | MENUITEM_FUNCTION(list_viewers_item, 0, ID2P(LANG_ONPLAY_OPEN_WITH), | 1581 | MENUITEM_FUNCTION(list_viewers_item, 0, ID2P(LANG_ONPLAY_OPEN_WITH), |
1582 | list_viewers, NULL, clipboard_callback, Icon_NOICON); | 1582 | list_viewers, clipboard_callback, Icon_NOICON); |
1583 | MENUITEM_FUNCTION_W_PARAM(properties_item, 0, ID2P(LANG_PROPERTIES), | 1583 | MENUITEM_FUNCTION_W_PARAM(properties_item, 0, ID2P(LANG_PROPERTIES), |
1584 | onplay_load_plugin, (void *)"properties", | 1584 | onplay_load_plugin, (void *)"properties", |
1585 | clipboard_callback, Icon_NOICON); | 1585 | clipboard_callback, Icon_NOICON); |
@@ -1597,7 +1597,7 @@ static bool onplay_add_to_shortcuts(void) | |||
1597 | return false; | 1597 | return false; |
1598 | } | 1598 | } |
1599 | MENUITEM_FUNCTION(add_to_faves_item, 0, ID2P(LANG_ADD_TO_FAVES), | 1599 | MENUITEM_FUNCTION(add_to_faves_item, 0, ID2P(LANG_ADD_TO_FAVES), |
1600 | onplay_add_to_shortcuts, NULL, | 1600 | onplay_add_to_shortcuts, |
1601 | clipboard_callback, Icon_NOICON); | 1601 | clipboard_callback, Icon_NOICON); |
1602 | 1602 | ||
1603 | #if LCD_DEPTH > 1 | 1603 | #if LCD_DEPTH > 1 |
@@ -1611,7 +1611,7 @@ static bool set_backdrop(void) | |||
1611 | return true; | 1611 | return true; |
1612 | } | 1612 | } |
1613 | MENUITEM_FUNCTION(set_backdrop_item, 0, ID2P(LANG_SET_AS_BACKDROP), | 1613 | MENUITEM_FUNCTION(set_backdrop_item, 0, ID2P(LANG_SET_AS_BACKDROP), |
1614 | set_backdrop, NULL, clipboard_callback, Icon_NOICON); | 1614 | set_backdrop, clipboard_callback, Icon_NOICON); |
1615 | #endif | 1615 | #endif |
1616 | #ifdef HAVE_RECORDING | 1616 | #ifdef HAVE_RECORDING |
1617 | static bool set_recdir(void) | 1617 | static bool set_recdir(void) |
@@ -1622,7 +1622,7 @@ static bool set_recdir(void) | |||
1622 | return false; | 1622 | return false; |
1623 | } | 1623 | } |
1624 | MENUITEM_FUNCTION(set_recdir_item, 0, ID2P(LANG_SET_AS_REC_DIR), | 1624 | MENUITEM_FUNCTION(set_recdir_item, 0, ID2P(LANG_SET_AS_REC_DIR), |
1625 | set_recdir, NULL, clipboard_callback, Icon_Recording); | 1625 | set_recdir, clipboard_callback, Icon_Recording); |
1626 | #endif | 1626 | #endif |
1627 | static bool set_startdir(void) | 1627 | static bool set_startdir(void) |
1628 | { | 1628 | { |
@@ -1633,7 +1633,7 @@ static bool set_startdir(void) | |||
1633 | return false; | 1633 | return false; |
1634 | } | 1634 | } |
1635 | MENUITEM_FUNCTION(set_startdir_item, 0, ID2P(LANG_SET_AS_START_DIR), | 1635 | MENUITEM_FUNCTION(set_startdir_item, 0, ID2P(LANG_SET_AS_START_DIR), |
1636 | set_startdir, NULL, clipboard_callback, Icon_file_view_menu); | 1636 | set_startdir, clipboard_callback, Icon_file_view_menu); |
1637 | 1637 | ||
1638 | static int clipboard_callback(int action, | 1638 | static int clipboard_callback(int action, |
1639 | const struct menu_item_ex *this_item, | 1639 | const struct menu_item_ex *this_item, |
@@ -1747,7 +1747,7 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE), | |||
1747 | ); | 1747 | ); |
1748 | 1748 | ||
1749 | MENUITEM_FUNCTION(view_playlist_item, 0, ID2P(LANG_VIEW), | 1749 | MENUITEM_FUNCTION(view_playlist_item, 0, ID2P(LANG_VIEW), |
1750 | view_playlist, NULL, | 1750 | view_playlist, |
1751 | onplaymenu_callback, Icon_Playlist); | 1751 | onplaymenu_callback, Icon_Playlist); |
1752 | 1752 | ||
1753 | /* used when onplay() is not called in the CONTEXT_WPS context */ | 1753 | /* used when onplay() is not called in the CONTEXT_WPS context */ |
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c index a8ef3efc97..91c0950035 100644 --- a/apps/plugins/imageviewer/imageviewer.c +++ b/apps/plugins/imageviewer/imageviewer.c | |||
@@ -236,9 +236,9 @@ static bool set_option_dithering(void) | |||
236 | } | 236 | } |
237 | 237 | ||
238 | MENUITEM_FUNCTION(grayscale_item, 0, ID2P(LANG_GRAYSCALE), | 238 | MENUITEM_FUNCTION(grayscale_item, 0, ID2P(LANG_GRAYSCALE), |
239 | set_option_grayscale, NULL, NULL, Icon_NOICON); | 239 | set_option_grayscale, NULL, Icon_NOICON); |
240 | MENUITEM_FUNCTION(dithering_item, 0, ID2P(LANG_DITHERING), | 240 | MENUITEM_FUNCTION(dithering_item, 0, ID2P(LANG_DITHERING), |
241 | set_option_dithering, NULL, NULL, Icon_NOICON); | 241 | set_option_dithering, NULL, Icon_NOICON); |
242 | MAKE_MENU(display_menu, "Display Options", NULL, Icon_NOICON, | 242 | MAKE_MENU(display_menu, "Display Options", NULL, Icon_NOICON, |
243 | &grayscale_item, &dithering_item); | 243 | &grayscale_item, &dithering_item); |
244 | 244 | ||
diff --git a/apps/plugins/lib/playback_control.c b/apps/plugins/lib/playback_control.c index 363033b1f2..a7f5b8baff 100644 --- a/apps/plugins/lib/playback_control.c +++ b/apps/plugins/lib/playback_control.c | |||
@@ -91,19 +91,19 @@ static bool repeat_mode(void) | |||
91 | return false; | 91 | return false; |
92 | } | 92 | } |
93 | MENUITEM_FUNCTION(prevtrack_item, 0, ID2P(LANG_PREVTRACK), | 93 | MENUITEM_FUNCTION(prevtrack_item, 0, ID2P(LANG_PREVTRACK), |
94 | prevtrack, NULL, NULL, Icon_NOICON); | 94 | prevtrack, NULL, Icon_NOICON); |
95 | MENUITEM_FUNCTION(playpause_item, 0, ID2P(LANG_PLAYPAUSE), | 95 | MENUITEM_FUNCTION(playpause_item, 0, ID2P(LANG_PLAYPAUSE), |
96 | play, NULL, NULL, Icon_NOICON); | 96 | play, NULL, Icon_NOICON); |
97 | MENUITEM_FUNCTION(stop_item, 0, ID2P(LANG_STOP_PLAYBACK), | 97 | MENUITEM_FUNCTION(stop_item, 0, ID2P(LANG_STOP_PLAYBACK), |
98 | stop, NULL, NULL, Icon_NOICON); | 98 | stop, NULL, Icon_NOICON); |
99 | MENUITEM_FUNCTION(nexttrack_item, 0, ID2P(LANG_NEXTTRACK), | 99 | MENUITEM_FUNCTION(nexttrack_item, 0, ID2P(LANG_NEXTTRACK), |
100 | nexttrack, NULL, NULL, Icon_NOICON); | 100 | nexttrack, NULL, Icon_NOICON); |
101 | MENUITEM_FUNCTION(volume_item, 0, ID2P(LANG_CHANGE_VOLUME), | 101 | MENUITEM_FUNCTION(volume_item, 0, ID2P(LANG_CHANGE_VOLUME), |
102 | volume, NULL, NULL, Icon_NOICON); | 102 | volume, NULL, Icon_NOICON); |
103 | MENUITEM_FUNCTION(shuffle_item, 0, ID2P(LANG_CHANGE_SHUFFLE_MODE), | 103 | MENUITEM_FUNCTION(shuffle_item, 0, ID2P(LANG_CHANGE_SHUFFLE_MODE), |
104 | shuffle, NULL, NULL, Icon_NOICON); | 104 | shuffle, NULL, Icon_NOICON); |
105 | MENUITEM_FUNCTION(repeat_mode_item, 0, ID2P(LANG_CHANGE_REPEAT_MODE), | 105 | MENUITEM_FUNCTION(repeat_mode_item, 0, ID2P(LANG_CHANGE_REPEAT_MODE), |
106 | repeat_mode, NULL, NULL, Icon_NOICON); | 106 | repeat_mode, NULL, Icon_NOICON); |
107 | MAKE_MENU(playback_control_menu, ID2P(LANG_PLAYBACK_CONTROL), NULL, Icon_NOICON, | 107 | MAKE_MENU(playback_control_menu, ID2P(LANG_PLAYBACK_CONTROL), NULL, Icon_NOICON, |
108 | &prevtrack_item, &playpause_item, &stop_item, &nexttrack_item, | 108 | &prevtrack_item, &playpause_item, &stop_item, &nexttrack_item, |
109 | &volume_item, &shuffle_item, &repeat_mode_item); | 109 | &volume_item, &shuffle_item, &repeat_mode_item); |
diff --git a/apps/plugins/text_viewer/tv_menu.c b/apps/plugins/text_viewer/tv_menu.c index 53e0adaf67..3d22794f62 100644 --- a/apps/plugins/text_viewer/tv_menu.c +++ b/apps/plugins/text_viewer/tv_menu.c | |||
@@ -51,10 +51,9 @@ static bool tv_horizontal_scroll_mode_setting(void) | |||
51 | } | 51 | } |
52 | 52 | ||
53 | MENUITEM_FUNCTION(horizontal_scrollbar_item, 0, "Scrollbar", | 53 | MENUITEM_FUNCTION(horizontal_scrollbar_item, 0, "Scrollbar", |
54 | tv_horizontal_scrollbar_setting, | 54 | tv_horizontal_scrollbar_setting, NULL, Icon_NOICON); |
55 | NULL, NULL, Icon_NOICON); | ||
56 | MENUITEM_FUNCTION(horizontal_scroll_mode_item, 0, "Scroll Mode", | 55 | MENUITEM_FUNCTION(horizontal_scroll_mode_item, 0, "Scroll Mode", |
57 | tv_horizontal_scroll_mode_setting, NULL, NULL, Icon_NOICON); | 56 | tv_horizontal_scroll_mode_setting, NULL, Icon_NOICON); |
58 | 57 | ||
59 | MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON, | 58 | MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON, |
60 | &horizontal_scrollbar_item, | 59 | &horizontal_scrollbar_item, |
@@ -103,16 +102,14 @@ static bool tv_narrow_mode_setting(void) | |||
103 | } | 102 | } |
104 | 103 | ||
105 | MENUITEM_FUNCTION(vertical_scrollbar_item, 0, "Scrollbar", | 104 | MENUITEM_FUNCTION(vertical_scrollbar_item, 0, "Scrollbar", |
106 | tv_vertical_scrollbar_setting, | 105 | tv_vertical_scrollbar_setting, NULL, Icon_NOICON); |
107 | NULL, NULL, Icon_NOICON); | ||
108 | MENUITEM_FUNCTION(vertical_scroll_mode_item, 0, "Scroll Mode", | 106 | MENUITEM_FUNCTION(vertical_scroll_mode_item, 0, "Scroll Mode", |
109 | tv_vertical_scroll_mode_setting, NULL, NULL, Icon_NOICON); | 107 | tv_vertical_scroll_mode_setting, NULL, Icon_NOICON); |
110 | MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, | 108 | MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, NULL, Icon_NOICON); |
111 | NULL, NULL, Icon_NOICON); | ||
112 | MENUITEM_FUNCTION(autoscroll_speed_item, 0, "Auto-Scroll Speed", | 109 | MENUITEM_FUNCTION(autoscroll_speed_item, 0, "Auto-Scroll Speed", |
113 | tv_autoscroll_speed_setting, NULL, NULL, Icon_NOICON); | 110 | tv_autoscroll_speed_setting, NULL, Icon_NOICON); |
114 | MENUITEM_FUNCTION(narrow_mode_item, 0, "Left/Right Key (Narrow mode)", | 111 | MENUITEM_FUNCTION(narrow_mode_item, 0, "Left/Right Key (Narrow mode)", |
115 | tv_narrow_mode_setting, NULL, NULL, Icon_NOICON); | 112 | tv_narrow_mode_setting, NULL, Icon_NOICON); |
116 | 113 | ||
117 | MAKE_MENU(vertical_scroll_menu, "Vertical", NULL, Icon_NOICON, | 114 | MAKE_MENU(vertical_scroll_menu, "Vertical", NULL, Icon_NOICON, |
118 | &vertical_scrollbar_item, | 115 | &vertical_scrollbar_item, |
@@ -240,29 +237,29 @@ static bool tv_night_mode_setting(void) | |||
240 | } | 237 | } |
241 | #endif | 238 | #endif |
242 | 239 | ||
243 | MENUITEM_FUNCTION(encoding_item, 0, "Encoding", tv_encoding_setting, | 240 | MENUITEM_FUNCTION(encoding_item, 0, "Encoding", |
244 | NULL, NULL, Icon_NOICON); | 241 | tv_encoding_setting, NULL, Icon_NOICON); |
245 | MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap", tv_word_wrap_setting, | 242 | MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap", |
246 | NULL, NULL, Icon_NOICON); | 243 | tv_word_wrap_setting, NULL, Icon_NOICON); |
247 | MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode", tv_line_mode_setting, | 244 | MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode", |
248 | NULL, NULL, Icon_NOICON); | 245 | tv_line_mode_setting, NULL, Icon_NOICON); |
249 | MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", tv_windows_setting, | 246 | MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", |
250 | NULL, NULL, Icon_NOICON); | 247 | tv_windows_setting, NULL, Icon_NOICON); |
251 | MENUITEM_FUNCTION(alignment_item, 0, "Alignment", tv_alignment_setting, | 248 | MENUITEM_FUNCTION(alignment_item, 0, "Alignment", |
252 | NULL, NULL, Icon_NOICON); | 249 | tv_alignment_setting, NULL, Icon_NOICON); |
253 | MENUITEM_FUNCTION(header_item, 0, "Show Header", tv_header_setting, | 250 | MENUITEM_FUNCTION(header_item, 0, "Show Header", |
254 | NULL, NULL, Icon_NOICON); | 251 | tv_header_setting, NULL, Icon_NOICON); |
255 | MENUITEM_FUNCTION(footer_item, 0, "Show Footer", tv_footer_setting, | 252 | MENUITEM_FUNCTION(footer_item, 0, "Show Footer", |
256 | NULL, NULL, Icon_NOICON); | 253 | tv_footer_setting, NULL, Icon_NOICON); |
257 | MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", tv_statusbar_setting, | 254 | MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", |
258 | NULL, NULL, Icon_NOICON); | 255 | tv_statusbar_setting, NULL, Icon_NOICON); |
259 | MENUITEM_FUNCTION(font_item, 0, "Font", tv_font_setting, | 256 | MENUITEM_FUNCTION(font_item, 0, "Font", |
260 | NULL, NULL, Icon_NOICON); | 257 | tv_font_setting, NULL, Icon_NOICON); |
261 | MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", tv_indent_spaces_setting, | 258 | MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", |
262 | NULL, NULL, Icon_NOICON); | 259 | tv_indent_spaces_setting, NULL, Icon_NOICON); |
263 | #ifdef HAVE_LCD_COLOR | 260 | #ifdef HAVE_LCD_COLOR |
264 | MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", tv_night_mode_setting, | 261 | MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", |
265 | NULL, NULL, Icon_NOICON); | 262 | tv_night_mode_setting, NULL, Icon_NOICON); |
266 | #endif | 263 | #endif |
267 | 264 | ||
268 | MAKE_MENU(option_menu, "Viewer Options", NULL, Icon_NOICON, | 265 | MAKE_MENU(option_menu, "Viewer Options", NULL, Icon_NOICON, |
diff --git a/apps/radio/presets.c b/apps/radio/presets.c index 1cd85637e8..d90f54ed99 100644 --- a/apps/radio/presets.c +++ b/apps/radio/presets.c | |||
@@ -428,11 +428,11 @@ int preset_list_clear(void) | |||
428 | } | 428 | } |
429 | 429 | ||
430 | MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL, | 430 | MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL, |
431 | ID2P(LANG_FM_EDIT_PRESET), | 431 | ID2P(LANG_FM_EDIT_PRESET), |
432 | radio_edit_preset, NULL, NULL, Icon_NOICON); | 432 | radio_edit_preset, NULL, Icon_NOICON); |
433 | MENUITEM_FUNCTION(radio_delete_preset_item, MENU_FUNC_CHECK_RETVAL, | 433 | MENUITEM_FUNCTION(radio_delete_preset_item, MENU_FUNC_CHECK_RETVAL, |
434 | ID2P(LANG_FM_DELETE_PRESET), | 434 | ID2P(LANG_FM_DELETE_PRESET), |
435 | radio_delete_preset, NULL, NULL, Icon_NOICON); | 435 | radio_delete_preset, NULL, Icon_NOICON); |
436 | static int radio_preset_callback(int action, | 436 | static int radio_preset_callback(int action, |
437 | const struct menu_item_ex *this_item, | 437 | const struct menu_item_ex *this_item, |
438 | struct gui_synclist *this_list) | 438 | struct gui_synclist *this_list) |