Skip to content

Commit eaa0a00

Browse files
RepiteoRepiteo
committed
Merge pull request #108457 from KoBeWi/worldwide_debugging
Improve auto-translation of Debugger
2 parents 34e5b4e + 448a605 commit eaa0a00

File tree

8 files changed

+171
-121
lines changed

8 files changed

+171
-121
lines changed

‎editor/debugger/editor_expression_evaluator.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,19 +165,19 @@ EditorExpressionEvaluator::EditorExpressionEvaluator() {
165165

166166
clear_on_run_checkbox = memnew(CheckBox);
167167
clear_on_run_checkbox->set_h_size_flags(Control::SIZE_SHRINK_CENTER);
168-
clear_on_run_checkbox->set_text(TTR("Clear on Run"));
168+
clear_on_run_checkbox->set_text(TTRC("Clear on Run"));
169169
clear_on_run_checkbox->set_pressed(true);
170170
hb->add_child(clear_on_run_checkbox);
171171

172172
evaluate_btn = memnew(Button);
173173
evaluate_btn->set_h_size_flags(Control::SIZE_SHRINK_CENTER);
174-
evaluate_btn->set_text(TTR("Evaluate"));
174+
evaluate_btn->set_text(TTRC("Evaluate"));
175175
evaluate_btn->connect(SceneStringName(pressed), callable_mp(this, &EditorExpressionEvaluator::_evaluate));
176176
hb->add_child(evaluate_btn);
177177

178178
clear_btn = memnew(Button);
179179
clear_btn->set_h_size_flags(Control::SIZE_SHRINK_CENTER);
180-
clear_btn->set_text(TTR("Clear"));
180+
clear_btn->set_text(TTRC("Clear"));
181181
clear_btn->connect(SceneStringName(pressed), callable_mp(this, &EditorExpressionEvaluator::_clear));
182182
hb->add_child(clear_btn);
183183

‎editor/debugger/editor_performance_profiler.cpp‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ TreeItem *EditorPerformanceProfiler::_get_monitor_base(const StringName &p_base_
242242

243243
TreeItem *base = monitor_tree->create_item(monitor_tree->get_root());
244244
base->set_text(0, EditorPropertyNameProcessor::get_singleton()->process_name(p_base_name, EditorPropertyNameProcessor::get_settings_style()));
245+
base->set_auto_translate_mode(0, AUTO_TRANSLATE_MODE_DISABLED);
245246
base->set_editable(0, false);
246247
base->set_selectable(0, false);
247248
base->set_expand_right(0, true);
@@ -386,6 +387,15 @@ List<float> *EditorPerformanceProfiler::get_monitor_data(const StringName &p_nam
386387

387388
void EditorPerformanceProfiler::_notification(int p_what) {
388389
switch (p_what) {
390+
case NOTIFICATION_TRANSLATION_CHANGED: {
391+
if (is_ready()) {
392+
_build_monitor_tree();
393+
if (monitor_draw->is_visible_in_tree()) {
394+
monitor_draw->queue_redraw();
395+
}
396+
}
397+
} break;
398+
389399
case NOTIFICATION_THEME_CHANGED: {
390400
for (KeyValue<StringName, TreeItem *> &E : base_map) {
391401
E.value->set_custom_font(0, get_theme_font(SNAME("bold"), EditorStringName(EditorFonts)));
@@ -401,16 +411,15 @@ void EditorPerformanceProfiler::_notification(int p_what) {
401411
}
402412

403413
EditorPerformanceProfiler::EditorPerformanceProfiler() {
404-
set_name(TTR("Monitors"));
414+
set_name(TTRC("Monitors"));
405415
set_split_offset(340 * EDSCALE);
406416

407417
monitor_tree = memnew(Tree);
408418
monitor_tree->set_custom_minimum_size(Size2(300, 0) * EDSCALE);
409-
monitor_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
410419
monitor_tree->set_columns(2);
411-
monitor_tree->set_column_title(0, TTR("Monitor"));
420+
monitor_tree->set_column_title(0, TTRC("Monitor"));
412421
monitor_tree->set_column_expand(0, true);
413-
monitor_tree->set_column_title(1, TTR("Value"));
422+
monitor_tree->set_column_title(1, TTRC("Value"));
414423
monitor_tree->set_column_custom_minimum_width(1, 100 * EDSCALE);
415424
monitor_tree->set_column_expand(1, false);
416425
monitor_tree->set_column_titles_visible(true);
@@ -429,7 +438,7 @@ EditorPerformanceProfiler::EditorPerformanceProfiler() {
429438

430439
info_message = memnew(Label);
431440
info_message->set_focus_mode(FOCUS_ACCESSIBILITY);
432-
info_message->set_text(TTR("Pick one or more items from the list to display the graph."));
441+
info_message->set_text(TTRC("Pick one or more items from the list to display the graph."));
433442
info_message->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER);
434443
info_message->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
435444
info_message->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);

‎editor/debugger/editor_profiler.cpp‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ void EditorProfiler::_update_frame() {
359359
category->set_editable(0, true);
360360
category->set_metadata(0, m.categories[i].signature);
361361
category->set_text(0, String(m.categories[i].name));
362+
category->set_auto_translate_mode(0, AUTO_TRANSLATE_MODE_DISABLED);
362363
category->set_text(1, _get_time_as_text(m, m.categories[i].total_time, 1));
363364

364365
if (plot_sigs.has(m.categories[i].signature)) {
@@ -376,6 +377,7 @@ void EditorProfiler::_update_frame() {
376377
item->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
377378
item->set_editable(0, true);
378379
item->set_text(0, it.name);
380+
item->set_auto_translate_mode(0, AUTO_TRANSLATE_MODE_DISABLED);
379381
item->set_metadata(0, it.signature);
380382
item->set_metadata(1, it.script);
381383
item->set_metadata(2, it.line);
@@ -404,10 +406,10 @@ void EditorProfiler::_update_frame() {
404406
void EditorProfiler::_update_button_text() {
405407
if (activate->is_pressed()) {
406408
activate->set_button_icon(get_editor_theme_icon(SNAME("Stop")));
407-
activate->set_text(TTR("Stop"));
409+
activate->set_text(TTRC("Stop"));
408410
} else {
409411
activate->set_button_icon(get_editor_theme_icon(SNAME("Play")));
410-
activate->set_text(TTR("Start"));
412+
activate->set_text(TTRC("Start"));
411413
}
412414
}
413415

@@ -438,9 +440,14 @@ void EditorProfiler::_autostart_toggled(bool p_toggled_on) {
438440

439441
void EditorProfiler::_notification(int p_what) {
440442
switch (p_what) {
441-
case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
442-
case NOTIFICATION_THEME_CHANGED:
443443
case NOTIFICATION_TRANSLATION_CHANGED: {
444+
if (is_ready()) {
445+
_update_frame();
446+
}
447+
[[fallthrough]];
448+
}
449+
case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
450+
case NOTIFICATION_THEME_CHANGED: {
444451
activate->set_button_icon(get_editor_theme_icon(SNAME("Play")));
445452
clear_button->set_button_icon(get_editor_theme_icon(SNAME("Clear")));
446453

@@ -673,18 +680,18 @@ EditorProfiler::EditorProfiler() {
673680
activate = memnew(Button);
674681
activate->set_toggle_mode(true);
675682
activate->set_disabled(true);
676-
activate->set_text(TTR("Start"));
683+
activate->set_text(TTRC("Start"));
677684
activate->connect(SceneStringName(pressed), callable_mp(this, &EditorProfiler::_activate_pressed));
678685
container->add_child(activate);
679686

680687
clear_button = memnew(Button);
681-
clear_button->set_text(TTR("Clear"));
688+
clear_button->set_text(TTRC("Clear"));
682689
clear_button->connect(SceneStringName(pressed), callable_mp(this, &EditorProfiler::_clear_pressed));
683690
clear_button->set_disabled(true);
684691
container->add_child(clear_button);
685692

686693
CheckBox *autostart_checkbox = memnew(CheckBox);
687-
autostart_checkbox->set_text(TTR("Autostart"));
694+
autostart_checkbox->set_text(TTRC("Autostart"));
688695
autostart_checkbox->set_pressed(EditorSettings::get_singleton()->get_project_metadata("debug_options", "autostart_profiler", false));
689696
autostart_checkbox->connect(SceneStringName(toggled), callable_mp(this, &EditorProfiler::_autostart_toggled));
690697
container->add_child(autostart_checkbox);
@@ -693,14 +700,14 @@ EditorProfiler::EditorProfiler() {
693700
hb_measure->add_theme_constant_override(SNAME("separation"), 2 * EDSCALE);
694701
container->add_child(hb_measure);
695702

696-
hb_measure->add_child(memnew(Label(TTR("Measure:"))));
703+
hb_measure->add_child(memnew(Label(TTRC("Measure:"))));
697704

698705
display_mode = memnew(OptionButton);
699706
display_mode->set_accessibility_name(TTRC("Measure:"));
700-
display_mode->add_item(TTR("Frame Time (ms)"));
701-
display_mode->add_item(TTR("Average Time (ms)"));
702-
display_mode->add_item(TTR("Frame %"));
703-
display_mode->add_item(TTR("Physics Frame %"));
707+
display_mode->add_item(TTRC("Frame Time (ms)"));
708+
display_mode->add_item(TTRC("Average Time (ms)"));
709+
display_mode->add_item(TTRC("Frame %"));
710+
display_mode->add_item(TTRC("Physics Frame %"));
704711
display_mode->connect(SceneStringName(item_selected), callable_mp(this, &EditorProfiler::_combo_changed));
705712

706713
hb_measure->add_child(display_mode);
@@ -709,19 +716,19 @@ EditorProfiler::EditorProfiler() {
709716
hb_time->add_theme_constant_override(SNAME("separation"), 2 * EDSCALE);
710717
container->add_child(hb_time);
711718

712-
hb_time->add_child(memnew(Label(TTR("Time:"))));
719+
hb_time->add_child(memnew(Label(TTRC("Time:"))));
713720

714721
display_time = memnew(OptionButton);
715722
display_time->set_accessibility_name(TTRC("Time:"));
716723
// 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.
717-
display_time->add_item(TTR("Inclusive"));
724+
display_time->add_item(TTRC("Inclusive"));
718725
// 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.
719-
display_time->add_item(TTR("Self"));
720-
display_time->set_tooltip_text(TTR("Inclusive: Includes time from other functions called by this function.\nUse this to spot bottlenecks.\n\nSelf: Only count the time spent in the function itself, not in other functions called by that function.\nUse this to find individual functions to optimize."));
726+
display_time->add_item(TTRC("Self"));
727+
display_time->set_tooltip_text(TTRC("Inclusive: Includes time from other functions called by this function.\nUse this to spot bottlenecks.\n\nSelf: Only count the time spent in the function itself, not in other functions called by that function.\nUse this to find individual functions to optimize."));
721728
display_time->connect(SceneStringName(item_selected), callable_mp(this, &EditorProfiler::_combo_changed));
722729
hb_time->add_child(display_time);
723730

724-
display_internal_profiles = memnew(CheckButton(TTR("Display internal functions")));
731+
display_internal_profiles = memnew(CheckButton(TTRC("Display internal functions")));
725732
display_internal_profiles->set_visible(EDITOR_GET("debugger/profile_native_calls"));
726733
display_internal_profiles->set_pressed(false);
727734
display_internal_profiles->connect(SceneStringName(pressed), callable_mp(this, &EditorProfiler::_internal_profiles_pressed));
@@ -732,7 +739,7 @@ EditorProfiler::EditorProfiler() {
732739
hb_frame->set_v_size_flags(SIZE_SHRINK_BEGIN);
733740
hb->add_child(hb_frame);
734741

735-
hb_frame->add_child(memnew(Label(TTR("Frame #:"))));
742+
hb_frame->add_child(memnew(Label(TTRC("Frame #:"))));
736743

737744
cursor_metric_edit = memnew(SpinBox);
738745
cursor_metric_edit->set_accessibility_name(TTRC("Frame #:"));
@@ -747,22 +754,21 @@ EditorProfiler::EditorProfiler() {
747754
h_split->set_v_size_flags(SIZE_EXPAND_FILL);
748755

749756
variables = memnew(Tree);
750-
variables->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
751757
variables->set_custom_minimum_size(Size2(320, 0) * EDSCALE);
752758
variables->set_hide_folding(true);
753759
h_split->add_child(variables);
754760
variables->set_hide_root(true);
755761
variables->set_columns(3);
756762
variables->set_column_titles_visible(true);
757-
variables->set_column_title(0, TTR("Name"));
763+
variables->set_column_title(0, TTRC("Name"));
758764
variables->set_column_expand(0, true);
759765
variables->set_column_clip_content(0, true);
760766
variables->set_column_custom_minimum_width(0, 60);
761-
variables->set_column_title(1, TTR("Time"));
767+
variables->set_column_title(1, TTRC("Time"));
762768
variables->set_column_expand(1, false);
763769
variables->set_column_clip_content(1, true);
764770
variables->set_column_custom_minimum_width(1, 75 * EDSCALE);
765-
variables->set_column_title(2, TTR("Calls"));
771+
variables->set_column_title(2, TTRC("Calls"));
766772
variables->set_column_expand(2, false);
767773
variables->set_column_clip_content(2, true);
768774
variables->set_column_custom_minimum_width(2, 50 * EDSCALE);

‎editor/debugger/editor_visual_profiler.cpp‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -422,12 +422,12 @@ void EditorVisualProfiler::_update_frame(bool p_focus_selected) {
422422
void EditorVisualProfiler::_activate_pressed() {
423423
if (activate->is_pressed()) {
424424
activate->set_button_icon(get_editor_theme_icon(SNAME("Stop")));
425-
activate->set_text(TTR("Stop"));
425+
activate->set_text(TTRC("Stop"));
426426
_clear_pressed(); //always clear on start
427427
clear_button->set_disabled(false);
428428
} else {
429429
activate->set_button_icon(get_editor_theme_icon(SNAME("Play")));
430-
activate->set_text(TTR("Start"));
430+
activate->set_text(TTRC("Start"));
431431
}
432432
emit_signal(SNAME("enable_profiling"), activate->is_pressed());
433433
}
@@ -445,9 +445,14 @@ void EditorVisualProfiler::_autostart_toggled(bool p_toggled_on) {
445445

446446
void EditorVisualProfiler::_notification(int p_what) {
447447
switch (p_what) {
448-
case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
449-
case NOTIFICATION_THEME_CHANGED:
450448
case NOTIFICATION_TRANSLATION_CHANGED: {
449+
if (is_ready()) {
450+
_update_frame();
451+
}
452+
[[fallthrough]];
453+
}
454+
case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
455+
case NOTIFICATION_THEME_CHANGED: {
451456
activate->set_button_icon(get_editor_theme_icon(SNAME("Play")));
452457
clear_button->set_button_icon(get_editor_theme_icon(SNAME("Clear")));
453458
} break;
@@ -668,10 +673,10 @@ void EditorVisualProfiler::_bind_methods() {
668673
void EditorVisualProfiler::_update_button_text() {
669674
if (activate->is_pressed()) {
670675
activate->set_button_icon(get_editor_theme_icon(SNAME("Stop")));
671-
activate->set_text(TTR("Stop"));
676+
activate->set_text(TTRC("Stop"));
672677
} else {
673678
activate->set_button_icon(get_editor_theme_icon(SNAME("Play")));
674-
activate->set_text(TTR("Start"));
679+
activate->set_text(TTRC("Start"));
675680
}
676681
}
677682

@@ -757,18 +762,18 @@ EditorVisualProfiler::EditorVisualProfiler() {
757762
activate = memnew(Button);
758763
activate->set_toggle_mode(true);
759764
activate->set_disabled(true);
760-
activate->set_text(TTR("Start"));
765+
activate->set_text(TTRC("Start"));
761766
activate->connect(SceneStringName(pressed), callable_mp(this, &EditorVisualProfiler::_activate_pressed));
762767
container->add_child(activate);
763768

764769
clear_button = memnew(Button);
765-
clear_button->set_text(TTR("Clear"));
770+
clear_button->set_text(TTRC("Clear"));
766771
clear_button->set_disabled(true);
767772
clear_button->connect(SceneStringName(pressed), callable_mp(this, &EditorVisualProfiler::_clear_pressed));
768773
container->add_child(clear_button);
769774

770775
CheckBox *autostart_checkbox = memnew(CheckBox);
771-
autostart_checkbox->set_text(TTR("Autostart"));
776+
autostart_checkbox->set_text(TTRC("Autostart"));
772777
autostart_checkbox->set_pressed(EditorSettings::get_singleton()->get_project_metadata("debug_options", "autostart_visual_profiler", false));
773778
autostart_checkbox->connect(SceneStringName(toggled), callable_mp(this, &EditorVisualProfiler::_autostart_toggled));
774779
container->add_child(autostart_checkbox);
@@ -777,21 +782,21 @@ EditorVisualProfiler::EditorVisualProfiler() {
777782
hb_measure->add_theme_constant_override(SNAME("separation"), 2 * EDSCALE);
778783
container->add_child(hb_measure);
779784

780-
hb_measure->add_child(memnew(Label(TTR("Measure:"))));
785+
hb_measure->add_child(memnew(Label(TTRC("Measure:"))));
781786

782787
display_mode = memnew(OptionButton);
783788
display_mode->set_accessibility_name(TTRC("Measure:"));
784-
display_mode->add_item(TTR("Frame Time (ms)"));
785-
display_mode->add_item(TTR("Frame %"));
789+
display_mode->add_item(TTRC("Frame Time (ms)"));
790+
display_mode->add_item(TTRC("Frame %"));
786791
display_mode->connect(SceneStringName(item_selected), callable_mp(this, &EditorVisualProfiler::_combo_changed));
787792

788793
hb_measure->add_child(display_mode);
789794

790-
frame_relative = memnew(CheckBox(TTR("Fit to Frame")));
795+
frame_relative = memnew(CheckBox(TTRC("Fit to Frame")));
791796
frame_relative->set_pressed(true);
792797
container->add_child(frame_relative);
793798
frame_relative->connect(SceneStringName(pressed), callable_mp(this, &EditorVisualProfiler::_update_plot));
794-
linked = memnew(CheckBox(TTR("Linked")));
799+
linked = memnew(CheckBox(TTRC("Linked")));
795800
linked->set_pressed(true);
796801
container->add_child(linked);
797802
linked->connect(SceneStringName(pressed), callable_mp(this, &EditorVisualProfiler::_update_plot));
@@ -801,7 +806,7 @@ EditorVisualProfiler::EditorVisualProfiler() {
801806
hb_frame->set_v_size_flags(SIZE_SHRINK_BEGIN);
802807
hb->add_child(hb_frame);
803808

804-
hb_frame->add_child(memnew(Label(TTR("Frame #:"))));
809+
hb_frame->add_child(memnew(Label(TTRC("Frame #:"))));
805810

806811
cursor_metric_edit = memnew(SpinBox);
807812
cursor_metric_edit->set_accessibility_name(TTRC("Frame #:"));
@@ -820,15 +825,15 @@ EditorVisualProfiler::EditorVisualProfiler() {
820825
variables->set_hide_root(true);
821826
variables->set_columns(3);
822827
variables->set_column_titles_visible(true);
823-
variables->set_column_title(0, TTR("Name"));
828+
variables->set_column_title(0, TTRC("Name"));
824829
variables->set_column_expand(0, true);
825830
variables->set_column_clip_content(0, true);
826831
variables->set_column_custom_minimum_width(0, 60);
827-
variables->set_column_title(1, TTR("CPU"));
832+
variables->set_column_title(1, TTRC("CPU"));
828833
variables->set_column_expand(1, false);
829834
variables->set_column_clip_content(1, true);
830835
variables->set_column_custom_minimum_width(1, 75 * EDSCALE);
831-
variables->set_column_title(2, TTR("GPU"));
836+
variables->set_column_title(2, TTRC("GPU"));
832837
variables->set_column_expand(2, false);
833838
variables->set_column_clip_content(2, true);
834839
variables->set_column_custom_minimum_width(2, 75 * EDSCALE);

0 commit comments

Comments
 (0)