From 469cb391d303ab7f57a8095843d75be64925d625 Mon Sep 17 00:00:00 2001 From: hqurve Date: Sun, 11 Apr 2021 15:01:58 -0400 Subject: [PATCH] cleaned widget_ids --- voxygen/src/hud/settings_window/controls.rs | 198 +---------------- voxygen/src/hud/settings_window/gameplay.rs | 169 --------------- voxygen/src/hud/settings_window/interface.rs | 131 +---------- voxygen/src/hud/settings_window/language.rs | 197 ----------------- voxygen/src/hud/settings_window/mod.rs | 217 ++----------------- voxygen/src/hud/settings_window/sound.rs | 191 ---------------- voxygen/src/hud/settings_window/video.rs | 138 ------------ 7 files changed, 18 insertions(+), 1223 deletions(-) diff --git a/voxygen/src/hud/settings_window/controls.rs b/voxygen/src/hud/settings_window/controls.rs index 1e0bc2fabf..901be934ab 100644 --- a/voxygen/src/hud/settings_window/controls.rs +++ b/voxygen/src/hud/settings_window/controls.rs @@ -19,204 +19,10 @@ widget_ids! { window, window_r, window_scrollbar, - frame, - tabs_align, - icon, - settings_icon, - settings_button_mo, - settings_close, - settings_title, - settings_r, - settings_l, - settings_scrollbar, + reset_controls_button, + controls_alignment_rectangle, controls_texts[], controls_buttons[], - reset_interface_button, - reset_gameplay_button, - reset_controls_button, - reset_graphics_button, - reset_sound_button, - controls_alignment_rectangle, - button_help, - button_help2, - show_help_label, - ui_scale_label, - ui_scale_slider, - ui_scale_button, - ui_scale_value, - relative_to_win_button, - relative_to_win_text, - absolute_scale_button, - absolute_scale_text, - gameplay, - controls, - languages, - language_list[], - languages_list, - rectangle, - general_txt, - load_tips_button, - load_tips_button_label, - debug_button, - debug_button_label, - interface, - language_text, - mouse_pan_slider, - mouse_pan_label, - mouse_pan_value, - mouse_zoom_slider, - mouse_zoom_label, - mouse_zoom_value, - mouse_zoom_invert_button, - mouse_zoom_invert_label, - camera_clamp_slider, - camera_clamp_label, - camera_clamp_value, - mouse_y_invert_button, - mouse_y_invert_label, - controller_y_invert_button, - controller_y_invert_label, - smooth_pan_toggle_button, - smooth_pan_toggle_label, - ch_title, - ch_transp_slider, - ch_transp_label, - ch_transp_value, - ch_transp_text, - ch_1_bg, - ch_2_bg, - ch_3_bg, - crosshair_outer_1, - crosshair_inner_1, - crosshair_outer_2, - crosshair_inner_2, - crosshair_outer_3, - crosshair_inner_3, - settings_bg, - sound, - test, - video, - language, - fps_counter, - vd_slider, - vd_text, - vd_value, - lod_detail_slider, - lod_detail_text, - lod_detail_value, - sprite_dist_slider, - sprite_dist_text, - sprite_dist_value, - figure_dist_slider, - figure_dist_text, - figure_dist_value, - max_fps_slider, - max_fps_text, - max_fps_value, - fov_slider, - fov_text, - fov_value, - gamma_slider, - gamma_text, - gamma_value, - exposure_slider, - exposure_text, - exposure_value, - ambiance_slider, - ambiance_text, - ambiance_value, - aa_mode_text, - aa_mode_list, - upscale_factor_text, - upscale_factor_list, - cloud_mode_text, - cloud_mode_list, - fluid_mode_text, - fluid_mode_list, - fullscreen_mode_text, - fullscreen_mode_list, - // - resolution, - resolution_label, - bit_depth, - bit_depth_label, - refresh_rate, - refresh_rate_label, - // - particles_button, - particles_label, - // - fullscreen_button, - fullscreen_label, - lighting_mode_text, - lighting_mode_list, - shadow_mode_text, - shadow_mode_list, - shadow_mode_map_resolution_text, - shadow_mode_map_resolution_slider, - shadow_mode_map_resolution_value, - save_window_size_button, - audio_volume_slider, - audio_volume_text, - sfx_volume_slider, - sfx_volume_text, - audio_device_list, - audio_device_text, - // - hotbar_title, - bar_numbers_title, - show_bar_numbers_none_button, - show_bar_numbers_none_text, - show_bar_numbers_values_button, - show_bar_numbers_values_text, - show_bar_numbers_percentage_button, - show_bar_numbers_percentage_text, - // - show_shortcuts_button, - show_shortcuts_text, - buff_pos_bar_button, - buff_pos_bar_text, - buff_pos_map_button, - buff_pos_map_text, - // - chat_transp_title, - chat_transp_text, - chat_transp_slider, - chat_char_name_text, - chat_char_name_button, - // - sct_title, - sct_show_text, - sct_show_radio, - sct_single_dmg_text, - sct_single_dmg_radio, - sct_show_batch_text, - sct_show_batch_radio, - sct_batched_dmg_text, - sct_batched_dmg_radio, - sct_inc_dmg_text, - sct_inc_dmg_radio, - sct_batch_inc_text, - sct_batch_inc_radio, - sct_num_dur_text, - sct_num_dur_slider, - sct_num_dur_value, - // - speech_bubble_text, - speech_bubble_dark_mode_text, - speech_bubble_dark_mode_button, - speech_bubble_icon_text, - speech_bubble_icon_button, - free_look_behavior_text, - free_look_behavior_list, - auto_walk_behavior_text, - auto_walk_behavior_list, - camera_clamp_behavior_text, - camera_clamp_behavior_list, - stop_auto_walk_on_input_button, - stop_auto_walk_on_input_label, - auto_camera_button, - auto_camera_label, } } diff --git a/voxygen/src/hud/settings_window/gameplay.rs b/voxygen/src/hud/settings_window/gameplay.rs index f1eaac64fa..2965a737bb 100644 --- a/voxygen/src/hud/settings_window/gameplay.rs +++ b/voxygen/src/hud/settings_window/gameplay.rs @@ -18,48 +18,7 @@ widget_ids! { window, window_r, window_scrollbar, - frame, - tabs_align, - icon, - settings_icon, - settings_button_mo, - settings_close, - settings_title, - settings_r, - settings_l, - settings_scrollbar, - controls_texts[], - controls_buttons[], - reset_interface_button, reset_gameplay_button, - reset_controls_button, - reset_graphics_button, - reset_sound_button, - controls_alignment_rectangle, - button_help, - button_help2, - show_help_label, - ui_scale_label, - ui_scale_slider, - ui_scale_button, - ui_scale_value, - relative_to_win_button, - relative_to_win_text, - absolute_scale_button, - absolute_scale_text, - gameplay, - controls, - languages, - language_list[], - languages_list, - rectangle, - general_txt, - load_tips_button, - load_tips_button_label, - debug_button, - debug_button_label, - interface, - language_text, mouse_pan_slider, mouse_pan_label, mouse_pan_value, @@ -77,135 +36,7 @@ widget_ids! { controller_y_invert_label, smooth_pan_toggle_button, smooth_pan_toggle_label, - ch_title, - ch_transp_slider, - ch_transp_label, - ch_transp_value, - ch_transp_text, - ch_1_bg, - ch_2_bg, - ch_3_bg, - crosshair_outer_1, - crosshair_inner_1, - crosshair_outer_2, - crosshair_inner_2, - crosshair_outer_3, - crosshair_inner_3, - settings_bg, - sound, - test, - video, - language, - fps_counter, - vd_slider, - vd_text, - vd_value, - lod_detail_slider, - lod_detail_text, - lod_detail_value, - sprite_dist_slider, - sprite_dist_text, - sprite_dist_value, - figure_dist_slider, - figure_dist_text, - figure_dist_value, - max_fps_slider, - max_fps_text, - max_fps_value, - fov_slider, - fov_text, - fov_value, - gamma_slider, - gamma_text, - gamma_value, - exposure_slider, - exposure_text, - exposure_value, - ambiance_slider, - ambiance_text, - ambiance_value, - aa_mode_text, - aa_mode_list, - upscale_factor_text, - upscale_factor_list, - cloud_mode_text, - cloud_mode_list, - fluid_mode_text, - fluid_mode_list, - fullscreen_mode_text, - fullscreen_mode_list, // - resolution, - resolution_label, - bit_depth, - bit_depth_label, - refresh_rate, - refresh_rate_label, - // - particles_button, - particles_label, - // - fullscreen_button, - fullscreen_label, - lighting_mode_text, - lighting_mode_list, - shadow_mode_text, - shadow_mode_list, - shadow_mode_map_resolution_text, - shadow_mode_map_resolution_slider, - shadow_mode_map_resolution_value, - save_window_size_button, - audio_volume_slider, - audio_volume_text, - sfx_volume_slider, - sfx_volume_text, - audio_device_list, - audio_device_text, - // - hotbar_title, - bar_numbers_title, - show_bar_numbers_none_button, - show_bar_numbers_none_text, - show_bar_numbers_values_button, - show_bar_numbers_values_text, - show_bar_numbers_percentage_button, - show_bar_numbers_percentage_text, - // - show_shortcuts_button, - show_shortcuts_text, - buff_pos_bar_button, - buff_pos_bar_text, - buff_pos_map_button, - buff_pos_map_text, - // - chat_transp_title, - chat_transp_text, - chat_transp_slider, - chat_char_name_text, - chat_char_name_button, - // - sct_title, - sct_show_text, - sct_show_radio, - sct_single_dmg_text, - sct_single_dmg_radio, - sct_show_batch_text, - sct_show_batch_radio, - sct_batched_dmg_text, - sct_batched_dmg_radio, - sct_inc_dmg_text, - sct_inc_dmg_radio, - sct_batch_inc_text, - sct_batch_inc_radio, - sct_num_dur_text, - sct_num_dur_slider, - sct_num_dur_value, - // - speech_bubble_text, - speech_bubble_dark_mode_text, - speech_bubble_dark_mode_button, - speech_bubble_icon_text, - speech_bubble_icon_button, free_look_behavior_text, free_look_behavior_list, auto_walk_behavior_text, diff --git a/voxygen/src/hud/settings_window/interface.rs b/voxygen/src/hud/settings_window/interface.rs index cba5592a78..4729e2b55f 100644 --- a/voxygen/src/hud/settings_window/interface.rs +++ b/voxygen/src/hud/settings_window/interface.rs @@ -16,72 +16,27 @@ use conrod_core::{ }; widget_ids! { - struct Ids { + struct Ids{ window, window_r, window_scrollbar, - frame, - tabs_align, - icon, - settings_icon, - settings_button_mo, - settings_close, - settings_title, - settings_r, - settings_l, - settings_scrollbar, - controls_texts[], - controls_buttons[], reset_interface_button, - reset_gameplay_button, - reset_controls_button, - reset_graphics_button, - reset_sound_button, - controls_alignment_rectangle, button_help, - button_help2, show_help_label, ui_scale_label, ui_scale_slider, - ui_scale_button, ui_scale_value, relative_to_win_button, relative_to_win_text, absolute_scale_button, absolute_scale_text, - gameplay, - controls, - languages, - language_list[], - languages_list, - rectangle, general_txt, load_tips_button, load_tips_button_label, debug_button, debug_button_label, - interface, - language_text, - mouse_pan_slider, - mouse_pan_label, - mouse_pan_value, - mouse_zoom_slider, - mouse_zoom_label, - mouse_zoom_value, - mouse_zoom_invert_button, - mouse_zoom_invert_label, - camera_clamp_slider, - camera_clamp_label, - camera_clamp_value, - mouse_y_invert_button, - mouse_y_invert_label, - controller_y_invert_button, - controller_y_invert_label, - smooth_pan_toggle_button, - smooth_pan_toggle_label, ch_title, ch_transp_slider, - ch_transp_label, ch_transp_value, ch_transp_text, ch_1_bg, @@ -93,76 +48,6 @@ widget_ids! { crosshair_inner_2, crosshair_outer_3, crosshair_inner_3, - settings_bg, - sound, - test, - video, - language, - fps_counter, - vd_slider, - vd_text, - vd_value, - lod_detail_slider, - lod_detail_text, - lod_detail_value, - sprite_dist_slider, - sprite_dist_text, - sprite_dist_value, - figure_dist_slider, - figure_dist_text, - figure_dist_value, - max_fps_slider, - max_fps_text, - max_fps_value, - fov_slider, - fov_text, - fov_value, - gamma_slider, - gamma_text, - gamma_value, - exposure_slider, - exposure_text, - exposure_value, - ambiance_slider, - ambiance_text, - ambiance_value, - aa_mode_text, - aa_mode_list, - upscale_factor_text, - upscale_factor_list, - cloud_mode_text, - cloud_mode_list, - fluid_mode_text, - fluid_mode_list, - fullscreen_mode_text, - fullscreen_mode_list, - // - resolution, - resolution_label, - bit_depth, - bit_depth_label, - refresh_rate, - refresh_rate_label, - // - particles_button, - particles_label, - // - fullscreen_button, - fullscreen_label, - lighting_mode_text, - lighting_mode_list, - shadow_mode_text, - shadow_mode_list, - shadow_mode_map_resolution_text, - shadow_mode_map_resolution_slider, - shadow_mode_map_resolution_value, - save_window_size_button, - audio_volume_slider, - audio_volume_text, - sfx_volume_slider, - sfx_volume_text, - audio_device_list, - audio_device_text, // hotbar_title, bar_numbers_title, @@ -193,31 +78,17 @@ widget_ids! { sct_single_dmg_radio, sct_show_batch_text, sct_show_batch_radio, - sct_batched_dmg_text, sct_batched_dmg_radio, sct_inc_dmg_text, sct_inc_dmg_radio, sct_batch_inc_text, sct_batch_inc_radio, - sct_num_dur_text, - sct_num_dur_slider, - sct_num_dur_value, // speech_bubble_text, speech_bubble_dark_mode_text, speech_bubble_dark_mode_button, speech_bubble_icon_text, speech_bubble_icon_button, - free_look_behavior_text, - free_look_behavior_list, - auto_walk_behavior_text, - auto_walk_behavior_list, - camera_clamp_behavior_text, - camera_clamp_behavior_list, - stop_auto_walk_on_input_button, - stop_auto_walk_on_input_label, - auto_camera_button, - auto_camera_label, } } diff --git a/voxygen/src/hud/settings_window/language.rs b/voxygen/src/hud/settings_window/language.rs index 1855fbca0f..4796070184 100644 --- a/voxygen/src/hud/settings_window/language.rs +++ b/voxygen/src/hud/settings_window/language.rs @@ -17,204 +17,7 @@ widget_ids! { window, window_r, window_scrollbar, - frame, - tabs_align, - icon, - settings_icon, - settings_button_mo, - settings_close, - settings_title, - settings_r, - settings_l, - settings_scrollbar, - controls_texts[], - controls_buttons[], - reset_interface_button, - reset_gameplay_button, - reset_controls_button, - reset_graphics_button, - reset_sound_button, - controls_alignment_rectangle, - button_help, - button_help2, - show_help_label, - ui_scale_label, - ui_scale_slider, - ui_scale_button, - ui_scale_value, - relative_to_win_button, - relative_to_win_text, - absolute_scale_button, - absolute_scale_text, - gameplay, - controls, - languages, language_list[], - languages_list, - rectangle, - general_txt, - load_tips_button, - load_tips_button_label, - debug_button, - debug_button_label, - interface, - language_text, - mouse_pan_slider, - mouse_pan_label, - mouse_pan_value, - mouse_zoom_slider, - mouse_zoom_label, - mouse_zoom_value, - mouse_zoom_invert_button, - mouse_zoom_invert_label, - camera_clamp_slider, - camera_clamp_label, - camera_clamp_value, - mouse_y_invert_button, - mouse_y_invert_label, - controller_y_invert_button, - controller_y_invert_label, - smooth_pan_toggle_button, - smooth_pan_toggle_label, - ch_title, - ch_transp_slider, - ch_transp_label, - ch_transp_value, - ch_transp_text, - ch_1_bg, - ch_2_bg, - ch_3_bg, - crosshair_outer_1, - crosshair_inner_1, - crosshair_outer_2, - crosshair_inner_2, - crosshair_outer_3, - crosshair_inner_3, - settings_bg, - sound, - test, - video, - language, - fps_counter, - vd_slider, - vd_text, - vd_value, - lod_detail_slider, - lod_detail_text, - lod_detail_value, - sprite_dist_slider, - sprite_dist_text, - sprite_dist_value, - figure_dist_slider, - figure_dist_text, - figure_dist_value, - max_fps_slider, - max_fps_text, - max_fps_value, - fov_slider, - fov_text, - fov_value, - gamma_slider, - gamma_text, - gamma_value, - exposure_slider, - exposure_text, - exposure_value, - ambiance_slider, - ambiance_text, - ambiance_value, - aa_mode_text, - aa_mode_list, - upscale_factor_text, - upscale_factor_list, - cloud_mode_text, - cloud_mode_list, - fluid_mode_text, - fluid_mode_list, - fullscreen_mode_text, - fullscreen_mode_list, - // - resolution, - resolution_label, - bit_depth, - bit_depth_label, - refresh_rate, - refresh_rate_label, - // - particles_button, - particles_label, - // - fullscreen_button, - fullscreen_label, - lighting_mode_text, - lighting_mode_list, - shadow_mode_text, - shadow_mode_list, - shadow_mode_map_resolution_text, - shadow_mode_map_resolution_slider, - shadow_mode_map_resolution_value, - save_window_size_button, - audio_volume_slider, - audio_volume_text, - sfx_volume_slider, - sfx_volume_text, - audio_device_list, - audio_device_text, - // - hotbar_title, - bar_numbers_title, - show_bar_numbers_none_button, - show_bar_numbers_none_text, - show_bar_numbers_values_button, - show_bar_numbers_values_text, - show_bar_numbers_percentage_button, - show_bar_numbers_percentage_text, - // - show_shortcuts_button, - show_shortcuts_text, - buff_pos_bar_button, - buff_pos_bar_text, - buff_pos_map_button, - buff_pos_map_text, - // - chat_transp_title, - chat_transp_text, - chat_transp_slider, - chat_char_name_text, - chat_char_name_button, - // - sct_title, - sct_show_text, - sct_show_radio, - sct_single_dmg_text, - sct_single_dmg_radio, - sct_show_batch_text, - sct_show_batch_radio, - sct_batched_dmg_text, - sct_batched_dmg_radio, - sct_inc_dmg_text, - sct_inc_dmg_radio, - sct_batch_inc_text, - sct_batch_inc_radio, - sct_num_dur_text, - sct_num_dur_slider, - sct_num_dur_value, - // - speech_bubble_text, - speech_bubble_dark_mode_text, - speech_bubble_dark_mode_button, - speech_bubble_icon_text, - speech_bubble_icon_button, - free_look_behavior_text, - free_look_behavior_list, - auto_walk_behavior_text, - auto_walk_behavior_list, - camera_clamp_behavior_text, - camera_clamp_behavior_list, - stop_auto_walk_on_input_button, - stop_auto_walk_on_input_label, - auto_camera_button, - auto_camera_label, } } diff --git a/voxygen/src/hud/settings_window/mod.rs b/voxygen/src/hud/settings_window/mod.rs index b9ccf1bf1b..afdfb1c121 100644 --- a/voxygen/src/hud/settings_window/mod.rs +++ b/voxygen/src/hud/settings_window/mod.rs @@ -25,214 +25,27 @@ use conrod_core::{ widget_ids! { struct Ids { + frame, + tabs_align, + icon, + settings_content, + settings_content_r, + settings_close, + settings_title, + gameplay, + controls, + interface, + settings_bg, + sound, + video, + language, + interface_window, gameplay_window, controls_window, video_window, sound_window, language_window, - - - frame, - tabs_align, - icon, - settings_content, - settings_content_r, - settings_icon, - settings_button_mo, - settings_close, - settings_title, - settings_r, - settings_l, - settings_scrollbar, - controls_texts[], - controls_buttons[], - reset_interface_button, - reset_gameplay_button, - reset_controls_button, - reset_graphics_button, - reset_sound_button, - controls_alignment_rectangle, - button_help, - button_help2, - show_help_label, - ui_scale_label, - ui_scale_slider, - ui_scale_button, - ui_scale_value, - relative_to_win_button, - relative_to_win_text, - absolute_scale_button, - absolute_scale_text, - gameplay, - controls, - languages, - language_list[], - languages_list, - rectangle, - general_txt, - load_tips_button, - load_tips_button_label, - debug_button, - debug_button_label, - interface, - language_text, - mouse_pan_slider, - mouse_pan_label, - mouse_pan_value, - mouse_zoom_slider, - mouse_zoom_label, - mouse_zoom_value, - mouse_zoom_invert_button, - mouse_zoom_invert_label, - camera_clamp_slider, - camera_clamp_label, - camera_clamp_value, - mouse_y_invert_button, - mouse_y_invert_label, - controller_y_invert_button, - controller_y_invert_label, - smooth_pan_toggle_button, - smooth_pan_toggle_label, - ch_title, - ch_transp_slider, - ch_transp_label, - ch_transp_value, - ch_transp_text, - ch_1_bg, - ch_2_bg, - ch_3_bg, - crosshair_outer_1, - crosshair_inner_1, - crosshair_outer_2, - crosshair_inner_2, - crosshair_outer_3, - crosshair_inner_3, - settings_bg, - sound, - test, - video, - language, - fps_counter, - vd_slider, - vd_text, - vd_value, - lod_detail_slider, - lod_detail_text, - lod_detail_value, - sprite_dist_slider, - sprite_dist_text, - sprite_dist_value, - figure_dist_slider, - figure_dist_text, - figure_dist_value, - max_fps_slider, - max_fps_text, - max_fps_value, - fov_slider, - fov_text, - fov_value, - gamma_slider, - gamma_text, - gamma_value, - exposure_slider, - exposure_text, - exposure_value, - ambiance_slider, - ambiance_text, - ambiance_value, - aa_mode_text, - aa_mode_list, - upscale_factor_text, - upscale_factor_list, - cloud_mode_text, - cloud_mode_list, - fluid_mode_text, - fluid_mode_list, - fullscreen_mode_text, - fullscreen_mode_list, - // - resolution, - resolution_label, - bit_depth, - bit_depth_label, - refresh_rate, - refresh_rate_label, - // - particles_button, - particles_label, - // - fullscreen_button, - fullscreen_label, - lighting_mode_text, - lighting_mode_list, - shadow_mode_text, - shadow_mode_list, - shadow_mode_map_resolution_text, - shadow_mode_map_resolution_slider, - shadow_mode_map_resolution_value, - save_window_size_button, - audio_volume_slider, - audio_volume_text, - sfx_volume_slider, - sfx_volume_text, - audio_device_list, - audio_device_text, - // - hotbar_title, - bar_numbers_title, - show_bar_numbers_none_button, - show_bar_numbers_none_text, - show_bar_numbers_values_button, - show_bar_numbers_values_text, - show_bar_numbers_percentage_button, - show_bar_numbers_percentage_text, - // - show_shortcuts_button, - show_shortcuts_text, - buff_pos_bar_button, - buff_pos_bar_text, - buff_pos_map_button, - buff_pos_map_text, - // - chat_transp_title, - chat_transp_text, - chat_transp_slider, - chat_char_name_text, - chat_char_name_button, - // - sct_title, - sct_show_text, - sct_show_radio, - sct_single_dmg_text, - sct_single_dmg_radio, - sct_show_batch_text, - sct_show_batch_radio, - sct_batched_dmg_text, - sct_batched_dmg_radio, - sct_inc_dmg_text, - sct_inc_dmg_radio, - sct_batch_inc_text, - sct_batch_inc_radio, - sct_num_dur_text, - sct_num_dur_slider, - sct_num_dur_value, - // - speech_bubble_text, - speech_bubble_dark_mode_text, - speech_bubble_dark_mode_button, - speech_bubble_icon_text, - speech_bubble_icon_button, - free_look_behavior_text, - free_look_behavior_list, - auto_walk_behavior_text, - auto_walk_behavior_list, - camera_clamp_behavior_text, - camera_clamp_behavior_list, - stop_auto_walk_on_input_button, - stop_auto_walk_on_input_label, - auto_camera_button, - auto_camera_label, } } diff --git a/voxygen/src/hud/settings_window/sound.rs b/voxygen/src/hud/settings_window/sound.rs index 8a501f18e0..6a436010aa 100644 --- a/voxygen/src/hud/settings_window/sound.rs +++ b/voxygen/src/hud/settings_window/sound.rs @@ -18,204 +18,13 @@ widget_ids! { window, window_r, window_scrollbar, - frame, - tabs_align, - icon, - settings_icon, - settings_button_mo, - settings_close, - settings_title, - settings_r, - settings_l, - settings_scrollbar, - controls_texts[], - controls_buttons[], - reset_interface_button, - reset_gameplay_button, - reset_controls_button, - reset_graphics_button, reset_sound_button, - controls_alignment_rectangle, - button_help, - button_help2, - show_help_label, - ui_scale_label, - ui_scale_slider, - ui_scale_button, - ui_scale_value, - relative_to_win_button, - relative_to_win_text, - absolute_scale_button, - absolute_scale_text, - gameplay, - controls, - languages, - language_list[], - languages_list, - rectangle, - general_txt, - load_tips_button, - load_tips_button_label, - debug_button, - debug_button_label, - interface, - language_text, - mouse_pan_slider, - mouse_pan_label, - mouse_pan_value, - mouse_zoom_slider, - mouse_zoom_label, - mouse_zoom_value, - mouse_zoom_invert_button, - mouse_zoom_invert_label, - camera_clamp_slider, - camera_clamp_label, - camera_clamp_value, - mouse_y_invert_button, - mouse_y_invert_label, - controller_y_invert_button, - controller_y_invert_label, - smooth_pan_toggle_button, - smooth_pan_toggle_label, - ch_title, - ch_transp_slider, - ch_transp_label, - ch_transp_value, - ch_transp_text, - ch_1_bg, - ch_2_bg, - ch_3_bg, - crosshair_outer_1, - crosshair_inner_1, - crosshair_outer_2, - crosshair_inner_2, - crosshair_outer_3, - crosshair_inner_3, - settings_bg, - sound, - test, - video, - language, - fps_counter, - vd_slider, - vd_text, - vd_value, - lod_detail_slider, - lod_detail_text, - lod_detail_value, - sprite_dist_slider, - sprite_dist_text, - sprite_dist_value, - figure_dist_slider, - figure_dist_text, - figure_dist_value, - max_fps_slider, - max_fps_text, - max_fps_value, - fov_slider, - fov_text, - fov_value, - gamma_slider, - gamma_text, - gamma_value, - exposure_slider, - exposure_text, - exposure_value, - ambiance_slider, - ambiance_text, - ambiance_value, - aa_mode_text, - aa_mode_list, - upscale_factor_text, - upscale_factor_list, - cloud_mode_text, - cloud_mode_list, - fluid_mode_text, - fluid_mode_list, - fullscreen_mode_text, - fullscreen_mode_list, - // - resolution, - resolution_label, - bit_depth, - bit_depth_label, - refresh_rate, - refresh_rate_label, - // - particles_button, - particles_label, - // - fullscreen_button, - fullscreen_label, - lighting_mode_text, - lighting_mode_list, - shadow_mode_text, - shadow_mode_list, - shadow_mode_map_resolution_text, - shadow_mode_map_resolution_slider, - shadow_mode_map_resolution_value, - save_window_size_button, audio_volume_slider, audio_volume_text, sfx_volume_slider, sfx_volume_text, audio_device_list, audio_device_text, - // - hotbar_title, - bar_numbers_title, - show_bar_numbers_none_button, - show_bar_numbers_none_text, - show_bar_numbers_values_button, - show_bar_numbers_values_text, - show_bar_numbers_percentage_button, - show_bar_numbers_percentage_text, - // - show_shortcuts_button, - show_shortcuts_text, - buff_pos_bar_button, - buff_pos_bar_text, - buff_pos_map_button, - buff_pos_map_text, - // - chat_transp_title, - chat_transp_text, - chat_transp_slider, - chat_char_name_text, - chat_char_name_button, - // - sct_title, - sct_show_text, - sct_show_radio, - sct_single_dmg_text, - sct_single_dmg_radio, - sct_show_batch_text, - sct_show_batch_radio, - sct_batched_dmg_text, - sct_batched_dmg_radio, - sct_inc_dmg_text, - sct_inc_dmg_radio, - sct_batch_inc_text, - sct_batch_inc_radio, - sct_num_dur_text, - sct_num_dur_slider, - sct_num_dur_value, - // - speech_bubble_text, - speech_bubble_dark_mode_text, - speech_bubble_dark_mode_button, - speech_bubble_icon_text, - speech_bubble_icon_button, - free_look_behavior_text, - free_look_behavior_list, - auto_walk_behavior_text, - auto_walk_behavior_list, - camera_clamp_behavior_text, - camera_clamp_behavior_list, - stop_auto_walk_on_input_button, - stop_auto_walk_on_input_label, - auto_camera_button, - auto_camera_label, } } diff --git a/voxygen/src/hud/settings_window/video.rs b/voxygen/src/hud/settings_window/video.rs index 15a2f3f814..33a1ec17d3 100644 --- a/voxygen/src/hud/settings_window/video.rs +++ b/voxygen/src/hud/settings_window/video.rs @@ -32,84 +32,7 @@ widget_ids! { window, window_r, window_scrollbar, - frame, - tabs_align, - icon, - settings_icon, - settings_button_mo, - settings_close, - settings_title, - settings_r, - settings_l, - settings_scrollbar, - controls_texts[], - controls_buttons[], - reset_interface_button, - reset_gameplay_button, - reset_controls_button, reset_graphics_button, - reset_sound_button, - controls_alignment_rectangle, - button_help, - button_help2, - show_help_label, - ui_scale_label, - ui_scale_slider, - ui_scale_button, - ui_scale_value, - relative_to_win_button, - relative_to_win_text, - absolute_scale_button, - absolute_scale_text, - gameplay, - controls, - languages, - language_list[], - languages_list, - rectangle, - general_txt, - load_tips_button, - load_tips_button_label, - debug_button, - debug_button_label, - interface, - language_text, - mouse_pan_slider, - mouse_pan_label, - mouse_pan_value, - mouse_zoom_slider, - mouse_zoom_label, - mouse_zoom_value, - mouse_zoom_invert_button, - mouse_zoom_invert_label, - camera_clamp_slider, - camera_clamp_label, - camera_clamp_value, - mouse_y_invert_button, - mouse_y_invert_label, - controller_y_invert_button, - controller_y_invert_label, - smooth_pan_toggle_button, - smooth_pan_toggle_label, - ch_title, - ch_transp_slider, - ch_transp_label, - ch_transp_value, - ch_transp_text, - ch_1_bg, - ch_2_bg, - ch_3_bg, - crosshair_outer_1, - crosshair_inner_1, - crosshair_outer_2, - crosshair_inner_2, - crosshair_outer_3, - crosshair_inner_3, - settings_bg, - sound, - test, - video, - language, fps_counter, vd_slider, vd_text, @@ -169,67 +92,6 @@ widget_ids! { shadow_mode_map_resolution_slider, shadow_mode_map_resolution_value, save_window_size_button, - audio_volume_slider, - audio_volume_text, - sfx_volume_slider, - sfx_volume_text, - audio_device_list, - audio_device_text, - // - hotbar_title, - bar_numbers_title, - show_bar_numbers_none_button, - show_bar_numbers_none_text, - show_bar_numbers_values_button, - show_bar_numbers_values_text, - show_bar_numbers_percentage_button, - show_bar_numbers_percentage_text, - // - show_shortcuts_button, - show_shortcuts_text, - buff_pos_bar_button, - buff_pos_bar_text, - buff_pos_map_button, - buff_pos_map_text, - // - chat_transp_title, - chat_transp_text, - chat_transp_slider, - chat_char_name_text, - chat_char_name_button, - // - sct_title, - sct_show_text, - sct_show_radio, - sct_single_dmg_text, - sct_single_dmg_radio, - sct_show_batch_text, - sct_show_batch_radio, - sct_batched_dmg_text, - sct_batched_dmg_radio, - sct_inc_dmg_text, - sct_inc_dmg_radio, - sct_batch_inc_text, - sct_batch_inc_radio, - sct_num_dur_text, - sct_num_dur_slider, - sct_num_dur_value, - // - speech_bubble_text, - speech_bubble_dark_mode_text, - speech_bubble_dark_mode_button, - speech_bubble_icon_text, - speech_bubble_icon_button, - free_look_behavior_text, - free_look_behavior_list, - auto_walk_behavior_text, - auto_walk_behavior_list, - camera_clamp_behavior_text, - camera_clamp_behavior_list, - stop_auto_walk_on_input_button, - stop_auto_walk_on_input_label, - auto_camera_button, - auto_camera_label, } }