godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89963 from timothyqiu/auto-translation 

Fix unexpected auto-translation of more editor components
This commit is contained in:
Rémi Verschelde 2024-03-28 10:47:42 +01:00
parent af08342fd8 f298aaa956
commit 86415f0245
No known key found for this signature in database
GPG Key ID: C3336907360768E1
6 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/connections_dialog.cpp
View File

@ -50,7 +50,6 @@
#include "scene/gui/option_button.h" #include "scene/gui/option_button.h"
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
#include "scene/gui/spin_box.h" #include "scene/gui/spin_box.h"
#include "scene/resources/packed_scene.h"
static Node *_find_first_script(Node *p_root, Node *p_node) { static Node *_find_first_script(Node *p_root, Node *p_node) {
if (p_node != p_root && p_node->get_owner() != p_root) { if (p_node != p_root && p_node->get_owner() != p_root) {
@ -1562,6 +1561,7 @@ ConnectionsDock::ConnectionsDock() {
vbc->add_child(search_box); vbc->add_child(search_box);
tree = memnew(ConnectionsDockTree); tree = memnew(ConnectionsDockTree);
tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
tree->set_columns(1); tree->set_columns(1);
tree->set_select_mode(Tree::SELECT_ROW); tree->set_select_mode(Tree::SELECT_ROW);
tree->set_hide_root(true); tree->set_hide_root(true);

1
editor/debugger/editor_debugger_tree.cpp
View File

@ -41,6 +41,7 @@
EditorDebuggerTree::EditorDebuggerTree() { EditorDebuggerTree::EditorDebuggerTree() {
set_v_size_flags(SIZE_EXPAND_FILL); set_v_size_flags(SIZE_EXPAND_FILL);
set_allow_rmb_select(true); set_allow_rmb_select(true);
set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
// Popup // Popup
item_menu = memnew(PopupMenu); item_menu = memnew(PopupMenu);

2
editor/group_settings_editor.cpp
View File

@ -31,7 +31,6 @@
#include "group_settings_editor.h" #include "group_settings_editor.h"
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "editor/editor_file_system.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_undo_redo_manager.h" #include "editor/editor_undo_redo_manager.h"
#include "editor/filesystem_dock.h" #include "editor/filesystem_dock.h"
@ -521,6 +520,7 @@ GroupSettingsEditor::GroupSettingsEditor() {
hbc->add_child(add_button); hbc->add_child(add_button);
tree = memnew(Tree); tree = memnew(Tree);
tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
tree->set_hide_root(true); tree->set_hide_root(true);
tree->set_select_mode(Tree::SELECT_SINGLE); tree->set_select_mode(Tree::SELECT_SINGLE);
tree->set_allow_reselect(true); tree->set_allow_reselect(true);

2
editor/gui/scene_tree_editor.cpp
View File

@ -45,7 +45,6 @@
#include "editor/themes/editor_scale.h" #include "editor/themes/editor_scale.h"
#include "scene/gui/flow_container.h" #include "scene/gui/flow_container.h"
#include "scene/gui/label.h" #include "scene/gui/label.h"
#include "scene/gui/tab_container.h"
#include "scene/gui/texture_rect.h" #include "scene/gui/texture_rect.h"
#include "scene/main/window.h" #include "scene/main/window.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
@ -1513,6 +1512,7 @@ SceneTreeEditor::SceneTreeEditor(bool p_label, bool p_can_rename, bool p_can_ope
} }
tree = memnew(Tree); tree = memnew(Tree);
tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
tree->set_anchor(SIDE_RIGHT, ANCHOR_END); tree->set_anchor(SIDE_RIGHT, ANCHOR_END);
tree->set_anchor(SIDE_BOTTOM, ANCHOR_END); tree->set_anchor(SIDE_BOTTOM, ANCHOR_END);
tree->set_begin(Point2(0, p_label ? 18 : 0)); tree->set_begin(Point2(0, p_label ? 18 : 0));

1
editor/inspector_dock.cpp
View File

@ -702,6 +702,7 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
forward_button->connect("pressed", callable_mp(this, &InspectorDock::_edit_forward)); forward_button->connect("pressed", callable_mp(this, &InspectorDock::_edit_forward));
history_menu = memnew(MenuButton); history_menu = memnew(MenuButton);
history_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
history_menu->set_flat(false); history_menu->set_flat(false);
history_menu->set_theme_type_variation("FlatMenuButton"); history_menu->set_theme_type_variation("FlatMenuButton");
history_menu->set_tooltip_text(TTR("History of recently edited objects.")); history_menu->set_tooltip_text(TTR("History of recently edited objects."));

11
editor/plugins/animation_tree_editor_plugin.cpp
View File

@ -34,25 +34,15 @@
#include "animation_blend_space_2d_editor.h" #include "animation_blend_space_2d_editor.h"
#include "animation_blend_tree_editor_plugin.h" #include "animation_blend_tree_editor_plugin.h"
#include "animation_state_machine_editor.h" #include "animation_state_machine_editor.h"
#include "core/config/project_settings.h"
#include "core/input/input.h"
#include "core/io/resource_loader.h"
#include "core/math/delaunay_2d.h"
#include "core/os/keyboard.h"
#include "editor/editor_command_palette.h" #include "editor/editor_command_palette.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/gui/editor_bottom_panel.h" #include "editor/gui/editor_bottom_panel.h"
#include "editor/gui/editor_file_dialog.h"
#include "editor/themes/editor_scale.h" #include "editor/themes/editor_scale.h"
#include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_blend_tree.h"
#include "scene/animation/animation_player.h"
#include "scene/gui/button.h" #include "scene/gui/button.h"
#include "scene/gui/margin_container.h" #include "scene/gui/margin_container.h"
#include "scene/gui/menu_button.h"
#include "scene/gui/panel.h"
#include "scene/gui/scroll_container.h" #include "scene/gui/scroll_container.h"
#include "scene/gui/separator.h" #include "scene/gui/separator.h"
#include "scene/main/window.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
void AnimationTreeEditor::edit(AnimationTree *p_tree) { void AnimationTreeEditor::edit(AnimationTree *p_tree) {
@ -115,6 +105,7 @@ void AnimationTreeEditor::_update_path() {
path_hb->add_child(b); path_hb->add_child(b);
for (int i = 0; i < button_path.size(); i++) { for (int i = 0; i < button_path.size(); i++) {
b = memnew(Button); b = memnew(Button);
b->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
b->set_text(button_path[i]); b->set_text(button_path[i]);
b->set_toggle_mode(true); b->set_toggle_mode(true);
b->set_button_group(group); b->set_button_group(group);