Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #62827 from fire-forge/ok-cancel

Browse source 
Add `ok_button_text` to AcceptDialog and `cancel_button_text` to ConfirmationDialog
This commit is contained in:
Rémi Verschelde 2022-07-13 14:10:38 +02:00 • committed by GitHub
commit b942c1ffe3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 188 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
editor/plugins/tiles/atlas_merging_dialog.cpp
View file

@ -256,7 +256,7 @@ AtlasMergingDialog::AtlasMergingDialog() {
set_hide_on_ok(false);
// Ok buttons
get_ok_button()->set_text(TTR("Merge (Keep original Atlases)"));
set_ok_button_text(TTR("Merge (Keep original Atlases)"));
get_ok_button()->set_disabled(true);
merge_button = add_button(TTR("Merge"), true, "merge");
merge_button->set_disabled(true);

2
editor/plugins/tiles/tile_set_atlas_source_editor.cpp
View file

@ -2405,7 +2405,7 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
confirm_auto_create_tiles = memnew(AcceptDialog);
confirm_auto_create_tiles->set_title(TTR("Auto Create Tiles in Non-Transparent Texture Regions?"));
confirm_auto_create_tiles->set_text(TTR("The atlas's texture was modified.\nWould you like to automatically create tiles in the atlas?"));
confirm_auto_create_tiles->get_ok_button()->set_text(TTR("Yes"));
confirm_auto_create_tiles->set_ok_button_text(TTR("Yes"));
confirm_auto_create_tiles->add_cancel_button()->set_text(TTR("No"));
confirm_auto_create_tiles->connect("confirmed", callable_mp(this, &TileSetAtlasSourceEditor::_auto_create_tiles));
add_child(confirm_auto_create_tiles);