From 26553be42491687ae66ba854b7be51f56635d819 Mon Sep 17 00:00:00 2001 From: Haoyu Qiu Date: Tue, 28 Mar 2023 23:02:02 +0800 Subject: [PATCH] Turn off auto translate for some editor controls * Scene tab * Animation name list in Animation panel * Feature profile name list in Editor Feature Profile dialog * Layout names in editor layout menu * Subresource list in Inspector dock * Resource type shown in EditorResourcePicker * Enum dropdowns in inspectors: We'll eventually allow auto translating these after implementing a way to opt-out auto translation on a property-by-property basis and a way to extract enumerators. --- editor/editor_feature_profile.cpp | 1 + editor/editor_node.cpp | 2 ++ editor/editor_path.cpp | 2 ++ editor/editor_properties.cpp | 2 ++ editor/editor_resource_picker.cpp | 1 + editor/plugins/animation_player_editor_plugin.cpp | 2 ++ 6 files changed, 10 insertions(+) diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index 33a1fe4b455..f8bc37798af 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -908,6 +908,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() { HBoxContainer *profiles_hbc = memnew(HBoxContainer); profile_list = memnew(OptionButton); profile_list->set_h_size_flags(Control::SIZE_EXPAND_FILL); + profile_list->set_auto_translate(false); profiles_hbc->add_child(profile_list); profile_list->connect("item_selected", callable_mp(this, &EditorFeatureProfileManager::_profile_selected)); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index e296c01f5bd..3e6faf99e70 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -7161,6 +7161,7 @@ EditorNode::EditorNode() { scene_tabs->set_tab_close_display_policy((TabBar::CloseButtonDisplayPolicy)EDITOR_GET("interface/scene_tabs/display_close_button").operator int()); scene_tabs->set_max_tab_width(int(EDITOR_GET("interface/scene_tabs/maximum_width")) * EDSCALE); scene_tabs->set_drag_to_rearrange_enabled(true); + scene_tabs->set_auto_translate(false); scene_tabs->connect("tab_changed", callable_mp(this, &EditorNode::_scene_tab_changed)); scene_tabs->connect("tab_button_pressed", callable_mp(this, &EditorNode::_scene_tab_script_edited)); scene_tabs->connect("tab_close_pressed", callable_mp(this, &EditorNode::_scene_tab_closed).bind(SCENE_TAB_CLOSE)); @@ -7441,6 +7442,7 @@ EditorNode::EditorNode() { editor_layouts = memnew(PopupMenu); editor_layouts->set_name("Layouts"); + editor_layouts->set_auto_translate(false); settings_menu->add_child(editor_layouts); editor_layouts->connect("id_pressed", callable_mp(this, &EditorNode::_layout_menu_option)); settings_menu->add_submenu_item(TTR("Editor Layout"), "Layouts"); diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp index 3f425c0f0b4..01e3bff5c2d 100644 --- a/editor/editor_path.cpp +++ b/editor/editor_path.cpp @@ -233,6 +233,7 @@ EditorPath::EditorPath(EditorSelectionHistory *p_history) { current_object_label = memnew(Label); current_object_label->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS); current_object_label->set_h_size_flags(SIZE_EXPAND_FILL); + current_object_label->set_auto_translate(false); main_hb->add_child(current_object_label); sub_objects_icon = memnew(TextureRect); @@ -241,6 +242,7 @@ EditorPath::EditorPath(EditorSelectionHistory *p_history) { main_hb->add_child(sub_objects_icon); sub_objects_menu = memnew(PopupMenu); + sub_objects_menu->set_auto_translate(false); add_child(sub_objects_menu); sub_objects_menu->connect("about_to_popup", callable_mp(this, &EditorPath::_about_to_show)); sub_objects_menu->connect("id_pressed", callable_mp(this, &EditorPath::_id_pressed)); diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index b8e491b243b..5147237ac26 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -358,6 +358,7 @@ EditorPropertyTextEnum::EditorPropertyTextEnum() { option_button->set_h_size_flags(SIZE_EXPAND_FILL); option_button->set_clip_text(true); option_button->set_flat(true); + option_button->set_auto_translate(false); default_layout->add_child(option_button); option_button->connect("item_selected", callable_mp(this, &EditorPropertyTextEnum::_option_selected)); @@ -711,6 +712,7 @@ EditorPropertyEnum::EditorPropertyEnum() { options = memnew(OptionButton); options->set_clip_text(true); options->set_flat(true); + options->set_auto_translate(false); add_child(options); add_focusable(options); options->connect("item_selected", callable_mp(this, &EditorPropertyEnum::_option_selected)); diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index a83db21f20f..17f005a579a 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -924,6 +924,7 @@ EditorResourcePicker::EditorResourcePicker(bool p_hide_assign_button_controls) { assign_button->set_flat(true); assign_button->set_h_size_flags(SIZE_EXPAND_FILL); assign_button->set_clip_text(true); + assign_button->set_auto_translate(false); SET_DRAG_FORWARDING_GCD(assign_button, EditorResourcePicker); add_child(assign_button); assign_button->connect("pressed", callable_mp(this, &EditorResourcePicker::_resource_selected)); diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index c5bfd968d7a..2abb74d9e96 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -1749,6 +1749,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug animation->set_h_size_flags(SIZE_EXPAND_FILL); animation->set_tooltip_text(TTR("Display list of animations in player.")); animation->set_clip_text(true); + animation->set_auto_translate(false); autoplay = memnew(Button); autoplay->set_flat(true); @@ -1848,6 +1849,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug blend_editor.tree->set_columns(2); blend_vb->add_margin_child(TTR("Blend Times:"), blend_editor.tree, true); blend_editor.next = memnew(OptionButton); + blend_editor.next->set_auto_translate(false); blend_vb->add_margin_child(TTR("Next (Auto Queue):"), blend_editor.next); blend_editor.dialog->set_title(TTR("Cross-Animation Blend Times")); updating_blends = false;