Skip to content

Commit ca1a390

Browse files
committed
Merge pull request godotengine#97398 from timothyqiu/color-picker-etr
Add missing `ETR` macros in `ColorPicker`
2 parents 5d5cdc0 + 2e57089 commit ca1a390

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

scene/gui/color_picker.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,13 @@
3333
#include "core/input/input.h"
3434
#include "core/io/image.h"
3535
#include "core/math/color.h"
36-
#include "core/os/keyboard.h"
37-
#include "core/os/os.h"
3836
#include "scene/gui/color_mode.h"
3937
#include "scene/gui/margin_container.h"
4038
#include "scene/resources/image_texture.h"
4139
#include "scene/resources/style_box_flat.h"
4240
#include "scene/resources/style_box_texture.h"
4341
#include "scene/theme/theme_db.h"
4442
#include "servers/display_server.h"
45-
#include "thirdparty/misc/ok_color.h"
4643
#include "thirdparty/misc/ok_color_shader.h"
4744

4845
List<Color> ColorPicker::preset_cache;
@@ -1567,7 +1564,7 @@ void ColorPicker::_pick_button_pressed_legacy() {
15671564

15681565
picker_preview_label = memnew(Label);
15691566
picker_preview->set_anchors_preset(Control::PRESET_CENTER_TOP);
1570-
picker_preview_label->set_text("Color Picking active");
1567+
picker_preview_label->set_text(ETR("Color Picking active"));
15711568
picker_preview->add_child(picker_preview_label);
15721569

15731570
picker_preview_style_box = (Ref<StyleBoxFlat>)memnew(StyleBoxFlat);
@@ -1905,7 +1902,7 @@ ColorPicker::ColorPicker() {
19051902
mode_popup->add_radio_check_item(modes[i]->get_name(), i);
19061903
}
19071904
mode_popup->add_separator();
1908-
mode_popup->add_check_item("Colorized Sliders", MODE_MAX);
1905+
mode_popup->add_check_item(ETR("Colorized Sliders"), MODE_MAX);
19091906
mode_popup->set_item_checked(current_mode, true);
19101907
mode_popup->set_item_checked(MODE_MAX + 1, true);
19111908
mode_popup->connect(SceneStringName(id_pressed), callable_mp(this, &ColorPicker::_set_mode_popup_value));
@@ -1933,7 +1930,7 @@ ColorPicker::ColorPicker() {
19331930
hex_hbc->set_alignment(ALIGNMENT_BEGIN);
19341931
vbr->add_child(hex_hbc);
19351932

1936-
hex_hbc->add_child(memnew(Label("Hex")));
1933+
hex_hbc->add_child(memnew(Label(ETR("Hex"))));
19371934

19381935
text_type = memnew(Button);
19391936
hex_hbc->add_child(text_type);
@@ -1997,8 +1994,7 @@ ColorPicker::ColorPicker() {
19971994

19981995
preset_group.instantiate();
19991996

2000-
btn_preset = memnew(Button);
2001-
btn_preset->set_text("Swatches");
1997+
btn_preset = memnew(Button(ETR("Swatches")));
20021998
btn_preset->set_flat(true);
20031999
btn_preset->set_toggle_mode(true);
20042000
btn_preset->set_focus_mode(FOCUS_NONE);
@@ -2014,8 +2010,7 @@ ColorPicker::ColorPicker() {
20142010

20152011
recent_preset_group.instantiate();
20162012

2017-
btn_recent_preset = memnew(Button);
2018-
btn_recent_preset->set_text("Recent Colors");
2013+
btn_recent_preset = memnew(Button(ETR("Recent Colors")));
20192014
btn_recent_preset->set_flat(true);
20202015
btn_recent_preset->set_toggle_mode(true);
20212016
btn_recent_preset->set_focus_mode(FOCUS_NONE);

0 commit comments

Comments
 (0)