diff options
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 1007d2aeb0..bcd49c942c 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -46,11 +46,6 @@ | |||
46 | #ifdef HAVE_DIRCACHE | 46 | #ifdef HAVE_DIRCACHE |
47 | #include "dircache.h" | 47 | #include "dircache.h" |
48 | #endif | 48 | #endif |
49 | #ifdef HAVE_HOTKEY | ||
50 | #include "list.h" | ||
51 | #include "settings_list.h" | ||
52 | #include "onplay.h" | ||
53 | #endif | ||
54 | 49 | ||
55 | /***********************************/ | 50 | /***********************************/ |
56 | /* TAGCACHE MENU */ | 51 | /* TAGCACHE MENU */ |
@@ -406,44 +401,10 @@ MAKE_MENU(voice_settings_menu, ID2P(LANG_VOICE), 0, Icon_Voice, | |||
406 | /***********************************/ | 401 | /***********************************/ |
407 | /* HOTKEY MENU */ | 402 | /* HOTKEY MENU */ |
408 | #ifdef HAVE_HOTKEY | 403 | #ifdef HAVE_HOTKEY |
409 | static void view_hotkey_info(void) | 404 | MENUITEM_SETTING(hotkey_wps_item, &global_settings.hotkey_wps, NULL); |
410 | { | 405 | MENUITEM_SETTING(hotkey_tree_item, &global_settings.hotkey_tree, NULL); |
411 | struct simplelist_info info; | ||
412 | simplelist_info_init(&info, str(LANG_VIEW_HOTKEY), 0, NULL); | ||
413 | info.hide_selection = true; | ||
414 | info.scroll_all = true; | ||
415 | simplelist_addline(SIMPLELIST_ADD_LINE, str(LANG_HOTKEY_VIEW_WPS), | ||
416 | get_hotkey_desc(global_settings.hotkey_wps)); | ||
417 | simplelist_addline(SIMPLELIST_ADD_LINE, str(LANG_HOTKEY_VIEW_FILE_BROWSER), | ||
418 | get_hotkey_desc(global_settings.hotkey_tree)); | ||
419 | simplelist_show_list(&info); | ||
420 | } | ||
421 | |||
422 | /* reset hotkey settings to their defaults */ | ||
423 | static void reset_hotkey_settings(void) | ||
424 | { | ||
425 | { | ||
426 | const struct settings_list *setting = | ||
427 | find_setting(&global_settings.hotkey_wps, NULL); | ||
428 | reset_setting(setting, setting->setting); | ||
429 | } | ||
430 | { | ||
431 | const struct settings_list *setting = | ||
432 | find_setting(&global_settings.hotkey_tree, NULL); | ||
433 | reset_setting(setting, setting->setting); | ||
434 | } | ||
435 | settings_save(); | ||
436 | splash(HZ, str(LANG_RESET_DONE_CLEAR)); | ||
437 | } | ||
438 | |||
439 | MENUITEM_FUNCTION(hotkey_view, 0, ID2P(LANG_VIEW_HOTKEY), | ||
440 | (int(*)(void))view_hotkey_info, NULL, | ||
441 | NULL, Icon_NOICON); | ||
442 | MENUITEM_FUNCTION(hotkey_reset, 0, ID2P(LANG_RESET), | ||
443 | (int(*)(void))reset_hotkey_settings, NULL, | ||
444 | NULL, Icon_NOICON); | ||
445 | MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, | 406 | MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, |
446 | &hotkey_view, &hotkey_reset); | 407 | &hotkey_wps_item, &hotkey_tree_item); |
447 | #endif /*have_hotkey */ | 408 | #endif /*have_hotkey */ |
448 | /* HOTKEY MENU */ | 409 | /* HOTKEY MENU */ |
449 | /***********************************/ | 410 | /***********************************/ |