diff options
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 28 |
1 files changed, 13 insertions, 15 deletions
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, |