diff options
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/settings_menu.c | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index a71245cf80..191079deb8 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -191,6 +191,9 @@ MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL); | |||
191 | MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL); | 191 | MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL); |
192 | MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL); | 192 | MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL); |
193 | MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL); | 193 | MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL); |
194 | #ifdef HAVE_HOTKEY | ||
195 | MENUITEM_SETTING(hotkey_tree_item, &global_settings.hotkey_tree, NULL); | ||
196 | #endif | ||
194 | static int clear_start_directory(void) | 197 | static int clear_start_directory(void) |
195 | { | 198 | { |
196 | path_append(global_settings.start_directory, PATH_ROOTSTR, | 199 | path_append(global_settings.start_directory, PATH_ROOTSTR, |
@@ -229,6 +232,9 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), filemenu_callback, Icon_file_view_menu, | |||
229 | &dirfilter, &show_filename_ext, &browse_current, | 232 | &dirfilter, &show_filename_ext, &browse_current, |
230 | &show_path_in_browser, | 233 | &show_path_in_browser, |
231 | &clear_start_directory_item | 234 | &clear_start_directory_item |
235 | #ifdef HAVE_HOTKEY | ||
236 | ,&hotkey_tree_item | ||
237 | #endif | ||
232 | ); | 238 | ); |
233 | static int filemenu_callback(int action, | 239 | static int filemenu_callback(int action, |
234 | const struct menu_item_ex *this_item, | 240 | const struct menu_item_ex *this_item, |
@@ -776,14 +782,24 @@ MENUITEM_FUNCTION(wps_set_context_plugin, 0, | |||
776 | /***********************************/ | 782 | /***********************************/ |
777 | 783 | ||
778 | /***********************************/ | 784 | /***********************************/ |
779 | /* HOTKEY MENU */ | 785 | /* WPS Settings MENU */ |
786 | |||
787 | MENUITEM_SETTING(browser_default, | ||
788 | &global_settings.browser_default, NULL); | ||
789 | |||
780 | #ifdef HAVE_HOTKEY | 790 | #ifdef HAVE_HOTKEY |
781 | MENUITEM_SETTING(hotkey_wps_item, &global_settings.hotkey_wps, NULL); | 791 | MENUITEM_SETTING(hotkey_wps_item, &global_settings.hotkey_wps, NULL); |
782 | MENUITEM_SETTING(hotkey_tree_item, &global_settings.hotkey_tree, NULL); | 792 | #endif |
783 | MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, | 793 | |
784 | &hotkey_wps_item, &hotkey_tree_item); | 794 | MAKE_MENU(wps_settings, ID2P(LANG_WPS), 0, Icon_Playback_menu |
785 | #endif /*have_hotkey */ | 795 | ,&browser_default |
786 | /* HOTKEY MENU */ | 796 | #ifdef HAVE_HOTKEY |
797 | ,&hotkey_wps_item | ||
798 | #endif | ||
799 | ,&wps_set_context_plugin | ||
800 | ); | ||
801 | |||
802 | /* WPS Settings MENU */ | ||
787 | /***********************************/ | 803 | /***********************************/ |
788 | 804 | ||
789 | 805 | ||
@@ -797,6 +813,7 @@ MENUITEM_FUNCTION_W_PARAM(browse_langs, 0, ID2P(LANG_LANGUAGE), | |||
797 | 813 | ||
798 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | 814 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, |
799 | Icon_General_settings_menu, | 815 | Icon_General_settings_menu, |
816 | &wps_settings, | ||
800 | &playlist_settings, &file_menu, | 817 | &playlist_settings, &file_menu, |
801 | #ifdef HAVE_TAGCACHE | 818 | #ifdef HAVE_TAGCACHE |
802 | &tagcache_menu, | 819 | &tagcache_menu, |
@@ -808,10 +825,6 @@ MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | |||
808 | &autoresume_menu, | 825 | &autoresume_menu, |
809 | #endif | 826 | #endif |
810 | &browse_langs, &voice_settings_menu, | 827 | &browse_langs, &voice_settings_menu, |
811 | &wps_set_context_plugin, | ||
812 | #ifdef HAVE_HOTKEY | ||
813 | &hotkey_menu, | ||
814 | #endif | ||
815 | ); | 828 | ); |
816 | /* SETTINGS MENU */ | 829 | /* SETTINGS MENU */ |
817 | /***********************************/ | 830 | /***********************************/ |