|
@@ -5292,7 +5292,7 @@ bool EditorNode::immediate_confirmation_dialog(const String &p_text, const Strin
|
|
|
cd->get_label()->set_custom_minimum_size(Size2(p_wrap_width, 0) * EDSCALE);
|
|
|
}
|
|
|
|
|
|
- cd->connect("confirmed", callable_mp(singleton, &EditorNode::_immediate_dialog_confirmed));
|
|
|
+ cd->connect(SceneStringName(confirmed), callable_mp(singleton, &EditorNode::_immediate_dialog_confirmed));
|
|
|
singleton->gui_base->add_child(cd);
|
|
|
|
|
|
cd->popup_centered();
|
|
@@ -6846,7 +6846,7 @@ EditorNode::EditorNode() {
|
|
|
|
|
|
save_accept = memnew(AcceptDialog);
|
|
|
save_accept->set_unparent_when_invisible(true);
|
|
|
- save_accept->connect("confirmed", callable_mp(this, &EditorNode::_menu_option).bind((int)MenuOptions::FILE_SAVE_AS_SCENE));
|
|
|
+ save_accept->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_option).bind((int)MenuOptions::FILE_SAVE_AS_SCENE));
|
|
|
|
|
|
project_export = memnew(ProjectExportDialog);
|
|
|
gui_base->add_child(project_export);
|
|
@@ -7164,7 +7164,7 @@ EditorNode::EditorNode() {
|
|
|
|
|
|
video_restart_dialog = memnew(ConfirmationDialog);
|
|
|
video_restart_dialog->set_ok_button_text(TTR("Save & Restart"));
|
|
|
- video_restart_dialog->connect("confirmed", callable_mp(this, &EditorNode::_menu_option).bind(SET_RENDERER_NAME_SAVE_AND_RESTART));
|
|
|
+ video_restart_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_option).bind(SET_RENDERER_NAME_SAVE_AND_RESTART));
|
|
|
gui_base->add_child(video_restart_dialog);
|
|
|
|
|
|
progress_hb = memnew(BackgroundProgress);
|
|
@@ -7266,13 +7266,13 @@ EditorNode::EditorNode() {
|
|
|
|
|
|
confirmation = memnew(ConfirmationDialog);
|
|
|
gui_base->add_child(confirmation);
|
|
|
- confirmation->connect("confirmed", callable_mp(this, &EditorNode::_menu_confirm_current));
|
|
|
+ confirmation->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_confirm_current));
|
|
|
|
|
|
save_confirmation = memnew(ConfirmationDialog);
|
|
|
save_confirmation->add_button(TTR("Don't Save"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard");
|
|
|
gui_base->add_child(save_confirmation);
|
|
|
save_confirmation->set_min_size(Vector2(450.0 * EDSCALE, 0));
|
|
|
- save_confirmation->connect("confirmed", callable_mp(this, &EditorNode::_menu_confirm_current));
|
|
|
+ save_confirmation->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_confirm_current));
|
|
|
save_confirmation->connect("custom_action", callable_mp(this, &EditorNode::_discard_changes));
|
|
|
save_confirmation->connect("canceled", callable_mp(this, &EditorNode::_cancel_close_scene_tab));
|
|
|
|
|
@@ -7280,7 +7280,7 @@ EditorNode::EditorNode() {
|
|
|
gradle_build_manage_templates->set_text(TTR("Android build template is missing, please install relevant templates."));
|
|
|
gradle_build_manage_templates->set_ok_button_text(TTR("Manage Templates"));
|
|
|
gradle_build_manage_templates->add_button(TTR("Install from file"))->connect(SceneStringName(pressed), callable_mp(this, &EditorNode::_menu_option).bind(SETTINGS_INSTALL_ANDROID_BUILD_TEMPLATE));
|
|
|
- gradle_build_manage_templates->connect("confirmed", callable_mp(this, &EditorNode::_menu_option).bind(SETTINGS_MANAGE_EXPORT_TEMPLATES));
|
|
|
+ gradle_build_manage_templates->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_option).bind(SETTINGS_MANAGE_EXPORT_TEMPLATES));
|
|
|
gui_base->add_child(gradle_build_manage_templates);
|
|
|
|
|
|
file_android_build_source = memnew(EditorFileDialog);
|
|
@@ -7304,7 +7304,7 @@ EditorNode::EditorNode() {
|
|
|
|
|
|
install_android_build_template = memnew(ConfirmationDialog);
|
|
|
install_android_build_template->set_ok_button_text(TTR("Install"));
|
|
|
- install_android_build_template->connect("confirmed", callable_mp(this, &EditorNode::_menu_confirm_current));
|
|
|
+ install_android_build_template->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_confirm_current));
|
|
|
install_android_build_template->add_child(vbox);
|
|
|
install_android_build_template->set_min_size(Vector2(500.0 * EDSCALE, 0));
|
|
|
gui_base->add_child(install_android_build_template);
|
|
@@ -7312,7 +7312,7 @@ EditorNode::EditorNode() {
|
|
|
|
|
|
remove_android_build_template = memnew(ConfirmationDialog);
|
|
|
remove_android_build_template->set_ok_button_text(TTR("Show in File Manager"));
|
|
|
- remove_android_build_template->connect("confirmed", callable_mp(this, &EditorNode::_menu_option).bind(FILE_EXPLORE_ANDROID_BUILD_TEMPLATES));
|
|
|
+ remove_android_build_template->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_option).bind(FILE_EXPLORE_ANDROID_BUILD_TEMPLATES));
|
|
|
gui_base->add_child(remove_android_build_template);
|
|
|
|
|
|
file_templates = memnew(EditorFileDialog);
|
|
@@ -7378,8 +7378,8 @@ EditorNode::EditorNode() {
|
|
|
vbc->add_child(disk_changed_list);
|
|
|
disk_changed_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
|
|
|
|
|
- disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_modified_scenes));
|
|
|
- disk_changed->connect("confirmed", callable_mp(this, &EditorNode::_reload_project_settings));
|
|
|
+ disk_changed->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_reload_modified_scenes));
|
|
|
+ disk_changed->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_reload_project_settings));
|
|
|
disk_changed->set_ok_button_text(TTR("Discard local changes and reload"));
|
|
|
|
|
|
disk_changed->add_button(TTR("Keep local changes and overwrite"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
|
|
@@ -7512,7 +7512,7 @@ EditorNode::EditorNode() {
|
|
|
open_imported = memnew(ConfirmationDialog);
|
|
|
open_imported->set_ok_button_text(TTR("Open Anyway"));
|
|
|
new_inherited_button = open_imported->add_button(TTR("New Inherited"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "inherit");
|
|
|
- open_imported->connect("confirmed", callable_mp(this, &EditorNode::_open_imported));
|
|
|
+ open_imported->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_open_imported));
|
|
|
open_imported->connect("custom_action", callable_mp(this, &EditorNode::_inherit_imported));
|
|
|
gui_base->add_child(open_imported);
|
|
|
|
|
@@ -7548,7 +7548,7 @@ EditorNode::EditorNode() {
|
|
|
pick_main_scene = memnew(ConfirmationDialog);
|
|
|
gui_base->add_child(pick_main_scene);
|
|
|
pick_main_scene->set_ok_button_text(TTR("Select"));
|
|
|
- pick_main_scene->connect("confirmed", callable_mp(this, &EditorNode::_menu_option).bind(SETTINGS_PICK_MAIN_SCENE));
|
|
|
+ pick_main_scene->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_option).bind(SETTINGS_PICK_MAIN_SCENE));
|
|
|
select_current_scene_button = pick_main_scene->add_button(TTR("Select Current"), true, "select_current");
|
|
|
pick_main_scene->connect("custom_action", callable_mp(this, &EditorNode::_pick_main_scene_custom_action));
|
|
|
|