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

menus remove reserved 'param' parameter

Browse source 
-- missed the plugin menu --

Change-Id: Iac2c9b0b8212ab5f3ac2ef90e1ac2723d212f86c
This commit is contained in:
William Wilgus 2022-12-17 03:27:21 -05:00
parent ccf1aaa5be
commit c85a4f1fa4
17 changed files with 191 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/enc_config.c
View file

@ -194,8 +194,8 @@ static bool mp3_enc_bitrate(struct menucallback_data *data)
/* mp3_enc configuration menu */
MENUITEM_FUNCTION_W_PARAM(mp3_bitrate, 0, ID2P(LANG_BITRATE),
mp3_enc_bitrate,
&menu_callback_data, enc_menuitem_callback, Icon_NOICON);
mp3_enc_bitrate, &menu_callback_data,
enc_menuitem_callback, Icon_NOICON);
MAKE_MENU( mp3_enc_menu, ID2P(LANG_ENCODER_SETTINGS),
enc_menuitem_enteritem, Icon_NOICON,
&mp3_bitrate);

7
apps/menu.h
View file

@ -195,8 +195,7 @@ int do_menu(const struct menu_item_ex *menu, int *start_selected,
When the user selects this item the function will be run,
if MENU_FUNC_CHECK_RETVAL is set, the return value
will be checked, returning 1 will exit do_menu(); */
#define MENUITEM_FUNCTION(name, flags, str, func, reserved, \
callback, icon) \
#define MENUITEM_FUNCTION(name, flags, str, func, callback, icon) \
static const struct menu_callback_with_desc name##_ = {callback,str,icon}; \
static const struct menu_func name##__ = {(void*)func}; \
/* 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,
{ .function = & name##__}, {.callback_and_desc = & name##_}};
/* As above, except the text is dynamic */
#define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, reserved, \
#define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, \
text_callback, voice_callback, \
text_cb_data, callback, icon) \
static const struct menu_get_name_and_icon name##_ \
= {callback,text_callback,voice_callback,text_cb_data,icon}; \
static const struct menu_func name##__ = {(void*)func}; \
const struct menu_item_ex name = \
{ MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \
{ MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \
{ .function = & name##__}, {.menu_get_name_and_icon = & name##_}};
/* Use this to put a function call into the menu.

24
apps/menus/display_menu.c
View file

@ -168,8 +168,8 @@ MENUITEM_SETTING(bl_selective_actions,
selectivebacklight_callback);
MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS),
selectivebacklight_set_mask, NULL,
selectivebacklight_callback, Icon_Menu_setting);
selectivebacklight_set_mask, selectivebacklight_callback,
Icon_Menu_setting);
MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE),
NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask);
@ -520,18 +520,17 @@ static bool history_interval(void)
INT, names, 4, NULL );
}
MENUITEM_FUNCTION(histogram, 0,
ID2P(LANG_HISTOGRAM_INTERVAL),
history_interval, NULL, NULL, Icon_Menu_setting);
MENUITEM_FUNCTION(histogram, 0, ID2P(LANG_HISTOGRAM_INTERVAL),
history_interval, NULL, Icon_Menu_setting);
#endif
MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE),
peak_meter_scale, NULL, NULL, Icon_NOICON);
peak_meter_scale, NULL, Icon_NOICON);
MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN),
peak_meter_min, NULL, NULL, Icon_NOICON);
peak_meter_min, NULL, Icon_NOICON);
MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX),
peak_meter_max, NULL, NULL, Icon_NOICON);
peak_meter_max, NULL, Icon_NOICON);
MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON,
&peak_meter_release, &peak_meter_hold,
&peak_meter_clip_hold,
@ -575,10 +574,11 @@ static int line_padding_callback(int action,
MENUITEM_SETTING(touch_mode, &global_settings.touch_mode, touch_mode_callback);
MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), reset_mapping,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0,
ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, NULL, Icon_NOICON);
MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0,
ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION),
reset_mapping, NULL, Icon_NOICON);
MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback);
MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON, &list_line_padding, &touch_mode,

15
apps/menus/eq_menu.c
View file

@ -222,8 +222,8 @@ static int eq_do_simple_menu(void * param)
}
return 0;
}
MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN), eq_do_simple_menu,
NULL, NULL, Icon_Submenu);
MENUITEM_FUNCTION(gain_menu, 0, ID2P(LANG_EQUALIZER_GAIN),
eq_do_simple_menu, NULL, Icon_Submenu);
static void selection_to_banditem(int selection, int expanded_band, int *band, int *item)
{
@ -426,7 +426,7 @@ static int eq_do_advanced_menu(void * param)
return 0;
}
MENUITEM_FUNCTION(advanced_menu, 0, ID2P(LANG_EQUALIZER_ADVANCED),
eq_do_advanced_menu, NULL, NULL, Icon_EQ);
eq_do_advanced_menu, NULL, Icon_EQ);
enum eq_slider_mode {
GAIN,
@ -783,13 +783,12 @@ static int eq_save_preset(void)
static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG };
MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL),
eq_menu_graphical, NULL, lowlatency_callback,
Icon_EQ);
eq_menu_graphical, lowlatency_callback, Icon_EQ);
MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE),
eq_save_preset, NULL, NULL, Icon_NOICON);
eq_save_preset, NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE),
browse_folder, (void*)&eqs, lowlatency_callback,
Icon_NOICON);
browse_folder, (void*)&eqs,
lowlatency_callback, Icon_NOICON);
MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ,
&eq_enable, &eq_graphical, &eq_precut, &gain_menu,

23
apps/menus/main_menu.c
View file

@ -91,15 +91,18 @@ static int write_settings_file(void* param)
}
MENUITEM_FUNCTION_W_PARAM(browse_configs, 0, ID2P(LANG_CUSTOM_CFG),
browse_folder, (void*)&config, NULL, Icon_NOICON);
browse_folder, (void*)&config, NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(save_settings_item, 0, ID2P(LANG_SAVE_SETTINGS),
write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, Icon_NOICON);
write_settings_file, (void*)SETTINGS_SAVE_ALL,
NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(save_theme_item, 0, ID2P(LANG_SAVE_THEME),
write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, Icon_NOICON);
write_settings_file, (void*)SETTINGS_SAVE_THEME,
NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(save_sound_item, 0, ID2P(LANG_SAVE_SOUND),
write_settings_file, (void*)SETTINGS_SAVE_SOUND, NULL, Icon_NOICON);
write_settings_file, (void*)SETTINGS_SAVE_SOUND,
NULL, Icon_NOICON);
MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET),
reset_settings, NULL, NULL, Icon_NOICON);
reset_settings, NULL, Icon_NOICON);
MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config,
&browse_configs, &reset_settings_item,
@ -466,22 +469,22 @@ static int show_info(void)
MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO),
show_info, NULL, NULL, Icon_NOICON);
show_info, NULL, Icon_NOICON);
#if CONFIG_RTC
int time_screen(void* ignored);
MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU),
time_screen, NULL, NULL, Icon_Menu_setting );
time_screen, NULL, Icon_Menu_setting );
#endif
MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS),
show_credits, NULL, NULL, Icon_NOICON);
show_credits, NULL, Icon_NOICON);
MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME),
view_runtime, NULL, NULL, Icon_NOICON);
view_runtime, NULL, Icon_NOICON);
MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG),
debug_menu, NULL, NULL, Icon_NOICON);
debug_menu, NULL, Icon_NOICON);
MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu,
&show_info_item, &show_credits_item,

8
apps/menus/playlist_menu.c
View file

@ -143,12 +143,12 @@ static int playlist_view_(void)
return 0;
}
MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST),
create_playlist, NULL, NULL, Icon_NOICON);
create_playlist, NULL, Icon_NOICON);
MENUITEM_FUNCTION(view_cur_playlist, 0,
ID2P(LANG_VIEW_DYNAMIC_PLAYLIST),
playlist_view_, NULL, NULL, Icon_NOICON);
playlist_view_, NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(save_playlist, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST),
save_playlist_screen, NULL, NULL, Icon_NOICON);
save_playlist_screen, NULL, NULL, Icon_NOICON);
MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL);
static int clear_catalog_directory(void)
{
@ -158,7 +158,7 @@ static int clear_catalog_directory(void)
return false;
}
MENUITEM_FUNCTION(clear_catalog_directory_item, 0, ID2P(LANG_RESET_PLAYLISTCAT_DIR),
clear_catalog_directory, NULL, NULL, Icon_file_view_menu);
clear_catalog_directory, NULL, Icon_file_view_menu);
/* Playlist viewer settings submenu */
MENUITEM_SETTING(show_icons, &global_settings.playlist_viewer_icons, NULL);

15
apps/menus/plugin_menu.c
View file

@ -93,14 +93,15 @@ static int menu_callback(int action,
return action;
}
#define ITEM_FLAG (MENU_FUNC_USEPARAM|MENU_FUNC_CHECK_RETVAL)
#define ITEM_FLAG (MENU_FUNC_CHECK_RETVAL)
MENUITEM_FUNCTION_W_PARAM(games_item, ITEM_FLAG, ID2P(LANG_PLUGIN_GAMES),
plugins_menu, (void*)GAMES, NULL, Icon_Folder);
MENUITEM_FUNCTION_W_PARAM(apps_item, ITEM_FLAG, ID2P(LANG_PLUGIN_APPS),
plugins_menu, (void*)APPS, NULL, Icon_Folder);
MENUITEM_FUNCTION_W_PARAM(demos_item, ITEM_FLAG, ID2P(LANG_PLUGIN_DEMOS),
plugins_menu, (void*)DEMOS, NULL, Icon_Folder);
MENUITEM_FUNCTION(games_item, ITEM_FLAG, ID2P(LANG_PLUGIN_GAMES),
plugins_menu, (void*)GAMES, NULL, Icon_Folder);
MENUITEM_FUNCTION(apps_item, ITEM_FLAG, ID2P(LANG_PLUGIN_APPS),
plugins_menu, (void*)APPS, NULL, Icon_Folder);
MENUITEM_FUNCTION(demos_item, ITEM_FLAG, ID2P(LANG_PLUGIN_DEMOS),
plugins_menu, (void*)DEMOS, NULL, Icon_Folder);
MAKE_MENU(plugin_menu, ID2P(LANG_PLUGINS), &menu_callback,
Icon_Plugin,

25
apps/menus/radio_menu.c
View file

@ -52,7 +52,7 @@ static int fm_recording_screen(void)
}
MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING),
fm_recording_screen, NULL, NULL, Icon_Recording);
fm_recording_screen, NULL, Icon_Recording);
#endif /* defined(HAVE_FMRADIO_REC) */
#if defined(HAVE_FMRADIO_REC)
@ -65,25 +65,25 @@ static int fm_recording_settings(void)
}
MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS),
fm_recording_settings, NULL, NULL, Icon_Recording);
fm_recording_settings, NULL, Icon_Recording);
#endif /* defined(HAVE_FMRADIO_REC) */
#endif /* HAVE_RECORDING */
#ifndef FM_PRESET
MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_PRESET),
handle_radio_presets, NULL, NULL, Icon_NOICON);
handle_radio_presets, NULL, Icon_NOICON);
#endif
#ifndef FM_PRESET_ADD
MENUITEM_FUNCTION(radio_addpreset_item, 0, ID2P(LANG_FM_ADD_PRESET),
handle_radio_add_preset, NULL, NULL, Icon_NOICON);
handle_radio_add_preset, NULL, Icon_NOICON);
#endif
MENUITEM_FUNCTION(presetload_item, 0, ID2P(LANG_FM_PRESET_LOAD),
preset_list_load, NULL, NULL, Icon_NOICON);
preset_list_load, NULL, Icon_NOICON);
MENUITEM_FUNCTION(presetsave_item, 0, ID2P(LANG_FM_PRESET_SAVE),
preset_list_save, NULL, NULL, Icon_NOICON);
preset_list_save, NULL, Icon_NOICON);
MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR),
preset_list_clear, NULL, NULL, Icon_NOICON);
preset_list_clear, NULL, Icon_NOICON);
MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL);
MENUITEM_SETTING(force_mono, &global_settings.fm_force_mono, NULL);
@ -120,15 +120,14 @@ static int toggle_radio_mode(void)
RADIO_PRESET_MODE : RADIO_SCAN_MODE;
return 0;
}
MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0,
toggle_radio_mode, NULL,
get_mode_text, mode_speak_item,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, toggle_radio_mode,
get_mode_text, mode_speak_item,
NULL, NULL, Icon_NOICON);
#endif
MENUITEM_FUNCTION_W_PARAM(scan_presets_item, 0,
ID2P(LANG_FM_SCAN_PRESETS),
presets_scan, NULL, NULL, Icon_NOICON);
ID2P(LANG_FM_SCAN_PRESETS),
presets_scan, NULL, NULL, Icon_NOICON);
MAKE_MENU(radio_settings_menu, ID2P(LANG_FM_MENU), NULL,
Icon_Radio_screen,

40
apps/menus/recording_menu.c
View file

@ -94,8 +94,8 @@ static int recsource_func(void)
&global_settings.rec_source, INT, names,
n_opts, NULL );
}
MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE),
recsource_func, NULL, recmenu_callback, Icon_Menu_setting);
MENUITEM_FUNCTION(recsource, 0, ID2P(LANG_RECORDING_SOURCE),
recsource_func, recmenu_callback, Icon_Menu_setting);
/* Makes an options list from a source list of options and indexes */
static void make_options_from_indexes(const struct opt_items *src_names,
@ -188,7 +188,7 @@ static int recfrequency_func(void)
return ret;
} /* recfrequency */
MENUITEM_FUNCTION(recfrequency, 0, ID2P(LANG_FREQUENCY),
recfrequency_func, NULL, NULL, Icon_Menu_setting);
recfrequency_func, NULL, Icon_Menu_setting);
static int recchannels_func(void)
@ -229,7 +229,7 @@ static int recchannels_func(void)
return ret;
}
MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS),
recchannels_func, NULL, NULL, Icon_Menu_setting);
recchannels_func, NULL, Icon_Menu_setting);
static int recmonomode_func(void)
{
@ -249,7 +249,7 @@ static int recmonomode_func(void)
return ret;
}
MENUITEM_FUNCTION(recmonomode, 0, ID2P(LANG_RECORDING_MONO_MODE),
recmonomode_func, NULL, NULL, Icon_Menu_setting);
recmonomode_func, NULL, Icon_Menu_setting);
static int recformat_func(void)
{
@ -273,11 +273,10 @@ static int recformat_func(void)
return res;
} /* recformat */
MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_FORMAT),
recformat_func, NULL, NULL, Icon_Menu_setting);
recformat_func, NULL, Icon_Menu_setting);
MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS),
enc_global_config_menu,
NULL, NULL, Icon_Submenu);
enc_global_config_menu, NULL, Icon_Submenu);
static int recmenu_callback(int action,
const struct menu_item_ex *this_item,
@ -311,8 +310,8 @@ static int clear_rec_directory(void)
splash(HZ, ID2P(LANG_RESET_DONE_CLEAR));
return false;
}
MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR),
clear_rec_directory, NULL, NULL, Icon_Folder);
MENUITEM_FUNCTION(clear_rec_directory_item, 0, ID2P(LANG_CLEAR_REC_DIR),
clear_rec_directory, NULL, Icon_Folder);
MENUITEM_SETTING(cliplight, &global_settings.cliplight, NULL);
@ -350,10 +349,10 @@ static int agc_cliptime_func(void)
&global_settings.rec_agc_cliptime,
INT, names, 5, NULL );
}
MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET),
agc_preset_func, NULL, NULL, Icon_Menu_setting);
MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME),
agc_cliptime_func, NULL, NULL, Icon_Menu_setting);
MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET),
agc_preset_func, NULL, Icon_Menu_setting);
MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME),
agc_cliptime_func, NULL, Icon_Menu_setting);
#endif /* HAVE_AGC */
/** Rec trigger **/
@ -571,18 +570,19 @@ int rectrigger(void)
settings_save();
return 0;
}
MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER),
rectrigger, NULL, NULL, Icon_Menu_setting);
MENUITEM_FUNCTION(rectrigger_item, 0, ID2P(LANG_RECORD_TRIGGER),
rectrigger, NULL, Icon_Menu_setting);
static struct browse_folder_info rec_config_browse = {RECPRESETS_DIR, SHOW_CFG};
MENUITEM_FUNCTION_W_PARAM(browse_recconfigs, 0, ID2P(LANG_CUSTOM_CFG),
browse_folder, (void*)&rec_config_browse, NULL, Icon_Config);
MENUITEM_FUNCTION_W_PARAM(browse_recconfigs, 0, ID2P(LANG_CUSTOM_CFG),
browse_folder, (void*)&rec_config_browse,
NULL, Icon_Config);
static int write_settings_file(void)
{
return settings_save_config(SETTINGS_SAVE_RECPRESETS);
}
MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS),
write_settings_file, NULL, NULL, Icon_Config);
MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS),
write_settings_file, NULL, Icon_Config);
MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS),
NULL, Icon_Recording,

28
apps/menus/settings_menu.c
View file

@ -151,22 +151,20 @@ MENUITEM_SETTING(tagcache_ram, &global_settings.tagcache_ram, NULL);
#endif
MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL);
MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE),
(int(*)(void))tagcache_rebuild_with_splash,
NULL, NULL, Icon_NOICON);
(int(*)(void))tagcache_rebuild_with_splash, NULL, Icon_NOICON);
MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE),
(int(*)(void))tagcache_update_with_splash,
NULL, NULL, Icon_NOICON);
(int(*)(void))tagcache_update_with_splash, NULL, Icon_NOICON);
MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL);
MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT),
tagtree_export, NULL,
NULL, Icon_NOICON);
tagtree_export,
NULL, Icon_NOICON);
MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT),
tagtree_import, NULL,
NULL, Icon_NOICON);
tagtree_import,
NULL, Icon_NOICON);
MENUITEM_FUNCTION(tc_paths, 0, ID2P(LANG_SELECT_DATABASE_DIRS),
dirs_to_scan, NULL, NULL, Icon_NOICON);
dirs_to_scan, NULL, Icon_NOICON);
MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON,
#ifdef HAVE_TC_RAMCACHE
@ -201,7 +199,7 @@ static int clear_start_directory(void)
return false;
}
MENUITEM_FUNCTION(clear_start_directory_item, 0, ID2P(LANG_RESET_START_DIR),
clear_start_directory, NULL, NULL, Icon_file_view_menu);
clear_start_directory, NULL, Icon_file_view_menu);
static int fileview_callback(int action,
const struct menu_item_ex *this_item,
struct gui_synclist *this_list)
@ -406,8 +404,8 @@ MENUITEM_SETTING(bt_selective_actions,
&global_settings.bt_selective_softlock_actions,
selectivesoftlock_callback);
MENUITEM_FUNCTION(sel_softlock_mask, 0, ID2P(LANG_SETTINGS),
selectivesoftlock_set_mask, NULL,
selectivesoftlock_callback, Icon_Menu_setting);
selectivesoftlock_set_mask, selectivesoftlock_callback,
Icon_Menu_setting);
MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE),
NULL, Icon_Menu_setting, &bt_selective_actions, &sel_softlock_mask);
@ -572,7 +570,7 @@ static int sleeptimer_duration_cb(int action,
MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL);
MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL);
MENUITEM_FUNCTION_DYNTEXT(sleeptimer_toggle, 0, toggle_sleeptimer, NULL,
MENUITEM_FUNCTION_DYNTEXT(sleeptimer_toggle, 0, toggle_sleeptimer,
sleep_timer_getname, sleep_timer_voice, NULL,
NULL, Icon_NOICON);
MENUITEM_SETTING(sleeptimer_duration,
@ -762,7 +760,7 @@ static void wps_plugin_cb(void)
}
MENUITEM_FUNCTION(wps_set_context_plugin, 0,
ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN),
wps_plugin_cb, NULL, NULL, Icon_Plugin);
wps_plugin_cb, NULL, Icon_Plugin);
/* WPS_CONTEXT_PLUGIN */
/***********************************/
@ -785,7 +783,7 @@ MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON,
static struct browse_folder_info langs = { LANG_DIR, SHOW_LNG };
MENUITEM_FUNCTION_W_PARAM(browse_langs, 0, ID2P(LANG_LANGUAGE),
browse_folder, (void*)&langs, NULL, Icon_Language);
browse_folder, (void*)&langs, NULL, Icon_Language);
MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0,
Icon_General_settings_menu,

56
apps/menus/theme_menu.c
View file

@ -62,7 +62,7 @@ static int clear_main_backdrop(void)
return 0;
}
MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP),
clear_main_backdrop, NULL, NULL, Icon_NOICON);
clear_main_backdrop, NULL, Icon_NOICON);
#endif
#ifdef HAVE_LCD_COLOR
@ -130,19 +130,19 @@ static int reset_color(void)
return 0;
}
MENUITEM_FUNCTION_W_PARAM(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR),
set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON);
set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR),
set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON);
set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR),
set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON);
set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR),
set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON);
set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR),
set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON);
set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(set_sep_col, 0, ID2P(LANG_LIST_SEPARATOR_COLOR),
set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON);
set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON);
MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS),
reset_color, NULL, NULL, Icon_NOICON);
reset_color, NULL, Icon_NOICON);
MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU),
NULL, Icon_NOICON,
@ -323,32 +323,25 @@ int browse_folder(void *param)
return rockbox_browse(&browse);
}
MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0,
ID2P(LANG_CUSTOM_FONT),
browse_folder, (void*)&fonts, NULL, Icon_Font);
MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, ID2P(LANG_CUSTOM_FONT),
browse_folder, (void*)&fonts, NULL, Icon_Font);
MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0,
ID2P(LANG_BASE_SKIN),
browse_folder, (void*)&sbs, NULL, Icon_Wps);
MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, ID2P(LANG_BASE_SKIN),
browse_folder, (void*)&sbs, NULL, Icon_Wps);
#if CONFIG_TUNER
MENUITEM_FUNCTION_W_PARAM(browse_fms, 0,
ID2P(LANG_RADIOSCREEN),
browse_folder, (void*)&fms, NULL, Icon_Wps);
MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, ID2P(LANG_RADIOSCREEN),
browse_folder, (void*)&fms, NULL, Icon_Wps);
#endif
MENUITEM_FUNCTION_W_PARAM(browse_wps, 0,
ID2P(LANG_WHILE_PLAYING),
browse_folder, (void*)&wps, NULL, Icon_Wps);
MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, ID2P(LANG_WHILE_PLAYING),
browse_folder, (void*)&wps, NULL, Icon_Wps);
#ifdef HAVE_REMOTE_LCD
MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0,
ID2P(LANG_REMOTE_WHILE_PLAYING),
browse_folder, (void*)&rwps, NULL, Icon_Wps);
MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0,
ID2P(LANG_REMOTE_BASE_SKIN),
browse_folder, (void*)&rsbs, NULL, Icon_Wps);
MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, ID2P(LANG_REMOTE_WHILE_PLAYING),
browse_folder, (void*)&rwps, NULL, Icon_Wps);
MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, ID2P(LANG_REMOTE_BASE_SKIN),
browse_folder, (void*)&rsbs, NULL, Icon_Wps);
#if CONFIG_TUNER
MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0,
ID2P(LANG_REMOTE_RADIOSCREEN),
browse_folder, (void*)&rfms, NULL, Icon_Wps);
MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, ID2P(LANG_REMOTE_RADIOSCREEN),
browse_folder, (void*)&rfms, NULL, Icon_Wps);
#endif
#endif
@ -373,9 +366,8 @@ static int showicons_callback(int action,
}
MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback);
MENUITEM_FUNCTION_W_PARAM(browse_themes, 0,
ID2P(LANG_CUSTOM_THEME),
browse_folder, (void*)&themes, NULL, Icon_Config);
MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, ID2P(LANG_CUSTOM_THEME),
browse_folder, (void*)&themes, NULL, Icon_Config);
MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL);
#if LCD_DEPTH > 1
MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL);

8
apps/menus/time_menu.c
View file

@ -81,12 +81,12 @@ static int timedate_set(void)
return result;
}
MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME),
timedate_set, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME),
timedate_set, NULL, Icon_NOICON);
MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL);
#ifdef HAVE_RTC_ALARM
MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU),
alarm_screen, NULL, NULL, Icon_NOICON);
alarm_screen, NULL, Icon_NOICON);
#if CONFIG_TUNER || defined(HAVE_RECORDING)
#if CONFIG_TUNER && !defined(HAVE_RECORDING)
@ -139,7 +139,7 @@ static int alarm_setting(void)
}
MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN),
alarm_setting, NULL, alarm_callback, Icon_Menu_setting);
alarm_setting, alarm_callback, Icon_Menu_setting);
#endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */
#endif /* HAVE_RTC_ALARM */

54
apps/onplay.c
View file

@ -158,11 +158,11 @@ static int bookmark_menu_callback(int action,
struct gui_synclist *this_list);
MENUITEM_FUNCTION(bookmark_create_menu_item, 0,
ID2P(LANG_BOOKMARK_MENU_CREATE),
bookmark_create_menu, NULL,
bookmark_create_menu,
bookmark_menu_callback, Icon_Bookmark);
MENUITEM_FUNCTION(bookmark_load_menu_item, 0,
ID2P(LANG_BOOKMARK_MENU_LIST),
bookmark_load_menu_wrapper, NULL,
bookmark_load_menu_wrapper,
bookmark_menu_callback, Icon_Bookmark);
MAKE_ONPLAYMENU(bookmark_menu, ID2P(LANG_BOOKMARK_MENU),
bookmark_menu_callback, Icon_Bookmark,
@ -482,15 +482,15 @@ static int wps_view_cur_playlist(void)
}
MENUITEM_FUNCTION(wps_view_cur_playlist_item, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST),
wps_view_cur_playlist, NULL, NULL, Icon_NOICON);
wps_view_cur_playlist, NULL, Icon_NOICON);
MENUITEM_FUNCTION(search_playlist_item, 0, ID2P(LANG_SEARCH_IN_PLAYLIST),
search_playlist, NULL, NULL, Icon_Playlist);
search_playlist, NULL, Icon_Playlist);
MENUITEM_FUNCTION(playlist_save_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST),
save_playlist, NULL, NULL, Icon_Playlist);
save_playlist, NULL, Icon_Playlist);
MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST),
shuffle_playlist, NULL, NULL, Icon_Playlist);
shuffle_playlist, NULL, Icon_Playlist);
MENUITEM_FUNCTION(playing_time_item, 0, ID2P(LANG_PLAYING_TIME),
playing_time, NULL, NULL, Icon_Playlist);
playing_time, NULL, Icon_Playlist);
MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST),
NULL, Icon_Playlist,
&wps_view_cur_playlist_item, &search_playlist_item,
@ -807,16 +807,16 @@ static bool set_catalogdir(void)
return false;
}
MENUITEM_FUNCTION(set_catalogdir_item, 0, ID2P(LANG_SET_AS_PLAYLISTCAT_DIR),
set_catalogdir, NULL, clipboard_callback, Icon_Playlist);
set_catalogdir, clipboard_callback, Icon_Playlist);
static int cat_playlist_callback(int action,
const struct menu_item_ex *this_item,
struct gui_synclist *this_list);
MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_CATALOG_ADD_TO),
cat_add_to_a_playlist, 0, NULL, Icon_Playlist);
cat_add_to_a_playlist, NULL, Icon_Playlist);
MENUITEM_FUNCTION(cat_add_to_new, 0, ID2P(LANG_CATALOG_ADD_TO_NEW),
cat_add_to_a_new_playlist, 0, NULL, Icon_Playlist);
cat_add_to_a_new_playlist, NULL, Icon_Playlist);
MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_CATALOG),
cat_playlist_callback, Icon_Playlist,
&cat_add_to_list, &cat_add_to_new, &set_catalogdir_item);
@ -1481,7 +1481,7 @@ static int ratingitem_callback(int action,
return action;
}
MENUITEM_FUNCTION(rating_item, 0, ID2P(LANG_MENU_SET_RATING),
set_rating_inline, NULL,
set_rating_inline,
ratingitem_callback, Icon_Questionmark);
#endif
MENUITEM_RETURNVALUE(plugin_item, ID2P(LANG_OPEN_PLUGIN),
@ -1514,7 +1514,7 @@ static int view_cue_item_callback(int action,
return action;
}
MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET),
view_cue, NULL, view_cue_item_callback, Icon_NOICON);
view_cue, view_cue_item_callback, Icon_NOICON);
static int browse_id3_wrapper(void)
@ -1531,10 +1531,10 @@ static int browse_id3_wrapper(void)
/* CONTEXT_WPS items */
MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO),
browse_id3_wrapper, NULL, NULL, Icon_NOICON);
browse_id3_wrapper, NULL, Icon_NOICON);
#ifdef HAVE_PITCHCONTROL
MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH),
gui_syncpitchscreen_run, NULL, NULL, Icon_Audio);
gui_syncpitchscreen_run, NULL, Icon_Audio);
#endif
/* CONTEXT_[TREE|ID3DB] items */
@ -1543,19 +1543,19 @@ static int clipboard_callback(int action,
struct gui_synclist *this_list);
MENUITEM_FUNCTION(rename_file_item, 0, ID2P(LANG_RENAME),
rename_file, NULL, clipboard_callback, Icon_NOICON);
rename_file, clipboard_callback, Icon_NOICON);
MENUITEM_FUNCTION(clipboard_cut_item, 0, ID2P(LANG_CUT),
clipboard_cut, NULL, clipboard_callback, Icon_NOICON);
clipboard_cut, clipboard_callback, Icon_NOICON);
MENUITEM_FUNCTION(clipboard_copy_item, 0, ID2P(LANG_COPY),
clipboard_copy, NULL, clipboard_callback, Icon_NOICON);
clipboard_copy, clipboard_callback, Icon_NOICON);
MENUITEM_FUNCTION(clipboard_paste_item, 0, ID2P(LANG_PASTE),
clipboard_paste, NULL, clipboard_callback, Icon_NOICON);
clipboard_paste, clipboard_callback, Icon_NOICON);
MENUITEM_FUNCTION(delete_file_item, 0, ID2P(LANG_DELETE),
delete_file_dir, NULL, clipboard_callback, Icon_NOICON);
delete_file_dir, clipboard_callback, Icon_NOICON);
MENUITEM_FUNCTION(delete_dir_item, 0, ID2P(LANG_DELETE_DIR),
delete_file_dir, NULL, clipboard_callback, Icon_NOICON);
delete_file_dir, clipboard_callback, Icon_NOICON);
MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR),
create_dir, NULL, clipboard_callback, Icon_NOICON);
create_dir, clipboard_callback, Icon_NOICON);
/* other items */
static bool list_viewers(void)
@ -1579,7 +1579,7 @@ static bool onplay_load_plugin(void *param)
}
MENUITEM_FUNCTION(list_viewers_item, 0, ID2P(LANG_ONPLAY_OPEN_WITH),
list_viewers, NULL, clipboard_callback, Icon_NOICON);
list_viewers, clipboard_callback, Icon_NOICON);
MENUITEM_FUNCTION_W_PARAM(properties_item, 0, ID2P(LANG_PROPERTIES),
onplay_load_plugin, (void *)"properties",
clipboard_callback, Icon_NOICON);
@ -1597,7 +1597,7 @@ static bool onplay_add_to_shortcuts(void)
return false;
}
MENUITEM_FUNCTION(add_to_faves_item, 0, ID2P(LANG_ADD_TO_FAVES),
onplay_add_to_shortcuts, NULL,
onplay_add_to_shortcuts,
clipboard_callback, Icon_NOICON);
#if LCD_DEPTH > 1
@ -1611,7 +1611,7 @@ static bool set_backdrop(void)
return true;
}
MENUITEM_FUNCTION(set_backdrop_item, 0, ID2P(LANG_SET_AS_BACKDROP),
set_backdrop, NULL, clipboard_callback, Icon_NOICON);
set_backdrop, clipboard_callback, Icon_NOICON);
#endif
#ifdef HAVE_RECORDING
static bool set_recdir(void)
@ -1622,7 +1622,7 @@ static bool set_recdir(void)
return false;
}
MENUITEM_FUNCTION(set_recdir_item, 0, ID2P(LANG_SET_AS_REC_DIR),
set_recdir, NULL, clipboard_callback, Icon_Recording);
set_recdir, clipboard_callback, Icon_Recording);
#endif
static bool set_startdir(void)
{
@ -1633,7 +1633,7 @@ static bool set_startdir(void)
return false;
}
MENUITEM_FUNCTION(set_startdir_item, 0, ID2P(LANG_SET_AS_START_DIR),
set_startdir, NULL, clipboard_callback, Icon_file_view_menu);
set_startdir, clipboard_callback, Icon_file_view_menu);
static int clipboard_callback(int action,
const struct menu_item_ex *this_item,
@ -1747,7 +1747,7 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
);
MENUITEM_FUNCTION(view_playlist_item, 0, ID2P(LANG_VIEW),
view_playlist, NULL,
view_playlist,
onplaymenu_callback, Icon_Playlist);
/* used when onplay() is not called in the CONTEXT_WPS context */

4
apps/plugins/imageviewer/imageviewer.c
View file

@ -236,9 +236,9 @@ static bool set_option_dithering(void)
}
MENUITEM_FUNCTION(grayscale_item, 0, ID2P(LANG_GRAYSCALE),
set_option_grayscale, NULL, NULL, Icon_NOICON);
set_option_grayscale, NULL, Icon_NOICON);
MENUITEM_FUNCTION(dithering_item, 0, ID2P(LANG_DITHERING),
set_option_dithering, NULL, NULL, Icon_NOICON);
set_option_dithering, NULL, Icon_NOICON);
MAKE_MENU(display_menu, "Display Options", NULL, Icon_NOICON,
&grayscale_item, &dithering_item);

14
apps/plugins/lib/playback_control.c
View file

@ -91,19 +91,19 @@ static bool repeat_mode(void)
return false;
}
MENUITEM_FUNCTION(prevtrack_item, 0, ID2P(LANG_PREVTRACK),
prevtrack, NULL, NULL, Icon_NOICON);
prevtrack, NULL, Icon_NOICON);
MENUITEM_FUNCTION(playpause_item, 0, ID2P(LANG_PLAYPAUSE),
play, NULL, NULL, Icon_NOICON);
play, NULL, Icon_NOICON);
MENUITEM_FUNCTION(stop_item, 0, ID2P(LANG_STOP_PLAYBACK),
stop, NULL, NULL, Icon_NOICON);
stop, NULL, Icon_NOICON);
MENUITEM_FUNCTION(nexttrack_item, 0, ID2P(LANG_NEXTTRACK),
nexttrack, NULL, NULL, Icon_NOICON);
nexttrack, NULL, Icon_NOICON);
MENUITEM_FUNCTION(volume_item, 0, ID2P(LANG_CHANGE_VOLUME),
volume, NULL, NULL, Icon_NOICON);
volume, NULL, Icon_NOICON);
MENUITEM_FUNCTION(shuffle_item, 0, ID2P(LANG_CHANGE_SHUFFLE_MODE),
shuffle, NULL, NULL, Icon_NOICON);
shuffle, NULL, Icon_NOICON);
MENUITEM_FUNCTION(repeat_mode_item, 0, ID2P(LANG_CHANGE_REPEAT_MODE),
repeat_mode, NULL, NULL, Icon_NOICON);
repeat_mode, NULL, Icon_NOICON);
MAKE_MENU(playback_control_menu, ID2P(LANG_PLAYBACK_CONTROL), NULL, Icon_NOICON,
&prevtrack_item, &playpause_item, &stop_item, &nexttrack_item,
&volume_item, &shuffle_item, &repeat_mode_item);

61
apps/plugins/text_viewer/tv_menu.c
View file

@ -51,10 +51,9 @@ static bool tv_horizontal_scroll_mode_setting(void)
}
MENUITEM_FUNCTION(horizontal_scrollbar_item, 0, "Scrollbar",
tv_horizontal_scrollbar_setting,
NULL, NULL, Icon_NOICON);
tv_horizontal_scrollbar_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(horizontal_scroll_mode_item, 0, "Scroll Mode",
tv_horizontal_scroll_mode_setting, NULL, NULL, Icon_NOICON);
tv_horizontal_scroll_mode_setting, NULL, Icon_NOICON);
MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON,
&horizontal_scrollbar_item,
@ -103,16 +102,14 @@ static bool tv_narrow_mode_setting(void)
}
MENUITEM_FUNCTION(vertical_scrollbar_item, 0, "Scrollbar",
tv_vertical_scrollbar_setting,
NULL, NULL, Icon_NOICON);
tv_vertical_scrollbar_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(vertical_scroll_mode_item, 0, "Scroll Mode",
tv_vertical_scroll_mode_setting, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting,
NULL, NULL, Icon_NOICON);
tv_vertical_scroll_mode_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(autoscroll_speed_item, 0, "Auto-Scroll Speed",
tv_autoscroll_speed_setting, NULL, NULL, Icon_NOICON);
tv_autoscroll_speed_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(narrow_mode_item, 0, "Left/Right Key (Narrow mode)",
tv_narrow_mode_setting, NULL, NULL, Icon_NOICON);
tv_narrow_mode_setting, NULL, Icon_NOICON);
MAKE_MENU(vertical_scroll_menu, "Vertical", NULL, Icon_NOICON,
&vertical_scrollbar_item,
@ -240,29 +237,29 @@ static bool tv_night_mode_setting(void)
}
#endif
MENUITEM_FUNCTION(encoding_item, 0, "Encoding", tv_encoding_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap", tv_word_wrap_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode", tv_line_mode_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", tv_windows_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(alignment_item, 0, "Alignment", tv_alignment_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(header_item, 0, "Show Header", tv_header_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(footer_item, 0, "Show Footer", tv_footer_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", tv_statusbar_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(font_item, 0, "Font", tv_font_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", tv_indent_spaces_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(encoding_item, 0, "Encoding",
tv_encoding_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap",
tv_word_wrap_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode",
tv_line_mode_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page",
tv_windows_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(alignment_item, 0, "Alignment",
tv_alignment_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(header_item, 0, "Show Header",
tv_header_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(footer_item, 0, "Show Footer",
tv_footer_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar",
tv_statusbar_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(font_item, 0, "Font",
tv_font_setting, NULL, Icon_NOICON);
MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces",
tv_indent_spaces_setting, NULL, Icon_NOICON);
#ifdef HAVE_LCD_COLOR
MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", tv_night_mode_setting,
NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode",
tv_night_mode_setting, NULL, Icon_NOICON);
#endif
MAKE_MENU(option_menu, "Viewer Options", NULL, Icon_NOICON,

8
apps/radio/presets.c
View file

@ -428,11 +428,11 @@ int preset_list_clear(void)
}
MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL,
ID2P(LANG_FM_EDIT_PRESET),
radio_edit_preset, NULL, NULL, Icon_NOICON);
ID2P(LANG_FM_EDIT_PRESET),
radio_edit_preset, NULL, Icon_NOICON);
MENUITEM_FUNCTION(radio_delete_preset_item, MENU_FUNC_CHECK_RETVAL,
ID2P(LANG_FM_DELETE_PRESET),
radio_delete_preset, NULL, NULL, Icon_NOICON);
ID2P(LANG_FM_DELETE_PRESET),
radio_delete_preset, NULL, Icon_NOICON);
static int radio_preset_callback(int action,
const struct menu_item_ex *this_item,
struct gui_synclist *this_list)