From a272376f8967b806d50a4ab5e337455fe1cc97c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?= <7645683+bruvzg@users.noreply.github.com> Date: Thu, 12 Jun 2025 07:55:29 +0300 Subject: [PATCH] Cleanup accessibility names. --- editor/animation_track_editor.cpp | 35 ++++++++----------- editor/code_editor.cpp | 9 ++--- editor/connections_dialog.cpp | 6 ++-- editor/create_dialog.cpp | 9 +++-- .../debugger/editor_expression_evaluator.cpp | 2 +- editor/debugger/editor_profiler.cpp | 6 ++-- editor/debugger/editor_visual_profiler.cpp | 4 +-- editor/debugger/script_editor_debugger.cpp | 14 ++------ editor/dependency_editor.cpp | 2 +- editor/directory_create_dialog.cpp | 2 +- editor/editor_asset_installer.cpp | 2 -- editor/editor_audio_buses.cpp | 4 --- editor/editor_autoload_settings.cpp | 2 +- editor/editor_build_profile.cpp | 2 +- editor/editor_feature_profile.cpp | 6 ++-- editor/editor_help.cpp | 3 -- editor/editor_help_search.cpp | 2 -- editor/editor_inspector.cpp | 6 ++-- editor/editor_layouts_dialog.cpp | 2 +- editor/editor_locale_dialog.cpp | 4 +-- editor/editor_log.cpp | 1 - editor/editor_node.cpp | 1 - editor/editor_properties_vector.cpp | 1 - editor/editor_run_native.cpp | 1 - editor/export/project_export.cpp | 8 ++--- editor/filesystem_dock.cpp | 4 --- editor/find_in_files.cpp | 11 +++--- editor/group_settings_editor.cpp | 4 +-- editor/groups_editor.cpp | 5 ++- editor/gui/editor_bottom_panel.cpp | 1 - editor/gui/editor_file_dialog.cpp | 25 ++++--------- editor/gui/editor_run_bar.cpp | 6 ---- editor/gui/editor_scene_tabs.cpp | 1 - editor/gui/editor_toaster.cpp | 3 +- editor/import/3d/scene_import_settings.cpp | 7 +--- .../import/audio_stream_import_settings.cpp | 9 +++-- .../import/dynamic_font_import_settings.cpp | 3 +- editor/import_dock.cpp | 2 +- editor/input_event_configuration_dialog.cpp | 4 +-- editor/inspector_dock.cpp | 10 ------ .../animation_blend_space_1d_editor.cpp | 5 --- .../animation_blend_space_2d_editor.cpp | 7 ---- .../animation_player_editor_plugin.cpp | 10 ------ .../animation_state_machine_editor.cpp | 6 +--- editor/plugins/bone_map_editor_plugin.cpp | 1 - editor/plugins/canvas_item_editor_plugin.cpp | 22 +++--------- editor/plugins/control_editor_plugin.cpp | 1 - editor/plugins/curve_editor_plugin.cpp | 1 - editor/plugins/game_view_plugin.cpp | 8 +---- editor/plugins/gradient_editor_plugin.cpp | 1 - .../gradient_texture_2d_editor_plugin.cpp | 2 -- .../mesh_instance_3d_editor_plugin.cpp | 2 +- editor/plugins/multimesh_editor_plugin.cpp | 16 ++++----- editor/plugins/node_3d_editor_plugin.cpp | 18 +++++----- ...article_process_material_editor_plugin.cpp | 1 - editor/plugins/particles_editor_plugin.cpp | 6 ++-- editor/plugins/path_2d_editor_plugin.cpp | 5 +-- editor/plugins/path_3d_editor_plugin.cpp | 6 +--- editor/plugins/plugin_config_dialog.cpp | 16 ++++----- editor/plugins/polygon_2d_editor_plugin.cpp | 18 +++++----- editor/plugins/polygon_3d_editor_plugin.cpp | 2 -- .../resource_preloader_editor_plugin.cpp | 1 - editor/plugins/script_editor_plugin.cpp | 5 +-- editor/plugins/skeleton_3d_editor_plugin.cpp | 6 ---- editor/plugins/sprite_2d_editor_plugin.cpp | 6 ++-- .../plugins/sprite_frames_editor_plugin.cpp | 18 +--------- editor/plugins/style_box_editor_plugin.cpp | 1 - .../plugins/texture_region_editor_plugin.cpp | 5 +-- editor/plugins/theme_editor_plugin.cpp | 22 ++---------- editor/plugins/tiles/tile_atlas_view.cpp | 1 - editor/plugins/tiles/tile_data_editors.cpp | 5 --- .../plugins/tiles/tile_map_layer_editor.cpp | 11 ++---- editor/plugins/tiles/tile_set_editor.cpp | 1 - .../plugins/version_control_editor_plugin.cpp | 12 ++----- .../plugins/visual_shader_editor_plugin.cpp | 3 -- editor/project_manager.cpp | 3 +- editor/project_manager/project_dialog.cpp | 6 ++-- editor/project_manager/project_list.cpp | 3 -- editor/project_settings_editor.cpp | 1 - editor/rename_dialog.cpp | 14 ++++---- editor/run_instances_dialog.cpp | 4 +-- editor/scene_tree_dock.cpp | 8 +---- editor/script_create_dialog.cpp | 8 ++--- editor/shader_create_dialog.cpp | 9 ++--- .../gridmap/editor/grid_map_editor_plugin.cpp | 11 +++--- ...audio_stream_interactive_editor_plugin.cpp | 14 ++++---- .../multiplayer/editor/replication_editor.cpp | 3 +- .../navigation_obstacle_3d_editor_plugin.cpp | 1 - .../openxr/editor/openxr_action_editor.cpp | 1 - .../editor/openxr_action_set_editor.cpp | 2 -- .../editor/openxr_binding_modifier_editor.cpp | 1 - .../openxr_interaction_profile_editor.cpp | 1 - scene/gui/button.cpp | 9 +++-- scene/gui/color_picker.cpp | 11 ++---- scene/gui/file_dialog.cpp | 23 ++++-------- scene/gui/graph_edit.cpp | 10 +----- scene/gui/link_button.cpp | 5 ++- 97 files changed, 188 insertions(+), 440 deletions(-) diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 3acd215dc3..def89aee6e 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -2053,14 +2053,13 @@ AnimationTimelineEdit::AnimationTimelineEdit() { length->set_custom_minimum_size(Vector2(70 * EDSCALE, 0)); length->set_hide_slider(true); length->set_tooltip_text(TTR("Animation length (seconds)")); - length->set_accessibility_name(TTRC("Animation length")); + length->set_accessibility_name(TTRC("Animation length (seconds)")); length->connect(SceneStringName(value_changed), callable_mp(this, &AnimationTimelineEdit::_anim_length_changed)); len_hb->add_child(length); loop = memnew(Button); loop->set_flat(true); loop->set_tooltip_text(TTR("Animation Looping")); - loop->set_accessibility_name(TTRC("Animation Looping")); loop->connect(SceneStringName(pressed), callable_mp(this, &AnimationTimelineEdit::_anim_loop_pressed)); loop->set_toggle_mode(true); len_hb->add_child(loop); @@ -7874,7 +7873,6 @@ AnimationTrackEditor::AnimationTrackEditor() { bezier_edit_icon->set_toggle_mode(true); bezier_edit_icon->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_toggle_bezier_edit)); bezier_edit_icon->set_tooltip_text(TTR("Toggle between the bezier curve editor and track editor.")); - bezier_edit_icon->set_accessibility_name(TTRC("Bezier Curve Editor")); bottom_hf->add_child(bezier_edit_icon); @@ -7893,7 +7891,6 @@ AnimationTrackEditor::AnimationTrackEditor() { selected_filter->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_view_group_toggle)); // Same function works the same. selected_filter->set_toggle_mode(true); selected_filter->set_tooltip_text(TTR("Only show tracks from nodes selected in tree.")); - selected_filter->set_accessibility_name(TTRC("Show Tracks from Selected Nodes")); bottom_hf->add_child(selected_filter); @@ -7910,7 +7907,6 @@ AnimationTrackEditor::AnimationTrackEditor() { view_group->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_view_group_toggle)); view_group->set_toggle_mode(true); view_group->set_tooltip_text(TTR("Group tracks by node or display them as plain list.")); - view_group->set_accessibility_name(TTRC("Group Tracks by Node")); bottom_hf->add_child(view_group); bottom_hf->add_child(memnew(VSeparator)); @@ -7922,7 +7918,6 @@ AnimationTrackEditor::AnimationTrackEditor() { snap_timeline->set_toggle_mode(true); snap_timeline->set_pressed(false); snap_timeline->set_tooltip_text(TTR("Apply snapping to timeline cursor.")); - snap_timeline->set_accessibility_name(TTRC("Apply Snapping to Cursor")); snap_keys = memnew(Button); snap_keys->set_flat(true); @@ -7931,7 +7926,6 @@ AnimationTrackEditor::AnimationTrackEditor() { snap_keys->set_toggle_mode(true); snap_keys->set_pressed(true); snap_keys->set_tooltip_text(TTR("Apply snapping to selected key(s).")); - snap_keys->set_accessibility_name(TTRC("Apply Snapping to Selected Key")); fps_compat = memnew(Button); fps_compat->set_flat(true); @@ -7940,7 +7934,6 @@ AnimationTrackEditor::AnimationTrackEditor() { fps_compat->set_toggle_mode(true); fps_compat->set_pressed(true); fps_compat->set_tooltip_text(TTR("Apply snapping to the nearest integer FPS.")); - fps_compat->set_accessibility_name(TTRC("Apply Snapping to Nearest Integer FPS")); fps_compat->connect(SceneStringName(toggled), callable_mp(this, &AnimationTrackEditor::_update_fps_compat_mode)); nearest_fps_label = memnew(Label); @@ -7955,7 +7948,7 @@ AnimationTrackEditor::AnimationTrackEditor() { step->set_hide_slider(true); step->set_custom_minimum_size(Size2(100, 0) * EDSCALE); step->set_tooltip_text(TTR("Animation step value.")); - step->set_accessibility_name(TTRC("Animation Step Value")); + step->set_accessibility_name(TTRC("Animation step value.")); bottom_hf->add_child(step); step->connect(SceneStringName(value_changed), callable_mp(this, &AnimationTrackEditor::_update_step)); step->set_read_only(true); @@ -8009,7 +8002,7 @@ AnimationTrackEditor::AnimationTrackEditor() { edit->set_flat(false); edit->set_disabled(true); edit->set_tooltip_text(TTR("Animation properties.")); - edit->set_accessibility_name(TTRC("Animation Properties")); + edit->set_accessibility_name(TTRC("Animation properties.")); edit->get_popup()->add_item(TTR("Copy Tracks..."), EDIT_COPY_TRACKS); edit->get_popup()->add_item(TTR("Paste Tracks"), EDIT_PASTE_TRACKS); edit->get_popup()->add_separator(); @@ -8105,21 +8098,21 @@ AnimationTrackEditor::AnimationTrackEditor() { optimize_velocity_error->set_min(0.001); optimize_velocity_error->set_step(0.001); optimize_velocity_error->set_value(0.01); - optimize_velocity_error->set_accessibility_name(TTRC("Max Velocity Error")); + optimize_velocity_error->set_accessibility_name(TTRC("Max Velocity Error:")); optimize_vb->add_margin_child(TTR("Max Velocity Error:"), optimize_velocity_error); optimize_angular_error = memnew(SpinBox); optimize_angular_error->set_max(1.0); optimize_angular_error->set_min(0.001); optimize_angular_error->set_step(0.001); optimize_angular_error->set_value(0.01); - optimize_angular_error->set_accessibility_name(TTRC("Max Angular Error")); + optimize_angular_error->set_accessibility_name(TTRC("Max Angular Error:")); optimize_vb->add_margin_child(TTR("Max Angular Error:"), optimize_angular_error); optimize_precision_error = memnew(SpinBox); optimize_precision_error->set_max(6); optimize_precision_error->set_min(1); optimize_precision_error->set_step(1); optimize_precision_error->set_value(3); - optimize_precision_error->set_accessibility_name(TTRC("Max Precision Error")); + optimize_precision_error->set_accessibility_name(TTRC("Max Precision Error:")); optimize_vb->add_margin_child(TTR("Max Precision Error:"), optimize_precision_error); optimize_dialog->set_ok_button_text(TTR("Optimize")); @@ -8186,7 +8179,7 @@ AnimationTrackEditor::AnimationTrackEditor() { ease_grid->set_columns(2); ease_dialog->add_child(ease_grid); transition_selection = memnew(OptionButton); - transition_selection->set_accessibility_name(TTRC("Transition Type")); + transition_selection->set_accessibility_name(TTRC("Transition Type:")); transition_selection->add_item(TTR("Linear", "Transition Type"), Tween::TRANS_LINEAR); transition_selection->add_item(TTR("Sine", "Transition Type"), Tween::TRANS_SINE); transition_selection->add_item(TTR("Quint", "Transition Type"), Tween::TRANS_QUINT); @@ -8202,7 +8195,7 @@ AnimationTrackEditor::AnimationTrackEditor() { transition_selection->select(Tween::TRANS_LINEAR); // Default transition_selection->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // Translation context is needed. ease_selection = memnew(OptionButton); - ease_selection->set_accessibility_name(TTRC("Ease Type")); + ease_selection->set_accessibility_name(TTRC("Ease Type:")); ease_selection->add_item(TTR("In", "Ease Type"), Tween::EASE_IN); ease_selection->add_item(TTR("Out", "Ease Type"), Tween::EASE_OUT); ease_selection->add_item(TTR("InOut", "Ease Type"), Tween::EASE_IN_OUT); @@ -8214,7 +8207,7 @@ AnimationTrackEditor::AnimationTrackEditor() { ease_fps->set_max(999); ease_fps->set_step(FPS_DECIMAL); ease_fps->set_value(30); // Default - ease_fps->set_accessibility_name(TTRC("FPS")); + ease_fps->set_accessibility_name(TTRC("FPS:")); ease_grid->add_child(memnew(Label(TTR("Transition Type:")))); ease_grid->add_child(transition_selection); ease_grid->add_child(memnew(Label(TTR("Ease Type:")))); @@ -8231,16 +8224,16 @@ AnimationTrackEditor::AnimationTrackEditor() { bake_grid->set_columns(2); bake_dialog->add_child(bake_grid); bake_trs = memnew(CheckBox); - bake_trs->set_accessibility_name(TTRC("3D Pos/Rot/Scl Track")); + bake_trs->set_accessibility_name(TTRC("3D Pos/Rot/Scl Track:")); bake_trs->set_pressed(true); bake_blendshape = memnew(CheckBox); - bake_blendshape->set_accessibility_name(TTRC("Blendshape Track")); + bake_blendshape->set_accessibility_name(TTRC("Blendshape Track:")); bake_blendshape->set_pressed(true); bake_value = memnew(CheckBox); - bake_value->set_accessibility_name(TTRC("Value Track")); + bake_value->set_accessibility_name(TTRC("Value Track:")); bake_value->set_pressed(true); bake_fps = memnew(SpinBox); - bake_fps->set_accessibility_name(TTRC("FPS")); + bake_fps->set_accessibility_name(TTRC("FPS:")); bake_fps->set_min(FPS_DECIMAL); bake_fps->set_max(999); bake_fps->set_step(FPS_DECIMAL); @@ -9376,7 +9369,7 @@ AnimationMarkerEdit::AnimationMarkerEdit() { marker_rename_new_name_label->set_text(TTR("Change Marker Name:")); marker_rename_vbox->add_child(marker_rename_new_name_label); marker_rename_new_name = memnew(LineEdit); - marker_rename_new_name->set_accessibility_name(TTRC("Change Marker Name")); + marker_rename_new_name->set_accessibility_name(TTRC("Change Marker Name:")); marker_rename_new_name->connect(SceneStringName(text_changed), callable_mp(this, &AnimationMarkerEdit::_marker_rename_new_name_changed)); marker_rename_confirm->register_text_enter(marker_rename_new_name); marker_rename_vbox->add_child(marker_rename_new_name); diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index f0d80d654a..3173d43e88 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -127,7 +127,7 @@ GotoLinePopup::GotoLinePopup() { line_input->set_select_all_on_focus(true); line_input->connect(SceneStringName(text_changed), callable_mp(this, &GotoLinePopup::_goto_line).unbind(1)); line_input->connect(SceneStringName(text_submitted), callable_mp(this, &GotoLinePopup::_submit).unbind(1)); - line_input->set_accessibility_name(TTRC("Line Number")); + line_input->set_accessibility_name(TTRC("Line Number:")); vbc->add_child(line_input); } @@ -802,7 +802,6 @@ FindReplaceBar::FindReplaceBar() { find_prev->set_flat(true); find_prev->set_disabled(results_count < 1); find_prev->set_tooltip_text(TTRC("Previous Match")); - find_prev->set_accessibility_name(TTRC("Previous Match")); hbc_button_search->add_child(find_prev); find_prev->set_focus_mode(FOCUS_ACCESSIBILITY); find_prev->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::search_prev)); @@ -811,7 +810,6 @@ FindReplaceBar::FindReplaceBar() { find_next->set_flat(true); find_next->set_disabled(results_count < 1); find_next->set_tooltip_text(TTRC("Next Match")); - find_next->set_accessibility_name(TTRC("Next Match")); hbc_button_search->add_child(find_next); find_next->set_focus_mode(FOCUS_ACCESSIBILITY); find_next->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::search_next)); @@ -856,7 +854,6 @@ FindReplaceBar::FindReplaceBar() { hide_button = memnew(Button); hide_button->set_flat(true); hide_button->set_tooltip_text(TTRC("Hide")); - hide_button->set_accessibility_name(TTRC("Hide")); hide_button->set_focus_mode(FOCUS_ACCESSIBILITY); hide_button->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::_hide_bar)); hide_button->set_v_size_flags(SIZE_SHRINK_CENTER); @@ -1947,7 +1944,6 @@ CodeTextEditor::CodeTextEditor() { error_button->set_default_cursor_shape(CURSOR_POINTING_HAND); error_button->connect(SceneStringName(pressed), callable_mp(this, &CodeTextEditor::_error_button_pressed)); error_button->set_tooltip_text(TTRC("Errors")); - error_button->set_accessibility_name(TTRC("Errors")); // Warnings warning_button = memnew(Button); @@ -1957,7 +1953,6 @@ CodeTextEditor::CodeTextEditor() { warning_button->set_default_cursor_shape(CURSOR_POINTING_HAND); warning_button->connect(SceneStringName(pressed), callable_mp(this, &CodeTextEditor::_warning_button_pressed)); warning_button->set_tooltip_text(TTRC("Warnings")); - warning_button->set_accessibility_name(TTRC("Warnings")); status_bar->add_child(memnew(VSeparator)); @@ -1989,7 +1984,7 @@ CodeTextEditor::CodeTextEditor() { line_and_col_txt->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); line_and_col_txt->set_tooltip_auto_translate_mode(AUTO_TRANSLATE_MODE_ALWAYS); line_and_col_txt->set_tooltip_text(TTRC("Line and column numbers.")); - line_and_col_txt->set_accessibility_name(TTRC("Line and Column Numbers")); + line_and_col_txt->set_accessibility_name(TTRC("Line and column numbers.")); line_and_col_txt->set_focus_mode(FOCUS_ACCESSIBILITY); line_and_col_txt->set_mouse_filter(MOUSE_FILTER_STOP); diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 6122bb7f77..4e44920ade 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -749,7 +749,7 @@ ConnectDialog::ConnectDialog() { vbc_left->set_custom_minimum_size(Vector2(400 * EDSCALE, 0)); from_signal = memnew(LineEdit); - from_signal->set_accessibility_name(TTRC("From Signal")); + from_signal->set_accessibility_name(TTRC("From Signal:")); vbc_left->add_margin_child(TTR("From Signal:"), from_signal); from_signal->set_editable(false); @@ -864,14 +864,14 @@ ConnectDialog::ConnectDialog() { vbc_right->add_margin_child(TTR("Add Extra Call Argument:"), add_bind_hb); bind_editor = memnew(EditorInspector); - bind_editor->set_accessibility_name(TTRC("Extra Call Arguments")); + bind_editor->set_accessibility_name(TTRC("Extra Call Arguments:")); bind_controls.push_back(bind_editor); vbc_right->add_margin_child(TTR("Extra Call Arguments:"), bind_editor, true); unbind_count = memnew(SpinBox); unbind_count->set_tooltip_text(TTR("Allows to drop arguments sent by signal emitter.")); - unbind_count->set_accessibility_name(TTRC("Unbind Signal Arguments")); + unbind_count->set_accessibility_name(TTRC("Unbind Signal Arguments:")); unbind_count->connect(SceneStringName(value_changed), callable_mp(this, &ConnectDialog::_unbind_count_changed)); vbc_right->add_margin_child(TTR("Unbind Signal Arguments:"), unbind_count); diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 906f1a2a4a..d5017db2d8 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -863,7 +863,7 @@ CreateDialog::CreateDialog() { vsc->add_child(fav_vb); favorites = memnew(Tree); - favorites->set_accessibility_name(TTRC("Favorites")); + favorites->set_accessibility_name(TTRC("Favorites:")); favorites->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); favorites->set_hide_root(true); favorites->set_hide_folding(true); @@ -881,7 +881,7 @@ CreateDialog::CreateDialog() { rec_vb->set_v_size_flags(Control::SIZE_EXPAND_FILL); recent = memnew(ItemList); - recent->set_accessibility_name(TTRC("Recent")); + recent->set_accessibility_name(TTRC("Recent:")); recent->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); rec_vb->add_margin_child(TTR("Recent:"), recent, true); recent->set_allow_reselect(true); @@ -908,13 +908,12 @@ CreateDialog::CreateDialog() { favorite = memnew(Button); favorite->set_toggle_mode(true); favorite->set_tooltip_text(TTR("(Un)favorite selected item.")); - favorite->set_accessibility_name(TTRC("(Un)favorite")); favorite->connect(SceneStringName(pressed), callable_mp(this, &CreateDialog::_favorite_toggled)); search_hb->add_child(favorite); vbc->add_margin_child(TTR("Search:"), search_hb); search_options = memnew(Tree); - search_options->set_accessibility_name(TTRC("Matches")); + search_options->set_accessibility_name(TTRC("Matches:")); search_options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); search_options->connect("item_activated", callable_mp(this, &CreateDialog::_confirmed)); search_options->connect("cell_selected", callable_mp(this, &CreateDialog::_item_selected)); @@ -922,7 +921,7 @@ CreateDialog::CreateDialog() { vbc->add_margin_child(TTR("Matches:"), search_options, true); help_bit = memnew(EditorHelpBit); - help_bit->set_accessibility_name(TTRC("Description")); + help_bit->set_accessibility_name(TTRC("Description:")); help_bit->set_content_height_limits(80 * EDSCALE, 80 * EDSCALE); help_bit->connect("request_hide", callable_mp(this, &CreateDialog::_hide_requested)); vbc->add_margin_child(TTR("Description:"), help_bit); diff --git a/editor/debugger/editor_expression_evaluator.cpp b/editor/debugger/editor_expression_evaluator.cpp index b86e466b24..3f9eca8636 100644 --- a/editor/debugger/editor_expression_evaluator.cpp +++ b/editor/debugger/editor_expression_evaluator.cpp @@ -111,7 +111,7 @@ EditorExpressionEvaluator::EditorExpressionEvaluator() { expression_input = memnew(LineEdit); expression_input->set_h_size_flags(Control::SIZE_EXPAND_FILL); expression_input->set_placeholder(TTR("Expression to evaluate")); - expression_input->set_accessibility_name(TTRC("Expression")); + expression_input->set_accessibility_name(TTRC("Expression to evaluate")); expression_input->set_clear_button_enabled(true); expression_input->connect(SceneStringName(text_submitted), callable_mp(this, &EditorExpressionEvaluator::_evaluate).unbind(1)); expression_input->connect(SceneStringName(text_changed), callable_mp(this, &EditorExpressionEvaluator::_on_expression_input_changed)); diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index 04ee5f0487..775ac9166a 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -693,7 +693,7 @@ EditorProfiler::EditorProfiler() { hb_measure->add_child(memnew(Label(TTR("Measure:")))); display_mode = memnew(OptionButton); - display_mode->set_accessibility_name(TTRC("Measure")); + display_mode->set_accessibility_name(TTRC("Measure:")); display_mode->add_item(TTR("Frame Time (ms)")); display_mode->add_item(TTR("Average Time (ms)")); display_mode->add_item(TTR("Frame %")); @@ -709,7 +709,7 @@ EditorProfiler::EditorProfiler() { hb_time->add_child(memnew(Label(TTR("Time:")))); display_time = memnew(OptionButton); - display_time->set_accessibility_name(TTRC("Time")); + display_time->set_accessibility_name(TTRC("Time:")); // TRANSLATORS: This is an option in the profiler to display the time spent in a function, including the time spent in other functions called by that function. display_time->add_item(TTR("Inclusive")); // TRANSLATORS: This is an option in the profiler to display the time spent in a function, exincluding the time spent in other functions called by that function. @@ -732,7 +732,7 @@ EditorProfiler::EditorProfiler() { hb_frame->add_child(memnew(Label(TTR("Frame #:")))); cursor_metric_edit = memnew(SpinBox); - cursor_metric_edit->set_accessibility_name(TTRC("Frame")); + cursor_metric_edit->set_accessibility_name(TTRC("Frame #:")); cursor_metric_edit->set_h_size_flags(SIZE_FILL); cursor_metric_edit->set_value(0); cursor_metric_edit->set_editable(false); diff --git a/editor/debugger/editor_visual_profiler.cpp b/editor/debugger/editor_visual_profiler.cpp index cbd97f0e61..398fa6d872 100644 --- a/editor/debugger/editor_visual_profiler.cpp +++ b/editor/debugger/editor_visual_profiler.cpp @@ -777,7 +777,7 @@ EditorVisualProfiler::EditorVisualProfiler() { hb_measure->add_child(memnew(Label(TTR("Measure:")))); display_mode = memnew(OptionButton); - display_mode->set_accessibility_name(TTRC("Measure")); + display_mode->set_accessibility_name(TTRC("Measure:")); display_mode->add_item(TTR("Frame Time (ms)")); display_mode->add_item(TTR("Frame %")); display_mode->connect(SceneStringName(item_selected), callable_mp(this, &EditorVisualProfiler::_combo_changed)); @@ -801,7 +801,7 @@ EditorVisualProfiler::EditorVisualProfiler() { hb_frame->add_child(memnew(Label(TTR("Frame #:")))); cursor_metric_edit = memnew(SpinBox); - cursor_metric_edit->set_accessibility_name(TTRC("Frame")); + cursor_metric_edit->set_accessibility_name(TTRC("Frame #:")); cursor_metric_edit->set_h_size_flags(SIZE_FILL); hb_frame->add_child(cursor_metric_edit); cursor_metric_edit->connect(SceneStringName(value_changed), callable_mp(this, &EditorVisualProfiler::_cursor_metric_changed)); diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 97574ed44c..894f54f735 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -2008,13 +2008,11 @@ ScriptEditorDebugger::ScriptEditorDebugger() { skip_breakpoints->set_theme_type_variation(SceneStringName(FlatButton)); hbc->add_child(skip_breakpoints); skip_breakpoints->set_tooltip_text(TTR("Skip Breakpoints")); - skip_breakpoints->set_accessibility_name(TTRC("Skip Breakpoints")); skip_breakpoints->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_skip_breakpoints)); ignore_error_breaks = memnew(Button); ignore_error_breaks->set_flat(true); ignore_error_breaks->set_tooltip_text(TTR("Ignore Error Breaks")); - ignore_error_breaks->set_accessibility_name(TTRC("Ignore Error Breaks")); hbc->add_child(ignore_error_breaks); ignore_error_breaks->connect("pressed", callable_mp(this, &ScriptEditorDebugger::debug_ignore_error_breaks)); @@ -2024,7 +2022,6 @@ ScriptEditorDebugger::ScriptEditorDebugger() { copy->set_theme_type_variation(SceneStringName(FlatButton)); hbc->add_child(copy); copy->set_tooltip_text(TTR("Copy Error")); - copy->set_accessibility_name(TTRC("Copy Error")); copy->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_copy)); hbc->add_child(memnew(VSeparator)); @@ -2033,7 +2030,6 @@ ScriptEditorDebugger::ScriptEditorDebugger() { step->set_theme_type_variation(SceneStringName(FlatButton)); hbc->add_child(step); step->set_tooltip_text(TTR("Step Into")); - step->set_accessibility_name(TTRC("Step Into")); step->set_shortcut(ED_GET_SHORTCUT("debugger/step_into")); step->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_step)); @@ -2041,7 +2037,6 @@ ScriptEditorDebugger::ScriptEditorDebugger() { next->set_theme_type_variation(SceneStringName(FlatButton)); hbc->add_child(next); next->set_tooltip_text(TTR("Step Over")); - next->set_accessibility_name(TTRC("Step Over")); next->set_shortcut(ED_GET_SHORTCUT("debugger/step_over")); next->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_next)); @@ -2051,7 +2046,6 @@ ScriptEditorDebugger::ScriptEditorDebugger() { dobreak->set_theme_type_variation(SceneStringName(FlatButton)); hbc->add_child(dobreak); dobreak->set_tooltip_text(TTR("Break")); - dobreak->set_accessibility_name(TTRC("Break")); dobreak->set_shortcut(ED_GET_SHORTCUT("debugger/break")); dobreak->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_break)); @@ -2059,7 +2053,6 @@ ScriptEditorDebugger::ScriptEditorDebugger() { docontinue->set_theme_type_variation(SceneStringName(FlatButton)); hbc->add_child(docontinue); docontinue->set_tooltip_text(TTR("Continue")); - docontinue->set_accessibility_name(TTRC("Continue")); docontinue->set_shortcut(ED_GET_SHORTCUT("debugger/continue")); docontinue->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_continue)); @@ -2274,7 +2267,6 @@ Instead, use the monitors tab to obtain more precise VRAM usage. vmem_export = memnew(Button); vmem_export->set_theme_type_variation(SceneStringName(FlatButton)); vmem_export->set_tooltip_text(TTR("Export list to a CSV file")); - vmem_export->set_accessibility_name(TTRC("Export to CSV")); vmem_hb->add_child(vmem_export); vmem_vb->add_child(vmem_hb); vmem_refresh->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::_video_mem_request)); @@ -2318,13 +2310,13 @@ Instead, use the monitors tab to obtain more precise VRAM usage. misc->add_child(info_left); clicked_ctrl = memnew(LineEdit); clicked_ctrl->set_editable(false); - clicked_ctrl->set_accessibility_name(TTRC("Clicked Control")); + clicked_ctrl->set_accessibility_name(TTRC("Clicked Control:")); clicked_ctrl->set_h_size_flags(SIZE_EXPAND_FILL); info_left->add_child(memnew(Label(TTR("Clicked Control:")))); info_left->add_child(clicked_ctrl); clicked_ctrl_type = memnew(LineEdit); clicked_ctrl_type->set_editable(false); - clicked_ctrl_type->set_accessibility_name(TTRC("Clicked Control Type")); + clicked_ctrl_type->set_accessibility_name(TTRC("Clicked Control Type:")); info_left->add_child(memnew(Label(TTR("Clicked Control Type:")))); info_left->add_child(clicked_ctrl_type); @@ -2332,7 +2324,7 @@ Instead, use the monitors tab to obtain more precise VRAM usage. live_edit_root = memnew(LineEdit); live_edit_root->set_editable(false); live_edit_root->set_h_size_flags(SIZE_EXPAND_FILL); - live_edit_root->set_accessibility_name(TTRC("Live Edit Root")); + live_edit_root->set_accessibility_name(TTRC("Live Edit Root:")); { HBoxContainer *lehb = memnew(HBoxContainer); diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 12b96bef5d..c8782b7719 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -680,7 +680,7 @@ DependencyRemoveDialog::DependencyRemoveDialog() { files_to_delete_list->set_h_size_flags(Control::SIZE_EXPAND_FILL); files_to_delete_list->set_v_size_flags(Control::SIZE_EXPAND_FILL); files_to_delete_list->set_custom_minimum_size(Size2(0, 94) * EDSCALE); - files_to_delete_list->set_accessibility_name(TTRC("Files to be Deleted")); + files_to_delete_list->set_accessibility_name(TTRC("Files to be deleted:")); vb->add_child(files_to_delete_list); vb_owners = memnew(VBoxContainer); diff --git a/editor/directory_create_dialog.cpp b/editor/directory_create_dialog.cpp index 8a692a8825..fbe6ddbb16 100644 --- a/editor/directory_create_dialog.cpp +++ b/editor/directory_create_dialog.cpp @@ -167,7 +167,7 @@ DirectoryCreateDialog::DirectoryCreateDialog() { vb->add_child(name_label); dir_path = memnew(LineEdit); - dir_path->set_accessibility_name(TTRC("Name")); + dir_path->set_accessibility_name(TTRC("Name:")); vb->add_child(dir_path); register_text_enter(dir_path); diff --git a/editor/editor_asset_installer.cpp b/editor/editor_asset_installer.cpp index 4dfd45dcdf..04084b8eb7 100644 --- a/editor/editor_asset_installer.cpp +++ b/editor/editor_asset_installer.cpp @@ -685,7 +685,6 @@ EditorAssetInstaller::EditorAssetInstaller() { show_source_files_button = memnew(Button); show_source_files_button->set_toggle_mode(true); show_source_files_button->set_tooltip_text(TTRC("Open the list of the asset contents and select which files to install.")); - show_source_files_button->set_accessibility_name(TTRC("Show Asset Contents")); remapping_tools->add_child(show_source_files_button); show_source_files_button->connect(SceneStringName(toggled), callable_mp(this, &EditorAssetInstaller::_toggle_source_tree).bind(false)); @@ -711,7 +710,6 @@ EditorAssetInstaller::EditorAssetInstaller() { asset_conflicts_label->set_text(TTRC("No files conflict with your project")); remapping_tools->add_child(asset_conflicts_label); asset_conflicts_link = memnew(LinkButton); - asset_conflicts_link->set_accessibility_name(TTRC("Show Conflicting Files")); asset_conflicts_link->set_theme_type_variation("HeaderSmallLink"); asset_conflicts_link->set_v_size_flags(Control::SIZE_SHRINK_CENTER); asset_conflicts_link->set_tooltip_text(TTRC("Show contents of the asset and conflicting files.")); diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 521bd85d53..f675535f3a 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -843,7 +843,6 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) { solo->set_theme_type_variation(SceneStringName(FlatButton)); solo->set_toggle_mode(true); solo->set_tooltip_text(TTR("Solo")); - solo->set_accessibility_name(TTRC("Solo")); solo->set_focus_mode(FOCUS_ACCESSIBILITY); solo->connect(SceneStringName(pressed), callable_mp(this, &EditorAudioBus::_solo_toggled)); hbc->add_child(solo); @@ -851,7 +850,6 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) { mute->set_theme_type_variation(SceneStringName(FlatButton)); mute->set_toggle_mode(true); mute->set_tooltip_text(TTR("Mute")); - mute->set_accessibility_name(TTRC("Mute")); mute->set_focus_mode(FOCUS_ACCESSIBILITY); mute->connect(SceneStringName(pressed), callable_mp(this, &EditorAudioBus::_mute_toggled)); hbc->add_child(mute); @@ -859,7 +857,6 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) { bypass->set_theme_type_variation(SceneStringName(FlatButton)); bypass->set_toggle_mode(true); bypass->set_tooltip_text(TTR("Bypass")); - bypass->set_accessibility_name(TTRC("Bypass")); bypass->set_focus_mode(FOCUS_ACCESSIBILITY); bypass->connect(SceneStringName(pressed), callable_mp(this, &EditorAudioBus::_bypass_toggled)); hbc->add_child(bypass); @@ -1019,7 +1016,6 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) { bus_options->set_h_size_flags(SIZE_SHRINK_END); bus_options->set_anchor(SIDE_RIGHT, 0.0); bus_options->set_tooltip_text(TTR("Bus Options")); - bus_options->set_accessibility_name(TTRC("Bus Options")); hbc->add_child(bus_options); bus_popup = bus_options->get_popup(); diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index 7c65c78bf0..ae079b9ab4 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -933,7 +933,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() { hbc->add_child(l); autoload_add_name = memnew(LineEdit); - autoload_add_name->set_accessibility_name(TTRC("Node Name")); + autoload_add_name->set_accessibility_name(TTRC("Node Name:")); autoload_add_name->set_h_size_flags(SIZE_EXPAND_FILL); autoload_add_name->connect(SceneStringName(text_submitted), callable_mp(this, &EditorAutoloadSettings::_autoload_text_submitted)); autoload_add_name->connect(SceneStringName(text_changed), callable_mp(this, &EditorAutoloadSettings::_autoload_text_changed)); diff --git a/editor/editor_build_profile.cpp b/editor/editor_build_profile.cpp index 70dd490a00..c6f4658433 100644 --- a/editor/editor_build_profile.cpp +++ b/editor/editor_build_profile.cpp @@ -1361,7 +1361,7 @@ EditorBuildProfileManager::EditorBuildProfileManager() { export_profile->set_access(EditorFileDialog::ACCESS_FILESYSTEM); force_detect_classes = memnew(LineEdit); - force_detect_classes->set_accessibility_name(TTRC("Forced Classes")); + force_detect_classes->set_accessibility_name(TTRC("Forced Classes on Detect:")); main_vbc->add_margin_child(TTR("Forced Classes on Detect:"), force_detect_classes); force_detect_classes->connect(SceneStringName(text_changed), callable_mp(this, &EditorBuildProfileManager::_force_detect_classes_changed)); diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index 77d10378ee..5e1d11b594 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -925,7 +925,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() { HBoxContainer *name_hbc = memnew(HBoxContainer); current_profile_name = memnew(LineEdit); name_hbc->add_child(current_profile_name); - current_profile_name->set_accessibility_name(TTRC("Current Profile")); + current_profile_name->set_accessibility_name(TTRC("Current Profile:")); current_profile_name->set_text(TTR("(none)")); current_profile_name->set_editable(false); current_profile_name->set_h_size_flags(Control::SIZE_EXPAND_FILL); @@ -940,7 +940,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() { HBoxContainer *profiles_hbc = memnew(HBoxContainer); profile_list = memnew(OptionButton); - profile_list->set_accessibility_name(TTRC("Profiles")); + profile_list->set_accessibility_name(TTRC("Available Profiles:")); profile_list->set_h_size_flags(Control::SIZE_EXPAND_FILL); profile_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); profiles_hbc->add_child(profile_list); @@ -1034,7 +1034,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() { new_profile_name = memnew(LineEdit); new_profile_vb->add_child(new_profile_name); new_profile_name->set_custom_minimum_size(Size2(300 * EDSCALE, 1)); - new_profile_name->set_accessibility_name(TTRC("Profile Name")); + new_profile_name->set_accessibility_name(TTRC("New profile name:")); add_child(new_profile_dialog); new_profile_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorFeatureProfileManager::_create_new_profile)); new_profile_dialog->register_text_enter(new_profile_name); diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 14c1e6630d..fc58600dbc 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -4889,7 +4889,6 @@ FindBar::FindBar() { find_prev->set_flat(true); find_prev->set_disabled(results_count < 1); find_prev->set_tooltip_text(TTR("Previous Match")); - find_prev->set_accessibility_name(TTRC("Previous Match")); add_child(find_prev); find_prev->set_focus_mode(FOCUS_ACCESSIBILITY); find_prev->connect(SceneStringName(pressed), callable_mp(this, &FindBar::search_prev)); @@ -4898,7 +4897,6 @@ FindBar::FindBar() { find_next->set_flat(true); find_next->set_disabled(results_count < 1); find_next->set_tooltip_text(TTR("Next Match")); - find_next->set_accessibility_name(TTRC("Next Match")); add_child(find_next); find_next->set_focus_mode(FOCUS_ACCESSIBILITY); find_next->connect(SceneStringName(pressed), callable_mp(this, &FindBar::search_next)); @@ -4906,7 +4904,6 @@ FindBar::FindBar() { hide_button = memnew(Button); hide_button->set_flat(true); hide_button->set_tooltip_text(TTR("Hide")); - hide_button->set_accessibility_name(TTRC("Hide")); hide_button->set_focus_mode(FOCUS_ACCESSIBILITY); hide_button->connect(SceneStringName(pressed), callable_mp(this, &FindBar::_hide_bar)); hide_button->set_v_size_flags(SIZE_SHRINK_CENTER); diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp index 55d0b0d16a..527e0cc6a3 100644 --- a/editor/editor_help_search.cpp +++ b/editor/editor_help_search.cpp @@ -341,7 +341,6 @@ EditorHelpSearch::EditorHelpSearch() { case_sensitive_button = memnew(Button); case_sensitive_button->set_theme_type_variation(SceneStringName(FlatButton)); case_sensitive_button->set_tooltip_text(TTR("Case Sensitive")); - case_sensitive_button->set_accessibility_name(TTRC("Case Sensitive")); case_sensitive_button->connect(SceneStringName(pressed), callable_mp(this, &EditorHelpSearch::_update_results)); case_sensitive_button->set_toggle_mode(true); case_sensitive_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); @@ -350,7 +349,6 @@ EditorHelpSearch::EditorHelpSearch() { hierarchy_button = memnew(Button); hierarchy_button->set_theme_type_variation(SceneStringName(FlatButton)); hierarchy_button->set_tooltip_text(TTR("Show Hierarchy")); - hierarchy_button->set_accessibility_name(TTRC("Show Hierarchy")); hierarchy_button->connect(SceneStringName(pressed), callable_mp(this, &EditorHelpSearch::_update_results)); hierarchy_button->set_toggle_mode(true); hierarchy_button->set_pressed(true); diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index a9508d7645..70cbe59830 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -3190,7 +3190,7 @@ EditorInspectorArray::EditorInspectorArray(bool p_read_only) { resize_dialog->add_child(resize_dialog_vbox); new_size_spin_box = memnew(SpinBox); - new_size_spin_box->set_accessibility_name(TTRC("Size")); + new_size_spin_box->set_accessibility_name(TTRC("New Size:")); new_size_spin_box->set_max(16384); new_size_spin_box->connect(SceneStringName(value_changed), callable_mp(this, &EditorInspectorArray::_new_size_spin_box_value_changed)); new_size_spin_box->get_line_edit()->connect(SceneStringName(text_submitted), callable_mp(this, &EditorInspectorArray::_new_size_spin_box_text_submitted)); @@ -3271,13 +3271,13 @@ EditorPaginator::EditorPaginator() { add_child(first_page_button); prev_page_button = memnew(Button); - prev_page_button->set_accessibility_name(TTRC("Previuos Page")); + prev_page_button->set_accessibility_name(TTRC("Previous Page")); prev_page_button->set_flat(true); prev_page_button->connect(SceneStringName(pressed), callable_mp(this, &EditorPaginator::_prev_page_button_pressed)); add_child(prev_page_button); page_line_edit = memnew(LineEdit); - page_line_edit->set_accessibility_name(TTRC("Page")); + page_line_edit->set_accessibility_name(TTRC("Page Number")); page_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &EditorPaginator::_page_line_edit_text_submitted)); page_line_edit->add_theme_constant_override("minimum_character_width", 2); add_child(page_line_edit); diff --git a/editor/editor_layouts_dialog.cpp b/editor/editor_layouts_dialog.cpp index fb7148eaa5..081ffa579c 100644 --- a/editor/editor_layouts_dialog.cpp +++ b/editor/editor_layouts_dialog.cpp @@ -127,7 +127,7 @@ EditorLayoutsDialog::EditorLayoutsDialog() { name = memnew(LineEdit); makevb->add_child(name); name->set_placeholder(TTR("Or enter new layout name")); - name->set_accessibility_name(TTRC("Layout Name")); + name->set_accessibility_name(TTRC("New layout name")); name->set_offset(SIDE_TOP, 5); name->set_anchor_and_offset(SIDE_LEFT, Control::ANCHOR_BEGIN, 5); name->set_anchor_and_offset(SIDE_RIGHT, Control::ANCHOR_END, -5); diff --git a/editor/editor_locale_dialog.cpp b/editor/editor_locale_dialog.cpp index e0caf50b73..d7e8aaf6ab 100644 --- a/editor/editor_locale_dialog.cpp +++ b/editor/editor_locale_dialog.cpp @@ -447,7 +447,7 @@ EditorLocaleDialog::EditorLocaleDialog() { } { lang_list = memnew(Tree); - lang_list->set_accessibility_name(TTRC("Language")); + lang_list->set_accessibility_name(TTRC("Language:")); lang_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); lang_list->set_v_size_flags(Control::SIZE_EXPAND_FILL); lang_list->connect("cell_selected", callable_mp(this, &EditorLocaleDialog::_item_selected)); @@ -486,7 +486,7 @@ EditorLocaleDialog::EditorLocaleDialog() { } { cnt_list = memnew(Tree); - cnt_list->set_accessibility_name(TTRC("Country")); + cnt_list->set_accessibility_name(TTRC("Country:")); cnt_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); cnt_list->set_v_size_flags(Control::SIZE_EXPAND_FILL); cnt_list->connect("cell_selected", callable_mp(this, &EditorLocaleDialog::_item_selected)); diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 0e4de5ce17..0ecfbf02d7 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -512,7 +512,6 @@ EditorLog::EditorLog() { collapse_button->set_theme_type_variation(SceneStringName(FlatButton)); collapse_button->set_focus_mode(FOCUS_ACCESSIBILITY); collapse_button->set_tooltip_text(TTR("Collapse duplicate messages into one log entry. Shows number of occurrences.")); - collapse_button->set_accessibility_name(TTRC("Collapse Duplicate Messages")); collapse_button->set_toggle_mode(true); collapse_button->set_pressed(false); collapse_button->connect(SceneStringName(toggled), callable_mp(this, &EditorLog::_set_collapse)); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index f188d8e74f..9d4a52db46 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -7928,7 +7928,6 @@ EditorNode::EditorNode() { ED_SHORTCUT_AND_COMMAND("editor/toggle_last_opened_bottom_panel", TTRC("Toggle Last Opened Bottom Panel"), KeyModifierMask::CMD_OR_CTRL | Key::J); distraction_free->set_shortcut(ED_GET_SHORTCUT("editor/distraction_free_mode")); distraction_free->set_tooltip_text(TTRC("Toggle distraction-free mode.")); - distraction_free->set_accessibility_name(TTRC("Distraction-free Mode")); distraction_free->set_toggle_mode(true); scene_tabs->add_extra_button(distraction_free); distraction_free->connect(SceneStringName(pressed), callable_mp(this, &EditorNode::_toggle_distraction_free_mode)); diff --git a/editor/editor_properties_vector.cpp b/editor/editor_properties_vector.cpp index 0cd0fdd8b3..1bc66c0dd9 100644 --- a/editor/editor_properties_vector.cpp +++ b/editor/editor_properties_vector.cpp @@ -239,7 +239,6 @@ EditorPropertyVectorN::EditorPropertyVectorN(Variant::Type p_type, bool p_force_ linked->set_toggle_mode(true); linked->set_stretch_mode(TextureButton::STRETCH_KEEP_CENTERED); linked->set_tooltip_text(TTR("Lock/Unlock Component Ratio")); - linked->set_accessibility_name(TTRC("Lock/Unlock Component Ratio")); linked->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyVectorN::_update_ratio)); linked->connect(SceneStringName(toggled), callable_mp(this, &EditorPropertyVectorN::_store_link)); hb->add_child(linked); diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp index 0d7f969aab..3e4594cd09 100644 --- a/editor/editor_run_native.cpp +++ b/editor/editor_run_native.cpp @@ -202,7 +202,6 @@ EditorRunNative::EditorRunNative() { remote_debug->get_popup()->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); remote_debug->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &EditorRunNative::start_run_native)); remote_debug->set_tooltip_text(TTRC("Remote Deploy")); - remote_debug->set_accessibility_name(TTRC("Remote Deploy")); remote_debug->set_disabled(true); add_child(remote_debug); diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index 57cd2939bc..9b25f7e245 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -1472,13 +1472,11 @@ ProjectExportDialog::ProjectExportDialog() { presets->connect(SceneStringName(item_selected), callable_mp(this, &ProjectExportDialog::_edit_preset)); duplicate_preset = memnew(Button); duplicate_preset->set_tooltip_text(TTR("Duplicate")); - duplicate_preset->set_accessibility_name(TTRC("Duplicate")); duplicate_preset->set_flat(true); preset_hb->add_child(duplicate_preset); duplicate_preset->connect(SceneStringName(pressed), callable_mp(this, &ProjectExportDialog::_duplicate_preset)); delete_preset = memnew(Button); delete_preset->set_tooltip_text(TTR("Delete")); - delete_preset->set_accessibility_name(TTRC("Delete")); delete_preset->set_flat(true); preset_hb->add_child(delete_preset); delete_preset->connect(SceneStringName(pressed), callable_mp(this, &ProjectExportDialog::_delete_preset)); @@ -1700,7 +1698,7 @@ ProjectExportDialog::ProjectExportDialog() { enc_ex_filters); script_key = memnew(LineEdit); - script_key->set_accessibility_name(TTRC("Encryption Key")); + script_key->set_accessibility_name(TTRC("Encryption Key (256-bits as hexadecimal):")); script_key->connect(SceneStringName(text_changed), callable_mp(this, &ProjectExportDialog::_script_encryption_key_changed)); script_key_error = memnew(Label); script_key_error->set_focus_mode(Control::FOCUS_ACCESSIBILITY); @@ -1711,7 +1709,7 @@ ProjectExportDialog::ProjectExportDialog() { sections->add_child(sec_scroll_container); seed_input = memnew(LineEdit); - seed_input->set_accessibility_name(TTRC("Encryption Seed")); + seed_input->set_accessibility_name(TTRC("Initialization vector seed")); seed_input->connect(SceneStringName(text_changed), callable_mp(this, &ProjectExportDialog::_seed_input_changed)); sec_vb->add_margin_child(TTR("Initialization vector seed"), seed_input); @@ -1731,7 +1729,7 @@ ProjectExportDialog::ProjectExportDialog() { script_vb->set_name(TTR("Scripts")); script_mode = memnew(OptionButton); - script_mode->set_accessibility_name(TTRC("GDScript Export Mode")); + script_mode->set_accessibility_name(TTRC("GDScript Export Mode:")); script_vb->add_margin_child(TTR("GDScript Export Mode:"), script_mode); script_mode->add_item(TTR("Text (easier debugging)"), (int)EditorExportPreset::MODE_SCRIPT_TEXT); script_mode->add_item(TTR("Binary tokens (faster loading)"), (int)EditorExportPreset::MODE_SCRIPT_BINARY_TOKENS); diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 9a6a119aaa..dda29d9660 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -4195,7 +4195,6 @@ FileSystemDock::FileSystemDock() { button_hist_prev->set_disabled(true); button_hist_prev->set_focus_mode(FOCUS_ACCESSIBILITY); button_hist_prev->set_tooltip_text(TTRC("Go to previous selected folder/file.")); - button_hist_prev->set_accessibility_name(TTRC("Previous")); nav_hbc->add_child(button_hist_prev); button_hist_next = memnew(Button); @@ -4203,7 +4202,6 @@ FileSystemDock::FileSystemDock() { button_hist_next->set_disabled(true); button_hist_next->set_focus_mode(FOCUS_ACCESSIBILITY); button_hist_next->set_tooltip_text(TTRC("Go to next selected folder/file.")); - button_hist_next->set_accessibility_name(TTRC("Next")); nav_hbc->add_child(button_hist_next); current_path_line_edit = memnew(LineEdit); @@ -4217,7 +4215,6 @@ FileSystemDock::FileSystemDock() { button_toggle_display_mode->connect(SceneStringName(pressed), callable_mp(this, &FileSystemDock::_change_split_mode)); button_toggle_display_mode->set_focus_mode(FOCUS_ACCESSIBILITY); button_toggle_display_mode->set_tooltip_text(TTRC("Change Split Mode")); - button_toggle_display_mode->set_accessibility_name(TTRC("Change Split Mode")); button_toggle_display_mode->set_theme_type_variation("FlatMenuButton"); toolbar_hbc->add_child(button_toggle_display_mode); @@ -4234,7 +4231,6 @@ FileSystemDock::FileSystemDock() { tree_search_box = memnew(LineEdit); tree_search_box->set_h_size_flags(SIZE_EXPAND_FILL); tree_search_box->set_placeholder(TTRC("Filter Files")); - tree_search_box->set_accessibility_name(TTRC("Filter Files")); tree_search_box->set_clear_button_enabled(true); tree_search_box->connect(SceneStringName(text_changed), callable_mp(this, &FileSystemDock::_search_changed).bind(tree_search_box)); toolbar2_hbc->add_child(tree_search_box); diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp index b62a82324e..333e45e74a 100644 --- a/editor/find_in_files.cpp +++ b/editor/find_in_files.cpp @@ -349,7 +349,7 @@ FindInFilesDialog::FindInFilesDialog() { _search_text_line_edit = memnew(LineEdit); _search_text_line_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); - _search_text_line_edit->set_accessibility_name(TTRC("Search")); + _search_text_line_edit->set_accessibility_name(TTRC("Find:")); _search_text_line_edit->connect(SceneStringName(text_changed), callable_mp(this, &FindInFilesDialog::_on_search_text_modified)); _search_text_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &FindInFilesDialog::_on_search_text_submitted)); gc->add_child(_search_text_line_edit); @@ -361,7 +361,7 @@ FindInFilesDialog::FindInFilesDialog() { _replace_text_line_edit = memnew(LineEdit); _replace_text_line_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); - _replace_text_line_edit->set_accessibility_name(TTRC("Replace")); + _replace_text_line_edit->set_accessibility_name(TTRC("Replace:")); _replace_text_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &FindInFilesDialog::_on_replace_text_submitted)); _replace_text_line_edit->hide(); gc->add_child(_replace_text_line_edit); @@ -396,6 +396,7 @@ FindInFilesDialog::FindInFilesDialog() { _folder_line_edit = memnew(LineEdit); _folder_line_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); _folder_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &FindInFilesDialog::_on_search_text_submitted)); + _folder_line_edit->set_accessibility_name(TTRC("Folder:")); hbc->add_child(_folder_line_edit); Button *folder_button = memnew(Button); @@ -421,7 +422,7 @@ FindInFilesDialog::FindInFilesDialog() { _includes_line_edit = memnew(LineEdit); _includes_line_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); _includes_line_edit->set_placeholder(TTR("example: scripts,scenes/*/test.gd")); - _includes_line_edit->set_accessibility_name(TTRC("Include Files")); + _includes_line_edit->set_accessibility_name(TTRC("Includes:")); _includes_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &FindInFilesDialog::_on_search_text_submitted)); gc->add_child(_includes_line_edit); @@ -434,7 +435,7 @@ FindInFilesDialog::FindInFilesDialog() { _excludes_line_edit = memnew(LineEdit); _excludes_line_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); _excludes_line_edit->set_placeholder(TTR("example: res://addons,scenes/test/*.gd")); - _excludes_line_edit->set_accessibility_name(TTRC("Exclude Files")); + _excludes_line_edit->set_accessibility_name(TTRC("Excludes:")); _excludes_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &FindInFilesDialog::_on_search_text_submitted)); gc->add_child(_excludes_line_edit); @@ -761,7 +762,7 @@ FindInFilesPanel::FindInFilesPanel() { _replace_container->add_child(replace_label); _replace_line_edit = memnew(LineEdit); - _replace_line_edit->set_accessibility_name(TTRC("Replace")); + _replace_line_edit->set_accessibility_name(TTRC("Replace:")); _replace_line_edit->set_h_size_flags(SIZE_EXPAND_FILL); _replace_line_edit->connect(SceneStringName(text_changed), callable_mp(this, &FindInFilesPanel::_on_replace_text_changed)); _replace_container->add_child(_replace_line_edit); diff --git a/editor/group_settings_editor.cpp b/editor/group_settings_editor.cpp index e09a690291..ba13ecc69e 100644 --- a/editor/group_settings_editor.cpp +++ b/editor/group_settings_editor.cpp @@ -501,7 +501,7 @@ GroupSettingsEditor::GroupSettingsEditor() { group_name = memnew(LineEdit); group_name->set_h_size_flags(SIZE_EXPAND_FILL); group_name->set_clear_button_enabled(true); - group_name->set_accessibility_name(TTRC("Group Name")); + group_name->set_accessibility_name(TTRC("Name:")); group_name->connect(SceneStringName(text_changed), callable_mp(this, &GroupSettingsEditor::_group_name_text_changed)); group_name->connect(SceneStringName(text_submitted), callable_mp(this, &GroupSettingsEditor::_text_submitted)); hbc->add_child(group_name); @@ -512,7 +512,7 @@ GroupSettingsEditor::GroupSettingsEditor() { group_description = memnew(LineEdit); group_description->set_clear_button_enabled(true); - group_description->set_accessibility_name(TTRC("Group Description")); + group_description->set_accessibility_name(TTRC("Description:")); group_description->set_h_size_flags(SIZE_EXPAND_FILL); group_description->connect(SceneStringName(text_submitted), callable_mp(this, &GroupSettingsEditor::_text_submitted)); hbc->add_child(group_description); diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp index 9fd47b9b5b..3421d991fb 100644 --- a/editor/groups_editor.cpp +++ b/editor/groups_editor.cpp @@ -633,7 +633,7 @@ void GroupsEditor::_show_add_group_dialog() { add_group_name = memnew(LineEdit); add_group_name->set_custom_minimum_size(Size2(200 * EDSCALE, 0)); add_group_name->set_h_size_flags(SIZE_EXPAND_FILL); - add_group_name->set_accessibility_name(TTRC("Name")); + add_group_name->set_accessibility_name(TTRC("Name:")); hbc->add_child(add_group_name); global_group_button = memnew(CheckButton); @@ -647,7 +647,7 @@ void GroupsEditor::_show_add_group_dialog() { add_group_description = memnew(LineEdit); add_group_description->set_h_size_flags(SIZE_EXPAND_FILL); add_group_description->set_editable(false); - add_group_description->set_accessibility_name(TTRC("Description")); + add_group_description->set_accessibility_name(TTRC("Description:")); gc->add_child(add_group_description); global_group_button->connect(SceneStringName(toggled), callable_mp(add_group_description, &LineEdit::set_editable)); @@ -844,7 +844,6 @@ GroupsEditor::GroupsEditor() { add = memnew(Button); add->set_theme_type_variation("FlatMenuButton"); - add->set_accessibility_name(TTRC("Add Group")); add->set_tooltip_text(TTR("Add a new group.")); add->connect(SceneStringName(pressed), callable_mp(this, &GroupsEditor::_show_add_group_dialog)); hbc->add_child(add); diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp index e39a846ee1..ec8db6008c 100644 --- a/editor/gui/editor_bottom_panel.cpp +++ b/editor/gui/editor_bottom_panel.cpp @@ -356,7 +356,6 @@ EditorBottomPanel::EditorBottomPanel() { pin_button->set_theme_type_variation("FlatMenuButton"); pin_button->set_toggle_mode(true); pin_button->set_tooltip_text(TTRC("Pin Bottom Panel Switching")); - pin_button->set_accessibility_name(TTRC("Pin Bottom Panel")); pin_button->connect(SceneStringName(toggled), callable_mp(this, &EditorBottomPanel::_pin_button_toggled)); expand_button = memnew(Button); diff --git a/editor/gui/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp index e7e9c3a8fd..4bc4260dfe 100644 --- a/editor/gui/editor_file_dialog.cpp +++ b/editor/gui/editor_file_dialog.cpp @@ -2369,15 +2369,12 @@ EditorFileDialog::EditorFileDialog() { dir_prev = memnew(Button); dir_prev->set_theme_type_variation(SceneStringName(FlatButton)); - dir_prev->set_accessibility_name(TTRC("Previous")); dir_prev->set_tooltip_text(TTRC("Go to previous folder.")); dir_next = memnew(Button); dir_next->set_theme_type_variation(SceneStringName(FlatButton)); - dir_next->set_accessibility_name(TTRC("Next")); dir_next->set_tooltip_text(TTRC("Go to next folder.")); dir_up = memnew(Button); dir_up->set_theme_type_variation(SceneStringName(FlatButton)); - dir_up->set_accessibility_name(TTRC("Parent Folder")); dir_up->set_tooltip_text(TTRC("Go to parent folder.")); pathhb->add_child(dir_prev); @@ -2397,12 +2394,11 @@ EditorFileDialog::EditorFileDialog() { dir = memnew(LineEdit); dir->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE); - dir->set_accessibility_name(TTRC("Directory Path")); + dir->set_accessibility_name(TTRC("Path:")); pathhb->add_child(dir); refresh = memnew(Button); refresh->set_theme_type_variation(SceneStringName(FlatButton)); - refresh->set_accessibility_name(TTRC("Refresh Files")); refresh->set_tooltip_text(TTRC("Refresh files.")); refresh->connect(SceneStringName(pressed), callable_mp(this, &EditorFileDialog::update_file_list)); pathhb->add_child(refresh); @@ -2410,7 +2406,6 @@ EditorFileDialog::EditorFileDialog() { favorite = memnew(Button); favorite->set_theme_type_variation(SceneStringName(FlatButton)); favorite->set_toggle_mode(true); - favorite->set_accessibility_name(TTRC("(Un)favorite Folder")); favorite->set_tooltip_text(TTRC("(Un)favorite current folder.")); favorite->connect(SceneStringName(pressed), callable_mp(this, &EditorFileDialog::_favorite_pressed)); pathhb->add_child(favorite); @@ -2428,7 +2423,6 @@ EditorFileDialog::EditorFileDialog() { makedir = memnew(Button); makedir->set_theme_type_variation(SceneStringName(FlatButton)); - makedir->set_accessibility_name(TTRC("Create Folder")); makedir->set_tooltip_text(TTRC("Create a new folder.")); makedir->connect(SceneStringName(pressed), callable_mp(this, &EditorFileDialog::_make_dir)); pathhb->add_child(makedir); @@ -2484,7 +2478,7 @@ EditorFileDialog::EditorFileDialog() { fav_vb->add_child(favorites); favorites->set_v_size_flags(Control::SIZE_EXPAND_FILL); favorites->set_theme_type_variation("ItemListSecondary"); - favorites->set_accessibility_name(TTRC("Favorites")); + favorites->set_accessibility_name(TTRC("Favorites:")); favorites->connect(SceneStringName(item_selected), callable_mp(this, &EditorFileDialog::_favorite_selected)); VBoxContainer *rec_vb = memnew(VBoxContainer); @@ -2495,7 +2489,7 @@ EditorFileDialog::EditorFileDialog() { recent->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); recent->set_allow_reselect(true); recent->set_theme_type_variation("ItemListSecondary"); - recent->set_accessibility_name(TTRC("Recent")); + recent->set_accessibility_name(TTRC("Recent:")); rec_vb->add_margin_child(TTRC("Recent:"), recent, true); recent->connect(SceneStringName(item_selected), callable_mp(this, &EditorFileDialog::_recent_selected)); @@ -2523,7 +2517,6 @@ EditorFileDialog::EditorFileDialog() { show_hidden->set_theme_type_variation(SceneStringName(FlatButton)); show_hidden->set_toggle_mode(true); show_hidden->set_pressed(is_showing_hidden_files()); - show_hidden->set_accessibility_name(TTRC("Show Hidden Files")); show_hidden->set_tooltip_text(TTRC("Toggle the visibility of hidden files.")); show_hidden->connect(SceneStringName(toggled), callable_mp(this, &EditorFileDialog::set_show_hidden_files)); lower_hb->add_child(show_hidden); @@ -2539,7 +2532,6 @@ EditorFileDialog::EditorFileDialog() { mode_thumbnails->set_toggle_mode(true); mode_thumbnails->set_pressed(display_mode == DISPLAY_THUMBNAILS); mode_thumbnails->set_button_group(view_mode_group); - mode_thumbnails->set_accessibility_name(TTRC("View as Thumbnails")); mode_thumbnails->set_tooltip_text(TTRC("View items as a grid of thumbnails.")); lower_hb->add_child(mode_thumbnails); @@ -2549,7 +2541,6 @@ EditorFileDialog::EditorFileDialog() { mode_list->set_toggle_mode(true); mode_list->set_pressed(display_mode == DISPLAY_LIST); mode_list->set_button_group(view_mode_group); - mode_list->set_accessibility_name(TTRC("View as List")); mode_list->set_tooltip_text(TTRC("View items as a list.")); lower_hb->add_child(mode_list); @@ -2559,14 +2550,12 @@ EditorFileDialog::EditorFileDialog() { file_sort_button->set_flat(false); file_sort_button->set_theme_type_variation("FlatMenuButton"); file_sort_button->set_tooltip_text(TTRC("Sort files")); - file_sort_button->set_accessibility_name(TTRC("Sort Files")); show_search_filter_button = memnew(Button); show_search_filter_button->set_theme_type_variation(SceneStringName(FlatButton)); show_search_filter_button->set_toggle_mode(true); show_search_filter_button->set_pressed(false); show_search_filter_button->set_tooltip_text(TTRC("Toggle the visibility of the filter for file names.")); - show_search_filter_button->set_accessibility_name(TTRC("Show Search Filters")); show_search_filter_button->connect(SceneStringName(toggled), callable_mp(this, &EditorFileDialog::set_show_search_filter)); lower_hb->add_child(show_search_filter_button); @@ -2592,7 +2581,7 @@ EditorFileDialog::EditorFileDialog() { item_list->connect("item_clicked", callable_mp(this, &EditorFileDialog::_item_list_item_rmb_clicked)); item_list->connect("empty_clicked", callable_mp(this, &EditorFileDialog::_item_list_empty_clicked)); item_list->set_allow_rmb_select(true); - item_list->set_accessibility_name(TTRC("Directories and Files")); + item_list->set_accessibility_name(TTRC("Directories & Files:")); list_vb->add_child(item_list); @@ -2615,7 +2604,7 @@ EditorFileDialog::EditorFileDialog() { filter_box = memnew(LineEdit); filter_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); filter_box->set_placeholder(TTRC("Filter")); - filter_box->set_accessibility_name(TTRC("Filename Filter")); + filter_box->set_accessibility_name(TTRC("Filename Filter:")); filter_hb->add_child(filter_box); filter_hb->set_visible(false); item_vb->add_child(filter_hb); @@ -2630,7 +2619,7 @@ EditorFileDialog::EditorFileDialog() { file->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE); file->set_stretch_ratio(4); file->set_h_size_flags(Control::SIZE_EXPAND_FILL); - file->set_accessibility_name(TTRC("File Name")); + file->set_accessibility_name(TTRC("File:")); file_box->add_child(file); filter = memnew(OptionButton); filter->set_stretch_ratio(3); @@ -2674,7 +2663,7 @@ EditorFileDialog::EditorFileDialog() { makedirname = memnew(LineEdit); makedirname->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE); - makedirname->set_accessibility_name(TTRC("Name")); + makedirname->set_accessibility_name(TTRC("Name:")); makevb->add_margin_child(TTRC("Name:"), makedirname); add_child(makedialog); makedialog->register_text_enter(makedirname); diff --git a/editor/gui/editor_run_bar.cpp b/editor/gui/editor_run_bar.cpp index 569b7dbceb..3a43fe5eed 100644 --- a/editor/gui/editor_run_bar.cpp +++ b/editor/gui/editor_run_bar.cpp @@ -552,7 +552,6 @@ EditorRunBar::EditorRunBar() { recovery_mode_reload_button->set_theme_type_variation("RunBarButton"); recovery_mode_reload_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); recovery_mode_reload_button->set_tooltip_text(TTR("Disable recovery mode and reload the project.")); - recovery_mode_reload_button->set_accessibility_name(TTRC("Disable Recovery Mode")); recovery_mode_reload_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::recovery_mode_reload_project)); recovery_mode_panel = memnew(PanelContainer); @@ -575,7 +574,6 @@ EditorRunBar::EditorRunBar() { play_button->set_toggle_mode(true); play_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); play_button->set_tooltip_text(TTRC("Run the project's default scene.")); - play_button->set_accessibility_name(TTRC("Run Default Scene")); play_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::play_main_scene).bind(false)); ED_SHORTCUT_AND_COMMAND("editor/run_project", TTRC("Run Project"), Key::F5); @@ -588,7 +586,6 @@ EditorRunBar::EditorRunBar() { pause_button->set_toggle_mode(true); pause_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); pause_button->set_tooltip_text(TTRC("Pause the running project's execution for debugging.")); - pause_button->set_accessibility_name(TTRC("Pause")); pause_button->set_disabled(true); ED_SHORTCUT("editor/pause_running_project", TTRC("Pause Running Project"), Key::F7); @@ -600,7 +597,6 @@ EditorRunBar::EditorRunBar() { stop_button->set_theme_type_variation("RunBarButton"); stop_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); stop_button->set_tooltip_text(TTRC("Stop the currently running project.")); - stop_button->set_accessibility_name(TTRC("Stop")); stop_button->set_disabled(true); stop_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::stop_playing)); @@ -639,7 +635,6 @@ EditorRunBar::EditorRunBar() { play_scene_button->set_theme_type_variation("RunBarButton"); play_scene_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); play_scene_button->set_tooltip_text(TTRC("Run the currently edited scene.")); - play_scene_button->set_accessibility_name(TTRC("Run Edited Scene")); ED_SHORTCUT_AND_COMMAND("editor/run_current_scene", TTRC("Run Current Scene"), Key::F6); ED_SHORTCUT_OVERRIDE("editor/run_current_scene", "macos", KeyModifierMask::META | Key::R); @@ -661,7 +656,6 @@ EditorRunBar::EditorRunBar() { play_custom_scene_button->set_theme_type_variation("RunBarButton"); play_custom_scene_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); play_custom_scene_button->set_tooltip_text(TTRC("Run a specific scene.")); - play_custom_scene_button->set_accessibility_name(TTRC("Run Specific Scene")); ED_SHORTCUT_AND_COMMAND("editor/run_specific_scene", TTRC("Run Specific Scene"), KeyModifierMask::CTRL | KeyModifierMask::SHIFT | Key::F5); ED_SHORTCUT_OVERRIDE("editor/run_specific_scene", "macos", KeyModifierMask::META | KeyModifierMask::SHIFT | Key::R); diff --git a/editor/gui/editor_scene_tabs.cpp b/editor/gui/editor_scene_tabs.cpp index 504e96e090..9a2e1af799 100644 --- a/editor/gui/editor_scene_tabs.cpp +++ b/editor/gui/editor_scene_tabs.cpp @@ -437,7 +437,6 @@ EditorSceneTabs::EditorSceneTabs() { scene_tab_add = memnew(Button); scene_tab_add->set_flat(true); scene_tab_add->set_tooltip_text(TTR("Add a new scene.")); - scene_tab_add->set_accessibility_name(TTRC("Add Scene")); scene_tabs->add_child(scene_tab_add); scene_tab_add->connect(SceneStringName(pressed), callable_mp(EditorNode::get_singleton(), &EditorNode::trigger_menu_option).bind(EditorNode::SCENE_NEW_SCENE, false)); diff --git a/editor/gui/editor_toaster.cpp b/editor/gui/editor_toaster.cpp index e41a32e0e5..0b0a59e7e8 100644 --- a/editor/gui/editor_toaster.cpp +++ b/editor/gui/editor_toaster.cpp @@ -578,7 +578,7 @@ EditorToaster::EditorToaster() { // Main button. main_button = memnew(Button); - main_button->set_accessibility_name(TTRC("Notifications")); + main_button->set_accessibility_name(TTRC("Notifications:")); main_button->set_tooltip_text(TTRC("No notifications.")); main_button->set_modulate(Color(0.5, 0.5, 0.5)); main_button->set_disabled(true); @@ -595,7 +595,6 @@ EditorToaster::EditorToaster() { add_child(disable_notifications_panel); disable_notifications_button = memnew(Button); - disable_notifications_button->set_accessibility_name(TTRC("Silence Notifications")); disable_notifications_button->set_tooltip_text(TTRC("Silence the notifications.")); disable_notifications_button->set_flat(true); disable_notifications_button->connect(SceneStringName(pressed), callable_mp(this, &EditorToaster::_set_notifications_enabled).bind(false)); diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp index 727577204d..176ee6633b 100644 --- a/editor/import/3d/scene_import_settings.cpp +++ b/editor/import/3d/scene_import_settings.cpp @@ -1780,7 +1780,7 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() { animation_play_button = memnew(Button); animation_hbox->add_child(animation_play_button); animation_play_button->set_flat(true); - animation_play_button->set_accessibility_name(TTRC("Play")); + animation_play_button->set_accessibility_name(TTRC("Selected Animation Play/Pause")); animation_play_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); animation_play_button->set_shortcut(ED_SHORTCUT("scene_import_settings/play_selected_animation", TTRC("Selected Animation Play/Pause"), Key::SPACE)); animation_play_button->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_play_animation)); @@ -1788,7 +1788,6 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() { animation_stop_button = memnew(Button); animation_hbox->add_child(animation_stop_button); animation_stop_button->set_flat(true); - animation_stop_button->set_accessibility_name(TTRC("Stop")); animation_stop_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); animation_stop_button->set_tooltip_text(TTR("Selected Animation Stop")); animation_stop_button->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_stop_current_animation)); @@ -1810,7 +1809,6 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() { animation_toggle_skeleton_visibility->set_theme_type_variation("FlatButton"); animation_toggle_skeleton_visibility->set_focus_mode(Control::FOCUS_ACCESSIBILITY); animation_toggle_skeleton_visibility->set_tooltip_text(TTR("Toggle Animation Skeleton Visibility")); - animation_toggle_skeleton_visibility->set_accessibility_name(TTRC("Skeleton Visibility")); animation_toggle_skeleton_visibility->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_animation_update_skeleton_visibility)); @@ -1831,7 +1829,6 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() { light_rotate_switch->set_toggle_mode(true); light_rotate_switch->set_pressed(true); light_rotate_switch->set_tooltip_text(TTR("Rotate Lights With Model")); - light_rotate_switch->set_accessibility_name(TTRC("Rotate Lights With Model")); light_rotate_switch->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_on_light_rotate_switch_pressed)); vb_light->add_child(light_rotate_switch); @@ -1840,7 +1837,6 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() { light_1_switch->set_toggle_mode(true); light_1_switch->set_pressed(true); light_1_switch->set_tooltip_text(TTR("Primary Light")); - light_1_switch->set_accessibility_name(TTRC("Primary Light")); light_1_switch->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_on_light_1_switch_pressed)); vb_light->add_child(light_1_switch); @@ -1849,7 +1845,6 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() { light_2_switch->set_toggle_mode(true); light_2_switch->set_pressed(true); light_2_switch->set_tooltip_text(TTR("Secondary Light")); - light_2_switch->set_accessibility_name(TTRC("Secondary Light")); light_2_switch->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_on_light_2_switch_pressed)); vb_light->add_child(light_2_switch); diff --git a/editor/import/audio_stream_import_settings.cpp b/editor/import/audio_stream_import_settings.cpp index 4e2a09ff4d..724b2f61a0 100644 --- a/editor/import/audio_stream_import_settings.cpp +++ b/editor/import/audio_stream_import_settings.cpp @@ -541,14 +541,13 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() { loop_hb->add_theme_constant_override("separation", 4 * EDSCALE); loop = memnew(CheckBox); loop->set_text(TTR("Enable")); - loop->set_accessibility_name(TTRC("Enable looping")); loop->set_tooltip_text(TTR("Enable looping.")); loop->connect(SceneStringName(toggled), callable_mp(this, &AudioStreamImportSettingsDialog::_settings_changed).unbind(1)); loop_hb->add_child(loop); loop_hb->add_spacer(); loop_hb->add_child(memnew(Label(TTR("Offset:")))); loop_offset = memnew(SpinBox); - loop_offset->set_accessibility_name(TTRC("Loop Offset")); + loop_offset->set_accessibility_name(TTRC("Offset:")); loop_offset->set_max(10000); loop_offset->set_step(0.001); loop_offset->set_suffix("s"); @@ -568,7 +567,7 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() { bpm_edit = memnew(SpinBox); bpm_edit->set_max(400); bpm_edit->set_step(0.01); - bpm_edit->set_accessibility_name(TTRC("BPM")); + bpm_edit->set_accessibility_name(TTRC("BPM:")); bpm_edit->set_tooltip_text(TTR("Configure the Beats Per Measure (tempo) used for the interactive streams.\nThis is required in order to configure beat information.")); bpm_edit->connect(SceneStringName(value_changed), callable_mp(this, &AudioStreamImportSettingsDialog::_settings_changed).unbind(1)); interactive_hb->add_child(bpm_edit); @@ -580,7 +579,7 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() { beats_edit = memnew(SpinBox); beats_edit->set_tooltip_text(TTR("Configure the amount of Beats used for music-aware looping. If zero, it will be autodetected from the length.\nIt is recommended to set this value (either manually or by clicking on a beat number in the preview) to ensure looping works properly.")); beats_edit->set_max(99999); - beats_edit->set_accessibility_name(TTRC("Beat Count")); + beats_edit->set_accessibility_name(TTRC("Beat Count:")); beats_edit->connect(SceneStringName(value_changed), callable_mp(this, &AudioStreamImportSettingsDialog::_settings_changed).unbind(1)); interactive_hb->add_child(beats_edit); bar_beats_label = memnew(Label(TTR("Bar Beats:"))); @@ -589,7 +588,7 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() { bar_beats_edit->set_tooltip_text(TTR("Configure the Beats Per Bar. This used for music-aware transitions between AudioStreams.")); bar_beats_edit->set_min(2); bar_beats_edit->set_max(32); - bar_beats_edit->set_accessibility_name(TTRC("Bar Beats")); + bar_beats_edit->set_accessibility_name(TTRC("Bar Beats:")); bar_beats_edit->connect(SceneStringName(value_changed), callable_mp(this, &AudioStreamImportSettingsDialog::_settings_changed).unbind(1)); interactive_hb->add_child(bar_beats_edit); main_vbox->add_margin_child(TTR("Music Playback:"), interactive_hb); diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index 90b4b08446..21ac2f37c6 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -1100,13 +1100,12 @@ DynamicFontImportSettingsDialog::DynamicFontImportSettingsDialog() { add_var = memnew(Button); add_var->set_tooltip_text(TTR("Add new font variation configuration.")); - add_var->set_accessibility_name(TTRC("Add Configuration")); page2_hb_vars->add_child(add_var); add_var->connect(SceneStringName(pressed), callable_mp(this, &DynamicFontImportSettingsDialog::_variation_add)); vars_list = memnew(Tree); vars_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); - vars_list->set_accessibility_name(TTRC("Configuration")); + vars_list->set_accessibility_name(TTRC("Configuration:")); vars_list->set_custom_minimum_size(Size2(300 * EDSCALE, 0)); vars_list->set_hide_root(true); vars_list->set_columns(2); diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index 126e1f3e3c..e6c1934add 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -762,7 +762,7 @@ ImportDock::ImportDock() { import_as->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS); import_as->set_h_size_flags(SIZE_EXPAND_FILL); import_as->connect(SceneStringName(item_selected), callable_mp(this, &ImportDock::_importer_selected)); - import_as->set_accessibility_name(TTRC("Import As")); + import_as->set_accessibility_name(TTRC("Import As:")); hb->add_child(import_as); import_as->set_h_size_flags(SIZE_EXPAND_FILL); preset = memnew(MenuButton); diff --git a/editor/input_event_configuration_dialog.cpp b/editor/input_event_configuration_dialog.cpp index 00a72adaad..2a90c777cd 100644 --- a/editor/input_event_configuration_dialog.cpp +++ b/editor/input_event_configuration_dialog.cpp @@ -712,7 +712,7 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() { device_id_option->add_item(EventListenerLineEdit::get_device_string(i)); } device_id_option->connect(SceneStringName(item_selected), callable_mp(this, &InputEventConfigurationDialog::_device_selection_changed)); - device_id_option->set_accessibility_name(TTRC("Device")); + device_id_option->set_accessibility_name(TTRC("Device:")); _set_current_device(InputMap::ALL_DEVICES); device_container->add_child(device_id_option); @@ -767,7 +767,7 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() { key_location->add_item(String(), (int)KeyLocation::LEFT); key_location->add_item(String(), (int)KeyLocation::RIGHT); key_location->connect(SceneStringName(item_selected), callable_mp(this, &InputEventConfigurationDialog::_key_location_selected)); - key_location->set_accessibility_name(TTRC("Location")); + key_location->set_accessibility_name(TTRC("Physical location")); location_container->add_child(key_location); additional_options_container->add_child(location_container); diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index e3075dbf6d..dcf5a51c53 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -719,7 +719,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { resource_new_button = memnew(Button); resource_new_button->set_theme_type_variation("FlatMenuButton"); resource_new_button->set_tooltip_text(TTRC("Create a new resource in memory and edit it.")); - resource_new_button->set_accessibility_name(TTRC("New Resource")); general_options_hb->add_child(resource_new_button); resource_new_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_new_resource)); resource_new_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); @@ -727,7 +726,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { resource_load_button = memnew(Button); resource_load_button->set_theme_type_variation("FlatMenuButton"); resource_load_button->set_tooltip_text(TTRC("Load an existing resource from disk and edit it.")); - resource_load_button->set_accessibility_name(TTRC("Load Resource")); general_options_hb->add_child(resource_load_button); resource_load_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_open_resource_selector)); resource_load_button->set_focus_mode(Control::FOCUS_ACCESSIBILITY); @@ -736,7 +734,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { resource_save_button->set_flat(false); resource_save_button->set_theme_type_variation("FlatMenuButton"); resource_save_button->set_tooltip_text(TTRC("Save the currently edited resource.")); - resource_save_button->set_accessibility_name(TTRC("Save Resource")); general_options_hb->add_child(resource_save_button); resource_save_button->get_popup()->add_item(TTRC("Save"), RESOURCE_SAVE); resource_save_button->get_popup()->add_item(TTRC("Save As..."), RESOURCE_SAVE_AS); @@ -748,7 +745,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { resource_extra_button->set_flat(false); resource_extra_button->set_theme_type_variation("FlatMenuButton"); resource_extra_button->set_tooltip_text(TTRC("Extra resource options.")); - resource_extra_button->set_accessibility_name(TTRC("Resource Options")); general_options_hb->add_child(resource_extra_button); resource_extra_button->connect("about_to_popup", callable_mp(this, &InspectorDock::_prepare_resource_extra_popup)); resource_extra_button->get_popup()->add_shortcut(ED_SHORTCUT("property_editor/paste_resource", TTRC("Edit Resource from Clipboard")), RESOURCE_EDIT_CLIPBOARD); @@ -766,7 +762,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { backward_button->set_flat(true); general_options_hb->add_child(backward_button); backward_button->set_tooltip_text(TTRC("Go to previous edited object in history.")); - backward_button->set_accessibility_name(TTRC("Previous Edited Object")); backward_button->set_disabled(true); backward_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_edit_back)); @@ -774,7 +769,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { forward_button->set_flat(true); general_options_hb->add_child(forward_button); forward_button->set_tooltip_text(TTRC("Go to next edited object in history.")); - forward_button->set_accessibility_name(TTRC("Next Edited Object")); forward_button->set_disabled(true); forward_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_edit_forward)); @@ -783,7 +777,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { history_menu->set_flat(false); history_menu->set_theme_type_variation("FlatMenuButton"); history_menu->set_tooltip_text(TTRC("History of recently edited objects.")); - history_menu->set_accessibility_name(TTRC("Edit History")); general_options_hb->add_child(history_menu); history_menu->connect("about_to_popup", callable_mp(this, &InspectorDock::_prepare_history)); history_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &InspectorDock::_select_history)); @@ -798,7 +791,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { open_docs_button->set_theme_type_variation("FlatMenuButton"); open_docs_button->set_disabled(true); open_docs_button->set_tooltip_text(TTRC("Open documentation for this object.")); - open_docs_button->set_accessibility_name(TTRC("Open Documentation")); open_docs_button->set_shortcut(ED_SHORTCUT("property_editor/open_help", TTRC("Open Documentation"))); subresource_hb->add_child(open_docs_button); open_docs_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_menu_option).bind(OBJECT_REQUEST_HELP)); @@ -814,7 +806,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { search = memnew(LineEdit); search->set_h_size_flags(Control::SIZE_EXPAND_FILL); search->set_placeholder(TTRC("Filter Properties")); - search->set_accessibility_name(TTRC("Filter Properties")); search->set_clear_button_enabled(true); property_tools_hb->add_child(search); @@ -823,7 +814,6 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { object_menu->set_theme_type_variation("FlatMenuButton"); property_tools_hb->add_child(object_menu); object_menu->set_tooltip_text(TTRC("Manage object properties.")); - object_menu->set_accessibility_name(TTRC("Object Properties")); object_menu->get_popup()->connect("about_to_popup", callable_mp(this, &InspectorDock::_prepare_menu)); object_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &InspectorDock::_menu_option)); diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp index fa41cefbce..291d6a467f 100644 --- a/editor/plugins/animation_blend_space_1d_editor.cpp +++ b/editor/plugins/animation_blend_space_1d_editor.cpp @@ -666,7 +666,6 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() { top_hb->add_child(tool_blend); tool_blend->set_pressed(true); tool_blend->set_tooltip_text(TTR("Set the blending position within the space")); - tool_blend->set_accessibility_name(TTRC("Set Blending Position")); tool_blend->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_tool_switch).bind(3)); tool_select = memnew(Button); @@ -675,7 +674,6 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() { tool_select->set_button_group(bg); top_hb->add_child(tool_select); tool_select->set_tooltip_text(TTR("Select and move points, create points with RMB.")); - tool_select->set_accessibility_name(TTRC("Edit Points")); tool_select->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_tool_switch).bind(0)); tool_create = memnew(Button); @@ -684,7 +682,6 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() { tool_create->set_button_group(bg); top_hb->add_child(tool_create); tool_create->set_tooltip_text(TTR("Create points.")); - tool_create->set_accessibility_name(TTRC("Create Points")); tool_create->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_tool_switch).bind(1)); tool_erase_sep = memnew(VSeparator); @@ -693,7 +690,6 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() { tool_erase->set_theme_type_variation(SceneStringName(FlatButton)); top_hb->add_child(tool_erase); tool_erase->set_tooltip_text(TTR("Erase points.")); - tool_erase->set_accessibility_name(TTRC("Erase Points")); tool_erase->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_erase_selected)); top_hb->add_child(memnew(VSeparator)); @@ -704,7 +700,6 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() { top_hb->add_child(snap); snap->set_pressed(true); snap->set_tooltip_text(TTR("Enable snap and show grid.")); - snap->set_accessibility_name(TTRC("Snap to Grid")); snap->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_snap_toggled)); snap_value = memnew(SpinBox); diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index 2885af215a..08144a05eb 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -886,7 +886,6 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() { top_hb->add_child(tool_blend); tool_blend->set_pressed(true); tool_blend->set_tooltip_text(TTR("Set the blending position within the space")); - tool_blend->set_accessibility_name(TTRC("Set Blending Position")); tool_blend->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_tool_switch).bind(3)); tool_select = memnew(Button); @@ -895,7 +894,6 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() { tool_select->set_button_group(bg); top_hb->add_child(tool_select); tool_select->set_tooltip_text(TTR("Select and move points, create points with RMB.")); - tool_select->set_accessibility_name(TTRC("Edit Points")); tool_select->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_tool_switch).bind(0)); tool_create = memnew(Button); @@ -904,7 +902,6 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() { tool_create->set_button_group(bg); top_hb->add_child(tool_create); tool_create->set_tooltip_text(TTR("Create points.")); - tool_create->set_accessibility_name(TTRC("Create Points")); tool_create->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_tool_switch).bind(1)); tool_triangle = memnew(Button); @@ -913,7 +910,6 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() { tool_triangle->set_button_group(bg); top_hb->add_child(tool_triangle); tool_triangle->set_tooltip_text(TTR("Create triangles by connecting points.")); - tool_triangle->set_accessibility_name(TTRC("Create Triangles")); tool_triangle->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_tool_switch).bind(2)); tool_erase_sep = memnew(VSeparator); @@ -922,7 +918,6 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() { tool_erase->set_theme_type_variation(SceneStringName(FlatButton)); top_hb->add_child(tool_erase); tool_erase->set_tooltip_text(TTR("Erase points and triangles.")); - tool_erase->set_accessibility_name(TTRC("Erase Points")); tool_erase->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_erase_selected)); tool_erase->set_disabled(true); @@ -934,7 +929,6 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() { auto_triangles->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_auto_triangles_toggled)); auto_triangles->set_toggle_mode(true); auto_triangles->set_tooltip_text(TTR("Generate blend triangles automatically (instead of manually)")); - auto_triangles->set_accessibility_name(TTRC("Generate Triangles")); top_hb->add_child(memnew(VSeparator)); @@ -944,7 +938,6 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() { top_hb->add_child(snap); snap->set_pressed(true); snap->set_tooltip_text(TTR("Enable snap and show grid.")); - snap->set_accessibility_name(TTRC("Snap to Grid")); snap->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_snap_toggled)); snap_x = memnew(SpinBox); diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 805c5a1394..f6db886e3b 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -2034,31 +2034,26 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug play_bw_from = memnew(Button); play_bw_from->set_theme_type_variation(SceneStringName(FlatButton)); play_bw_from->set_tooltip_text(TTR("Play Animation Backwards")); - play_bw_from->set_accessibility_name(TTRC("Play Backwards")); playback_container->add_child(play_bw_from); play_bw = memnew(Button); play_bw->set_theme_type_variation(SceneStringName(FlatButton)); play_bw->set_tooltip_text(TTR("Play Animation Backwards from End")); - play_bw->set_accessibility_name(TTRC("Play Backwards from End")); playback_container->add_child(play_bw); stop = memnew(Button); stop->set_theme_type_variation(SceneStringName(FlatButton)); stop->set_tooltip_text(TTR("Pause/Stop Animation")); - stop->set_accessibility_name(TTRC("Pause/Stop")); playback_container->add_child(stop); play = memnew(Button); play->set_theme_type_variation(SceneStringName(FlatButton)); play->set_tooltip_text(TTR("Play Animation from Start")); - play->set_accessibility_name(TTRC("Play from Start")); playback_container->add_child(play); play_from = memnew(Button); play_from->set_theme_type_variation(SceneStringName(FlatButton)); play_from->set_tooltip_text(TTR("Play Animation")); - play_from->set_accessibility_name(TTRC("Play")); playback_container->add_child(play_from); frame = memnew(SpinBox); @@ -2067,7 +2062,6 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug frame->set_stretch_ratio(2); frame->set_step(0.0001); frame->set_tooltip_text(TTR("Animation position (in seconds).")); - frame->set_accessibility_name(TTRC("Frame")); hb->add_child(memnew(VSeparator)); @@ -2076,7 +2070,6 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug scale->set_h_size_flags(SIZE_EXPAND_FILL); scale->set_stretch_ratio(1); scale->set_tooltip_text(TTR("Scale animation playback globally for the node.")); - scale->set_accessibility_name(TTRC("Scale")); scale->hide(); delete_dialog = memnew(ConfirmationDialog); @@ -2114,7 +2107,6 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug autoplay->set_theme_type_variation(SceneStringName(FlatButton)); hb->add_child(autoplay); autoplay->set_tooltip_text(TTR("Autoplay on Load")); - autoplay->set_accessibility_name(TTRC("Autoplay on Load")); hb->add_child(memnew(VSeparator)); @@ -2127,7 +2119,6 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug onion_toggle->set_theme_type_variation(SceneStringName(FlatButton)); onion_toggle->set_toggle_mode(true); onion_toggle->set_tooltip_text(TTR("Enable Onion Skinning")); - onion_toggle->set_accessibility_name(TTRC("Onion Skinning")); onion_toggle->connect(SceneStringName(pressed), callable_mp(this, &AnimationPlayerEditor::_onion_skinning_menu).bind(ONION_SKINNING_ENABLE)); hb->add_child(onion_toggle); @@ -2159,7 +2150,6 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug pin->set_theme_type_variation(SceneStringName(FlatButton)); pin->set_toggle_mode(true); pin->set_tooltip_text(TTR("Pin AnimationPlayer")); - pin->set_accessibility_name(TTRC("Pin AnimationPlayer")); hb->add_child(pin); pin->connect(SceneStringName(pressed), callable_mp(this, &AnimationPlayerEditor::_pin_pressed)); diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp index 0a18592fc6..37f26998c7 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/plugins/animation_state_machine_editor.cpp @@ -1770,7 +1770,7 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() { tool_select->set_button_group(bg); tool_select->set_pressed(true); tool_select->set_tooltip_text(TTR("Select and move nodes.\nRMB: Add node at position clicked.\nShift+LMB+Drag: Connects the selected node with another node or creates a new node if you select an area without nodes.")); - tool_select->set_accessibility_name(TTRC("Edit Nodes")); + tool_select->set_accessibility_name(TTRC("Select and move nodes.")); tool_select->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_update_mode), CONNECT_DEFERRED); tool_create = memnew(Button); @@ -1779,7 +1779,6 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() { tool_create->set_toggle_mode(true); tool_create->set_button_group(bg); tool_create->set_tooltip_text(TTR("Create new nodes.")); - tool_create->set_accessibility_name(TTRC("Create Nodes")); tool_create->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_update_mode), CONNECT_DEFERRED); tool_connect = memnew(Button); @@ -1788,7 +1787,6 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() { tool_connect->set_toggle_mode(true); tool_connect->set_button_group(bg); tool_connect->set_tooltip_text(TTR("Connect nodes.")); - tool_connect->set_accessibility_name(TTRC("Connect Nodes")); tool_connect->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_update_mode), CONNECT_DEFERRED); // Context-sensitive selection tools: @@ -1801,7 +1799,6 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() { tool_erase->set_tooltip_text(TTR("Remove selected node or transition.")); tool_erase->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_erase_selected).bind(false)); tool_erase->set_disabled(true); - tool_erase->set_accessibility_name(TTRC("Erase")); selection_tools_hb->add_child(tool_erase); transition_tools_hb = memnew(HBoxContainer); @@ -1817,7 +1814,6 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() { auto_advance->set_tooltip_text(TTR("New Transitions Should Auto Advance")); auto_advance->set_toggle_mode(true); auto_advance->set_pressed(true); - auto_advance->set_accessibility_name(TTRC("Transitions Auto Advance")); transition_tools_hb->add_child(auto_advance); // diff --git a/editor/plugins/bone_map_editor_plugin.cpp b/editor/plugins/bone_map_editor_plugin.cpp index 1f73920ad9..01b149d24f 100644 --- a/editor/plugins/bone_map_editor_plugin.cpp +++ b/editor/plugins/bone_map_editor_plugin.cpp @@ -291,7 +291,6 @@ void BoneMapper::create_editor() { clear_mapping_button = memnew(Button); clear_mapping_button->set_button_icon(get_editor_theme_icon(SNAME("Clear"))); clear_mapping_button->set_tooltip_text(TTR("Clear mappings in current group.")); - clear_mapping_button->set_accessibility_name(TTRC("Clear Mappings")); clear_mapping_button->connect(SceneStringName(pressed), callable_mp(this, &BoneMapper::_clear_mapping_current_group)); group_hbox->add_child(clear_mapping_button); diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 9251bc6d2f..f05834bb5a 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -204,7 +204,7 @@ public: rotation_offset->set_suffix(U"°"); rotation_offset->set_h_size_flags(Control::SIZE_EXPAND_FILL); rotation_offset->set_select_all_on_focus(true); - rotation_offset->set_accessibility_name(TTRC("Rotation Offset")); + rotation_offset->set_accessibility_name(TTRC("Rotation Offset:")); child_container->add_child(rotation_offset); label = memnew(Label); @@ -218,7 +218,7 @@ public: rotation_step->set_suffix(U"°"); rotation_step->set_h_size_flags(Control::SIZE_EXPAND_FILL); rotation_step->set_select_all_on_focus(true); - rotation_step->set_accessibility_name(TTRC("Rotation Step")); + rotation_step->set_accessibility_name(TTRC("Rotation Step:")); child_container->add_child(rotation_step); container->add_child(memnew(HSeparator)); @@ -238,7 +238,7 @@ public: scale_step->set_h_size_flags(Control::SIZE_EXPAND_FILL); scale_step->set_step(0.01f); scale_step->set_select_all_on_focus(true); - scale_step->set_accessibility_name(TTRC("Scale Step")); + scale_step->set_accessibility_name(TTRC("Scale Step:")); child_container->add_child(scale_step); } @@ -5412,7 +5412,6 @@ CanvasItemEditor::CanvasItemEditor() { controls_hb->add_child(button_center_view); button_center_view->set_flat(true); button_center_view->set_tooltip_text(TTR("Center View")); - button_center_view->set_accessibility_name(TTRC("Center View")); button_center_view->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(VIEW_CENTER_TO_SELECTION)); zoom_widget = memnew(EditorZoomWidget); @@ -5474,7 +5473,6 @@ CanvasItemEditor::CanvasItemEditor() { move_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/move_mode", TTRC("Move Mode"), Key::W, true)); move_button->set_shortcut_context(this); move_button->set_tooltip_text(TTRC("Move Mode")); - move_button->set_accessibility_name(TTRC("Move Mode")); rotate_button = memnew(Button); rotate_button->set_theme_type_variation(SceneStringName(FlatButton)); @@ -5484,7 +5482,6 @@ CanvasItemEditor::CanvasItemEditor() { rotate_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/rotate_mode", TTRC("Rotate Mode"), Key::E, true)); rotate_button->set_shortcut_context(this); rotate_button->set_tooltip_text(TTRC("Rotate Mode")); - rotate_button->set_accessibility_name(TTRC("Rotate Mode")); scale_button = memnew(Button); scale_button->set_theme_type_variation(SceneStringName(FlatButton)); @@ -5504,7 +5501,6 @@ CanvasItemEditor::CanvasItemEditor() { list_select_button->set_toggle_mode(true); list_select_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_LIST_SELECT)); list_select_button->set_tooltip_text(TTRC("Show list of selectable nodes at position clicked.")); - list_select_button->set_accessibility_name(TTRC("List Selectable Nodes")); pivot_button = memnew(Button); pivot_button->set_tooltip_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); @@ -5532,7 +5528,6 @@ CanvasItemEditor::CanvasItemEditor() { ruler_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/ruler_mode", TTRC("Ruler Mode"), Key::M)); ruler_button->set_shortcut_context(this); ruler_button->set_tooltip_text(TTRC("Ruler Mode")); - ruler_button->set_accessibility_name(TTRC("Ruler Mode")); main_menu_hbox->add_child(memnew(VSeparator)); @@ -5544,7 +5539,6 @@ CanvasItemEditor::CanvasItemEditor() { smart_snap_button->set_tooltip_text(TTRC("Toggle smart snapping.")); smart_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_smart_snap", TTRC("Use Smart Snap"), KeyModifierMask::SHIFT | Key::S)); smart_snap_button->set_shortcut_context(this); - smart_snap_button->set_accessibility_name(TTRC("Smart Snap")); grid_snap_button = memnew(Button); grid_snap_button->set_theme_type_variation(SceneStringName(FlatButton)); @@ -5554,7 +5548,6 @@ CanvasItemEditor::CanvasItemEditor() { grid_snap_button->set_tooltip_text(TTRC("Toggle grid snapping.")); grid_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_grid_snap", TTRC("Use Grid Snap"), KeyModifierMask::SHIFT | Key::G)); grid_snap_button->set_shortcut_context(this); - grid_snap_button->set_accessibility_name(TTRC("Grid Snap")); snap_config_menu = memnew(MenuButton); snap_config_menu->set_flat(false); @@ -5564,7 +5557,6 @@ CanvasItemEditor::CanvasItemEditor() { snap_config_menu->set_h_size_flags(SIZE_SHRINK_END); snap_config_menu->set_tooltip_text(TTRC("Snapping Options")); snap_config_menu->set_switch_on_hover(true); - snap_config_menu->set_accessibility_name(TTRC("Snapping Options")); PopupMenu *p = snap_config_menu->get_popup(); p->connect(SceneStringName(id_pressed), callable_mp(this, &CanvasItemEditor::_popup_callback)); @@ -5636,7 +5628,6 @@ CanvasItemEditor::CanvasItemEditor() { main_menu_hbox->add_child(skeleton_menu); skeleton_menu->set_tooltip_text(TTRC("Skeleton Options")); skeleton_menu->set_switch_on_hover(true); - skeleton_menu->set_accessibility_name(TTRC("Skeleton Options")); p = skeleton_menu->get_popup(); p->set_hide_on_checkable_item_selection(false); @@ -5730,7 +5721,6 @@ CanvasItemEditor::CanvasItemEditor() { key_loc_button->set_focus_mode(FOCUS_ACCESSIBILITY); key_loc_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_POS)); key_loc_button->set_tooltip_text(TTRC("Translation mask for inserting keys.")); - key_loc_button->set_accessibility_name(TTRC("Translation Mask")); animation_hb->add_child(key_loc_button); key_rot_button = memnew(Button); @@ -5740,7 +5730,6 @@ CanvasItemEditor::CanvasItemEditor() { key_rot_button->set_focus_mode(FOCUS_ACCESSIBILITY); key_rot_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_ROT)); key_rot_button->set_tooltip_text(TTRC("Rotation mask for inserting keys.")); - key_rot_button->set_accessibility_name(TTRC("Rotation Mask")); animation_hb->add_child(key_rot_button); key_scale_button = memnew(Button); @@ -5749,7 +5738,6 @@ CanvasItemEditor::CanvasItemEditor() { key_scale_button->set_focus_mode(FOCUS_ACCESSIBILITY); key_scale_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_SCALE)); key_scale_button->set_tooltip_text(TTRC("Scale mask for inserting keys.")); - key_scale_button->set_accessibility_name(TTRC("Scale Mask")); animation_hb->add_child(key_scale_button); key_insert_button = memnew(Button); @@ -5758,7 +5746,6 @@ CanvasItemEditor::CanvasItemEditor() { key_insert_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_KEY)); key_insert_button->set_tooltip_text(TTRC("Insert keys (based on mask).")); key_insert_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/anim_insert_key", TTRC("Insert Key"), Key::INSERT)); - key_insert_button->set_accessibility_name(TTRC("Insert Keys")); key_insert_button->set_shortcut_context(this); animation_hb->add_child(key_insert_button); @@ -5768,7 +5755,7 @@ CanvasItemEditor::CanvasItemEditor() { key_auto_insert_button->set_focus_mode(FOCUS_ACCESSIBILITY); key_auto_insert_button->set_tooltip_text(TTRC("Auto insert keys when objects are translated, rotated or scaled (based on mask).\nKeys are only added to existing tracks, no new tracks will be created.\nKeys must be inserted manually for the first time.")); key_auto_insert_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/anim_auto_insert_key", TTRC("Auto Insert Key"))); - key_auto_insert_button->set_accessibility_name(TTRC("Auto Insert Keys")); + key_auto_insert_button->set_accessibility_name(TTRC("Auto Insert Key")); key_auto_insert_button->set_shortcut_context(this); animation_hb->add_child(key_auto_insert_button); @@ -5777,7 +5764,6 @@ CanvasItemEditor::CanvasItemEditor() { animation_menu->set_theme_type_variation("FlatMenuButton"); animation_menu->set_shortcut_context(this); animation_menu->set_tooltip_text(TTRC("Animation Key and Pose Options")); - animation_menu->set_accessibility_name(TTRC("Animation Key and Pose")); animation_hb->add_child(animation_menu); animation_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &CanvasItemEditor::_popup_callback)); animation_menu->set_switch_on_hover(true); diff --git a/editor/plugins/control_editor_plugin.cpp b/editor/plugins/control_editor_plugin.cpp index ca71f9247e..0a795b590c 100644 --- a/editor/plugins/control_editor_plugin.cpp +++ b/editor/plugins/control_editor_plugin.cpp @@ -583,7 +583,6 @@ void ControlEditorPresetPicker::_add_row_button(HBoxContainer *p_row, const int b->set_custom_minimum_size(Size2i(36, 36) * EDSCALE); b->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER); b->set_tooltip_text(p_name); - b->set_accessibility_name(p_name); b->set_flat(true); p_row->add_child(b); b->connect(SceneStringName(pressed), callable_mp(this, &ControlEditorPresetPicker::_preset_button_pressed).bind(p_preset)); diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 7b99546a63..da1b51fab2 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -997,7 +997,6 @@ CurveEditor::CurveEditor() { snap_button = memnew(Button); snap_button->set_tooltip_text(TTR("Toggle Grid Snap")); - snap_button->set_accessibility_name(TTRC("Grid Snap")); snap_button->set_toggle_mode(true); toolbar->add_child(snap_button); snap_button->connect(SceneStringName(toggled), callable_mp(this, &CurveEditor::_set_snap_enabled)); diff --git a/editor/plugins/game_view_plugin.cpp b/editor/plugins/game_view_plugin.cpp index 94d0e181a1..8b29c215fc 100644 --- a/editor/plugins/game_view_plugin.cpp +++ b/editor/plugins/game_view_plugin.cpp @@ -1109,7 +1109,6 @@ GameView::GameView(Ref p_debugger, EmbeddedProcessBase *p_embe hide_selection->set_theme_type_variation(SceneStringName(FlatButton)); hide_selection->connect(SceneStringName(toggled), callable_mp(this, &GameView::_hide_selection_toggled)); hide_selection->set_tooltip_text(TTRC("Toggle Selection Visibility")); - hide_selection->set_accessibility_name(TTRC("Selection Visibility")); hide_selection->set_pressed(EditorSettings::get_singleton()->get_project_metadata("game_view", "hide_selection", false)); main_menu_hbox->add_child(memnew(VSeparator)); @@ -1147,7 +1146,6 @@ GameView::GameView(Ref p_debugger, EmbeddedProcessBase *p_embe camera_override_button->set_toggle_mode(true); camera_override_button->set_theme_type_variation(SceneStringName(FlatButton)); camera_override_button->set_tooltip_text(TTRC("Override the in-game camera.")); - camera_override_button->set_accessibility_name(TTRC("Override In-game Camera")); camera_override_button->connect(SceneStringName(toggled), callable_mp(this, &GameView::_camera_override_button_toggled)); camera_override_menu = memnew(MenuButton); @@ -1156,7 +1154,6 @@ GameView::GameView(Ref p_debugger, EmbeddedProcessBase *p_embe camera_override_menu->set_theme_type_variation("FlatMenuButton"); camera_override_menu->set_h_size_flags(SIZE_SHRINK_END); camera_override_menu->set_tooltip_text(TTRC("Camera Override Options")); - camera_override_menu->set_accessibility_name(TTRC("Camera Override Options")); PopupMenu *menu = camera_override_menu->get_popup(); menu->connect(SceneStringName(id_pressed), callable_mp(this, &GameView::_camera_override_menu_id_pressed)); @@ -1176,7 +1173,7 @@ GameView::GameView(Ref p_debugger, EmbeddedProcessBase *p_embe fixed_size_button->set_toggle_mode(true); fixed_size_button->set_theme_type_variation("FlatButton"); fixed_size_button->set_tooltip_text(TTRC("Embedded game size is based on project settings.\nThe 'Keep Aspect' mode is used when the Game Workspace is smaller than the desired size.")); - fixed_size_button->set_accessibility_name(TTRC("Fixed Size")); + fixed_size_button->set_accessibility_name(TTRC("Embedded game size is based on project settings.")); fixed_size_button->connect(SceneStringName(pressed), callable_mp(this, &GameView::_size_mode_button_pressed).bind(SIZE_MODE_FIXED)); keep_aspect_button = memnew(Button); @@ -1184,7 +1181,6 @@ GameView::GameView(Ref p_debugger, EmbeddedProcessBase *p_embe keep_aspect_button->set_toggle_mode(true); keep_aspect_button->set_theme_type_variation("FlatButton"); keep_aspect_button->set_tooltip_text(TTRC("Keep the aspect ratio of the embedded game.")); - keep_aspect_button->set_accessibility_name(TTRC("Keep Aspect Ratio")); keep_aspect_button->connect(SceneStringName(pressed), callable_mp(this, &GameView::_size_mode_button_pressed).bind(SIZE_MODE_KEEP_ASPECT)); stretch_button = memnew(Button); @@ -1192,7 +1188,6 @@ GameView::GameView(Ref p_debugger, EmbeddedProcessBase *p_embe stretch_button->set_toggle_mode(true); stretch_button->set_theme_type_variation("FlatButton"); stretch_button->set_tooltip_text(TTRC("Embedded game size stretches to fit the Game Workspace.")); - stretch_button->set_accessibility_name(TTRC("Stretch")); stretch_button->connect(SceneStringName(pressed), callable_mp(this, &GameView::_size_mode_button_pressed).bind(SIZE_MODE_STRETCH)); embed_options_menu = memnew(MenuButton); @@ -1201,7 +1196,6 @@ GameView::GameView(Ref p_debugger, EmbeddedProcessBase *p_embe embed_options_menu->set_theme_type_variation("FlatMenuButton"); embed_options_menu->set_h_size_flags(SIZE_SHRINK_END); embed_options_menu->set_tooltip_text(TTRC("Embedding Options")); - embed_options_menu->set_accessibility_name(TTRC("Embedding Options")); menu = embed_options_menu->get_popup(); menu->connect(SceneStringName(id_pressed), callable_mp(this, &GameView::_embed_options_menu_menu_id_pressed)); diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp index 6dc429974e..7699a8a749 100644 --- a/editor/plugins/gradient_editor_plugin.cpp +++ b/editor/plugins/gradient_editor_plugin.cpp @@ -638,7 +638,6 @@ GradientEditor::GradientEditor() { snap_button = memnew(Button); snap_button->set_tooltip_text(TTR("Toggle Grid Snap")); - snap_button->set_accessibility_name(TTRC("Snap to Grid")); snap_button->set_toggle_mode(true); toolbar->add_child(snap_button); snap_button->connect(SceneStringName(toggled), callable_mp(this, &GradientEditor::_set_snap_enabled)); diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.cpp b/editor/plugins/gradient_texture_2d_editor_plugin.cpp index 575a6007d6..1dfa2a390c 100644 --- a/editor/plugins/gradient_texture_2d_editor_plugin.cpp +++ b/editor/plugins/gradient_texture_2d_editor_plugin.cpp @@ -278,7 +278,6 @@ GradientTexture2DEditor::GradientTexture2DEditor() { reverse_button = memnew(Button); reverse_button->set_tooltip_text(TTR("Swap Gradient Fill Points")); - reverse_button->set_accessibility_name(TTRC("Swap Gradient Fill Points")); toolbar->add_child(reverse_button); reverse_button->connect(SceneStringName(pressed), callable_mp(this, &GradientTexture2DEditor::_reverse_button_pressed)); @@ -286,7 +285,6 @@ GradientTexture2DEditor::GradientTexture2DEditor() { snap_button = memnew(Button); snap_button->set_tooltip_text(TTR("Toggle Grid Snap")); - snap_button->set_accessibility_name(TTRC("Snap to Grid")); snap_button->set_toggle_mode(true); toolbar->add_child(snap_button); snap_button->connect(SceneStringName(toggled), callable_mp(this, &GradientTexture2DEditor::_set_snap_enabled)); diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp index 9d9c6a031e..8cfe819516 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_3d_editor_plugin.cpp @@ -602,7 +602,7 @@ MeshInstance3DEditor::MeshInstance3DEditor() { //outline_dialog->set_child_rect(outline_dialog_vbc); outline_size = memnew(SpinBox); - outline_size->set_accessibility_name(TTRC("Outline Size")); + outline_size->set_accessibility_name(TTRC("Outline Size:")); outline_size->set_min(0.001); outline_size->set_max(1024); outline_size->set_step(0.001); diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp index 95fca84316..a56690e6d5 100644 --- a/editor/plugins/multimesh_editor_plugin.cpp +++ b/editor/plugins/multimesh_editor_plugin.cpp @@ -292,7 +292,7 @@ MultiMeshEditor::MultiMeshEditor() { surface_source = memnew(LineEdit); hbc->add_child(surface_source); surface_source->set_h_size_flags(SIZE_EXPAND_FILL); - surface_source->set_accessibility_name(TTRC("Surface Source")); + surface_source->set_accessibility_name(TTRC("Target Surface:")); Button *b = memnew(Button); hbc->add_child(b); b->set_accessibility_name(TTRC("Browse")); @@ -305,7 +305,7 @@ MultiMeshEditor::MultiMeshEditor() { mesh_source = memnew(LineEdit); hbc->add_child(mesh_source); mesh_source->set_h_size_flags(SIZE_EXPAND_FILL); - mesh_source->set_accessibility_name(TTRC("Mesh Source")); + mesh_source->set_accessibility_name(TTRC("Source Mesh:")); b = memnew(Button); hbc->add_child(b); b->set_accessibility_name(TTRC("Browse")); @@ -314,7 +314,7 @@ MultiMeshEditor::MultiMeshEditor() { b->connect(SceneStringName(pressed), callable_mp(this, &MultiMeshEditor::_browse).bind(true)); populate_axis = memnew(OptionButton); - populate_axis->set_accessibility_name(TTRC("Up Axis")); + populate_axis->set_accessibility_name(TTRC("Mesh Up Axis:")); populate_axis->add_item(TTR("X-Axis")); populate_axis->add_item(TTR("Y-Axis")); populate_axis->add_item(TTR("Z-Axis")); @@ -324,13 +324,13 @@ MultiMeshEditor::MultiMeshEditor() { populate_rotate_random = memnew(HSlider); populate_rotate_random->set_max(1); populate_rotate_random->set_step(0.01); - populate_rotate_random->set_accessibility_name(TTRC("Random Rotation")); + populate_rotate_random->set_accessibility_name(TTRC("Random Rotation:")); vbc->add_margin_child(TTR("Random Rotation:"), populate_rotate_random); populate_tilt_random = memnew(HSlider); populate_tilt_random->set_max(1); populate_tilt_random->set_step(0.01); - populate_tilt_random->set_accessibility_name(TTRC("Random Tilt")); + populate_tilt_random->set_accessibility_name(TTRC("Random Tilt:")); vbc->add_margin_child(TTR("Random Tilt:"), populate_tilt_random); populate_scale_random = memnew(SpinBox); @@ -338,7 +338,7 @@ MultiMeshEditor::MultiMeshEditor() { populate_scale_random->set_max(1); populate_scale_random->set_value(0); populate_scale_random->set_step(0.01); - populate_scale_random->set_accessibility_name(TTRC("Random Scale")); + populate_scale_random->set_accessibility_name(TTRC("Random Scale:")); vbc->add_margin_child(TTR("Random Scale:"), populate_scale_random); populate_scale = memnew(SpinBox); @@ -346,7 +346,7 @@ MultiMeshEditor::MultiMeshEditor() { populate_scale->set_max(4096); populate_scale->set_value(1); populate_scale->set_step(0.01); - populate_scale->set_accessibility_name(TTRC("Scale")); + populate_scale->set_accessibility_name(TTRC("Scale:")); vbc->add_margin_child(TTR("Scale:"), populate_scale); populate_amount = memnew(SpinBox); @@ -356,7 +356,7 @@ MultiMeshEditor::MultiMeshEditor() { populate_amount->set_min(1); populate_amount->set_max(65536); populate_amount->set_value(128); - populate_amount->set_accessibility_name(TTRC("Amount")); + populate_amount->set_accessibility_name(TTRC("Amount:")); vbc->add_margin_child(TTR("Amount:"), populate_amount); populate_dialog->set_ok_button_text(TTR("Populate")); diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 698cc836cd..8cbe03fabc 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -9203,7 +9203,6 @@ Node3DEditor::Node3DEditor() { tool_button[TOOL_MODE_LIST_SELECT]->set_theme_type_variation(SceneStringName(FlatButton)); tool_button[TOOL_MODE_LIST_SELECT]->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_TOOL_LIST_SELECT)); tool_button[TOOL_MODE_LIST_SELECT]->set_tooltip_text(TTRC("Show list of selectable nodes at position clicked.")); - tool_button[TOOL_MODE_LIST_SELECT]->set_accessibility_name(TTRC("Show List of Selectable Nodes")); tool_button[TOOL_LOCK_SELECTED] = memnew(Button); main_menu_hbox->add_child(tool_button[TOOL_LOCK_SELECTED]); @@ -9275,7 +9274,7 @@ Node3DEditor::Node3DEditor() { sun_button = memnew(Button); sun_button->set_tooltip_text(TTRC("Toggle preview sunlight.\nIf a DirectionalLight3D node is added to the scene, preview sunlight is disabled.")); sun_button->set_toggle_mode(true); - sun_button->set_accessibility_name(TTRC("Preview Sunlight")); + sun_button->set_accessibility_name(TTRC("Toggle preview sunlight.")); sun_button->set_theme_type_variation(SceneStringName(FlatButton)); sun_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_update_preview_environment), CONNECT_DEFERRED); // Preview is enabled by default - ensure this applies on editor startup when there is no state yet. @@ -9286,7 +9285,7 @@ Node3DEditor::Node3DEditor() { environ_button = memnew(Button); environ_button->set_tooltip_text(TTRC("Toggle preview environment.\nIf a WorldEnvironment node is added to the scene, preview environment is disabled.")); environ_button->set_toggle_mode(true); - environ_button->set_accessibility_name(TTRC("Preview Environment")); + environ_button->set_accessibility_name(TTRC("Toggle preview environment.")); environ_button->set_theme_type_variation(SceneStringName(FlatButton)); environ_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_update_preview_environment), CONNECT_DEFERRED); // Preview is enabled by default - ensure this applies on editor startup when there is no state yet. @@ -9297,7 +9296,6 @@ Node3DEditor::Node3DEditor() { sun_environ_settings = memnew(Button); sun_environ_settings->set_tooltip_text(TTRC("Edit Sun and Environment settings.")); sun_environ_settings->set_theme_type_variation(SceneStringName(FlatButton)); - sun_environ_settings->set_accessibility_name(TTRC("Edit Sun and Environment")); sun_environ_settings->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_sun_environ_settings_pressed)); main_menu_hbox->add_child(sun_environ_settings); @@ -9444,17 +9442,17 @@ Node3DEditor::Node3DEditor() { snap_translate = memnew(LineEdit); snap_translate->set_select_all_on_focus(true); - snap_translate->set_accessibility_name(TTRC("Translate Snap")); + snap_translate->set_accessibility_name(TTRC("Translate Snap:")); snap_dialog_vbc->add_margin_child(TTRC("Translate Snap:"), snap_translate); snap_rotate = memnew(LineEdit); snap_rotate->set_select_all_on_focus(true); - snap_rotate->set_accessibility_name(TTRC("Rotate Snap")); + snap_rotate->set_accessibility_name(TTRC("Rotate Snap (deg.):")); snap_dialog_vbc->add_margin_child(TTRC("Rotate Snap (deg.):"), snap_rotate); snap_scale = memnew(LineEdit); snap_scale->set_select_all_on_focus(true); - snap_scale->set_accessibility_name(TTRC("Scale Snap")); + snap_scale->set_accessibility_name(TTRC("Scale Snap (%):")); snap_dialog_vbc->add_margin_child(TTRC("Scale Snap (%):"), snap_scale); /* SETTINGS DIALOG */ @@ -9473,14 +9471,14 @@ Node3DEditor::Node3DEditor() { settings_fov->set_value(EDITOR_GET("editors/3d/default_fov")); settings_fov->set_select_all_on_focus(true); settings_fov->set_tooltip_text(TTRC("FOV is defined as a vertical value, as the editor camera always uses the Keep Height aspect mode.")); - settings_fov->set_accessibility_name(TTRC("Perspective VFOV")); + settings_fov->set_accessibility_name(TTRC("Perspective VFOV (deg.):")); settings_vbc->add_margin_child(TTRC("Perspective VFOV (deg.):"), settings_fov); settings_znear = memnew(SpinBox); settings_znear->set_max(MAX_Z); settings_znear->set_min(MIN_Z); settings_znear->set_step(0.01); - settings_znear->set_accessibility_name(TTRC("View Z-Near")); + settings_znear->set_accessibility_name(TTRC("View Z-Near:")); settings_znear->set_value(EDITOR_GET("editors/3d/default_z_near")); settings_znear->set_select_all_on_focus(true); settings_vbc->add_margin_child(TTRC("View Z-Near:"), settings_znear); @@ -9489,7 +9487,7 @@ Node3DEditor::Node3DEditor() { settings_zfar->set_max(MAX_Z); settings_zfar->set_min(MIN_Z); settings_zfar->set_step(0.1); - settings_zfar->set_accessibility_name(TTRC("View Z-Far")); + settings_zfar->set_accessibility_name(TTRC("View Z-Far:")); settings_zfar->set_value(EDITOR_GET("editors/3d/default_z_far")); settings_zfar->set_select_all_on_focus(true); settings_vbc->add_margin_child(TTRC("View Z-Far:"), settings_zfar); diff --git a/editor/plugins/particle_process_material_editor_plugin.cpp b/editor/plugins/particle_process_material_editor_plugin.cpp index f4db0e3daa..52cc2e658b 100644 --- a/editor/plugins/particle_process_material_editor_plugin.cpp +++ b/editor/plugins/particle_process_material_editor_plugin.cpp @@ -435,7 +435,6 @@ ParticleProcessMaterialMinMaxPropertyEditor::ParticleProcessMaterialMinMaxProper toggle_mode_button = memnew(Button); toggle_mode_button->set_toggle_mode(true); toggle_mode_button->set_tooltip_text(TTR("Toggle between minimum/maximum and base value/spread modes.")); - toggle_mode_button->set_accessibility_name(TTRC("Spread mode")); hb->add_child(toggle_mode_button); toggle_mode_button->connect(SceneStringName(toggled), callable_mp(this, &ParticleProcessMaterialMinMaxPropertyEditor::_toggle_mode)); diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp index 6cb193cb66..28b0f9cddb 100644 --- a/editor/plugins/particles_editor_plugin.cpp +++ b/editor/plugins/particles_editor_plugin.cpp @@ -853,7 +853,7 @@ Particles3DEditorPlugin::Particles3DEditorPlugin() { generate_aabb->add_child(genvb); generate_seconds = memnew(SpinBox); - generate_seconds->set_accessibility_name(TTRC("Generation Time")); + generate_seconds->set_accessibility_name(TTRC("Generation Time (sec)")); generate_seconds->set_min(0.1); generate_seconds->set_max(25); generate_seconds->set_value(2); @@ -878,14 +878,14 @@ Particles3DEditorPlugin::Particles3DEditorPlugin() { emission_dialog->add_child(emd_vb); emission_amount = memnew(SpinBox); - emission_amount->set_accessibility_name(TTRC("Emission Points")); + emission_amount->set_accessibility_name(TTRC("Emission Points:")); emission_amount->set_min(1); emission_amount->set_max(100000); emission_amount->set_value(512); emd_vb->add_margin_child(TTR("Emission Points:"), emission_amount); emission_fill = memnew(OptionButton); - emission_fill->set_accessibility_name(TTRC("Emission Source")); + emission_fill->set_accessibility_name(TTRC("Emission Source:")); emission_fill->add_item(TTR("Surface Points")); emission_fill->add_item(TTR("Surface Points+Normal (Directed)")); emission_fill->add_item(TTR("Volume")); diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp index d0dc017008..c13e977ae6 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/plugins/path_2d_editor_plugin.cpp @@ -868,7 +868,7 @@ Path2DEditor::Path2DEditor() { curve_create->set_toggle_mode(true); curve_create->set_focus_mode(Control::FOCUS_ACCESSIBILITY); curve_create->set_tooltip_text(TTR("Add Point (in empty space)") + "\n" + TTR("Right Click: Delete Point")); - curve_create->set_accessibility_name(TTRC("Add Point")); + curve_create->set_accessibility_name(TTRC("Add Point (in empty space)")); curve_create->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CREATE)); toolbar->add_child(curve_create); @@ -877,7 +877,6 @@ Path2DEditor::Path2DEditor() { curve_del->set_toggle_mode(true); curve_del->set_focus_mode(Control::FOCUS_ACCESSIBILITY); curve_del->set_tooltip_text(TTR("Delete Point")); - curve_del->set_accessibility_name(TTRC("Delete Point")); curve_del->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_DELETE)); toolbar->add_child(curve_del); @@ -885,7 +884,6 @@ Path2DEditor::Path2DEditor() { curve_close->set_theme_type_variation(SceneStringName(FlatButton)); curve_close->set_focus_mode(Control::FOCUS_ACCESSIBILITY); curve_close->set_tooltip_text(TTR("Close Curve")); - curve_close->set_accessibility_name(TTRC("Close Curve")); curve_close->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CLOSE)); toolbar->add_child(curve_close); @@ -893,7 +891,6 @@ Path2DEditor::Path2DEditor() { curve_clear_points->set_theme_type_variation(SceneStringName(FlatButton)); curve_clear_points->set_focus_mode(Control::FOCUS_ACCESSIBILITY); curve_clear_points->set_tooltip_text(TTR("Clear Points")); - curve_clear_points->set_accessibility_name(TTRC("Clear Points")); curve_clear_points->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_confirm_clear_points)); toolbar->add_child(curve_clear_points); diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp index 2141f33660..52fa94c921 100644 --- a/editor/plugins/path_3d_editor_plugin.cpp +++ b/editor/plugins/path_3d_editor_plugin.cpp @@ -937,7 +937,6 @@ Path3DEditorPlugin::Path3DEditorPlugin() { curve_edit_tilt->set_toggle_mode(true); curve_edit_tilt->set_focus_mode(Control::FOCUS_ACCESSIBILITY); curve_edit_tilt->set_tooltip_text(TTR("Select Tilt Handles")); - curve_edit_tilt->set_accessibility_name(TTRC("Select Tilt Handles")); toolbar->add_child(curve_edit_tilt); curve_edit_tilt->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_mode_changed).bind(MODE_EDIT_TILT)); @@ -946,7 +945,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() { curve_create->set_toggle_mode(true); curve_create->set_focus_mode(Control::FOCUS_ACCESSIBILITY); curve_create->set_tooltip_text(TTR("Add Point (in empty space)") + "\n" + TTR("Split Segment (in curve)")); - curve_create->set_accessibility_name(TTRC("Add Point")); + curve_create->set_accessibility_name(TTRC("Add Point (in empty space)")); toolbar->add_child(curve_create); curve_create->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_mode_changed).bind(MODE_CREATE)); @@ -955,7 +954,6 @@ Path3DEditorPlugin::Path3DEditorPlugin() { curve_del->set_toggle_mode(true); curve_del->set_focus_mode(Control::FOCUS_ACCESSIBILITY); curve_del->set_tooltip_text(TTR("Delete Point")); - curve_del->set_accessibility_name(TTRC("Delete Point")); toolbar->add_child(curve_del); curve_del->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_mode_changed).bind(MODE_DELETE)); @@ -963,7 +961,6 @@ Path3DEditorPlugin::Path3DEditorPlugin() { curve_closed->set_theme_type_variation(SceneStringName(FlatButton)); curve_closed->set_focus_mode(Control::FOCUS_ACCESSIBILITY); curve_closed->set_tooltip_text(TTR("Close Curve")); - curve_closed->set_accessibility_name(TTRC("Close Curve")); toolbar->add_child(curve_closed); curve_closed->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_toggle_closed_curve)); @@ -971,7 +968,6 @@ Path3DEditorPlugin::Path3DEditorPlugin() { curve_clear_points->set_theme_type_variation(SceneStringName(FlatButton)); curve_clear_points->set_focus_mode(Control::FOCUS_ACCESSIBILITY); curve_clear_points->set_tooltip_text(TTR("Clear Points")); - curve_clear_points->set_accessibility_name(TTRC("Clear Points")); curve_clear_points->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_confirm_clear_points)); toolbar->add_child(curve_clear_points); diff --git a/editor/plugins/plugin_config_dialog.cpp b/editor/plugins/plugin_config_dialog.cpp index 85cadfa503..bf9a077930 100644 --- a/editor/plugins/plugin_config_dialog.cpp +++ b/editor/plugins/plugin_config_dialog.cpp @@ -224,7 +224,7 @@ PluginConfigDialog::PluginConfigDialog() { name_edit = memnew(LineEdit); name_edit->set_placeholder("MyPlugin"); name_edit->set_tooltip_text(TTR("Required. This name will be displayed in the list of plugins.")); - name_edit->set_accessibility_name(TTRC("Name")); + name_edit->set_accessibility_name(TTRC("Plugin Name:")); name_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); grid->add_child(name_edit); @@ -238,7 +238,7 @@ PluginConfigDialog::PluginConfigDialog() { subfolder_edit = memnew(LineEdit); subfolder_edit->set_placeholder("\"my_plugin\" -> res://addons/my_plugin"); subfolder_edit->set_tooltip_text(TTR("Optional. The folder name should generally use `snake_case` naming (avoid spaces and special characters).\nIf left empty, the folder will be named after the plugin name converted to `snake_case`.")); - subfolder_edit->set_accessibility_name(TTRC("Subfolder")); + subfolder_edit->set_accessibility_name(TTRC("Subfolder:")); subfolder_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); grid->add_child(subfolder_edit); plugin_edit_hidden_controls.push_back(subfolder_edit); @@ -251,7 +251,7 @@ PluginConfigDialog::PluginConfigDialog() { desc_edit = memnew(TextEdit); desc_edit->set_tooltip_text(TTR("Optional. This description should be kept relatively short (up to 5 lines).\nIt will display when hovering the plugin in the list of plugins.")); - desc_edit->set_accessibility_name(TTRC("Description")); + desc_edit->set_accessibility_name(TTRC("Description:")); desc_edit->set_custom_minimum_size(Size2(400, 80) * EDSCALE); desc_edit->set_line_wrapping_mode(TextEdit::LineWrappingMode::LINE_WRAPPING_BOUNDARY); desc_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); @@ -266,7 +266,7 @@ PluginConfigDialog::PluginConfigDialog() { author_edit = memnew(LineEdit); author_edit->set_placeholder("Godette"); - author_edit->set_accessibility_name(TTRC("Author")); + author_edit->set_accessibility_name(TTRC("Author:")); author_edit->set_tooltip_text(TTR("Optional. The author's username, full name, or organization name.")); author_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); grid->add_child(author_edit); @@ -280,7 +280,7 @@ PluginConfigDialog::PluginConfigDialog() { version_edit = memnew(LineEdit); version_edit->set_tooltip_text(TTR("Optional. A human-readable version identifier used for informational purposes only.")); version_edit->set_placeholder("1.0"); - version_edit->set_accessibility_name(TTRC("Version")); + version_edit->set_accessibility_name(TTRC("Version:")); version_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); grid->add_child(version_edit); @@ -292,7 +292,7 @@ PluginConfigDialog::PluginConfigDialog() { script_option_edit = memnew(OptionButton); script_option_edit->set_tooltip_text(TTR("Required. The scripting language to use for the script.\nNote that a plugin may use several languages at once by adding more scripts to the plugin.")); - script_option_edit->set_accessibility_name(TTRC("Scripting Language")); + script_option_edit->set_accessibility_name(TTRC("Language:")); int default_lang = 0; for (int i = 0; i < ScriptServer::get_language_count(); i++) { ScriptLanguage *lang = ScriptServer::get_language(i); @@ -313,7 +313,7 @@ PluginConfigDialog::PluginConfigDialog() { script_edit = memnew(LineEdit); script_edit->set_tooltip_text(TTR("Optional. The name of the script file. If left empty, will default to the subfolder name.")); script_edit->set_placeholder("\"plugin.gd\" -> res://addons/my_plugin/plugin.gd"); - script_edit->set_accessibility_name(TTRC("Script")); + script_edit->set_accessibility_name(TTRC("Script Name:")); script_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); grid->add_child(script_edit); @@ -326,7 +326,7 @@ PluginConfigDialog::PluginConfigDialog() { active_edit = memnew(CheckBox); active_edit->set_pressed(true); - active_edit->set_accessibility_name(TTRC("Active")); + active_edit->set_accessibility_name(TTRC("Activate now?")); grid->add_child(active_edit); plugin_edit_hidden_controls.push_back(active_edit); diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index 0e612f1c12..853c9ae81b 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -1326,10 +1326,10 @@ Polygon2DEditor::Polygon2DEditor() { action_buttons[ACTION_MOVE]->set_accessibility_name(TTRC("Move Polygon")); action_buttons[ACTION_ROTATE]->set_accessibility_name(TTRC("Rotate Polygon")); action_buttons[ACTION_SCALE]->set_accessibility_name(TTRC("Scale Polygon")); - action_buttons[ACTION_ADD_POLYGON]->set_accessibility_name(TTRC("Create Custom Polygon")); - action_buttons[ACTION_REMOVE_POLYGON]->set_accessibility_name(TTRC("Remove Custom Polygon")); - action_buttons[ACTION_PAINT_WEIGHT]->set_accessibility_name(TTRC("Paint Weights")); - action_buttons[ACTION_CLEAR_WEIGHT]->set_accessibility_name(TTRC("Unpaint Weights")); + action_buttons[ACTION_ADD_POLYGON]->set_accessibility_name(TTRC("Create a custom polygon. Enables custom polygon rendering.")); + action_buttons[ACTION_REMOVE_POLYGON]->set_accessibility_name(TTRC("Remove a custom polygon. If none remain, custom polygon rendering is disabled.")); + action_buttons[ACTION_PAINT_WEIGHT]->set_accessibility_name(TTRC("Paint weights with specified intensity.")); + action_buttons[ACTION_CLEAR_WEIGHT]->set_accessibility_name(TTRC("Unpaint weights with specified intensity.")); bone_paint_strength = memnew(HSlider); toolbar->add_child(bone_paint_strength); @@ -1350,7 +1350,7 @@ Polygon2DEditor::Polygon2DEditor() { bone_paint_radius->set_max(100); bone_paint_radius->set_step(1); bone_paint_radius->set_value(32); - bone_paint_radius->set_accessibility_name(TTRC("Radius")); + bone_paint_radius->set_accessibility_name(TTRC("Radius:")); HSplitContainer *uv_main_hsc = memnew(HSplitContainer); polygon_edit->add_child(uv_main_hsc); @@ -1421,7 +1421,7 @@ Polygon2DEditor::Polygon2DEditor() { sb_off_x->set_value(snap_offset.x); sb_off_x->set_suffix("px"); sb_off_x->connect(SceneStringName(value_changed), callable_mp(this, &Polygon2DEditor::_set_snap_off_x)); - sb_off_x->set_accessibility_name(TTRC("Grid Offset X")); + sb_off_x->set_accessibility_name(TTRC("Grid Offset X:")); grid_settings_vb->add_margin_child(TTR("Grid Offset X:"), sb_off_x); SpinBox *sb_off_y = memnew(SpinBox); @@ -1431,7 +1431,7 @@ Polygon2DEditor::Polygon2DEditor() { sb_off_y->set_value(snap_offset.y); sb_off_y->set_suffix("px"); sb_off_y->connect(SceneStringName(value_changed), callable_mp(this, &Polygon2DEditor::_set_snap_off_y)); - sb_off_y->set_accessibility_name(TTRC("Grid Offset Y")); + sb_off_y->set_accessibility_name(TTRC("Grid Offset Y:")); grid_settings_vb->add_margin_child(TTR("Grid Offset Y:"), sb_off_y); SpinBox *sb_step_x = memnew(SpinBox); @@ -1441,7 +1441,7 @@ Polygon2DEditor::Polygon2DEditor() { sb_step_x->set_value(snap_step.x); sb_step_x->set_suffix("px"); sb_step_x->connect(SceneStringName(value_changed), callable_mp(this, &Polygon2DEditor::_set_snap_step_x)); - sb_step_x->set_accessibility_name(TTRC("Grid Step X")); + sb_step_x->set_accessibility_name(TTRC("Grid Step X:")); grid_settings_vb->add_margin_child(TTR("Grid Step X:"), sb_step_x); SpinBox *sb_step_y = memnew(SpinBox); @@ -1451,7 +1451,7 @@ Polygon2DEditor::Polygon2DEditor() { sb_step_y->set_value(snap_step.y); sb_step_y->set_suffix("px"); sb_step_y->connect(SceneStringName(value_changed), callable_mp(this, &Polygon2DEditor::_set_snap_step_y)); - sb_step_y->set_accessibility_name(TTRC("Grid Step Y")); + sb_step_y->set_accessibility_name(TTRC("Grid Step Y:")); grid_settings_vb->add_margin_child(TTR("Grid Step Y:"), sb_step_y); zoom_widget = memnew(EditorZoomWidget); diff --git a/editor/plugins/polygon_3d_editor_plugin.cpp b/editor/plugins/polygon_3d_editor_plugin.cpp index ee1bdeef8d..49fca7f7ea 100644 --- a/editor/plugins/polygon_3d_editor_plugin.cpp +++ b/editor/plugins/polygon_3d_editor_plugin.cpp @@ -533,7 +533,6 @@ Polygon3DEditor::Polygon3DEditor() { button_create = memnew(Button); button_create->set_theme_type_variation(SceneStringName(FlatButton)); - button_create->set_accessibility_name(TTRC("Create Polygon")); button_create->set_tooltip_text(TTRC("Create Polygon")); add_child(button_create); button_create->connect(SceneStringName(pressed), callable_mp(this, &Polygon3DEditor::_menu_option).bind(MODE_CREATE)); @@ -541,7 +540,6 @@ Polygon3DEditor::Polygon3DEditor() { button_edit = memnew(Button); button_edit->set_theme_type_variation(SceneStringName(FlatButton)); - button_edit->set_accessibility_name(TTRC("Edit Polygon")); button_edit->set_tooltip_text(TTRC("Edit Polygon")); add_child(button_edit); button_edit->connect(SceneStringName(pressed), callable_mp(this, &Polygon3DEditor::_menu_option).bind(MODE_EDIT)); diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp index 971196e3f1..01d7b3d797 100644 --- a/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/editor/plugins/resource_preloader_editor_plugin.cpp @@ -355,7 +355,6 @@ ResourcePreloaderEditor::ResourcePreloaderEditor() { vbc->add_child(hbc); load = memnew(Button); - load->set_accessibility_name(TTRC("Load Resource")); load->set_tooltip_text(TTR("Load Resource")); hbc->add_child(load); diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index d0c3a9d9aa..4be1cd3cd1 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -4234,7 +4234,6 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) { members_overview_alphabeta_sort_button = memnew(Button); members_overview_alphabeta_sort_button->set_flat(true); - members_overview_alphabeta_sort_button->set_accessibility_name(TTRC("Alphabetical Sorting")); members_overview_alphabeta_sort_button->set_tooltip_text(TTRC("Toggle alphabetical sorting of the method list.")); members_overview_alphabeta_sort_button->set_toggle_mode(true); members_overview_alphabeta_sort_button->set_pressed(EDITOR_GET("text_editor/script_list/sort_members_outline_alphabetically")); @@ -4408,7 +4407,6 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) { menu_hb->add_child(memnew(VSeparator)); script_back = memnew(Button); - script_back->set_accessibility_name(TTRC("Previous")); script_back->set_flat(true); script_back->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditor::_history_back)); menu_hb->add_child(script_back); @@ -4416,7 +4414,6 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) { script_back->set_tooltip_text(TTRC("Go to previous edited document.")); script_forward = memnew(Button); - script_forward->set_accessibility_name(TTRC("Next")); script_forward->set_flat(true); script_forward->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditor::_history_forward)); menu_hb->add_child(script_forward); @@ -4469,7 +4466,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) { disk_changed_list = memnew(Tree); disk_changed_list->set_hide_root(true); disk_changed_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); - disk_changed_list->set_accessibility_name(TTRC("The following files are newer on disk")); + disk_changed_list->set_accessibility_name(TTRC("The following files are newer on disk:")); disk_changed_list->set_v_size_flags(SIZE_EXPAND_FILL); vbc->add_child(disk_changed_list); diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp index 0cc54b9590..c516bde0a8 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.cpp +++ b/editor/plugins/skeleton_3d_editor_plugin.cpp @@ -1026,7 +1026,6 @@ void Skeleton3DEditor::create_editors() { edit_mode_button->set_toggle_mode(true); edit_mode_button->set_focus_mode(FOCUS_ACCESSIBILITY); edit_mode_button->set_tooltip_text(TTR("Edit Mode\nShow buttons on joints.")); - edit_mode_button->set_accessibility_name(TTRC("Edit Mode")); edit_mode_button->connect(SceneStringName(toggled), callable_mp(this, &Skeleton3DEditor::edit_mode_toggled)); edit_mode = false; @@ -1048,7 +1047,6 @@ void Skeleton3DEditor::create_editors() { key_loc_button->set_pressed(false); key_loc_button->set_focus_mode(FOCUS_ACCESSIBILITY); key_loc_button->set_tooltip_text(TTR("Translation mask for inserting keys.")); - key_loc_button->set_accessibility_name(TTRC("Translation Mask")); animation_hb->add_child(key_loc_button); key_rot_button = memnew(Button); @@ -1057,7 +1055,6 @@ void Skeleton3DEditor::create_editors() { key_rot_button->set_pressed(true); key_rot_button->set_focus_mode(FOCUS_ACCESSIBILITY); key_rot_button->set_tooltip_text(TTR("Rotation mask for inserting keys.")); - key_rot_button->set_accessibility_name(TTRC("Rotation Mask")); animation_hb->add_child(key_rot_button); key_scale_button = memnew(Button); @@ -1066,7 +1063,6 @@ void Skeleton3DEditor::create_editors() { key_scale_button->set_pressed(false); key_scale_button->set_focus_mode(FOCUS_ACCESSIBILITY); key_scale_button->set_tooltip_text(TTR("Scale mask for inserting keys.")); - key_scale_button->set_accessibility_name(TTRC("Scale Mask")); animation_hb->add_child(key_scale_button); key_insert_button = memnew(Button); @@ -1075,7 +1071,6 @@ void Skeleton3DEditor::create_editors() { key_insert_button->connect(SceneStringName(pressed), callable_mp(this, &Skeleton3DEditor::insert_keys).bind(false)); key_insert_button->set_tooltip_text(TTRC("Insert key (based on mask) for bones with an existing track.")); key_insert_button->set_shortcut(ED_SHORTCUT("skeleton_3d_editor/insert_key_to_existing_tracks", TTRC("Insert Key (Existing Tracks)"), Key::INSERT)); - key_insert_button->set_accessibility_name(TTRC("Insert Key")); animation_hb->add_child(key_insert_button); key_insert_all_button = memnew(Button); @@ -1083,7 +1078,6 @@ void Skeleton3DEditor::create_editors() { key_insert_all_button->set_focus_mode(FOCUS_ACCESSIBILITY); key_insert_all_button->connect(SceneStringName(pressed), callable_mp(this, &Skeleton3DEditor::insert_keys).bind(true)); key_insert_all_button->set_tooltip_text(TTRC("Insert key (based on mask) for all bones.")); - key_insert_all_button->set_accessibility_name(TTRC("Insert Key for All Bones")); key_insert_all_button->set_shortcut(ED_SHORTCUT("skeleton_3d_editor/insert_key_of_all_bones", TTRC("Insert Key (All Bones)"), KeyModifierMask::CMD_OR_CTRL + Key::INSERT)); animation_hb->add_child(key_insert_all_button); diff --git a/editor/plugins/sprite_2d_editor_plugin.cpp b/editor/plugins/sprite_2d_editor_plugin.cpp index 3a3dbffeef..a5f88dc6c7 100644 --- a/editor/plugins/sprite_2d_editor_plugin.cpp +++ b/editor/plugins/sprite_2d_editor_plugin.cpp @@ -683,7 +683,7 @@ Sprite2DEditor::Sprite2DEditor() { simplification->set_max(10.00); simplification->set_step(0.01); simplification->set_value(2); - simplification->set_accessibility_name(TTRC("Simplification")); + simplification->set_accessibility_name(TTRC("Simplification:")); hb->add_child(simplification); hb->add_spacer(); hb->add_child(memnew(Label(TTR("Shrink (Pixels):")))); @@ -692,7 +692,7 @@ Sprite2DEditor::Sprite2DEditor() { shrink_pixels->set_max(10); shrink_pixels->set_step(1); shrink_pixels->set_value(0); - shrink_pixels->set_accessibility_name(TTRC("Shrink")); + shrink_pixels->set_accessibility_name(TTRC("Shrink (Pixels):")); hb->add_child(shrink_pixels); hb->add_spacer(); hb->add_child(memnew(Label(TTR("Grow (Pixels):")))); @@ -701,7 +701,7 @@ Sprite2DEditor::Sprite2DEditor() { grow_pixels->set_max(10); grow_pixels->set_step(1); grow_pixels->set_value(2); - grow_pixels->set_accessibility_name(TTRC("Grow")); + grow_pixels->set_accessibility_name(TTRC("Grow (Pixels):")); hb->add_child(grow_pixels); hb->add_spacer(); update_preview = memnew(Button); diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index b1fb26a35c..32b704af29 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -1992,7 +1992,6 @@ SpriteFramesEditor::SpriteFramesEditor() { autoplay = memnew(Button); autoplay->set_theme_type_variation(SceneStringName(FlatButton)); - autoplay->set_accessibility_name(TTRC("Autoplay on Load")); autoplay->set_tooltip_text(TTR("Autoplay on Load")); autoplay_container->add_child(autoplay); @@ -2001,7 +2000,6 @@ SpriteFramesEditor::SpriteFramesEditor() { anim_loop = memnew(Button); anim_loop->set_toggle_mode(true); anim_loop->set_theme_type_variation(SceneStringName(FlatButton)); - anim_loop->set_accessibility_name(TTRC("Animation Looping")); anim_loop->set_tooltip_text(TTR("Animation Looping")); anim_loop->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_animation_loop_changed)); hbc_animlist->add_child(anim_loop); @@ -2013,7 +2011,6 @@ SpriteFramesEditor::SpriteFramesEditor() { anim_speed->set_step(0.01); anim_speed->set_custom_arrow_step(1); anim_speed->set_tooltip_text(TTR("Animation Speed")); - anim_speed->set_accessibility_name(TTRC("Animation Speed")); anim_speed->get_line_edit()->set_expand_to_text_length_enabled(true); anim_speed->get_line_edit()->connect(SceneStringName(resized), callable_mp(this, &SpriteFramesEditor::_animation_speed_resized)); anim_speed->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_animation_speed_changed)); @@ -2023,7 +2020,6 @@ SpriteFramesEditor::SpriteFramesEditor() { sub_vb->add_child(anim_search_box); anim_search_box->set_h_size_flags(SIZE_EXPAND_FILL); anim_search_box->set_placeholder(TTR("Filter Animations")); - anim_search_box->set_accessibility_name(TTRC("Filter Animations")); anim_search_box->set_clear_button_enabled(true); anim_search_box->connect(SceneStringName(text_changed), callable_mp(this, &SpriteFramesEditor::_animation_search_text_changed)); @@ -2072,31 +2068,26 @@ SpriteFramesEditor::SpriteFramesEditor() { play_bw_from = memnew(Button); play_bw_from->set_theme_type_variation(SceneStringName(FlatButton)); play_bw_from->set_tooltip_text(TTR("Play selected animation backwards from current pos. (A)")); - play_bw_from->set_accessibility_name(TTRC("Play Backwards")); playback_container->add_child(play_bw_from); play_bw = memnew(Button); play_bw->set_theme_type_variation(SceneStringName(FlatButton)); play_bw->set_tooltip_text(TTR("Play selected animation backwards from end. (Shift+A)")); - play_bw->set_accessibility_name(TTRC("Play Backwards from End")); playback_container->add_child(play_bw); stop = memnew(Button); stop->set_theme_type_variation(SceneStringName(FlatButton)); stop->set_tooltip_text(TTR("Pause/stop animation playback. (S)")); - stop->set_accessibility_name(TTRC("Pause/Stop")); playback_container->add_child(stop); play = memnew(Button); play->set_theme_type_variation(SceneStringName(FlatButton)); play->set_tooltip_text(TTR("Play selected animation from start. (Shift+D)")); - play->set_accessibility_name(TTRC("Play from Start")); playback_container->add_child(play); play_from = memnew(Button); play_from->set_theme_type_variation(SceneStringName(FlatButton)); play_from->set_tooltip_text(TTR("Play selected animation from current pos. (D)")); - play_from->set_accessibility_name(TTRC("Play")); playback_container->add_child(play_from); hfc->add_child(memnew(VSeparator)); @@ -2181,7 +2172,7 @@ SpriteFramesEditor::SpriteFramesEditor() { frame_duration->set_allow_lesser(false); frame_duration->set_allow_greater(true); frame_duration->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_frame_duration_changed)); - frame_duration->set_accessibility_name(TTRC("Frame Duration")); + frame_duration->set_accessibility_name(TTRC("Frame Duration:")); hbc_frame_duration->add_child(frame_duration); // Wide empty separation control. (like BoxContainer::add_spacer()) @@ -2197,21 +2188,18 @@ SpriteFramesEditor::SpriteFramesEditor() { zoom_out->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_zoom_out)); zoom_out->set_flat(true); zoom_out->set_tooltip_text(TTRC("Zoom Out")); - zoom_out->set_accessibility_name(TTRC("Zoom Out")); hbc_zoom->add_child(zoom_out); zoom_reset = memnew(Button); zoom_reset->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_zoom_reset)); zoom_reset->set_flat(true); zoom_reset->set_tooltip_text(TTRC("Zoom Reset")); - zoom_reset->set_accessibility_name(TTRC("Reset Zoom")); hbc_zoom->add_child(zoom_reset); zoom_in = memnew(Button); zoom_in->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_zoom_in)); zoom_in->set_flat(true); zoom_in->set_tooltip_text(TTRC("Zoom In")); - zoom_in->set_accessibility_name(TTRC("Zoom In")); hbc_zoom->add_child(zoom_in); file = memnew(EditorFileDialog); @@ -2334,7 +2322,6 @@ SpriteFramesEditor::SpriteFramesEditor() { toggle_settings_button->set_theme_type_variation(SceneStringName(FlatButton)); toggle_settings_button->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_toggle_show_settings)); toggle_settings_button->set_tooltip_text(TTR("Toggle Settings Panel")); - toggle_settings_button->set_accessibility_name(TTRC("Settings Panel")); split_sheet_menu_hb->add_child(toggle_settings_button); split_sheet_vb->add_child(split_sheet_menu_hb); @@ -2373,7 +2360,6 @@ SpriteFramesEditor::SpriteFramesEditor() { split_sheet_zoom_out->set_theme_type_variation(SceneStringName(FlatButton)); split_sheet_zoom_out->set_focus_mode(FOCUS_ACCESSIBILITY); split_sheet_zoom_out->set_tooltip_text(TTR("Zoom Out")); - split_sheet_zoom_out->set_accessibility_name(TTRC("Zoom Out")); split_sheet_zoom_out->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_sheet_zoom_out)); split_sheet_zoom_hb->add_child(split_sheet_zoom_out); @@ -2381,7 +2367,6 @@ SpriteFramesEditor::SpriteFramesEditor() { split_sheet_zoom_reset->set_theme_type_variation(SceneStringName(FlatButton)); split_sheet_zoom_reset->set_focus_mode(FOCUS_ACCESSIBILITY); split_sheet_zoom_reset->set_tooltip_text(TTR("Zoom Reset")); - split_sheet_zoom_reset->set_accessibility_name(TTRC("Reset Zoom")); split_sheet_zoom_reset->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_sheet_zoom_reset)); split_sheet_zoom_hb->add_child(split_sheet_zoom_reset); @@ -2389,7 +2374,6 @@ SpriteFramesEditor::SpriteFramesEditor() { split_sheet_zoom_in->set_theme_type_variation(SceneStringName(FlatButton)); split_sheet_zoom_in->set_focus_mode(FOCUS_ACCESSIBILITY); split_sheet_zoom_in->set_tooltip_text(TTR("Zoom In")); - split_sheet_zoom_in->set_accessibility_name(TTRC("Zoom In")); split_sheet_zoom_in->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_sheet_zoom_in)); split_sheet_zoom_hb->add_child(split_sheet_zoom_in); diff --git a/editor/plugins/style_box_editor_plugin.cpp b/editor/plugins/style_box_editor_plugin.cpp index b7ce74d838..8098b9be70 100644 --- a/editor/plugins/style_box_editor_plugin.cpp +++ b/editor/plugins/style_box_editor_plugin.cpp @@ -113,7 +113,6 @@ StyleBoxPreview::StyleBoxPreview() { // This theme variation works better than the normal theme because there's no focus highlight. grid_preview->set_theme_type_variation("PreviewLightButton"); grid_preview->set_tooltip_text(TTRC("Toggle margins preview grid.")); - grid_preview->set_accessibility_name(TTRC("Margins Preview Grid")); grid_preview->set_toggle_mode(true); grid_preview->connect(SceneStringName(toggled), callable_mp(this, &StyleBoxPreview::_grid_preview_toggled)); grid_preview->set_pressed(grid_preview_enabled); diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 3bfdd30d59..394dbd5c45 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -1154,7 +1154,7 @@ TextureRegionEditor::TextureRegionEditor() { snap_mode_button = memnew(OptionButton); hb_tools->add_child(snap_mode_button); - snap_mode_button->set_accessibility_name(TTRC("Snap Mode")); + snap_mode_button->set_accessibility_name(TTRC("Snap Mode:")); snap_mode_button->add_item(TTR("None"), 0); snap_mode_button->add_item(TTR("Pixel Snap"), 1); snap_mode_button->add_item(TTR("Grid Snap"), 2); @@ -1256,21 +1256,18 @@ TextureRegionEditor::TextureRegionEditor() { zoom_out = memnew(Button); zoom_out->set_flat(true); zoom_out->set_tooltip_text(TTR("Zoom Out")); - zoom_out->set_accessibility_name(TTRC("Zoom Out")); zoom_out->connect(SceneStringName(pressed), callable_mp(this, &TextureRegionEditor::_zoom_out)); zoom_hb->add_child(zoom_out); zoom_reset = memnew(Button); zoom_reset->set_flat(true); zoom_reset->set_tooltip_text(TTR("Zoom Reset")); - zoom_reset->set_accessibility_name(TTRC("Reset Zoom")); zoom_reset->connect(SceneStringName(pressed), callable_mp(this, &TextureRegionEditor::_zoom_reset)); zoom_hb->add_child(zoom_reset); zoom_in = memnew(Button); zoom_in->set_flat(true); zoom_in->set_tooltip_text(TTR("Zoom In")); - zoom_in->set_accessibility_name(TTRC("Zoom In")); zoom_in->connect(SceneStringName(pressed), callable_mp(this, &TextureRegionEditor::_zoom_in)); zoom_hb->add_child(zoom_in); diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index 5b098b9c69..c9ef9376b3 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -2027,7 +2027,6 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito edit_items_add_color = memnew(Button); edit_items_add_color->set_tooltip_text(TTR("Add Color Item")); - edit_items_add_color->set_accessibility_name(TTRC("Add Color Item")); edit_items_add_color->set_flat(true); edit_items_add_color->set_disabled(true); edit_items_toolbar->add_child(edit_items_add_color); @@ -2035,7 +2034,6 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito edit_items_add_constant = memnew(Button); edit_items_add_constant->set_tooltip_text(TTR("Add Constant Item")); - edit_items_add_constant->set_accessibility_name(TTRC("Add Constant Item")); edit_items_add_constant->set_flat(true); edit_items_add_constant->set_disabled(true); edit_items_toolbar->add_child(edit_items_add_constant); @@ -2043,7 +2041,6 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito edit_items_add_font = memnew(Button); edit_items_add_font->set_tooltip_text(TTR("Add Font Item")); - edit_items_add_font->set_accessibility_name(TTRC("Add Font Item")); edit_items_add_font->set_flat(true); edit_items_add_font->set_disabled(true); edit_items_toolbar->add_child(edit_items_add_font); @@ -2051,7 +2048,6 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito edit_items_add_font_size = memnew(Button); edit_items_add_font_size->set_tooltip_text(TTR("Add Font Size Item")); - edit_items_add_font_size->set_accessibility_name(TTRC("Add Font Size Item")); edit_items_add_font_size->set_flat(true); edit_items_add_font_size->set_disabled(true); edit_items_toolbar->add_child(edit_items_add_font_size); @@ -2059,7 +2055,6 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito edit_items_add_icon = memnew(Button); edit_items_add_icon->set_tooltip_text(TTR("Add Icon Item")); - edit_items_add_icon->set_accessibility_name(TTRC("Add Icon Item")); edit_items_add_icon->set_flat(true); edit_items_add_icon->set_disabled(true); edit_items_toolbar->add_child(edit_items_add_icon); @@ -2067,7 +2062,6 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito edit_items_add_stylebox = memnew(Button); edit_items_add_stylebox->set_tooltip_text(TTR("Add StyleBox Item")); - edit_items_add_stylebox->set_accessibility_name(TTRC("Add StyleBox Item")); edit_items_add_stylebox->set_flat(true); edit_items_add_stylebox->set_disabled(true); edit_items_toolbar->add_child(edit_items_add_stylebox); @@ -2081,7 +2075,6 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito edit_items_remove_class = memnew(Button); edit_items_remove_class->set_tooltip_text(TTR("Remove Class Items")); - edit_items_remove_class->set_accessibility_name(TTRC("Remove Class Items")); edit_items_remove_class->set_flat(true); edit_items_remove_class->set_disabled(true); edit_items_toolbar->add_child(edit_items_remove_class); @@ -2089,7 +2082,6 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito edit_items_remove_custom = memnew(Button); edit_items_remove_custom->set_tooltip_text(TTR("Remove Custom Items")); - edit_items_remove_custom->set_accessibility_name(TTRC("Remove Custom Items")); edit_items_remove_custom->set_flat(true); edit_items_remove_custom->set_disabled(true); edit_items_toolbar->add_child(edit_items_remove_custom); @@ -2097,7 +2089,6 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito edit_items_remove_all = memnew(Button); edit_items_remove_all->set_tooltip_text(TTR("Remove All Items")); - edit_items_remove_all->set_accessibility_name(TTRC("Remove All Items")); edit_items_remove_all->set_flat(true); edit_items_remove_all->set_disabled(true); edit_items_toolbar->add_child(edit_items_remove_all); @@ -2556,7 +2547,6 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_ Button *item_rename_button = memnew(Button); item_rename_button->set_button_icon(get_editor_theme_icon(SNAME("Edit"))); item_rename_button->set_tooltip_text(TTR("Rename Item")); - item_rename_button->set_accessibility_name(TTRC("Rename Item")); item_rename_button->set_flat(true); item_name_container->add_child(item_rename_button); item_rename_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_rename_cbk).bind(p_data_type, p_item_name, item_name_container)); @@ -2564,7 +2554,6 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_ Button *item_remove_button = memnew(Button); item_remove_button->set_button_icon(get_editor_theme_icon(SNAME("Remove"))); item_remove_button->set_tooltip_text(TTR("Remove Item")); - item_remove_button->set_accessibility_name(TTRC("Remove Item")); item_remove_button->set_flat(true); item_name_container->add_child(item_remove_button); item_remove_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_remove_cbk).bind(p_data_type, p_item_name)); @@ -2572,7 +2561,6 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_ Button *item_rename_confirm_button = memnew(Button); item_rename_confirm_button->set_button_icon(get_editor_theme_icon(SNAME("ImportCheck"))); item_rename_confirm_button->set_tooltip_text(TTR("Confirm Item Rename")); - item_rename_confirm_button->set_accessibility_name(TTRC("Confirm Item Rename")); item_rename_confirm_button->set_flat(true); item_name_container->add_child(item_rename_confirm_button); item_rename_confirm_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_rename_confirmed).bind(p_data_type, p_item_name, item_name_container)); @@ -2581,7 +2569,6 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_ Button *item_rename_cancel_button = memnew(Button); item_rename_cancel_button->set_button_icon(get_editor_theme_icon(SNAME("ImportFail"))); item_rename_cancel_button->set_tooltip_text(TTR("Cancel Item Rename")); - item_rename_cancel_button->set_accessibility_name(TTRC("Cancel Item Rename")); item_rename_cancel_button->set_flat(true); item_name_container->add_child(item_rename_cancel_button); item_rename_cancel_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_rename_canceled).bind(p_data_type, p_item_name, item_name_container)); @@ -2592,7 +2579,6 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_ Button *item_override_button = memnew(Button); item_override_button->set_button_icon(get_editor_theme_icon(SNAME("Add"))); item_override_button->set_tooltip_text(TTR("Override Item")); - item_override_button->set_accessibility_name(TTRC("Override Item")); item_override_button->set_flat(true); item_name_container->add_child(item_override_button); item_override_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_override_cbk).bind(p_data_type, p_item_name)); @@ -2802,7 +2788,6 @@ void ThemeTypeEditor::_update_type_items() { pin_leader_button->set_pressed(true); pin_leader_button->set_button_icon(get_editor_theme_icon(SNAME("Pin"))); pin_leader_button->set_tooltip_text(TTR("Unpin this StyleBox as a main style.")); - pin_leader_button->set_accessibility_name(TTRC("Unpin StyleBox")); item_control->add_child(pin_leader_button); pin_leader_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_on_unpin_leader_button_pressed)); @@ -2846,7 +2831,7 @@ void ThemeTypeEditor::_update_type_items() { pin_leader_button->set_toggle_mode(true); pin_leader_button->set_button_icon(get_editor_theme_icon(SNAME("Pin"))); pin_leader_button->set_tooltip_text(TTR("Pin this StyleBox as a main style. Editing its properties will update the same properties in all other StyleBoxes of this type.")); - pin_leader_button->set_accessibility_name(TTRC("Pin StyleBox as a Main Style")); + pin_leader_button->set_accessibility_name(TTRC("Pin this StyleBox as a main style.")); item_control->add_child(pin_leader_button); pin_leader_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_on_pin_leader_button_pressed).bind(item_editor, E.key)); } else { @@ -3590,14 +3575,12 @@ ThemeTypeEditor::ThemeTypeEditor() { add_type_button = memnew(Button); add_type_button->set_tooltip_text(TTR("Add a type from a list of available types or create a new one.")); - add_type_button->set_accessibility_name(TTRC("Add Type")); type_list_hb->add_child(add_type_button); add_type_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_add_type_button_cbk)); rename_type_button = memnew(Button); rename_type_button->set_disabled(true); rename_type_button->set_tooltip_text(TTRC("Rename current type.")); - rename_type_button->set_accessibility_name(TTRC("Rename Current Type")); type_list_hb->add_child(rename_type_button); rename_type_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_rename_type_button_cbk)); @@ -3615,7 +3598,7 @@ ThemeTypeEditor::ThemeTypeEditor() { remove_type_button = memnew(Button); remove_type_button->set_disabled(true); remove_type_button->set_tooltip_text(TTRC("Remove current type.")); - remove_type_button->set_accessibility_name(TTRC("Remove Current Type")); + remove_type_button->set_accessibility_name(TTRC("Remove current type.")); type_list_hb->add_child(remove_type_button); remove_type_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_remove_type_button_cbk)); @@ -3682,7 +3665,6 @@ ThemeTypeEditor::ThemeTypeEditor() { type_variation_button = memnew(Button); type_variation_hb->add_child(type_variation_button); type_variation_button->set_tooltip_text(TTR("Select the variation base type from a list of available types.")); - type_variation_button->set_accessibility_name(TTRC("Select Base Type")); type_variation_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_add_type_variation_cbk)); type_variation_locked = memnew(Label); diff --git a/editor/plugins/tiles/tile_atlas_view.cpp b/editor/plugins/tiles/tile_atlas_view.cpp index 49f577800d..e2c2c391ca 100644 --- a/editor/plugins/tiles/tile_atlas_view.cpp +++ b/editor/plugins/tiles/tile_atlas_view.cpp @@ -649,7 +649,6 @@ TileAtlasView::TileAtlasView() { button_center_view->set_flat(true); button_center_view->set_disabled(true); button_center_view->set_tooltip_text(TTR("Center View")); - button_center_view->set_accessibility_name(TTRC("Center View")); add_child(button_center_view); panner.instantiate(); diff --git a/editor/plugins/tiles/tile_data_editors.cpp b/editor/plugins/tiles/tile_data_editors.cpp index cacea1e7be..cbbf4071e8 100644 --- a/editor/plugins/tiles/tile_data_editors.cpp +++ b/editor/plugins/tiles/tile_data_editors.cpp @@ -924,7 +924,6 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() { button_expand->set_toggle_mode(true); button_expand->set_pressed(false); button_expand->set_tooltip_text(TTR("Expand editor")); - button_expand->set_accessibility_name(TTRC("Expand editor")); button_expand->connect(SceneStringName(toggled), callable_mp(this, &GenericTilePolygonEditor::_toggle_expand)); toolbar->add_child(button_expand); @@ -936,7 +935,6 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() { button_create->set_button_group(tools_button_group); button_create->set_pressed(true); button_create->set_tooltip_text(TTR("Add polygon tool")); - button_create->set_accessibility_name(TTRC("Add Points")); toolbar->add_child(button_create); button_edit = memnew(Button); @@ -944,7 +942,6 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() { button_edit->set_toggle_mode(true); button_edit->set_button_group(tools_button_group); button_edit->set_tooltip_text(TTR("Edit points tool")); - button_edit->set_accessibility_name(TTRC("Edit Points")); toolbar->add_child(button_edit); button_delete = memnew(Button); @@ -952,7 +949,6 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() { button_delete->set_toggle_mode(true); button_delete->set_button_group(tools_button_group); button_delete->set_tooltip_text(TTR("Delete points tool")); - button_delete->set_accessibility_name(TTRC("Delete Points")); toolbar->add_child(button_delete); button_advanced_menu = memnew(MenuButton); @@ -1026,7 +1022,6 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() { button_center_view->connect(SceneStringName(pressed), callable_mp(this, &GenericTilePolygonEditor::_center_view)); button_center_view->set_theme_type_variation(SceneStringName(FlatButton)); button_center_view->set_tooltip_text(TTR("Center View")); - button_center_view->set_accessibility_name(TTRC("Center View")); button_center_view->set_disabled(true); root->add_child(button_center_view); diff --git a/editor/plugins/tiles/tile_map_layer_editor.cpp b/editor/plugins/tiles/tile_map_layer_editor.cpp index 6847f060fc..5d42115c3c 100644 --- a/editor/plugins/tiles/tile_map_layer_editor.cpp +++ b/editor/plugins/tiles/tile_map_layer_editor.cpp @@ -2303,7 +2303,6 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() { random_tile_toggle->set_toggle_mode(true); random_tile_toggle->set_tooltip_text(TTR("Place Random Tile")); random_tile_toggle->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditorTilesPlugin::_on_random_tile_checkbox_toggled)); - random_tile_toggle->set_accessibility_name(TTRC("Place Random Tile")); tools_settings->add_child(random_tile_toggle); // Random tile scattering. @@ -2321,7 +2320,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() { scatter_spinbox->set_tooltip_text(TTR("Modifies the chance of painting nothing instead of a randomly selected tile.")); scatter_spinbox->get_line_edit()->add_theme_constant_override("minimum_character_width", 4); scatter_spinbox->connect(SceneStringName(value_changed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_on_scattering_spinbox_changed)); - scatter_spinbox->set_accessibility_name(TTRC("Scattering")); + scatter_spinbox->set_accessibility_name(TTRC("Scattering:")); scatter_controls_container->add_child(scatter_spinbox); tools_settings->add_child(scatter_controls_container); @@ -2371,7 +2370,6 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() { source_sort_button->set_flat(false); source_sort_button->set_theme_type_variation("FlatMenuButton"); source_sort_button->set_tooltip_text(TTR("Sort sources")); - source_sort_button->set_accessibility_name(TTRC("Sort sources")); PopupMenu *p = source_sort_button->get_popup(); p->connect(SceneStringName(id_pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_set_source_sort)); @@ -4456,21 +4454,18 @@ TileMapLayerEditor::TileMapLayerEditor() { layers_selection_button->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS); layers_selection_button->set_tooltip_text(TTR("TileMap Layers")); layers_selection_button->connect(SceneStringName(item_selected), callable_mp(this, &TileMapLayerEditor::_layers_selection_item_selected)); - layers_selection_button->set_accessibility_name(TTRC("TileMap Layers")); layer_selection_hbox->add_child(layers_selection_button); select_previous_layer = memnew(Button); select_previous_layer->set_theme_type_variation(SceneStringName(FlatButton)); select_previous_layer->set_tooltip_text(TTR("Select previous layer")); select_previous_layer->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_previous_layer_pressed)); - select_previous_layer->set_accessibility_name(TTRC("Previous")); layer_selection_hbox->add_child(select_previous_layer); select_next_layer = memnew(Button); select_next_layer->set_theme_type_variation(SceneStringName(FlatButton)); select_next_layer->set_tooltip_text(TTR("Select next layer")); select_next_layer->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_next_layer_pressed)); - select_next_layer->set_accessibility_name(TTRC("Next")); layer_selection_hbox->add_child(select_next_layer); select_all_layers = memnew(Button); @@ -4486,7 +4481,6 @@ TileMapLayerEditor::TileMapLayerEditor() { toggle_highlight_selected_layer_button->set_toggle_mode(true); toggle_highlight_selected_layer_button->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditor::_highlight_selected_layer_button_toggled)); toggle_highlight_selected_layer_button->set_tooltip_text(TTR("Highlight Selected TileMap Layer")); - toggle_highlight_selected_layer_button->set_accessibility_name(TTRC("Highlight Selected TileMap Layer")); tile_map_toolbar->add_child(toggle_highlight_selected_layer_button); tile_map_toolbar->add_child(memnew(VSeparator)); @@ -4497,13 +4491,12 @@ TileMapLayerEditor::TileMapLayerEditor() { toggle_grid_button->set_toggle_mode(true); toggle_grid_button->set_tooltip_text(TTR("Toggle grid visibility.")); toggle_grid_button->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditor::_on_grid_toggled)); - toggle_grid_button->set_accessibility_name(TTRC("Grid")); tile_map_toolbar->add_child(toggle_grid_button); // Advanced settings menu button. advanced_menu_button = memnew(MenuButton); advanced_menu_button->set_flat(false); - advanced_menu_button->set_accessibility_name(TTRC("Advanced")); + advanced_menu_button->set_tooltip_text(TTRC("Advanced settings.")); advanced_menu_button->set_theme_type_variation(SceneStringName(FlatButton)); advanced_menu_button->get_popup()->add_item(TTR("Automatically Replace Tiles with Proxies"), ADVANCED_MENU_REPLACE_WITH_PROXIES); advanced_menu_button->get_popup()->add_item(TTR("Extract TileMap layers as individual TileMapLayer nodes"), ADVANCED_MENU_EXTRACT_TILE_MAP_LAYERS); diff --git a/editor/plugins/tiles/tile_set_editor.cpp b/editor/plugins/tiles/tile_set_editor.cpp index 5ad527b674..61d2deff56 100644 --- a/editor/plugins/tiles/tile_set_editor.cpp +++ b/editor/plugins/tiles/tile_set_editor.cpp @@ -846,7 +846,6 @@ TileSetEditor::TileSetEditor() { source_sort_button->set_flat(false); source_sort_button->set_theme_type_variation(SceneStringName(FlatButton)); source_sort_button->set_tooltip_text(TTR("Sort Sources")); - source_sort_button->set_accessibility_name(TTRC("Sort Sources")); PopupMenu *p = source_sort_button->get_popup(); p->connect(SceneStringName(id_pressed), callable_mp(this, &TileSetEditor::_set_source_sort)); diff --git a/editor/plugins/version_control_editor_plugin.cpp b/editor/plugins/version_control_editor_plugin.cpp index 4cec12206e..81693a81ac 100644 --- a/editor/plugins/version_control_editor_plugin.cpp +++ b/editor/plugins/version_control_editor_plugin.cpp @@ -1120,7 +1120,6 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { select_private_path_button->set_button_icon(EditorNode::get_singleton()->get_gui_base()->get_editor_theme_icon("Folder")); select_private_path_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_popup_file_dialog).bind(set_up_ssh_private_key_file_dialog)); select_private_path_button->set_tooltip_text(TTR("Select SSH private key path")); - select_private_path_button->set_accessibility_name(TTRC("Select SSH private key path")); set_up_ssh_private_key_input_hbc->add_child(select_private_path_button); HBoxContainer *set_up_ssh_passphrase_input = memnew(HBoxContainer); @@ -1163,7 +1162,6 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { unstage_title->add_child(unstage_label); refresh_button = memnew(Button); - refresh_button->set_accessibility_name(TTRC("Detect new changes")); refresh_button->set_tooltip_text(TTR("Detect new changes")); refresh_button->set_theme_type_variation(SceneStringName(FlatButton)); refresh_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Reload"), EditorStringName(EditorIcons))); @@ -1185,7 +1183,6 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { discard_all_confirm->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_discard_all)); discard_all_button = memnew(Button); - discard_all_button->set_accessibility_name(TTRC("Discard all changes")); discard_all_button->set_tooltip_text(TTR("Discard all changes")); discard_all_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Close"), EditorStringName(EditorIcons))); discard_all_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_confirm_discard_all)); @@ -1285,7 +1282,6 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { commit_list_hbc->add_child(commit_list_label); commit_list_size_button = memnew(OptionButton); - commit_list_size_button->set_accessibility_name(TTRC("Commit list size")); commit_list_size_button->set_tooltip_text(TTR("Commit list size")); commit_list_size_button->add_item("10"); commit_list_size_button->set_item_metadata(0, 10); @@ -1318,7 +1314,6 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { version_commit_dock->add_child(menu_bar); branch_select = memnew(OptionButton); - branch_select->set_accessibility_name(TTRC("Branches")); branch_select->set_tooltip_text(TTR("Branches")); branch_select->set_h_size_flags(Control::SIZE_EXPAND_FILL); branch_select->set_clip_text(true); @@ -1366,7 +1361,6 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { branch_create_hbc->add_child(branch_create_name_input); remote_select = memnew(OptionButton); - remote_select->set_accessibility_name(TTRC("Remote")); remote_select->set_tooltip_text(TTR("Remotes")); remote_select->set_h_size_flags(Control::SIZE_EXPAND_FILL); remote_select->set_clip_text(true); @@ -1430,7 +1424,6 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { fetch_button = memnew(Button); fetch_button->set_theme_type_variation(SceneStringName(FlatButton)); - fetch_button->set_accessibility_name(TTRC("Fetch")); fetch_button->set_tooltip_text(TTR("Fetch")); fetch_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Reload"), EditorStringName(EditorIcons))); fetch_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_fetch)); @@ -1438,7 +1431,6 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { pull_button = memnew(Button); pull_button->set_theme_type_variation(SceneStringName(FlatButton)); - pull_button->set_accessibility_name(TTRC("Pull")); pull_button->set_tooltip_text(TTR("Pull")); pull_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MoveDown"), EditorStringName(EditorIcons))); pull_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_pull)); @@ -1446,13 +1438,13 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { push_button = memnew(Button); push_button->set_theme_type_variation(SceneStringName(FlatButton)); - push_button->set_accessibility_name(TTRC("Push")); push_button->set_tooltip_text(TTR("Push")); push_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MoveUp"), EditorStringName(EditorIcons))); push_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_push)); menu_bar->add_child(push_button); extra_options = memnew(MenuButton); + extra_options->set_accessibility_name(TTRC("Extra options")); extra_options->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("GuiTabMenuHl"), EditorStringName(EditorIcons))); extra_options->get_popup()->connect(SNAME("about_to_popup"), callable_mp(this, &VersionControlEditorPlugin::_update_extra_options)); extra_options->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &VersionControlEditorPlugin::_extra_option_selected)); @@ -1514,7 +1506,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { diff_heading->add_child(view); diff_view_type_select = memnew(OptionButton); - diff_view_type_select->set_accessibility_name(TTRC("View")); + diff_view_type_select->set_accessibility_name(TTRC("View:")); diff_view_type_select->add_item(TTR("Split"), DIFF_VIEW_TYPE_SPLIT); diff_view_type_select->add_item(TTR("Unified"), DIFF_VIEW_TYPE_UNIFIED); diff_view_type_select->connect(SceneStringName(item_selected), callable_mp(this, &VersionControlEditorPlugin::_display_diff)); diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index 93c0caa6f4..2741150eae 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -6810,7 +6810,6 @@ VisualShaderEditor::VisualShaderEditor() { preview_tools = memnew(MenuButton); filter_hbox->add_child(preview_tools); preview_tools->set_tooltip_text(TTR("Options")); - preview_tools->set_accessibility_name(TTRC("Options")); preview_tools->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &VisualShaderEditor::_preview_tools_menu_option)); preview_tools->get_popup()->add_item(TTR("Copy Parameters From Material"), COPY_PARAMS_FROM_MATERIAL); preview_tools->get_popup()->add_item(TTR("Paste Parameters To Material"), PASTE_PARAMS_TO_MATERIAL); @@ -6860,12 +6859,10 @@ VisualShaderEditor::VisualShaderEditor() { node_filter->connect(SceneStringName(gui_input), callable_mp(this, &VisualShaderEditor::_sbox_input)); node_filter->set_h_size_flags(SIZE_EXPAND_FILL); node_filter->set_placeholder(TTR("Search")); - node_filter->set_accessibility_name(TTRC("Search")); tools = memnew(MenuButton); filter_hb->add_child(tools); tools->set_tooltip_text(TTR("Options")); - tools->set_accessibility_name(TTRC("Options")); tools->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &VisualShaderEditor::_tools_menu_option)); tools->get_popup()->add_item(TTR("Expand All"), EXPAND_ALL); tools->get_popup()->add_item(TTR("Collapse All"), COLLAPSE_ALL); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 4702a39e02..1296613962 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -1362,7 +1362,6 @@ ProjectManager::ProjectManager() { title_bar_logo = memnew(Button); title_bar_logo->set_flat(true); title_bar_logo->set_tooltip_text(TTR("About Godot")); - title_bar_logo->set_accessibility_name(TTRC("About Godot")); left_hbox->add_child(title_bar_logo); title_bar_logo->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_show_about)); @@ -1467,7 +1466,7 @@ ProjectManager::ProjectManager() { filter_option->set_clip_text(true); filter_option->set_h_size_flags(Control::SIZE_EXPAND_FILL); filter_option->set_stretch_ratio(0.3); - filter_option->set_accessibility_name(TTRC("Sort")); + filter_option->set_accessibility_name(TTRC("Sort:")); filter_option->connect(SceneStringName(item_selected), callable_mp(this, &ProjectManager::_on_order_option_changed)); hb->add_child(filter_option); diff --git a/editor/project_manager/project_dialog.cpp b/editor/project_manager/project_dialog.cpp index 20f5dcad6a..79f05fcf4c 100644 --- a/editor/project_manager/project_dialog.cpp +++ b/editor/project_manager/project_dialog.cpp @@ -975,7 +975,7 @@ ProjectDialog::ProjectDialog() { project_path = memnew(LineEdit); project_path->set_h_size_flags(Control::SIZE_EXPAND_FILL); - project_path->set_accessibility_name(TTRC("Project Path")); + project_path->set_accessibility_name(TTRC("Project Path:")); project_path->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE); pphb->add_child(project_path); @@ -991,7 +991,7 @@ ProjectDialog::ProjectDialog() { install_path = memnew(LineEdit); install_path->set_h_size_flags(Control::SIZE_EXPAND_FILL); - install_path->set_accessibility_name(TTRC("Install Path")); + install_path->set_accessibility_name(TTRC("Project Installation Path:")); install_path->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE); iphb->add_child(install_path); @@ -1128,7 +1128,7 @@ ProjectDialog::ProjectDialog() { vcs_metadata_selection->add_item(TTRC("None"), (int)EditorVCSInterface::VCSMetadata::NONE); vcs_metadata_selection->add_item(TTRC("Git"), (int)EditorVCSInterface::VCSMetadata::GIT); vcs_metadata_selection->select((int)EditorVCSInterface::VCSMetadata::GIT); - vcs_metadata_selection->set_accessibility_name(TTRC("Version Control Metadata")); + vcs_metadata_selection->set_accessibility_name(TTRC("Version Control Metadata:")); default_files_container->add_child(vcs_metadata_selection); Control *spacer = memnew(Control); spacer->set_h_size_flags(Control::SIZE_EXPAND_FILL); diff --git a/editor/project_manager/project_list.cpp b/editor/project_manager/project_list.cpp index 7b3720612a..996089880b 100644 --- a/editor/project_manager/project_list.cpp +++ b/editor/project_manager/project_list.cpp @@ -264,7 +264,6 @@ void ProjectListItemControl::set_unsupported_features(PackedStringArray p_featur } project_version->set_tooltip_text(tooltip_text); project_unsupported_features->set_focus_mode(FOCUS_ACCESSIBILITY); - project_unsupported_features->set_accessibility_name(tooltip_text); project_unsupported_features->set_tooltip_text(tooltip_text); project_unsupported_features->show(); } else { @@ -332,7 +331,6 @@ ProjectListItemControl::ProjectListItemControl() { favorite_button = memnew(TextureButton); favorite_button->set_name("FavoriteButton"); favorite_button->set_tooltip_text(TTRC("Add to favorites")); - favorite_button->set_accessibility_name(TTRC("Add to favorites")); favorite_button->set_auto_translate_mode(AUTO_TRANSLATE_MODE_ALWAYS); // This makes the project's "hover" style display correctly when hovering the favorite icon. favorite_button->set_mouse_filter(MOUSE_FILTER_PASS); @@ -383,7 +381,6 @@ ProjectListItemControl::ProjectListItemControl() { explore_button->set_name("ExploreButton"); explore_button->set_tooltip_auto_translate_mode(AUTO_TRANSLATE_MODE_ALWAYS); explore_button->set_tooltip_text(TTRC("Open in file manager")); - explore_button->set_accessibility_name(TTRC("Open in file manager")); explore_button->set_flat(true); path_hb->add_child(explore_button); explore_button->connect(SceneStringName(pressed), callable_mp(this, &ProjectListItemControl::_explore_button_pressed)); diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 42c2915514..87b4773e1b 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -722,7 +722,6 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { property_box = memnew(LineEdit); property_box->set_placeholder(TTRC("Select a Setting or Type its Name")); - property_box->set_accessibility_name(TTRC("Setting Name")); property_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); property_box->connect(SceneStringName(text_changed), callable_mp(this, &ProjectSettingsEditor::_property_box_changed)); custom_properties->add_child(property_box); diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index 03ff231ccf..69803b331c 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -69,7 +69,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) { lne_search = memnew(LineEdit); lne_search->set_name("lne_search"); - lne_search->set_accessibility_name(TTRC("Search")); + lne_search->set_accessibility_name(TTRC("Search:")); lne_search->set_h_size_flags(Control::SIZE_EXPAND_FILL); Label *lbl_replace = memnew(Label); @@ -77,7 +77,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) { lne_replace = memnew(LineEdit); lne_replace->set_name("lne_replace"); - lne_replace->set_accessibility_name(TTRC("Replace")); + lne_replace->set_accessibility_name(TTRC("Replace:")); lne_replace->set_h_size_flags(Control::SIZE_EXPAND_FILL); grd_main->add_child(lbl_search); @@ -92,7 +92,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) { lne_prefix = memnew(LineEdit); lne_prefix->set_name("lne_prefix"); - lne_prefix->set_accessibility_name(TTRC("Prefix")); + lne_prefix->set_accessibility_name(TTRC("Prefix:")); lne_prefix->set_h_size_flags(Control::SIZE_EXPAND_FILL); Label *lbl_suffix = memnew(Label); @@ -100,7 +100,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) { lne_suffix = memnew(LineEdit); lne_suffix->set_name("lne_suffix"); - lne_prefix->set_accessibility_name(TTRC("Suffix")); + lne_prefix->set_accessibility_name(TTRC("Suffix:")); lne_suffix->set_h_size_flags(Control::SIZE_EXPAND_FILL); grd_main->add_child(lbl_prefix); @@ -213,7 +213,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) { spn_count_start = memnew(SpinBox); spn_count_start->set_tooltip_text(TTR("Initial value for the counter.")); - spn_count_start->set_accessibility_name(TTRC("Counter Initial Value")); + spn_count_start->set_accessibility_name(TTRC("Initial value for the counter.")); spn_count_start->set_step(1); spn_count_start->set_min(0); hbc_count_options->add_child(spn_count_start); @@ -225,7 +225,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) { spn_count_step = memnew(SpinBox); spn_count_step->set_tooltip_text(TTR("Amount by which counter is incremented for each node.")); - spn_count_step->set_accessibility_name(TTRC("Counter Step")); + spn_count_step->set_accessibility_name(TTRC("Amount by which counter is incremented for each node.")); spn_count_step->set_step(1); hbc_count_options->add_child(spn_count_step); @@ -236,7 +236,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) { spn_count_padding = memnew(SpinBox); spn_count_padding->set_tooltip_text(TTR("Minimum number of digits for the counter.\nMissing digits are padded with leading zeros.")); - spn_count_padding->set_accessibility_name(TTRC("Minimum Number of Digits")); + spn_count_padding->set_accessibility_name(TTRC("Minimum number of digits for the counter.")); spn_count_padding->set_step(1); hbc_count_options->add_child(spn_count_padding); diff --git a/editor/run_instances_dialog.cpp b/editor/run_instances_dialog.cpp index 132e2c4cbd..2597d161ec 100644 --- a/editor/run_instances_dialog.cpp +++ b/editor/run_instances_dialog.cpp @@ -332,7 +332,7 @@ RunInstancesDialog::RunInstancesDialog() { main_args_edit = memnew(LineEdit); main_args_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); main_args_edit->set_placeholder(TTR("Space-separated arguments, example: host player1 blue")); - main_args_edit->set_accessibility_name(TTRC("Launch Arguments")); + main_args_edit->set_accessibility_name(TTRC("Main Run Args:")); main_gc->add_child(main_args_edit); _fetch_main_args(); ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &RunInstancesDialog::_fetch_main_args)); @@ -342,7 +342,7 @@ RunInstancesDialog::RunInstancesDialog() { main_features_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); main_features_edit->set_placeholder(TTR("Comma-separated tags, example: demo, steam, event")); main_features_edit->set_text(EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_main_feature_tags", "")); - main_features_edit->set_accessibility_name(TTRC("Feature Tags")); + main_features_edit->set_accessibility_name(TTRC("Main Feature Tags:")); main_gc->add_child(main_features_edit); main_features_edit->connect(SceneStringName(text_changed), callable_mp(this, &RunInstancesDialog::_start_main_timer).unbind(1)); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 53509368e1..aae864323b 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -4695,7 +4695,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec button_add->set_theme_type_variation("FlatMenuButton"); button_add->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_NEW, false)); button_add->set_tooltip_text(TTRC("Add/Create a New Node.")); - button_add->set_accessibility_name(TTRC("Add/Create")); button_add->set_shortcut(ED_GET_SHORTCUT("scene_tree/add_child_node")); filter_hbc->add_child(button_add); @@ -4703,7 +4702,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec button_instance->set_theme_type_variation("FlatMenuButton"); button_instance->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_INSTANTIATE, false)); button_instance->set_tooltip_text(TTRC("Instantiate a scene file as a Node. Creates an inherited scene if no root node exists.")); - button_instance->set_accessibility_name(TTRC("Instantiate Scene File")); button_instance->set_shortcut(ED_GET_SHORTCUT("scene_tree/instantiate_scene")); filter_hbc->add_child(button_instance); vbc->add_child(filter_hbc); @@ -4712,7 +4710,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec filter = memnew(LineEdit); filter->set_h_size_flags(SIZE_EXPAND_FILL); filter->set_placeholder(TTRC("Filter: name, t:type, g:group")); - filter->set_accessibility_name(TTRC("Filter")); + filter->set_accessibility_name(TTRC("Filter Nodes")); filter->set_tooltip_text(TTRC("Filter nodes by entering a part of their name, type (if prefixed with \"type:\" or \"t:\")\nor group (if prefixed with \"group:\" or \"g:\"). Filtering is case-insensitive.")); filter_hbc->add_child(filter); filter->add_theme_constant_override("minimum_character_width", 0); @@ -4730,7 +4728,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec button_create_script->set_theme_type_variation("FlatMenuButton"); button_create_script->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_ATTACH_SCRIPT, false)); button_create_script->set_tooltip_text(TTRC("Attach a new or existing script to the selected node.")); - button_create_script->set_accessibility_name(TTRC("Attach Script")); button_create_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/attach_script")); filter_hbc->add_child(button_create_script); button_create_script->hide(); @@ -4739,7 +4736,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec button_detach_script->set_theme_type_variation("FlatMenuButton"); button_detach_script->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_DETACH_SCRIPT, false)); button_detach_script->set_tooltip_text(TTRC("Detach the script from the selected node.")); - button_detach_script->set_accessibility_name(TTRC("Detach Script")); button_detach_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/detach_script")); filter_hbc->add_child(button_detach_script); button_detach_script->hide(); @@ -4748,7 +4744,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec button_extend_script->set_flat(true); button_extend_script->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_EXTEND_SCRIPT, false)); button_extend_script->set_tooltip_text(TTRC("Extend the script of the selected node.")); - button_extend_script->set_accessibility_name(TTRC("Extend Script")); button_extend_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/extend_script")); filter_hbc->add_child(button_extend_script); button_extend_script->hide(); @@ -4757,7 +4752,6 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec button_tree_menu->set_flat(false); button_tree_menu->set_theme_type_variation("FlatMenuButton"); button_tree_menu->set_tooltip_text(TTR("Extra scene options.")); - button_tree_menu->set_accessibility_name(TTRC("Scene Options")); button_tree_menu->connect("about_to_popup", callable_mp(this, &SceneTreeDock::_update_tree_menu)); filter_hbc->add_child(button_tree_menu); diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 00a0805bff..4def82b2d5 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -884,7 +884,7 @@ ScriptCreateDialog::ScriptCreateDialog() { language_menu->set_custom_minimum_size(Size2(350, 0) * EDSCALE); language_menu->set_expand_icon(true); language_menu->set_h_size_flags(Control::SIZE_EXPAND_FILL); - language_menu->set_accessibility_name(TTRC("Language")); + language_menu->set_accessibility_name(TTRC("Language:")); gc->add_child(memnew(Label(TTR("Language:")))); gc->add_child(language_menu); @@ -951,7 +951,7 @@ ScriptCreateDialog::ScriptCreateDialog() { built_in = memnew(CheckBox); built_in->set_text(TTR("On")); - built_in->set_accessibility_name(TTRC("Built-in Script")); + built_in->set_accessibility_name(TTRC("Built-in Script:")); built_in->connect(SceneStringName(pressed), callable_mp(this, &ScriptCreateDialog::_built_in_pressed)); gc->add_child(memnew(Label(TTR("Built-in Script:")))); gc->add_child(built_in); @@ -961,7 +961,7 @@ ScriptCreateDialog::ScriptCreateDialog() { hb = memnew(HBoxContainer); hb->connect(SceneStringName(sort_children), callable_mp(this, &ScriptCreateDialog::_path_hbox_sorted)); file_path = memnew(LineEdit); - file_path->set_accessibility_name(TTRC("File Path")); + file_path->set_accessibility_name(TTRC("Path:")); file_path->connect(SceneStringName(text_changed), callable_mp(this, &ScriptCreateDialog::_path_changed)); file_path->set_h_size_flags(Control::SIZE_EXPAND_FILL); hb->add_child(file_path); @@ -980,7 +980,7 @@ ScriptCreateDialog::ScriptCreateDialog() { built_in_name = memnew(LineEdit); built_in_name->set_h_size_flags(Control::SIZE_EXPAND_FILL); - built_in_name->set_accessibility_name(TTRC("Name")); + built_in_name->set_accessibility_name(TTRC("Name:")); register_text_enter(built_in_name); label = memnew(Label(TTR("Name:"))); gc->add_child(label); diff --git a/editor/shader_create_dialog.cpp b/editor/shader_create_dialog.cpp index 0b2ed2bcfc..beb1e44549 100644 --- a/editor/shader_create_dialog.cpp +++ b/editor/shader_create_dialog.cpp @@ -581,7 +581,7 @@ ShaderCreateDialog::ShaderCreateDialog() { type_menu = memnew(OptionButton); type_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); - type_menu->set_accessibility_name(TTRC("Type")); + type_menu->set_accessibility_name(TTRC("Type:")); type_menu->set_custom_minimum_size(Size2(250, 0) * EDSCALE); type_menu->set_h_size_flags(Control::SIZE_EXPAND_FILL); gc->add_child(memnew(Label(TTR("Type:")))); @@ -623,7 +623,7 @@ ShaderCreateDialog::ShaderCreateDialog() { mode_menu = memnew(OptionButton); mode_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); - mode_menu->set_accessibility_name(TTRC("Mode")); + mode_menu->set_accessibility_name(TTRC("Mode:")); for (const String &type_name : ShaderTypes::get_singleton()->get_types_list()) { mode_menu->add_item(type_name.capitalize()); } @@ -634,7 +634,7 @@ ShaderCreateDialog::ShaderCreateDialog() { // Templates. template_menu = memnew(OptionButton); - template_menu->set_accessibility_name(TTRC("Template")); + template_menu->set_accessibility_name(TTRC("Template:")); gc->add_child(memnew(Label(TTR("Template:")))); gc->add_child(template_menu); template_menu->connect(SceneStringName(item_selected), callable_mp(this, &ShaderCreateDialog::_template_changed)); @@ -643,7 +643,7 @@ ShaderCreateDialog::ShaderCreateDialog() { internal = memnew(CheckBox); internal->set_text(TTR("On")); - internal->set_accessibility_name(TTRC("Built-in Shader")); + internal->set_accessibility_name(TTRC("Built-in Shader:")); internal->connect(SceneStringName(toggled), callable_mp(this, &ShaderCreateDialog::_built_in_toggled)); gc->add_child(memnew(Label(TTR("Built-in Shader:")))); gc->add_child(internal); @@ -655,6 +655,7 @@ ShaderCreateDialog::ShaderCreateDialog() { hb->connect(SceneStringName(sort_children), callable_mp(this, &ShaderCreateDialog::_path_hbox_sorted)); file_path = memnew(LineEdit); file_path->connect(SceneStringName(text_changed), callable_mp(this, &ShaderCreateDialog::_path_changed)); + file_path->set_accessibility_name(TTRC("Path:")); file_path->set_h_size_flags(Control::SIZE_EXPAND_FILL); hb->add_child(file_path); register_text_enter(file_path); diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index d558da36e5..aa377172ea 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -1337,7 +1337,7 @@ GridMapEditor::GridMapEditor() { settings_pick_distance->set_min(500.0f); settings_pick_distance->set_step(1.0f); settings_pick_distance->set_value(EDITOR_GET("editors/grid_map/pick_distance")); - settings_pick_distance->set_accessibility_name(TTRC("Pick Distance")); + settings_pick_distance->set_accessibility_name(TTRC("Pick Distance:")); settings_vbc->add_margin_child(TTR("Pick Distance:"), settings_pick_distance); options->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &GridMapEditor::_menu_option)); @@ -1370,7 +1370,7 @@ GridMapEditor::GridMapEditor() { select_mode_button->set_toggle_mode(true); select_mode_button->set_button_group(mode_buttons_group); select_mode_button->set_shortcut(ED_SHORTCUT("grid_map/selection_tool", TTRC("Selection"), Key::Q, true)); - select_mode_button->set_accessibility_name(TTRC("Select")); + select_mode_button->set_accessibility_name(TTRC("Selection")); select_mode_button->connect(SceneStringName(toggled), callable_mp(this, &GridMapEditor::_on_tool_mode_changed).unbind(1)); mode_buttons->add_child(select_mode_button); @@ -1460,7 +1460,7 @@ GridMapEditor::GridMapEditor() { rotate_x_button = memnew(Button); rotate_x_button->set_theme_type_variation(SceneStringName(FlatButton)); rotate_x_button->set_shortcut(ED_SHORTCUT("grid_map/cursor_rotate_x", TTRC("Cursor Rotate X"), Key::A, true)); - rotate_x_button->set_accessibility_name(TTRC("Rotate X")); + rotate_x_button->set_accessibility_name(TTRC("Cursor Rotate X")); rotate_x_button->connect(SceneStringName(pressed), callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_CURSOR_ROTATE_X)); rotation_buttons->add_child(rotate_x_button); @@ -1469,7 +1469,7 @@ GridMapEditor::GridMapEditor() { rotate_y_button = memnew(Button); rotate_y_button->set_theme_type_variation(SceneStringName(FlatButton)); rotate_y_button->set_shortcut(ED_SHORTCUT("grid_map/cursor_rotate_y", TTRC("Cursor Rotate Y"), Key::S, true)); - rotate_y_button->set_accessibility_name(TTRC("Rotate Y")); + rotate_y_button->set_accessibility_name(TTRC("Cursor Rotate Y")); rotate_y_button->connect(SceneStringName(pressed), callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_CURSOR_ROTATE_Y)); rotation_buttons->add_child(rotate_y_button); @@ -1478,6 +1478,7 @@ GridMapEditor::GridMapEditor() { rotate_z_button = memnew(Button); rotate_z_button->set_theme_type_variation(SceneStringName(FlatButton)); rotate_z_button->set_shortcut(ED_SHORTCUT("grid_map/cursor_rotate_z", TTRC("Cursor Rotate Z"), Key::D, true)); + rotate_z_button->set_accessibility_name(TTRC("Cursor Rotate Z")); rotate_z_button->connect(SceneStringName(pressed), callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_CURSOR_ROTATE_Z)); rotation_buttons->add_child(rotate_z_button); @@ -1493,7 +1494,7 @@ GridMapEditor::GridMapEditor() { floor->set_min(-32767); floor->set_max(32767); floor->set_step(1); - floor->set_accessibility_name(TTRC("Grid Floor")); + floor->set_accessibility_name(TTRC("Change Grid Floor:")); floor->set_tooltip_text( vformat(TTR("Change Grid Floor:\nPrevious Plane (%s)\nNext Plane (%s)"), ED_GET_SHORTCUT("grid_map/previous_floor")->get_as_text(), diff --git a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp index 36d2913d8b..5918c650e6 100644 --- a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp +++ b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp @@ -341,7 +341,7 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor() transition_enabled = memnew(CheckBox); transition_enabled->set_text(TTR("Enabled")); - transition_enabled->set_accessibility_name(TTRC("Use Transition")); + transition_enabled->set_accessibility_name(TTRC("Use Transition:")); edit_vb->add_margin_child(TTR("Use Transition:"), transition_enabled); transition_enabled->connect(SceneStringName(pressed), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited)); @@ -351,7 +351,7 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor() transition_from->add_item(TTR("Next Beat"), AudioStreamInteractive::TRANSITION_FROM_TIME_NEXT_BEAT); transition_from->add_item(TTR("Next Bar"), AudioStreamInteractive::TRANSITION_FROM_TIME_NEXT_BAR); transition_from->add_item(TTR("Clip End"), AudioStreamInteractive::TRANSITION_FROM_TIME_END); - transition_from->set_accessibility_name(TTRC("Transition From")); + transition_from->set_accessibility_name(TTRC("Transition From:")); transition_from->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1)); @@ -360,30 +360,30 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor() transition_to->add_item(TTR("Same Position"), AudioStreamInteractive::TRANSITION_TO_TIME_SAME_POSITION); transition_to->add_item(TTR("Clip Start"), AudioStreamInteractive::TRANSITION_TO_TIME_START); transition_to->add_item(TTR("Prev Position"), AudioStreamInteractive::TRANSITION_TO_TIME_PREVIOUS_POSITION); - transition_to->set_accessibility_name(TTRC("Transition To")); + transition_to->set_accessibility_name(TTRC("Transition To:")); transition_to->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1)); fade_mode = memnew(OptionButton); edit_vb->add_margin_child(TTR("Fade Mode:"), fade_mode); fade_mode->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1)); - fade_mode->set_accessibility_name(TTRC("Fade Mode")); + fade_mode->set_accessibility_name(TTRC("Fade Mode:")); fade_beats = memnew(SpinBox); edit_vb->add_margin_child(TTR("Fade Beats:"), fade_beats); fade_beats->set_max(16); fade_beats->set_step(0.1); fade_beats->connect(SceneStringName(value_changed), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1)); - fade_beats->set_accessibility_name(TTRC("Fade Beats")); + fade_beats->set_accessibility_name(TTRC("Fade Beats:")); filler_clip = memnew(OptionButton); edit_vb->add_margin_child(TTR("Filler Clip:"), filler_clip); filler_clip->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); filler_clip->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1)); - filler_clip->set_accessibility_name(TTRC("Filler Clip")); + filler_clip->set_accessibility_name(TTRC("Filler Clip:")); hold_previous = memnew(CheckBox); hold_previous->set_text(TTR("Enabled")); - hold_previous->set_accessibility_name(TTRC("Hold Previous")); + hold_previous->set_accessibility_name(TTRC("Hold Previous:")); hold_previous->connect(SceneStringName(pressed), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited)); edit_vb->add_margin_child(TTR("Hold Previous:"), hold_previous); diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp index aabc23430f..55fda45f73 100644 --- a/modules/multiplayer/editor/replication_editor.cpp +++ b/modules/multiplayer/editor/replication_editor.cpp @@ -235,7 +235,7 @@ ReplicationEditor::ReplicationEditor() { np_line_edit = memnew(LineEdit); np_line_edit->set_placeholder(":property"); - np_line_edit->set_accessibility_name(TTRC("Path")); + np_line_edit->set_accessibility_name(TTRC("Path:")); np_line_edit->set_h_size_flags(SIZE_EXPAND_FILL); np_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &ReplicationEditor::_np_text_submitted)); hb->add_child(np_line_edit); @@ -253,7 +253,6 @@ ReplicationEditor::ReplicationEditor() { pin->set_theme_type_variation(SceneStringName(FlatButton)); pin->set_toggle_mode(true); pin->set_tooltip_text(TTR("Pin replication editor")); - pin->set_accessibility_name(TTRC("Pin")); hb->add_child(pin); tree = memnew(Tree); diff --git a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp index 48df1eb1a4..debed29bed 100644 --- a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp @@ -830,7 +830,6 @@ NavigationObstacle3DEditorPlugin::NavigationObstacle3DEditorPlugin() { button_create->set_theme_type_variation(SceneStringName(FlatButton)); obstacle_editor->add_child(button_create); button_create->set_tooltip_text(TTR("Add Vertex")); - button_create->set_accessibility_name(TTRC("Add Vertex")); button_create->connect(SceneStringName(pressed), callable_mp(this, &NavigationObstacle3DEditorPlugin::set_mode).bind(NavigationObstacle3DEditorPlugin::MODE_CREATE)); button_create->set_toggle_mode(true); button_create->set_button_group(bg); diff --git a/modules/openxr/editor/openxr_action_editor.cpp b/modules/openxr/editor/openxr_action_editor.cpp index d828c851f2..8f292e1058 100644 --- a/modules/openxr/editor/openxr_action_editor.cpp +++ b/modules/openxr/editor/openxr_action_editor.cpp @@ -165,7 +165,6 @@ OpenXRActionEditor::OpenXRActionEditor(Ref p_action) { rem_action = memnew(Button); rem_action->set_tooltip_text(TTR("Remove action")); - rem_action->set_accessibility_name(TTRC("Remove action")); rem_action->connect(SceneStringName(pressed), callable_mp(this, &OpenXRActionEditor::_on_remove_action)); rem_action->set_flat(true); add_child(rem_action); diff --git a/modules/openxr/editor/openxr_action_set_editor.cpp b/modules/openxr/editor/openxr_action_set_editor.cpp index fd9a14901f..b92444e235 100644 --- a/modules/openxr/editor/openxr_action_set_editor.cpp +++ b/modules/openxr/editor/openxr_action_set_editor.cpp @@ -279,14 +279,12 @@ OpenXRActionSetEditor::OpenXRActionSetEditor(Ref p_action_map, add_action = memnew(Button); add_action->set_tooltip_text(TTR("Add action.")); add_action->connect(SceneStringName(pressed), callable_mp(this, &OpenXRActionSetEditor::_on_add_action)); - add_action->set_accessibility_name(TTRC("Add")); add_action->set_flat(true); action_set_hb->add_child(add_action); rem_action_set = memnew(Button); rem_action_set->set_tooltip_text(TTR("Remove action set.")); rem_action_set->connect(SceneStringName(pressed), callable_mp(this, &OpenXRActionSetEditor::_on_remove_action_set)); - rem_action_set->set_accessibility_name(TTRC("Remove")); rem_action_set->set_flat(true); action_set_hb->add_child(rem_action_set); diff --git a/modules/openxr/editor/openxr_binding_modifier_editor.cpp b/modules/openxr/editor/openxr_binding_modifier_editor.cpp index 7da82ce0db..580bcedba0 100644 --- a/modules/openxr/editor/openxr_binding_modifier_editor.cpp +++ b/modules/openxr/editor/openxr_binding_modifier_editor.cpp @@ -263,7 +263,6 @@ OpenXRBindingModifierEditor::OpenXRBindingModifierEditor() { rem_binding_modifier_btn = memnew(Button); rem_binding_modifier_btn->set_tooltip_text(TTR("Remove this binding modifier.")); rem_binding_modifier_btn->connect(SceneStringName(pressed), callable_mp(this, &OpenXRBindingModifierEditor::_on_remove_binding_modifier)); - rem_binding_modifier_btn->set_accessibility_name(TTRC("Remove")); rem_binding_modifier_btn->set_flat(true); header_hb->add_child(rem_binding_modifier_btn); diff --git a/modules/openxr/editor/openxr_interaction_profile_editor.cpp b/modules/openxr/editor/openxr_interaction_profile_editor.cpp index 8fe6fd0055..1e8d7523d2 100644 --- a/modules/openxr/editor/openxr_interaction_profile_editor.cpp +++ b/modules/openxr/editor/openxr_interaction_profile_editor.cpp @@ -181,7 +181,6 @@ OpenXRInteractionProfileEditorBase::OpenXRInteractionProfileEditorBase() { binding_modifiers_btn = memnew(Button); binding_modifiers_btn->set_tooltip_text(TTR("Edit binding modifiers")); binding_modifiers_btn->connect("pressed", callable_mp(this, &OpenXRInteractionProfileEditorBase::_on_open_binding_modifiers)); - binding_modifiers_btn->set_accessibility_name(TTRC("Edit")); // TODO show visual difference if there are binding modifiers for this interaction profile toolbar_vb->add_child(binding_modifiers_btn); } diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 4c090cb1f6..2fac6ee053 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -191,10 +191,13 @@ void Button::_notification(int p_what) { RID ae = get_accessibility_element(); ERR_FAIL_COND(ae.is_null()); - if (!xl_text.is_empty() && get_accessibility_name().is_empty()) { + const String &ac_name = get_accessibility_name(); + if (!xl_text.is_empty() && ac_name.is_empty()) { DisplayServer::get_singleton()->accessibility_update_set_name(ae, xl_text); - } else if (!xl_text.is_empty() && !get_accessibility_name().is_empty() && get_accessibility_name() != xl_text) { - DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_accessibility_name() + ": " + xl_text); + } else if (!xl_text.is_empty() && !ac_name.is_empty() && ac_name != xl_text) { + DisplayServer::get_singleton()->accessibility_update_set_name(ae, ac_name + ": " + xl_text); + } else if (xl_text.is_empty() && ac_name.is_empty() && !get_tooltip_text().is_empty()) { + DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_tooltip_text()); // Fall back to tooltip. } AcceptDialog *dlg = Object::cast_to(get_parent()); if (dlg && dlg->get_ok_button() == this) { diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 4f4ebcd642..606b7e6c28 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -99,17 +99,14 @@ void ColorPicker::_notification(int p_what) { case NOTIFICATION_READY: { if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_COLOR_PICKER)) { - btn_pick->set_accessibility_name(ETR("Pick Color From Screen")); btn_pick->set_tooltip_text(ETR("Pick a color from the screen.")); btn_pick->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_pick_button_pressed_native)); } else if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SCREEN_CAPTURE) && !get_tree()->get_root()->is_embedding_subwindows()) { // FIXME: The embedding check is needed to fix a bug in single-window mode (GH-93718). - btn_pick->set_accessibility_name(ETR("Pick Color From Screen")); btn_pick->set_tooltip_text(ETR("Pick a color from the screen.")); btn_pick->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_pick_button_pressed)); } else { // On unsupported platforms, use a legacy method for color picking. - btn_pick->set_accessibility_name(ETR("Pick Color From Window")); btn_pick->set_tooltip_text(ETR("Pick a color from the application window.")); btn_pick->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_pick_button_pressed_legacy)); } @@ -2182,7 +2179,6 @@ ColorPicker::ColorPicker() { btn_shape->set_flat(false); sample_hbc->add_child(btn_shape); btn_shape->set_toggle_mode(true); - btn_shape->set_accessibility_name(ETR("Picker Shape")); btn_shape->set_tooltip_text(ETR("Select a picker shape.")); btn_shape->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER); btn_shape->set_focus_mode(FOCUS_ALL); @@ -2233,7 +2229,7 @@ ColorPicker::ColorPicker() { btn_mode->set_flat(false); mode_hbc->add_child(btn_mode); btn_mode->set_toggle_mode(true); - btn_mode->set_accessibility_name(ETR("Picker Mode")); + btn_mode->set_accessibility_name(ETR("Select a picker mode.")); btn_mode->set_tooltip_text(ETR("Select a picker mode.")); btn_mode->set_focus_mode(FOCUS_ALL); @@ -2284,7 +2280,6 @@ ColorPicker::ColorPicker() { text_type->set_text("#"); #ifdef TOOLS_ENABLED if (Engine::get_singleton()->is_editor_hint()) { - text_type->set_accessibility_name(TTRC("Hexadecimal/Code Values")); text_type->set_tooltip_text(TTRC("Switch between hexadecimal and code values.")); text_type->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_text_type_toggled)); } else { @@ -2300,7 +2295,7 @@ ColorPicker::ColorPicker() { hex_hbc->add_child(c_text); c_text->set_h_size_flags(SIZE_EXPAND_FILL); c_text->set_select_all_on_focus(true); - c_text->set_accessibility_name(ETR("Hex Code or Name")); + c_text->set_accessibility_name(ETR("Hex code or named color")); c_text->set_tooltip_text(ETR("Enter a hex code (\"#ff0000\") or named color (\"red\").")); c_text->set_placeholder(ETR("Hex code or named color")); c_text->connect(SceneStringName(text_submitted), callable_mp(this, &ColorPicker::_html_submitted)); @@ -2338,7 +2333,6 @@ ColorPicker::ColorPicker() { menu_btn->set_flat(false); menu_btn->set_focus_mode(FOCUS_ALL); menu_btn->set_tooltip_text(ETR("Show all options available.")); - menu_btn->set_accessibility_name(ETR("All Options")); menu_btn->connect("about_to_popup", callable_mp(this, &ColorPicker::_update_menu_items)); palette_box->add_child(menu_btn); @@ -2375,7 +2369,6 @@ ColorPicker::ColorPicker() { btn_add_preset = memnew(Button); btn_add_preset->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER); btn_add_preset->set_tooltip_text(ETR("Add current color as a preset.")); - btn_add_preset->set_accessibility_name(ETR("Add Preset")); btn_add_preset->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_add_preset_pressed)); preset_container->add_child(btn_add_preset); diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 7aa9e04bcd..3756225c8b 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -2096,20 +2096,17 @@ FileDialog::FileDialog() { dir_prev = memnew(Button); dir_prev->set_theme_type_variation(SceneStringName(FlatButton)); - dir_prev->set_accessibility_name(ETR("Previous")); dir_prev->set_tooltip_text(ETR("Go to previous folder.")); top_toolbar->add_child(dir_prev); dir_prev->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::_go_back)); dir_next = memnew(Button); - dir_next->set_accessibility_name(ETR("Next")); dir_next->set_theme_type_variation(SceneStringName(FlatButton)); dir_next->set_tooltip_text(ETR("Go to next folder.")); top_toolbar->add_child(dir_next); dir_next->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::_go_forward)); dir_up = memnew(Button); - dir_up->set_accessibility_name(ETR("Parent Folder")); dir_up->set_theme_type_variation(SceneStringName(FlatButton)); dir_up->set_tooltip_text(ETR("Go to parent folder.")); top_toolbar->add_child(dir_up); @@ -2129,7 +2126,7 @@ FileDialog::FileDialog() { top_toolbar->add_child(drives); directory_edit = memnew(LineEdit); - directory_edit->set_accessibility_name(ETR("Directory Path")); + directory_edit->set_accessibility_name(ETR("Path:")); directory_edit->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE); directory_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); top_toolbar->add_child(directory_edit); @@ -2140,14 +2137,12 @@ FileDialog::FileDialog() { refresh_button = memnew(Button); refresh_button->set_theme_type_variation(SceneStringName(FlatButton)); - refresh_button->set_accessibility_name(ETR("Refresh")); refresh_button->set_tooltip_text(ETR("Refresh files.")); top_toolbar->add_child(refresh_button); refresh_button->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::update_file_list)); favorite_button = memnew(Button); favorite_button->set_theme_type_variation(SceneStringName(FlatButton)); - favorite_button->set_accessibility_name(TTRC("(Un)favorite Folder")); favorite_button->set_tooltip_text(TTRC("(Un)favorite current folder.")); top_toolbar->add_child(favorite_button); favorite_button->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::_favorite_pressed)); @@ -2159,7 +2154,6 @@ FileDialog::FileDialog() { make_dir_button = memnew(Button); make_dir_button->set_theme_type_variation(SceneStringName(FlatButton)); - make_dir_button->set_accessibility_name(ETR("Create New Folder")); make_dir_button->set_tooltip_text(ETR("Create a new folder.")); make_dir_container->add_child(make_dir_button); make_dir_button->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::_make_dir)); @@ -2198,7 +2192,7 @@ FileDialog::FileDialog() { favorite_list = memnew(ItemList); favorite_list->set_v_size_flags(Control::SIZE_EXPAND_FILL); favorite_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); - favorite_list->set_accessibility_name(ETR("Favorites")); + favorite_list->set_accessibility_name(ETR("Favorites:")); favorite_vbox->add_child(favorite_list); favorite_list->connect(SceneStringName(item_selected), callable_mp(this, &FileDialog::_favorite_selected)); @@ -2214,7 +2208,7 @@ FileDialog::FileDialog() { recent_list = memnew(ItemList); recent_list->set_v_size_flags(Control::SIZE_EXPAND_FILL); recent_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); - recent_list->set_accessibility_name(ETR("Recent")); + recent_list->set_accessibility_name(ETR("Recent:")); recent_vbox->add_child(recent_list); recent_list->connect(SceneStringName(item_selected), callable_mp(this, &FileDialog::_recent_selected)); } @@ -2236,7 +2230,6 @@ FileDialog::FileDialog() { show_hidden->set_theme_type_variation(SceneStringName(FlatButton)); show_hidden->set_toggle_mode(true); show_hidden->set_pressed(is_showing_hidden_files()); - show_hidden->set_accessibility_name(ETR("Show Hidden Files")); show_hidden->set_tooltip_text(ETR("Toggle the visibility of hidden files.")); lower_toolbar->add_child(show_hidden); show_hidden->connect(SceneStringName(toggled), callable_mp(this, &FileDialog::set_show_hidden_files)); @@ -2255,7 +2248,6 @@ FileDialog::FileDialog() { thumbnail_mode_button->set_pressed(true); thumbnail_mode_button->set_button_group(view_mode_group); thumbnail_mode_button->set_theme_type_variation(SceneStringName(FlatButton)); - thumbnail_mode_button->set_accessibility_name(ETR("View as Thumbnails")); thumbnail_mode_button->set_tooltip_text(ETR("View items as a grid of thumbnails.")); layout_container->add_child(thumbnail_mode_button); thumbnail_mode_button->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::set_display_mode).bind(DISPLAY_THUMBNAILS)); @@ -2264,7 +2256,6 @@ FileDialog::FileDialog() { list_mode_button->set_toggle_mode(true); list_mode_button->set_button_group(view_mode_group); list_mode_button->set_theme_type_variation(SceneStringName(FlatButton)); - list_mode_button->set_accessibility_name(ETR("View as List")); list_mode_button->set_tooltip_text(ETR("View items as a list.")); layout_container->add_child(list_mode_button); list_mode_button->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::set_display_mode).bind(DISPLAY_LIST)); @@ -2276,7 +2267,6 @@ FileDialog::FileDialog() { show_filename_filter_button->set_theme_type_variation(SceneStringName(FlatButton)); show_filename_filter_button->set_toggle_mode(true); show_filename_filter_button->set_pressed(false); - show_filename_filter_button->set_accessibility_name(ETR("Filter File Names")); show_filename_filter_button->set_tooltip_text(ETR("Toggle the visibility of the filter for file names.")); lower_toolbar->add_child(show_filename_filter_button); show_filename_filter_button->connect(SceneStringName(toggled), callable_mp(this, &FileDialog::set_show_filename_filter)); @@ -2285,7 +2275,6 @@ FileDialog::FileDialog() { file_sort_button->set_flat(false); file_sort_button->set_theme_type_variation("FlatMenuButton"); file_sort_button->set_tooltip_text(ETR("Sort files")); - file_sort_button->set_accessibility_name(ETR("Sort Files")); PopupMenu *sort_menu = file_sort_button->get_popup(); sort_menu->add_radio_check_item(ETR("Sort by Name (Ascending)"), int(FileSortOption::NAME)); @@ -2301,7 +2290,7 @@ FileDialog::FileDialog() { file_list = memnew(ItemList); file_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); file_list->set_v_size_flags(Control::SIZE_EXPAND_FILL); - file_list->set_accessibility_name(ETR("Directories and Files")); + file_list->set_accessibility_name(ETR("Directories & Files:")); file_list->set_allow_rmb_select(true); file_vbox->add_child(file_list); file_list->connect("multi_selected", callable_mp(this, &FileDialog::_file_list_multi_selected)); @@ -2332,7 +2321,7 @@ FileDialog::FileDialog() { filename_filter->set_stretch_ratio(4); filename_filter->set_h_size_flags(Control::SIZE_EXPAND_FILL); filename_filter->set_clear_button_enabled(true); - filename_filter->set_accessibility_name(ETR("Filename Filter")); + filename_filter->set_accessibility_name(ETR("Filename Filter:")); filename_filter_box->add_child(filename_filter); filename_filter->connect(SceneStringName(text_changed), callable_mp(this, &FileDialog::_filename_filter_changed).unbind(1)); filename_filter->connect(SceneStringName(text_submitted), callable_mp(this, &FileDialog::_filename_filter_selected).unbind(1)); @@ -2346,7 +2335,7 @@ FileDialog::FileDialog() { } filename_edit = memnew(LineEdit); - filename_edit->set_accessibility_name(ETR("File Name")); + filename_edit->set_accessibility_name(ETR("File:")); filename_edit->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE); filename_edit->set_stretch_ratio(4); filename_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL); diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 1215e9e890..76af49366d 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -3239,7 +3239,6 @@ GraphEdit::GraphEdit() { zoom_minus_button->set_theme_type_variation(SceneStringName(FlatButton)); zoom_minus_button->set_visible(show_zoom_buttons); zoom_minus_button->set_tooltip_text(ETR("Zoom Out")); - zoom_minus_button->set_accessibility_name(ETR("Zoom Out")); zoom_minus_button->set_focus_mode(FOCUS_ACCESSIBILITY); menu_hbox->add_child(zoom_minus_button); zoom_minus_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::_zoom_minus)); @@ -3248,7 +3247,6 @@ GraphEdit::GraphEdit() { zoom_reset_button->set_theme_type_variation(SceneStringName(FlatButton)); zoom_reset_button->set_visible(show_zoom_buttons); zoom_reset_button->set_tooltip_text(ETR("Zoom Reset")); - zoom_reset_button->set_accessibility_name(ETR("Zoom Reset")); zoom_reset_button->set_focus_mode(FOCUS_ACCESSIBILITY); menu_hbox->add_child(zoom_reset_button); zoom_reset_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::_zoom_reset)); @@ -3257,7 +3255,6 @@ GraphEdit::GraphEdit() { zoom_plus_button->set_theme_type_variation(SceneStringName(FlatButton)); zoom_plus_button->set_visible(show_zoom_buttons); zoom_plus_button->set_tooltip_text(ETR("Zoom In")); - zoom_plus_button->set_accessibility_name(ETR("Zoom In")); zoom_plus_button->set_focus_mode(FOCUS_ACCESSIBILITY); menu_hbox->add_child(zoom_plus_button); zoom_plus_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::_zoom_plus)); @@ -3270,7 +3267,6 @@ GraphEdit::GraphEdit() { toggle_grid_button->set_toggle_mode(true); toggle_grid_button->set_pressed(true); toggle_grid_button->set_tooltip_text(ETR("Toggle the visual grid.")); - toggle_grid_button->set_accessibility_name(ETR("Grid")); toggle_grid_button->set_focus_mode(FOCUS_ACCESSIBILITY); menu_hbox->add_child(toggle_grid_button); toggle_grid_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::_show_grid_toggled)); @@ -3280,7 +3276,6 @@ GraphEdit::GraphEdit() { toggle_snapping_button->set_visible(show_grid_buttons); toggle_snapping_button->set_toggle_mode(true); toggle_snapping_button->set_tooltip_text(ETR("Toggle snapping to the grid.")); - toggle_snapping_button->set_accessibility_name(ETR("Snap to Grid")); toggle_snapping_button->set_pressed(snapping_enabled); toggle_snapping_button->set_focus_mode(FOCUS_ACCESSIBILITY); menu_hbox->add_child(toggle_snapping_button); @@ -3293,7 +3288,6 @@ GraphEdit::GraphEdit() { snapping_distance_spinbox->set_step(1); snapping_distance_spinbox->set_value(snapping_distance); snapping_distance_spinbox->set_tooltip_text(ETR("Change the snapping distance.")); - snapping_distance_spinbox->set_accessibility_name(ETR("Snapping Distance")); menu_hbox->add_child(snapping_distance_spinbox); snapping_distance_spinbox->connect(SceneStringName(value_changed), callable_mp(this, &GraphEdit::_snapping_distance_changed)); @@ -3304,7 +3298,6 @@ GraphEdit::GraphEdit() { minimap_button->set_visible(show_minimap_button); minimap_button->set_toggle_mode(true); minimap_button->set_tooltip_text(ETR("Toggle the graph minimap.")); - minimap_button->set_accessibility_name(ETR("Minimap")); minimap_button->set_pressed(show_grid); minimap_button->set_focus_mode(FOCUS_ACCESSIBILITY); menu_hbox->add_child(minimap_button); @@ -3313,11 +3306,10 @@ GraphEdit::GraphEdit() { arrange_button = memnew(Button); arrange_button->set_theme_type_variation(SceneStringName(FlatButton)); arrange_button->set_visible(show_arrange_button); - arrange_button->set_accessibility_name(ETR("Auto Arrange")); + arrange_button->set_tooltip_text(ETR("Automatically arrange selected nodes.")); arrange_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::arrange_nodes)); arrange_button->set_focus_mode(FOCUS_ACCESSIBILITY); menu_hbox->add_child(arrange_button); - arrange_button->set_tooltip_text(ETR("Automatically arrange selected nodes.")); // Minimap. diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp index 46f364f0c7..f9ef144400 100644 --- a/scene/gui/link_button.cpp +++ b/scene/gui/link_button.cpp @@ -157,8 +157,11 @@ void LinkButton::_notification(int p_what) { ERR_FAIL_COND(ae.is_null()); DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LINK); - if (!xl_text.is_empty() && get_accessibility_name().is_empty()) { + const String &ac_name = get_accessibility_name(); + if (!xl_text.is_empty() && ac_name.is_empty()) { DisplayServer::get_singleton()->accessibility_update_set_name(ae, xl_text); + } else if (xl_text.is_empty() && ac_name.is_empty() && !get_tooltip_text().is_empty()) { + DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_tooltip_text()); // Fall back to tooltip. } DisplayServer::get_singleton()->accessibility_update_set_url(ae, uri); } break;