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

Merge pull request #97398 from timothyqiu/color-picker-etr 

Add missing `ETR` macros in `ColorPicker`
This commit is contained in:
Rémi Verschelde 2024-09-25 12:39:29 +02:00
parent 5d5cdc02c5 2e57089135
commit ca1a390050
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/gui/color_picker.cpp
View File

@ -33,8 +33,6 @@
#include "core/input/input.h" #include "core/input/input.h"
#include "core/io/image.h" #include "core/io/image.h"
#include "core/math/color.h" #include "core/math/color.h"
#include "core/os/keyboard.h"
#include "core/os/os.h"
#include "scene/gui/color_mode.h" #include "scene/gui/color_mode.h"
#include "scene/gui/margin_container.h" #include "scene/gui/margin_container.h"
#include "scene/resources/image_texture.h" #include "scene/resources/image_texture.h"
@ -42,7 +40,6 @@
#include "scene/resources/style_box_texture.h" #include "scene/resources/style_box_texture.h"
#include "scene/theme/theme_db.h" #include "scene/theme/theme_db.h"
#include "servers/display_server.h" #include "servers/display_server.h"
#include "thirdparty/misc/ok_color.h"
#include "thirdparty/misc/ok_color_shader.h" #include "thirdparty/misc/ok_color_shader.h"
List<Color> ColorPicker::preset_cache; List<Color> ColorPicker::preset_cache;
@ -1567,7 +1564,7 @@ void ColorPicker::_pick_button_pressed_legacy() {
picker_preview_label = memnew(Label); picker_preview_label = memnew(Label);
picker_preview->set_anchors_preset(Control::PRESET_CENTER_TOP); picker_preview->set_anchors_preset(Control::PRESET_CENTER_TOP);
picker_preview_label->set_text("Color Picking active"); picker_preview_label->set_text(ETR("Color Picking active"));
picker_preview->add_child(picker_preview_label); picker_preview->add_child(picker_preview_label);
picker_preview_style_box = (Ref<StyleBoxFlat>)memnew(StyleBoxFlat); picker_preview_style_box = (Ref<StyleBoxFlat>)memnew(StyleBoxFlat);
@ -1905,7 +1902,7 @@ ColorPicker::ColorPicker() {
mode_popup->add_radio_check_item(modes[i]->get_name(), i); mode_popup->add_radio_check_item(modes[i]->get_name(), i);
} }
mode_popup->add_separator(); mode_popup->add_separator();
mode_popup->add_check_item("Colorized Sliders", MODE_MAX); mode_popup->add_check_item(ETR("Colorized Sliders"), MODE_MAX);
mode_popup->set_item_checked(current_mode, true); mode_popup->set_item_checked(current_mode, true);
mode_popup->set_item_checked(MODE_MAX + 1, true); mode_popup->set_item_checked(MODE_MAX + 1, true);
mode_popup->connect(SceneStringName(id_pressed), callable_mp(this, &ColorPicker::_set_mode_popup_value)); mode_popup->connect(SceneStringName(id_pressed), callable_mp(this, &ColorPicker::_set_mode_popup_value));
@ -1933,7 +1930,7 @@ ColorPicker::ColorPicker() {
hex_hbc->set_alignment(ALIGNMENT_BEGIN); hex_hbc->set_alignment(ALIGNMENT_BEGIN);
vbr->add_child(hex_hbc); vbr->add_child(hex_hbc);
hex_hbc->add_child(memnew(Label("Hex"))); hex_hbc->add_child(memnew(Label(ETR("Hex"))));
text_type = memnew(Button); text_type = memnew(Button);
hex_hbc->add_child(text_type); hex_hbc->add_child(text_type);
@ -1997,8 +1994,7 @@ ColorPicker::ColorPicker() {
preset_group.instantiate(); preset_group.instantiate();
btn_preset = memnew(Button); btn_preset = memnew(Button(ETR("Swatches")));
btn_preset->set_text("Swatches");
btn_preset->set_flat(true); btn_preset->set_flat(true);
btn_preset->set_toggle_mode(true); btn_preset->set_toggle_mode(true);
btn_preset->set_focus_mode(FOCUS_NONE); btn_preset->set_focus_mode(FOCUS_NONE);
@ -2014,8 +2010,7 @@ ColorPicker::ColorPicker() {
recent_preset_group.instantiate(); recent_preset_group.instantiate();
btn_recent_preset = memnew(Button); btn_recent_preset = memnew(Button(ETR("Recent Colors")));
btn_recent_preset->set_text("Recent Colors");
btn_recent_preset->set_flat(true); btn_recent_preset->set_flat(true);
btn_recent_preset->set_toggle_mode(true); btn_recent_preset->set_toggle_mode(true);
btn_recent_preset->set_focus_mode(FOCUS_NONE); btn_recent_preset->set_focus_mode(FOCUS_NONE);