From ca18a06ecbf68db50d8d7e7391b73a245c745cea Mon Sep 17 00:00:00 2001 From: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> Date: Tue, 14 May 2024 14:28:18 +0200 Subject: [PATCH] [Scene] Add `SceneStringNames::confirmed` --- editor/action_map_editor.cpp | 2 +- editor/animation_track_editor.cpp | 14 +++++------ editor/connections_dialog.cpp | 2 +- editor/create_dialog.cpp | 4 ++-- editor/dependency_editor.cpp | 4 ++-- editor/editor_build_profile.cpp | 2 +- editor/editor_command_palette.cpp | 2 +- editor/editor_feature_profile.cpp | 4 ++-- editor/editor_help_search.cpp | 2 +- editor/editor_inspector.cpp | 4 ++-- editor/editor_node.cpp | 24 +++++++++---------- editor/editor_properties.cpp | 2 +- editor/editor_quick_open.cpp | 4 ++-- editor/editor_resource_picker.cpp | 2 +- editor/editor_run_native.cpp | 2 +- editor/editor_settings_dialog.cpp | 2 +- editor/export/export_template_manager.cpp | 4 ++-- editor/export/project_export.cpp | 4 ++-- editor/fbx_importer_manager.cpp | 2 +- editor/filesystem_dock.cpp | 6 ++--- editor/group_settings_editor.cpp | 4 ++-- editor/groups_editor.cpp | 6 ++--- editor/gui/editor_file_dialog.cpp | 8 +++---- editor/gui/scene_tree_editor.cpp | 4 ++-- editor/import/3d/scene_import_settings.cpp | 4 ++-- .../import/audio_stream_import_settings.cpp | 2 +- .../import/dynamic_font_import_settings.cpp | 2 +- editor/import_dock.cpp | 2 +- editor/inspector_dock.cpp | 2 +- editor/plugins/abstract_polygon_2d_editor.cpp | 2 +- editor/plugins/animation_library_editor.cpp | 2 +- .../animation_player_editor_plugin.cpp | 4 ++-- .../plugins/asset_library_editor_plugin.cpp | 4 ++-- editor/plugins/bone_map_editor_plugin.cpp | 2 +- editor/plugins/canvas_item_editor_plugin.cpp | 4 ++-- .../cpu_particles_2d_editor_plugin.cpp | 2 +- .../cpu_particles_3d_editor_plugin.cpp | 2 +- .../gpu_particles_2d_editor_plugin.cpp | 4 ++-- .../gpu_particles_3d_editor_plugin.cpp | 4 ++-- editor/plugins/input_event_editor_plugin.cpp | 2 +- .../mesh_instance_3d_editor_plugin.cpp | 4 ++-- editor/plugins/node_3d_editor_plugin.cpp | 6 ++--- editor/plugins/path_2d_editor_plugin.cpp | 2 +- editor/plugins/path_3d_editor_plugin.cpp | 2 +- editor/plugins/plugin_config_dialog.cpp | 2 +- editor/plugins/polygon_2d_editor_plugin.cpp | 2 +- editor/plugins/root_motion_editor_plugin.cpp | 2 +- editor/plugins/script_editor_plugin.cpp | 8 +++---- editor/plugins/sprite_2d_editor_plugin.cpp | 2 +- .../plugins/sprite_frames_editor_plugin.cpp | 4 ++-- editor/plugins/text_shader_editor.cpp | 2 +- editor/plugins/theme_editor_plugin.cpp | 6 ++--- .../tiles/tile_set_atlas_source_editor.cpp | 2 +- editor/plugins/tiles/tile_set_editor.cpp | 2 +- editor/project_manager.cpp | 2 +- editor/property_selector.cpp | 4 ++-- editor/reparent_dialog.cpp | 4 ++-- editor/scene_create_dialog.cpp | 2 +- editor/scene_tree_dock.cpp | 18 +++++++------- editor/surface_upgrade_tool.cpp | 2 +- .../editor/editor_scene_importer_blend.cpp | 2 +- .../multiplayer/editor/replication_editor.cpp | 2 +- scene/gui/dialogs.cpp | 2 +- scene/gui/file_dialog.cpp | 6 ++--- scene/scene_string_names.cpp | 2 ++ scene/scene_string_names.h | 2 ++ 66 files changed, 128 insertions(+), 124 deletions(-) diff --git a/editor/action_map_editor.cpp b/editor/action_map_editor.cpp index f70730d5401..73ccfd0564e 100644 --- a/editor/action_map_editor.cpp +++ b/editor/action_map_editor.cpp @@ -614,7 +614,7 @@ ActionMapEditor::ActionMapEditor() { // Adding event dialog event_config_dialog = memnew(InputEventConfigurationDialog); - event_config_dialog->connect("confirmed", callable_mp(this, &ActionMapEditor::_event_config_confirmed)); + event_config_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ActionMapEditor::_event_config_confirmed)); add_child(event_config_dialog); message = memnew(AcceptDialog); diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index fc9212ba18f..f2575f2e1d2 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -7406,7 +7406,7 @@ AnimationTrackEditor::AnimationTrackEditor() { insert_confirm = memnew(ConfirmationDialog); add_child(insert_confirm); - insert_confirm->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_confirm_insert_list)); + insert_confirm->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_confirm_insert_list)); VBoxContainer *icvb = memnew(VBoxContainer); insert_confirm->add_child(icvb); insert_confirm_text = memnew(Label); @@ -7463,7 +7463,7 @@ AnimationTrackEditor::AnimationTrackEditor() { optimize_vb->add_margin_child(TTR("Max Precision Error:"), optimize_precision_error); optimize_dialog->set_ok_button_text(TTR("Optimize")); - optimize_dialog->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_OPTIMIZE_ANIMATION_CONFIRM)); + optimize_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_OPTIMIZE_ANIMATION_CONFIRM)); // cleanup_dialog = memnew(ConfirmationDialog); @@ -7498,7 +7498,7 @@ AnimationTrackEditor::AnimationTrackEditor() { cleanup_dialog->set_title(TTR("Clean-Up Animation(s) (NO UNDO!)")); cleanup_dialog->set_ok_button_text(TTR("Clean-Up")); - cleanup_dialog->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_CLEAN_UP_ANIMATION_CONFIRM)); + cleanup_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_CLEAN_UP_ANIMATION_CONFIRM)); // scale_dialog = memnew(ConfirmationDialog); @@ -7510,13 +7510,13 @@ AnimationTrackEditor::AnimationTrackEditor() { scale->set_max(99999); scale->set_step(0.001); vbc->add_margin_child(TTR("Scale Ratio:"), scale); - scale_dialog->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_SCALE_CONFIRM)); + scale_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_SCALE_CONFIRM)); add_child(scale_dialog); // ease_dialog = memnew(ConfirmationDialog); ease_dialog->set_title(TTR("Select Transition and Easing")); - ease_dialog->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_EASE_CONFIRM)); + ease_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_EASE_CONFIRM)); add_child(ease_dialog); GridContainer *ease_grid = memnew(GridContainer); ease_grid->set_columns(2); @@ -7558,7 +7558,7 @@ AnimationTrackEditor::AnimationTrackEditor() { // bake_dialog = memnew(ConfirmationDialog); bake_dialog->set_title(TTR("Animation Baker")); - bake_dialog->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_BAKE_ANIMATION_CONFIRM)); + bake_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_BAKE_ANIMATION_CONFIRM)); add_child(bake_dialog); GridContainer *bake_grid = memnew(GridContainer); bake_grid->set_columns(2); @@ -7603,7 +7603,7 @@ AnimationTrackEditor::AnimationTrackEditor() { track_copy_select->set_v_size_flags(SIZE_EXPAND_FILL); track_copy_select->set_hide_root(true); track_copy_vbox->add_child(track_copy_select); - track_copy_dialog->connect("confirmed", callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_COPY_TRACKS_CONFIRM)); + track_copy_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_COPY_TRACKS_CONFIRM)); } AnimationTrackEditor::~AnimationTrackEditor() { diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 4cf3d27121c..4966fd362a6 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -1613,7 +1613,7 @@ ConnectionsDock::ConnectionsDock() { disconnect_all_dialog = memnew(ConfirmationDialog); add_child(disconnect_all_dialog); - disconnect_all_dialog->connect("confirmed", callable_mp(this, &ConnectionsDock::_disconnect_all)); + disconnect_all_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ConnectionsDock::_disconnect_all)); disconnect_all_dialog->set_text(TTR("Are you sure you want to remove all connections from this signal?")); class_menu = memnew(PopupMenu); diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 3e77a08c0d9..3aaae9d52c6 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -447,11 +447,11 @@ void CreateDialog::_sbox_input(const Ref &p_ie) { void CreateDialog::_notification(int p_what) { switch (p_what) { case NOTIFICATION_ENTER_TREE: { - connect("confirmed", callable_mp(this, &CreateDialog::_confirmed)); + connect(SceneStringName(confirmed), callable_mp(this, &CreateDialog::_confirmed)); } break; case NOTIFICATION_EXIT_TREE: { - disconnect("confirmed", callable_mp(this, &CreateDialog::_confirmed)); + disconnect(SceneStringName(confirmed), callable_mp(this, &CreateDialog::_confirmed)); } break; case NOTIFICATION_VISIBILITY_CHANGED: { diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 0c870baec1e..c83e677b37f 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -327,7 +327,7 @@ void DependencyEditorOwners::_select_file(int p_idx) { EditorNode::get_singleton()->load_resource(fpath); } hide(); - emit_signal(SNAME("confirmed")); + emit_signal(SceneStringName(confirmed)); } void DependencyEditorOwners::_empty_clicked(const Vector2 &p_pos, MouseButton p_mouse_button_index) { @@ -875,7 +875,7 @@ OrphanResourcesDialog::OrphanResourcesDialog() { add_child(delete_confirm); dep_edit = memnew(DependencyEditor); add_child(dep_edit); - delete_confirm->connect("confirmed", callable_mp(this, &OrphanResourcesDialog::_delete_confirm)); + delete_confirm->connect(SceneStringName(confirmed), callable_mp(this, &OrphanResourcesDialog::_delete_confirm)); set_hide_on_ok(false); VBoxContainer *vbc = memnew(VBoxContainer); diff --git a/editor/editor_build_profile.cpp b/editor/editor_build_profile.cpp index 799bda78ab0..f4185fa4ae2 100644 --- a/editor/editor_build_profile.cpp +++ b/editor/editor_build_profile.cpp @@ -864,7 +864,7 @@ EditorBuildProfileManager::EditorBuildProfileManager() { confirm_dialog = memnew(ConfirmationDialog); add_child(confirm_dialog); confirm_dialog->set_title(TTR("Please Confirm:")); - confirm_dialog->connect("confirmed", callable_mp(this, &EditorBuildProfileManager::_action_confirm)); + confirm_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorBuildProfileManager::_action_confirm)); import_profile = memnew(EditorFileDialog); add_child(import_profile); diff --git a/editor/editor_command_palette.cpp b/editor/editor_command_palette.cpp index 7204ab81f0e..60226bf9713 100644 --- a/editor/editor_command_palette.cpp +++ b/editor/editor_command_palette.cpp @@ -342,7 +342,7 @@ EditorCommandPalette *EditorCommandPalette::get_singleton() { EditorCommandPalette::EditorCommandPalette() { set_hide_on_ok(false); - connect("confirmed", callable_mp(this, &EditorCommandPalette::_confirmed)); + connect(SceneStringName(confirmed), callable_mp(this, &EditorCommandPalette::_confirmed)); VBoxContainer *vbc = memnew(VBoxContainer); add_child(vbc); diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index 966bd7635e1..37cd74d2acb 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -1026,14 +1026,14 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() { new_profile_vb->add_child(new_profile_name); new_profile_name->set_custom_minimum_size(Size2(300 * EDSCALE, 1)); add_child(new_profile_dialog); - new_profile_dialog->connect("confirmed", callable_mp(this, &EditorFeatureProfileManager::_create_new_profile)); + new_profile_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorFeatureProfileManager::_create_new_profile)); new_profile_dialog->register_text_enter(new_profile_name); new_profile_dialog->set_ok_button_text(TTR("Create")); erase_profile_dialog = memnew(ConfirmationDialog); add_child(erase_profile_dialog); erase_profile_dialog->set_title(TTR("Remove Profile")); - erase_profile_dialog->connect("confirmed", callable_mp(this, &EditorFeatureProfileManager::_erase_selected_profile)); + erase_profile_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorFeatureProfileManager::_erase_selected_profile)); import_profiles = memnew(EditorFileDialog); add_child(import_profiles); diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp index 09cb7078cb3..98dee5eca40 100644 --- a/editor/editor_help_search.cpp +++ b/editor/editor_help_search.cpp @@ -212,7 +212,7 @@ void EditorHelpSearch::_notification(int p_what) { } break; case NOTIFICATION_READY: { - connect("confirmed", callable_mp(this, &EditorHelpSearch::_confirmed)); + connect(SceneStringName(confirmed), callable_mp(this, &EditorHelpSearch::_confirmed)); } break; case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 9e85b276bef..e897bdb270f 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -2471,7 +2471,7 @@ EditorInspectorArray::EditorInspectorArray(bool p_read_only) { resize_dialog = memnew(AcceptDialog); resize_dialog->set_title(TTRC("Resize Array")); resize_dialog->add_cancel_button(); - resize_dialog->connect("confirmed", callable_mp(this, &EditorInspectorArray::_resize_dialog_confirmed)); + resize_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorInspectorArray::_resize_dialog_confirmed)); add_child(resize_dialog); VBoxContainer *resize_dialog_vbox = memnew(VBoxContainer); @@ -4292,7 +4292,7 @@ void EditorInspector::_show_add_meta_dialog() { add_meta_dialog->set_ok_button_text(TTR("Add")); add_child(add_meta_dialog); add_meta_dialog->register_text_enter(add_meta_name); - add_meta_dialog->connect("confirmed", callable_mp(this, &EditorInspector::_add_meta_confirm)); + add_meta_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorInspector::_add_meta_confirm)); validation_panel = memnew(EditorValidationPanel); vbc->add_child(validation_panel); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 1e83be1dcd9..205ec87a5ba 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -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)); diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index eef8e3e5d0c..fa1584822d9 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -850,7 +850,7 @@ EditorPropertyLayersGrid::EditorPropertyLayersGrid() { rename_dialog->set_ok_button_text(TTR("Rename")); add_child(rename_dialog); rename_dialog->register_text_enter(rename_dialog_text); - rename_dialog->connect("confirmed", callable_mp(this, &EditorPropertyLayersGrid::_rename_operation_confirm)); + rename_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorPropertyLayersGrid::_rename_operation_confirm)); layer_rename = memnew(PopupMenu); layer_rename->add_item(TTR("Rename layer"), 0); add_child(layer_rename); diff --git a/editor/editor_quick_open.cpp b/editor/editor_quick_open.cpp index 356055c457c..ba32be606c4 100644 --- a/editor/editor_quick_open.cpp +++ b/editor/editor_quick_open.cpp @@ -261,7 +261,7 @@ String EditorQuickOpen::get_base_type() const { void EditorQuickOpen::_notification(int p_what) { switch (p_what) { case NOTIFICATION_ENTER_TREE: { - connect("confirmed", callable_mp(this, &EditorQuickOpen::_confirmed)); + connect(SceneStringName(confirmed), callable_mp(this, &EditorQuickOpen::_confirmed)); search_box->set_clear_button_enabled(true); } break; @@ -278,7 +278,7 @@ void EditorQuickOpen::_notification(int p_what) { } break; case NOTIFICATION_EXIT_TREE: { - disconnect("confirmed", callable_mp(this, &EditorQuickOpen::_confirmed)); + disconnect(SceneStringName(confirmed), callable_mp(this, &EditorQuickOpen::_confirmed)); } break; } } diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index 8cde63039b0..46fe2225d0e 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -373,7 +373,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) { duplicate_resources_dialog = memnew(ConfirmationDialog); add_child(duplicate_resources_dialog); duplicate_resources_dialog->set_title(TTR("Make Unique (Recursive)")); - duplicate_resources_dialog->connect("confirmed", callable_mp(this, &EditorResourcePicker::_duplicate_selected_resources)); + duplicate_resources_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorResourcePicker::_duplicate_selected_resources)); VBoxContainer *vb = memnew(VBoxContainer); duplicate_resources_dialog->add_child(vb); diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp index 715f310b5ba..548eac17375 100644 --- a/editor/editor_run_native.cpp +++ b/editor/editor_run_native.cpp @@ -205,7 +205,7 @@ EditorRunNative::EditorRunNative() { run_native_confirm = memnew(ConfirmationDialog); add_child(run_native_confirm); - run_native_confirm->connect("confirmed", callable_mp(this, &EditorRunNative::_confirm_run_native)); + run_native_confirm->connect(SceneStringName(confirmed), callable_mp(this, &EditorRunNative::_confirm_run_native)); set_process(true); } diff --git a/editor/editor_settings_dialog.cpp b/editor/editor_settings_dialog.cpp index 51138171fbb..778deed7b28 100644 --- a/editor/editor_settings_dialog.cpp +++ b/editor/editor_settings_dialog.cpp @@ -809,7 +809,7 @@ EditorSettingsDialog::EditorSettingsDialog() { // Adding event dialog shortcut_editor = memnew(InputEventConfigurationDialog); - shortcut_editor->connect("confirmed", callable_mp(this, &EditorSettingsDialog::_event_config_confirmed)); + shortcut_editor->connect(SceneStringName(confirmed), callable_mp(this, &EditorSettingsDialog::_event_config_confirmed)); shortcut_editor->set_allowed_input_types(INPUT_KEY); add_child(shortcut_editor); diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp index e84044f7e1d..a6f6c87ee10 100644 --- a/editor/export/export_template_manager.cpp +++ b/editor/export/export_template_manager.cpp @@ -1051,7 +1051,7 @@ ExportTemplateManager::ExportTemplateManager() { uninstall_confirm = memnew(ConfirmationDialog); uninstall_confirm->set_title(TTR("Uninstall Template")); add_child(uninstall_confirm); - uninstall_confirm->connect("confirmed", callable_mp(this, &ExportTemplateManager::_uninstall_template_confirmed)); + uninstall_confirm->connect(SceneStringName(confirmed), callable_mp(this, &ExportTemplateManager::_uninstall_template_confirmed)); install_file_dialog = memnew(FileDialog); install_file_dialog->set_title(TTR("Select Template File")); @@ -1065,5 +1065,5 @@ ExportTemplateManager::ExportTemplateManager() { hide_dialog_accept = memnew(AcceptDialog); hide_dialog_accept->set_text(TTR("The templates will continue to download.\nYou may experience a short editor freeze when they finish.")); add_child(hide_dialog_accept); - hide_dialog_accept->connect("confirmed", callable_mp(this, &ExportTemplateManager::_hide_dialog)); + hide_dialog_accept->connect(SceneStringName(confirmed), callable_mp(this, &ExportTemplateManager::_hide_dialog)); } diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index 04e30c56e40..fe20f57eac6 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -107,7 +107,7 @@ void ProjectExportDialog::_notification(int p_what) { case NOTIFICATION_READY: { duplicate_preset->set_icon(presets->get_editor_theme_icon(SNAME("Duplicate"))); delete_preset->set_icon(presets->get_editor_theme_icon(SNAME("Remove"))); - connect("confirmed", callable_mp(this, &ProjectExportDialog::_export_pck_zip)); + connect(SceneStringName(confirmed), callable_mp(this, &ProjectExportDialog::_export_pck_zip)); _update_export_all(); } break; } @@ -1483,7 +1483,7 @@ ProjectExportDialog::ProjectExportDialog() { delete_confirm = memnew(ConfirmationDialog); add_child(delete_confirm); delete_confirm->set_ok_button_text(TTR("Delete")); - delete_confirm->connect("confirmed", callable_mp(this, &ProjectExportDialog::_delete_preset_confirm)); + delete_confirm->connect(SceneStringName(confirmed), callable_mp(this, &ProjectExportDialog::_delete_preset_confirm)); // Export buttons, dialogs and errors. diff --git a/editor/fbx_importer_manager.cpp b/editor/fbx_importer_manager.cpp index a8dbb3212ce..a25c286d6c2 100644 --- a/editor/fbx_importer_manager.cpp +++ b/editor/fbx_importer_manager.cpp @@ -44,7 +44,7 @@ void FBXImporterManager::_notification(int p_what) { } break; case NOTIFICATION_READY: { - connect("confirmed", callable_mp(this, &FBXImporterManager::_path_confirmed)); + connect(SceneStringName(confirmed), callable_mp(this, &FBXImporterManager::_path_confirmed)); } break; } } diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index f8a82187b9d..3e16c9352e1 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -4111,7 +4111,7 @@ FileSystemDock::FileSystemDock() { add_child(overwrite_dialog); overwrite_dialog->set_ok_button_text(TTR("Overwrite")); overwrite_dialog->add_button(TTR("Keep Both"), true)->connect(SceneStringName(pressed), callable_mp(this, &FileSystemDock::_overwrite_dialog_action).bind(false)); - overwrite_dialog->connect("confirmed", callable_mp(this, &FileSystemDock::_overwrite_dialog_action).bind(true)); + overwrite_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_overwrite_dialog_action).bind(true)); VBoxContainer *overwrite_dialog_vb = memnew(VBoxContainer); overwrite_dialog->add_child(overwrite_dialog_vb); @@ -4138,7 +4138,7 @@ FileSystemDock::FileSystemDock() { duplicate_dialog->set_ok_button_text(TTR("Duplicate")); add_child(duplicate_dialog); duplicate_dialog->register_text_enter(duplicate_dialog_text); - duplicate_dialog->connect("confirmed", callable_mp(this, &FileSystemDock::_duplicate_operation_confirm)); + duplicate_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_duplicate_operation_confirm)); make_dir_dialog = memnew(DirectoryCreateDialog); add_child(make_dir_dialog); @@ -4146,7 +4146,7 @@ FileSystemDock::FileSystemDock() { make_scene_dialog = memnew(SceneCreateDialog); add_child(make_scene_dialog); - make_scene_dialog->connect("confirmed", callable_mp(this, &FileSystemDock::_make_scene_confirm)); + make_scene_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_make_scene_confirm)); make_script_dialog = memnew(ScriptCreateDialog); make_script_dialog->set_title(TTR("Create Script")); diff --git a/editor/group_settings_editor.cpp b/editor/group_settings_editor.cpp index 981a8474285..6415b0a5da7 100644 --- a/editor/group_settings_editor.cpp +++ b/editor/group_settings_editor.cpp @@ -400,7 +400,7 @@ void GroupSettingsEditor::show_message(const String &p_message) { void GroupSettingsEditor::_show_remove_dialog() { if (!remove_dialog) { remove_dialog = memnew(ConfirmationDialog); - remove_dialog->connect("confirmed", callable_mp(this, &GroupSettingsEditor::_confirm_delete)); + remove_dialog->connect(SceneStringName(confirmed), callable_mp(this, &GroupSettingsEditor::_confirm_delete)); VBoxContainer *vbox = memnew(VBoxContainer); remove_label = memnew(Label); @@ -431,7 +431,7 @@ void GroupSettingsEditor::_show_rename_dialog() { if (!rename_group_dialog) { rename_group_dialog = memnew(ConfirmationDialog); rename_group_dialog->set_title(TTR("Rename Group")); - rename_group_dialog->connect("confirmed", callable_mp(this, &GroupSettingsEditor::_confirm_rename)); + rename_group_dialog->connect(SceneStringName(confirmed), callable_mp(this, &GroupSettingsEditor::_confirm_rename)); VBoxContainer *vbc = memnew(VBoxContainer); rename_group_dialog->add_child(vbc); diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp index ed83ae98f37..1ec4b3df4c1 100644 --- a/editor/groups_editor.cpp +++ b/editor/groups_editor.cpp @@ -607,7 +607,7 @@ void GroupsEditor::_show_add_group_dialog() { if (!add_group_dialog) { add_group_dialog = memnew(ConfirmationDialog); add_group_dialog->set_title(TTR("Create New Group")); - add_group_dialog->connect("confirmed", callable_mp(this, &GroupsEditor::_confirm_add)); + add_group_dialog->connect(SceneStringName(confirmed), callable_mp(this, &GroupsEditor::_confirm_add)); VBoxContainer *vbc = memnew(VBoxContainer); add_group_dialog->add_child(vbc); @@ -673,7 +673,7 @@ void GroupsEditor::_show_rename_group_dialog() { if (!rename_group_dialog) { rename_group_dialog = memnew(ConfirmationDialog); rename_group_dialog->set_title(TTR("Rename Group")); - rename_group_dialog->connect("confirmed", callable_mp(this, &GroupsEditor::_confirm_rename)); + rename_group_dialog->connect(SceneStringName(confirmed), callable_mp(this, &GroupsEditor::_confirm_rename)); VBoxContainer *vbc = memnew(VBoxContainer); rename_group_dialog->add_child(vbc); @@ -729,7 +729,7 @@ void GroupsEditor::_show_rename_group_dialog() { void GroupsEditor::_show_remove_group_dialog() { if (!remove_group_dialog) { remove_group_dialog = memnew(ConfirmationDialog); - remove_group_dialog->connect("confirmed", callable_mp(this, &GroupsEditor::_confirm_delete)); + remove_group_dialog->connect(SceneStringName(confirmed), callable_mp(this, &GroupsEditor::_confirm_delete)); VBoxContainer *vbox = memnew(VBoxContainer); remove_label = memnew(Label); diff --git a/editor/gui/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp index 964602c72fd..3e94310c833 100644 --- a/editor/gui/editor_file_dialog.cpp +++ b/editor/gui/editor_file_dialog.cpp @@ -2300,7 +2300,7 @@ EditorFileDialog::EditorFileDialog() { dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES); _update_drives(); - connect("confirmed", callable_mp(this, &EditorFileDialog::_action_pressed)); + connect(SceneStringName(confirmed), callable_mp(this, &EditorFileDialog::_action_pressed)); item_list->connect(SceneStringName(item_selected), callable_mp(this, &EditorFileDialog::_item_selected), CONNECT_DEFERRED); item_list->connect("multi_selected", callable_mp(this, &EditorFileDialog::_multi_selected), CONNECT_DEFERRED); item_list->connect("item_activated", callable_mp(this, &EditorFileDialog::_item_dc_selected).bind()); @@ -2311,14 +2311,14 @@ EditorFileDialog::EditorFileDialog() { confirm_save = memnew(ConfirmationDialog); add_child(confirm_save); - confirm_save->connect("confirmed", callable_mp(this, &EditorFileDialog::_save_confirm_pressed)); + confirm_save->connect(SceneStringName(confirmed), callable_mp(this, &EditorFileDialog::_save_confirm_pressed)); dep_remove_dialog = memnew(DependencyRemoveDialog); add_child(dep_remove_dialog); global_remove_dialog = memnew(ConfirmationDialog); global_remove_dialog->set_text(TTR("Remove the selected files? For safety only files and empty directories can be deleted from here. (Cannot be undone.)\nDepending on your filesystem configuration, the files will either be moved to the system trash or deleted permanently.")); - global_remove_dialog->connect("confirmed", callable_mp(this, &EditorFileDialog::_delete_files_global)); + global_remove_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorFileDialog::_delete_files_global)); add_child(global_remove_dialog); makedialog = memnew(ConfirmationDialog); @@ -2331,7 +2331,7 @@ EditorFileDialog::EditorFileDialog() { makevb->add_margin_child(TTR("Name:"), makedirname); add_child(makedialog); makedialog->register_text_enter(makedirname); - makedialog->connect("confirmed", callable_mp(this, &EditorFileDialog::_make_dir_confirm)); + makedialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorFileDialog::_make_dir_confirm)); error_dialog = memnew(AcceptDialog); add_child(error_dialog); diff --git a/editor/gui/scene_tree_editor.cpp b/editor/gui/scene_tree_editor.cpp index fc52d7a0aea..aab2149eff9 100644 --- a/editor/gui/scene_tree_editor.cpp +++ b/editor/gui/scene_tree_editor.cpp @@ -1690,7 +1690,7 @@ void SceneTreeDialog::_notification(int p_what) { } break; case NOTIFICATION_ENTER_TREE: { - connect("confirmed", callable_mp(this, &SceneTreeDialog::_select)); + connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDialog::_select)); } break; case NOTIFICATION_THEME_CHANGED: { @@ -1702,7 +1702,7 @@ void SceneTreeDialog::_notification(int p_what) { } break; case NOTIFICATION_EXIT_TREE: { - disconnect("confirmed", callable_mp(this, &SceneTreeDialog::_select)); + disconnect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDialog::_select)); } break; } } diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp index 3d1eae26af7..d066e687130 100644 --- a/editor/import/3d/scene_import_settings.cpp +++ b/editor/import/3d/scene_import_settings.cpp @@ -1256,7 +1256,7 @@ void SceneImportSettingsDialog::_update_theme_item_cache() { void SceneImportSettingsDialog::_notification(int p_what) { switch (p_what) { case NOTIFICATION_READY: { - connect("confirmed", callable_mp(this, &SceneImportSettingsDialog::_re_import)); + connect(SceneStringName(confirmed), callable_mp(this, &SceneImportSettingsDialog::_re_import)); } break; case NOTIFICATION_THEME_CHANGED: { @@ -1810,7 +1810,7 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() { external_path_tree = memnew(Tree); external_paths->add_child(external_path_tree); external_path_tree->connect("button_clicked", callable_mp(this, &SceneImportSettingsDialog::_browse_save_callback)); - external_paths->connect("confirmed", callable_mp(this, &SceneImportSettingsDialog::_save_dir_confirm)); + external_paths->connect(SceneStringName(confirmed), callable_mp(this, &SceneImportSettingsDialog::_save_dir_confirm)); external_path_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); external_path_tree->set_columns(3); external_path_tree->set_column_titles_visible(true); diff --git a/editor/import/audio_stream_import_settings.cpp b/editor/import/audio_stream_import_settings.cpp index 7b30e681559..3b345573225 100644 --- a/editor/import/audio_stream_import_settings.cpp +++ b/editor/import/audio_stream_import_settings.cpp @@ -41,7 +41,7 @@ void AudioStreamImportSettingsDialog::_notification(int p_what) { switch (p_what) { case NOTIFICATION_READY: { AudioStreamPreviewGenerator::get_singleton()->connect("preview_updated", callable_mp(this, &AudioStreamImportSettingsDialog::_preview_changed)); - connect("confirmed", callable_mp(this, &AudioStreamImportSettingsDialog::_reimport)); + connect(SceneStringName(confirmed), callable_mp(this, &AudioStreamImportSettingsDialog::_reimport)); } break; case NOTIFICATION_THEME_CHANGED: { diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index d345711d9ca..00ce3d6a7a5 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -924,7 +924,7 @@ String DynamicFontImportSettingsDialog::_pad_zeros(const String &p_hex) const { void DynamicFontImportSettingsDialog::_notification(int p_what) { switch (p_what) { case NOTIFICATION_READY: { - connect("confirmed", callable_mp(this, &DynamicFontImportSettingsDialog::_re_import)); + connect(SceneStringName(confirmed), callable_mp(this, &DynamicFontImportSettingsDialog::_re_import)); } break; case NOTIFICATION_THEME_CHANGED: { diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index 5d6dc1ae0a4..846456ea551 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -834,7 +834,7 @@ ImportDock::ImportDock() { reimport_confirm = memnew(ConfirmationDialog); content->add_child(reimport_confirm); - reimport_confirm->connect("confirmed", callable_mp(this, &ImportDock::_reimport_and_cleanup)); + reimport_confirm->connect(SceneStringName(confirmed), callable_mp(this, &ImportDock::_reimport_and_cleanup)); VBoxContainer *vbc_confirm = memnew(VBoxContainer()); cleanup_warning = memnew(Label(TTR("The imported resource is currently loaded. All instances will be replaced and undo history will be cleared."))); diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index 43b5cb711ed..b71f0f1bb66 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -774,7 +774,7 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { bottom_label->set_text(TTR("This cannot be undone. Are you sure?")); container->add_child(bottom_label); - unique_resources_confirmation->connect("confirmed", callable_mp(this, &InspectorDock::_menu_confirm_current)); + unique_resources_confirmation->connect(SceneStringName(confirmed), callable_mp(this, &InspectorDock::_menu_confirm_current)); info_dialog = memnew(AcceptDialog); EditorNode::get_singleton()->get_gui_base()->add_child(info_dialog); diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index fbdf42a7179..97f628c4a42 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -169,7 +169,7 @@ void AbstractPolygon2DEditor::_notification(int p_what) { button_edit->set_pressed(true); get_tree()->connect("node_removed", callable_mp(this, &AbstractPolygon2DEditor::_node_removed)); - create_resource->connect("confirmed", callable_mp(this, &AbstractPolygon2DEditor::_create_resource)); + create_resource->connect(SceneStringName(confirmed), callable_mp(this, &AbstractPolygon2DEditor::_create_resource)); } break; } } diff --git a/editor/plugins/animation_library_editor.cpp b/editor/plugins/animation_library_editor.cpp index a00dbe27547..22c552d89ef 100644 --- a/editor/plugins/animation_library_editor.cpp +++ b/editor/plugins/animation_library_editor.cpp @@ -804,7 +804,7 @@ AnimationLibraryEditor::AnimationLibraryEditor() { add_library_validate = memnew(Label); dialog_vb->add_child(add_library_validate); add_library_dialog->add_child(dialog_vb); - add_library_dialog->connect("confirmed", callable_mp(this, &AnimationLibraryEditor::_add_library_confirm)); + add_library_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationLibraryEditor::_add_library_confirm)); add_library_dialog->register_text_enter(add_library_name); VBoxContainer *vb = memnew(VBoxContainer); diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index e6411707e61..a85f54b11e6 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -1951,7 +1951,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug delete_dialog = memnew(ConfirmationDialog); add_child(delete_dialog); - delete_dialog->connect(SNAME("confirmed"), callable_mp(this, &AnimationPlayerEditor::_animation_remove_confirmed)); + delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationPlayerEditor::_animation_remove_confirmed)); tool_anim = memnew(MenuButton); tool_anim->set_shortcut_context(this); @@ -2056,7 +2056,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug error_dialog->set_title(TTR("Error!")); name_dialog->add_child(error_dialog); - name_dialog->connect(SNAME("confirmed"), callable_mp(this, &AnimationPlayerEditor::_animation_name_edited)); + name_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationPlayerEditor::_animation_name_edited)); blend_editor.dialog = memnew(AcceptDialog); blend_editor.dialog->set_title(TTR("Cross-Animation Blend Times")); diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index f0f5a77288c..cd7fa7133da 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -620,7 +620,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() { asset_installer = memnew(EditorAssetInstaller); panel->add_child(asset_installer); - asset_installer->connect("confirmed", callable_mp(this, &EditorAssetLibraryItemDownload::_close)); + asset_installer->connect(SceneStringName(confirmed), callable_mp(this, &EditorAssetLibraryItemDownload::_close)); prev_status = -1; @@ -1427,7 +1427,7 @@ void EditorAssetLibrary::_http_request_completed(int p_status, int p_code, const description = memnew(EditorAssetLibraryItemDescription); add_child(description); - description->connect("confirmed", callable_mp(this, &EditorAssetLibrary::_install_asset)); + description->connect(SceneStringName(confirmed), callable_mp(this, &EditorAssetLibrary::_install_asset)); description->configure(r["title"], r["asset_id"], category_map[r["category_id"]], r["category_id"], r["author"], r["author_id"], r["cost"], r["version"], r["version_string"], r["description"], r["download_url"], r["browse_url"], r["download_hash"]); diff --git a/editor/plugins/bone_map_editor_plugin.cpp b/editor/plugins/bone_map_editor_plugin.cpp index c7207a6eab0..c00436b01f8 100644 --- a/editor/plugins/bone_map_editor_plugin.cpp +++ b/editor/plugins/bone_map_editor_plugin.cpp @@ -273,7 +273,7 @@ BonePicker::~BonePicker() { void BoneMapper::create_editor() { // Create Bone picker. picker = memnew(BonePicker(skeleton)); - picker->connect("confirmed", callable_mp(this, &BoneMapper::_apply_picker_selection)); + picker->connect(SceneStringName(confirmed), callable_mp(this, &BoneMapper::_apply_picker_selection)); add_child(picker, false, INTERNAL_MODE_FRONT); profile_selector = memnew(EditorPropertyResource); diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 196df7f33e4..0356493e089 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -5609,7 +5609,7 @@ CanvasItemEditor::CanvasItemEditor() { p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_clear_pose", TTR("Clear Pose"), KeyModifierMask::SHIFT | Key::K), ANIM_CLEAR_POSE); snap_dialog = memnew(SnapDialog); - snap_dialog->connect("confirmed", callable_mp(this, &CanvasItemEditor::_snap_changed)); + snap_dialog->connect(SceneStringName(confirmed), callable_mp(this, &CanvasItemEditor::_snap_changed)); add_child(snap_dialog); select_sb = Ref(memnew(StyleBoxTexture)); @@ -6266,7 +6266,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(CanvasItemEditor *p_canvas_it texture_node_type_selector = memnew(AcceptDialog); EditorNode::get_singleton()->get_gui_base()->add_child(texture_node_type_selector); texture_node_type_selector->set_title(TTR("Change Default Type")); - texture_node_type_selector->connect("confirmed", callable_mp(this, &CanvasItemEditorViewport::_on_change_type_confirmed)); + texture_node_type_selector->connect(SceneStringName(confirmed), callable_mp(this, &CanvasItemEditorViewport::_on_change_type_confirmed)); texture_node_type_selector->connect("canceled", callable_mp(this, &CanvasItemEditorViewport::_on_change_type_closed)); VBoxContainer *vbc = memnew(VBoxContainer); diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.cpp b/editor/plugins/cpu_particles_2d_editor_plugin.cpp index 1c0d93248d9..92c0fd847b6 100644 --- a/editor/plugins/cpu_particles_2d_editor_plugin.cpp +++ b/editor/plugins/cpu_particles_2d_editor_plugin.cpp @@ -305,7 +305,7 @@ CPUParticles2DEditorPlugin::CPUParticles2DEditorPlugin() { toolbar->add_child(emission_mask); - emission_mask->connect("confirmed", callable_mp(this, &CPUParticles2DEditorPlugin::_generate_emission_mask)); + emission_mask->connect(SceneStringName(confirmed), callable_mp(this, &CPUParticles2DEditorPlugin::_generate_emission_mask)); } CPUParticles2DEditorPlugin::~CPUParticles2DEditorPlugin() { diff --git a/editor/plugins/cpu_particles_3d_editor_plugin.cpp b/editor/plugins/cpu_particles_3d_editor_plugin.cpp index f01bc542da7..be2847d1d76 100644 --- a/editor/plugins/cpu_particles_3d_editor_plugin.cpp +++ b/editor/plugins/cpu_particles_3d_editor_plugin.cpp @@ -187,7 +187,7 @@ CPUParticles3DEditor::CPUParticles3DEditor() { add_child(generate_aabb); - generate_aabb->connect("confirmed", callable_mp(this, &CPUParticles3DEditor::_generate_aabb)); + generate_aabb->connect(SceneStringName(confirmed), callable_mp(this, &CPUParticles3DEditor::_generate_aabb)); } void CPUParticles3DEditorPlugin::edit(Object *p_object) { diff --git a/editor/plugins/gpu_particles_2d_editor_plugin.cpp b/editor/plugins/gpu_particles_2d_editor_plugin.cpp index 5376dfd9564..b70c34b7857 100644 --- a/editor/plugins/gpu_particles_2d_editor_plugin.cpp +++ b/editor/plugins/gpu_particles_2d_editor_plugin.cpp @@ -401,7 +401,7 @@ GPUParticles2DEditorPlugin::GPUParticles2DEditorPlugin() { toolbar->add_child(generate_visibility_rect); - generate_visibility_rect->connect("confirmed", callable_mp(this, &GPUParticles2DEditorPlugin::_generate_visibility_rect)); + generate_visibility_rect->connect(SceneStringName(confirmed), callable_mp(this, &GPUParticles2DEditorPlugin::_generate_visibility_rect)); emission_mask = memnew(ConfirmationDialog); emission_mask->set_title(TTR("Load Emission Mask")); @@ -423,7 +423,7 @@ GPUParticles2DEditorPlugin::GPUParticles2DEditorPlugin() { toolbar->add_child(emission_mask); - emission_mask->connect("confirmed", callable_mp(this, &GPUParticles2DEditorPlugin::_generate_emission_mask)); + emission_mask->connect(SceneStringName(confirmed), callable_mp(this, &GPUParticles2DEditorPlugin::_generate_emission_mask)); } GPUParticles2DEditorPlugin::~GPUParticles2DEditorPlugin() { diff --git a/editor/plugins/gpu_particles_3d_editor_plugin.cpp b/editor/plugins/gpu_particles_3d_editor_plugin.cpp index b1dd1b2182c..00c5332464a 100644 --- a/editor/plugins/gpu_particles_3d_editor_plugin.cpp +++ b/editor/plugins/gpu_particles_3d_editor_plugin.cpp @@ -221,7 +221,7 @@ GPUParticles3DEditorBase::GPUParticles3DEditorBase() { emd_vb->add_margin_child(TTR("Emission Source:"), emission_fill); emission_dialog->set_ok_button_text(TTR("Create")); - emission_dialog->connect("confirmed", callable_mp(this, &GPUParticles3DEditorBase::_generate_emission_points)); + emission_dialog->connect(SceneStringName(confirmed), callable_mp(this, &GPUParticles3DEditorBase::_generate_emission_points)); emission_tree_dialog = memnew(SceneTreeDialog); Vector valid_types; @@ -434,7 +434,7 @@ GPUParticles3DEditor::GPUParticles3DEditor() { add_child(generate_aabb); - generate_aabb->connect("confirmed", callable_mp(this, &GPUParticles3DEditor::_generate_aabb)); + generate_aabb->connect(SceneStringName(confirmed), callable_mp(this, &GPUParticles3DEditor::_generate_aabb)); } void GPUParticles3DEditorPlugin::edit(Object *p_object) { diff --git a/editor/plugins/input_event_editor_plugin.cpp b/editor/plugins/input_event_editor_plugin.cpp index 1f6bb119298..5a90d2de61a 100644 --- a/editor/plugins/input_event_editor_plugin.cpp +++ b/editor/plugins/input_event_editor_plugin.cpp @@ -94,7 +94,7 @@ InputEventConfigContainer::InputEventConfigContainer() { add_child(memnew(Control)); config_dialog = memnew(InputEventConfigurationDialog); - config_dialog->connect("confirmed", callable_mp(this, &InputEventConfigContainer::_config_dialog_confirmed)); + config_dialog->connect(SceneStringName(confirmed), callable_mp(this, &InputEventConfigContainer::_config_dialog_confirmed)); add_child(config_dialog); } diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp index 6eae3b975a8..4ebacbd0b37 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_3d_editor_plugin.cpp @@ -558,7 +558,7 @@ MeshInstance3DEditor::MeshInstance3DEditor() { outline_dialog_vbc->add_margin_child(TTR("Outline Size:"), outline_size); add_child(outline_dialog); - outline_dialog->connect("confirmed", callable_mp(this, &MeshInstance3DEditor::_create_outline_mesh)); + outline_dialog->connect(SceneStringName(confirmed), callable_mp(this, &MeshInstance3DEditor::_create_outline_mesh)); shape_dialog = memnew(ConfirmationDialog); shape_dialog->set_title(TTR("Create Collision Shape")); @@ -596,7 +596,7 @@ MeshInstance3DEditor::MeshInstance3DEditor() { shape_dialog_vbc->add_child(shape_type); add_child(shape_dialog); - shape_dialog->connect("confirmed", callable_mp(this, &MeshInstance3DEditor::_create_collision_shape)); + shape_dialog->connect(SceneStringName(confirmed), callable_mp(this, &MeshInstance3DEditor::_create_collision_shape)); err_dialog = memnew(AcceptDialog); add_child(err_dialog); diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 0887075e8b3..41adbcf08c2 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -8720,7 +8720,7 @@ Node3DEditor::Node3DEditor() { snap_dialog = memnew(ConfirmationDialog); snap_dialog->set_title(TTR("Snap Settings")); add_child(snap_dialog); - snap_dialog->connect("confirmed", callable_mp(this, &Node3DEditor::_snap_changed)); + snap_dialog->connect(SceneStringName(confirmed), callable_mp(this, &Node3DEditor::_snap_changed)); snap_dialog->get_cancel_button()->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_snap_update)); VBoxContainer *snap_dialog_vbc = memnew(VBoxContainer); @@ -8773,7 +8773,7 @@ Node3DEditor::Node3DEditor() { settings_vbc->add_margin_child(TTR("View Z-Far:"), settings_zfar); for (uint32_t i = 0; i < VIEWPORTS_COUNT; ++i) { - settings_dialog->connect("confirmed", callable_mp(viewports[i], &Node3DEditorViewport::_view_settings_confirmed).bind(0.0)); + settings_dialog->connect(SceneStringName(confirmed), callable_mp(viewports[i], &Node3DEditorViewport::_view_settings_confirmed).bind(0.0)); } /* XFORM DIALOG */ @@ -8837,7 +8837,7 @@ Node3DEditor::Node3DEditor() { xform_type->add_item(TTR("Post")); xform_vbc->add_child(xform_type); - xform_dialog->connect("confirmed", callable_mp(this, &Node3DEditor::_xform_dialog_action)); + xform_dialog->connect(SceneStringName(confirmed), callable_mp(this, &Node3DEditor::_xform_dialog_action)); selected = nullptr; diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp index ccb4e4921ba..5b23cf44d03 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/plugins/path_2d_editor_plugin.cpp @@ -688,7 +688,7 @@ Path2DEditor::Path2DEditor() { clear_points_dialog = memnew(ConfirmationDialog); clear_points_dialog->set_title(TTR("Please Confirm...")); clear_points_dialog->set_text(TTR("Remove all curve points?")); - clear_points_dialog->connect("confirmed", callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CLEAR_POINTS)); + clear_points_dialog->connect(SceneStringName(confirmed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CLEAR_POINTS)); add_child(clear_points_dialog); PopupMenu *menu; diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp index 447e82f70d2..240206e1245 100644 --- a/editor/plugins/path_3d_editor_plugin.cpp +++ b/editor/plugins/path_3d_editor_plugin.cpp @@ -881,7 +881,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() { clear_points_dialog = memnew(ConfirmationDialog); clear_points_dialog->set_title(TTR("Please Confirm...")); clear_points_dialog->set_text(TTR("Remove all curve points?")); - clear_points_dialog->connect("confirmed", callable_mp(this, &Path3DEditorPlugin::_clear_points)); + clear_points_dialog->connect(SceneStringName(confirmed), callable_mp(this, &Path3DEditorPlugin::_clear_points)); topmenu_bar->add_child(clear_points_dialog); handle_menu = memnew(MenuButton); diff --git a/editor/plugins/plugin_config_dialog.cpp b/editor/plugins/plugin_config_dialog.cpp index fa47e8cd3cb..a2a617e23d5 100644 --- a/editor/plugins/plugin_config_dialog.cpp +++ b/editor/plugins/plugin_config_dialog.cpp @@ -160,7 +160,7 @@ void PluginConfigDialog::_notification(int p_what) { } break; case NOTIFICATION_READY: { - connect("confirmed", callable_mp(this, &PluginConfigDialog::_on_confirmed)); + connect(SceneStringName(confirmed), callable_mp(this, &PluginConfigDialog::_on_confirmed)); get_cancel_button()->connect(SceneStringName(pressed), callable_mp(this, &PluginConfigDialog::_on_canceled)); } break; } diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index 61bd21db671..1fb9ad9bdd3 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -1308,7 +1308,7 @@ Polygon2DEditor::Polygon2DEditor() { uv_edit = memnew(AcceptDialog); add_child(uv_edit); uv_edit->set_title(TTR("Polygon 2D UV Editor")); - uv_edit->connect("confirmed", callable_mp(this, &Polygon2DEditor::_uv_edit_popup_hide)); + uv_edit->connect(SceneStringName(confirmed), callable_mp(this, &Polygon2DEditor::_uv_edit_popup_hide)); uv_edit->connect("canceled", callable_mp(this, &Polygon2DEditor::_uv_edit_popup_hide)); VBoxContainer *uv_main_vb = memnew(VBoxContainer); diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp index 4d0156eb5b5..8b31aa92b34 100644 --- a/editor/plugins/root_motion_editor_plugin.cpp +++ b/editor/plugins/root_motion_editor_plugin.cpp @@ -212,7 +212,7 @@ EditorPropertyRootMotion::EditorPropertyRootMotion() { filter_dialog = memnew(ConfirmationDialog); add_child(filter_dialog); filter_dialog->set_title(TTR("Edit Filtered Tracks:")); - filter_dialog->connect("confirmed", callable_mp(this, &EditorPropertyRootMotion::_confirmed)); + filter_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorPropertyRootMotion::_confirmed)); filters = memnew(Tree); filter_dialog->add_child(filters); diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 8c2e0f9620a..9bd4112d9d1 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -399,7 +399,7 @@ void ScriptEditorQuickOpen::_confirmed() { void ScriptEditorQuickOpen::_notification(int p_what) { switch (p_what) { case NOTIFICATION_ENTER_TREE: { - connect("confirmed", callable_mp(this, &ScriptEditorQuickOpen::_confirmed)); + connect(SceneStringName(confirmed), callable_mp(this, &ScriptEditorQuickOpen::_confirmed)); search_box->set_clear_button_enabled(true); [[fallthrough]]; @@ -409,7 +409,7 @@ void ScriptEditorQuickOpen::_notification(int p_what) { } break; case NOTIFICATION_EXIT_TREE: { - disconnect("confirmed", callable_mp(this, &ScriptEditorQuickOpen::_confirmed)); + disconnect(SceneStringName(confirmed), callable_mp(this, &ScriptEditorQuickOpen::_confirmed)); } break; } } @@ -4247,7 +4247,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) { erase_tab_confirm = memnew(ConfirmationDialog); erase_tab_confirm->set_ok_button_text(TTR("Save")); erase_tab_confirm->add_button(TTR("Discard"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard"); - erase_tab_confirm->connect("confirmed", callable_mp(this, &ScriptEditor::_close_current_tab).bind(true, true)); + erase_tab_confirm->connect(SceneStringName(confirmed), callable_mp(this, &ScriptEditor::_close_current_tab).bind(true, true)); erase_tab_confirm->connect("custom_action", callable_mp(this, &ScriptEditor::_close_discard_current_tab)); add_child(erase_tab_confirm); @@ -4284,7 +4284,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) { disk_changed_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); disk_changed_list->set_v_size_flags(SIZE_EXPAND_FILL); - disk_changed->connect("confirmed", callable_mp(this, &ScriptEditor::reload_scripts).bind(false)); + disk_changed->connect(SceneStringName(confirmed), callable_mp(this, &ScriptEditor::reload_scripts).bind(false)); 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"); diff --git a/editor/plugins/sprite_2d_editor_plugin.cpp b/editor/plugins/sprite_2d_editor_plugin.cpp index c7a89484f03..a3f167d7789 100644 --- a/editor/plugins/sprite_2d_editor_plugin.cpp +++ b/editor/plugins/sprite_2d_editor_plugin.cpp @@ -618,7 +618,7 @@ Sprite2DEditor::Sprite2DEditor() { debug_uv->add_child(h_scroll); h_scroll->connect("value_changed", callable_mp(this, &Sprite2DEditor::_update_zoom_and_pan).unbind(1).bind(false)); - debug_uv_dialog->connect("confirmed", callable_mp(this, &Sprite2DEditor::_create_node)); + debug_uv_dialog->connect(SceneStringName(confirmed), callable_mp(this, &Sprite2DEditor::_create_node)); HBoxContainer *hb = memnew(HBoxContainer); hb->add_child(memnew(Label(TTR("Simplification:")))); diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 11600c86bfc..844518187b5 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -2058,12 +2058,12 @@ SpriteFramesEditor::SpriteFramesEditor() { delete_dialog = memnew(ConfirmationDialog); add_child(delete_dialog); - delete_dialog->connect("confirmed", callable_mp(this, &SpriteFramesEditor::_animation_remove_confirmed)); + delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SpriteFramesEditor::_animation_remove_confirmed)); split_sheet_dialog = memnew(ConfirmationDialog); add_child(split_sheet_dialog); split_sheet_dialog->set_title(TTR("Select Frames")); - split_sheet_dialog->connect("confirmed", callable_mp(this, &SpriteFramesEditor::_sheet_add_frames)); + split_sheet_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SpriteFramesEditor::_sheet_add_frames)); HBoxContainer *split_sheet_hb = memnew(HBoxContainer); split_sheet_dialog->add_child(split_sheet_hb); diff --git a/editor/plugins/text_shader_editor.cpp b/editor/plugins/text_shader_editor.cpp index 6c47f3aadba..276c57533f7 100644 --- a/editor/plugins/text_shader_editor.cpp +++ b/editor/plugins/text_shader_editor.cpp @@ -1246,7 +1246,7 @@ TextShaderEditor::TextShaderEditor() { dl->set_text(TTR("This shader has been modified on disk.\nWhat action should be taken?")); vbc->add_child(dl); - disk_changed->connect("confirmed", callable_mp(this, &TextShaderEditor::_reload)); + disk_changed->connect(SceneStringName(confirmed), callable_mp(this, &TextShaderEditor::_reload)); disk_changed->set_ok_button_text(TTR("Reload")); disk_changed->add_button(TTR("Resave"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave"); diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index 4e59b207553..ecb2b4f1a49 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -2068,7 +2068,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito theme_item_name = memnew(LineEdit); edit_theme_item_vb->add_child(theme_item_name); theme_item_name->connect(SceneStringName(gui_input), callable_mp(this, &ThemeItemEditorDialog::_edit_theme_item_gui_input)); - edit_theme_item_dialog->connect("confirmed", callable_mp(this, &ThemeItemEditorDialog::_confirm_edit_theme_item)); + edit_theme_item_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ThemeItemEditorDialog::_confirm_edit_theme_item)); // Import Items tab. TabContainer *import_tc = memnew(TabContainer); @@ -2120,7 +2120,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito confirm_closing_dialog = memnew(ConfirmationDialog); confirm_closing_dialog->set_autowrap(true); add_child(confirm_closing_dialog); - confirm_closing_dialog->connect("confirmed", callable_mp(this, &ThemeItemEditorDialog::_close_dialog)); + confirm_closing_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ThemeItemEditorDialog::_close_dialog)); } /////////////////////// @@ -2260,7 +2260,7 @@ ThemeTypeDialog::ThemeTypeDialog() { add_type_confirmation = memnew(ConfirmationDialog); add_type_confirmation->set_title(TTR("Type name is empty!")); add_type_confirmation->set_text(TTR("Are you sure you want to create an empty type?")); - add_type_confirmation->connect("confirmed", callable_mp(this, &ThemeTypeDialog::_add_type_confirmed)); + add_type_confirmation->connect(SceneStringName(confirmed), callable_mp(this, &ThemeTypeDialog::_add_type_confirmed)); add_child(add_type_confirmation); } diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp b/editor/plugins/tiles/tile_set_atlas_source_editor.cpp index 1b73e0f335f..94e68ccc7c6 100644 --- a/editor/plugins/tiles/tile_set_atlas_source_editor.cpp +++ b/editor/plugins/tiles/tile_set_atlas_source_editor.cpp @@ -2733,7 +2733,7 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() { 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->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)); + confirm_auto_create_tiles->connect(SceneStringName(confirmed), callable_mp(this, &TileSetAtlasSourceEditor::_auto_create_tiles)); confirm_auto_create_tiles->connect("canceled", callable_mp(this, &TileSetAtlasSourceEditor::_cancel_auto_create_tiles)); add_child(confirm_auto_create_tiles); diff --git a/editor/plugins/tiles/tile_set_editor.cpp b/editor/plugins/tiles/tile_set_editor.cpp index 7b85831ca83..263e9cfa3b4 100644 --- a/editor/plugins/tiles/tile_set_editor.cpp +++ b/editor/plugins/tiles/tile_set_editor.cpp @@ -983,7 +983,7 @@ void TileSourceInspectorPlugin::_show_id_edit_dialog(Object *p_for_source) { vbox->add_child(id_input); id_input->set_max(INT_MAX); - id_edit_dialog->connect("confirmed", callable_mp(this, &TileSourceInspectorPlugin::_confirm_change_id)); + id_edit_dialog->connect(SceneStringName(confirmed), callable_mp(this, &TileSourceInspectorPlugin::_confirm_change_id)); } edited_source = p_for_source; id_input->set_value(p_for_source->get("id")); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index a819fa32cef..b4b8d58e01f 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -1486,7 +1486,7 @@ ProjectManager::ProjectManager() { ask_full_convert_dialog = memnew(ConfirmationDialog); ask_full_convert_dialog->set_autowrap(true); ask_full_convert_dialog->set_text(TTR("This option will perform full project conversion, updating scenes, resources and scripts from Godot 3 to work in Godot 4.\n\nNote that this is a best-effort conversion, i.e. it makes upgrading the project easier, but it will not open out-of-the-box and will still require manual adjustments.\n\nIMPORTANT: Make sure to backup your project before converting, as this operation makes it impossible to open it in older versions of Godot.")); - ask_full_convert_dialog->connect("confirmed", callable_mp(this, &ProjectManager::_perform_full_project_conversion)); + ask_full_convert_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ProjectManager::_perform_full_project_conversion)); add_child(ask_full_convert_dialog); project_dialog = memnew(ProjectDialog); diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index a5157bd394b..9bb15621481 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -410,11 +410,11 @@ void PropertySelector::_hide_requested() { void PropertySelector::_notification(int p_what) { switch (p_what) { case NOTIFICATION_ENTER_TREE: { - connect("confirmed", callable_mp(this, &PropertySelector::_confirmed)); + connect(SceneStringName(confirmed), callable_mp(this, &PropertySelector::_confirmed)); } break; case NOTIFICATION_EXIT_TREE: { - disconnect("confirmed", callable_mp(this, &PropertySelector::_confirmed)); + disconnect(SceneStringName(confirmed), callable_mp(this, &PropertySelector::_confirmed)); } break; } } diff --git a/editor/reparent_dialog.cpp b/editor/reparent_dialog.cpp index a139d180f04..a725508bc46 100644 --- a/editor/reparent_dialog.cpp +++ b/editor/reparent_dialog.cpp @@ -38,11 +38,11 @@ void ReparentDialog::_notification(int p_what) { switch (p_what) { case NOTIFICATION_ENTER_TREE: { - connect("confirmed", callable_mp(this, &ReparentDialog::_reparent)); + connect(SceneStringName(confirmed), callable_mp(this, &ReparentDialog::_reparent)); } break; case NOTIFICATION_EXIT_TREE: { - disconnect("confirmed", callable_mp(this, &ReparentDialog::_reparent)); + disconnect(SceneStringName(confirmed), callable_mp(this, &ReparentDialog::_reparent)); } break; } } diff --git a/editor/scene_create_dialog.cpp b/editor/scene_create_dialog.cpp index fe773378b06..36455be0bb1 100644 --- a/editor/scene_create_dialog.cpp +++ b/editor/scene_create_dialog.cpp @@ -72,7 +72,7 @@ void SceneCreateDialog::config(const String &p_dir) { void SceneCreateDialog::accept_create() { if (!get_ok_button()->is_disabled()) { hide(); - emit_signal(SNAME("confirmed")); + emit_signal(SceneStringName(confirmed)); } } diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 11e477e0443..ef73be2399a 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1597,12 +1597,12 @@ void SceneTreeDock::_notification(int p_what) { } break; case NOTIFICATION_ENTER_TREE: { - clear_inherit_confirm->connect("confirmed", callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_SCENE_CLEAR_INHERITANCE_CONFIRM, false)); + clear_inherit_confirm->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_SCENE_CLEAR_INHERITANCE_CONFIRM, false)); scene_tree->set_auto_expand_selected(EDITOR_GET("docks/scene_tree/auto_expand_to_selected"), false); } break; case NOTIFICATION_EXIT_TREE: { - clear_inherit_confirm->disconnect("confirmed", callable_mp(this, &SceneTreeDock::_tool_selected)); + clear_inherit_confirm->disconnect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_tool_selected)); } break; case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { @@ -2453,13 +2453,13 @@ void SceneTreeDock::_shader_created(Ref p_shader) { void SceneTreeDock::_script_creation_closed() { script_create_dialog->disconnect("script_created", callable_mp(this, &SceneTreeDock::_script_created)); - script_create_dialog->disconnect("confirmed", callable_mp(this, &SceneTreeDock::_script_creation_closed)); + script_create_dialog->disconnect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_script_creation_closed)); script_create_dialog->disconnect("canceled", callable_mp(this, &SceneTreeDock::_script_creation_closed)); } void SceneTreeDock::_shader_creation_closed() { shader_create_dialog->disconnect("shader_created", callable_mp(this, &SceneTreeDock::_shader_created)); - shader_create_dialog->disconnect("confirmed", callable_mp(this, &SceneTreeDock::_shader_creation_closed)); + shader_create_dialog->disconnect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_shader_creation_closed)); shader_create_dialog->disconnect("canceled", callable_mp(this, &SceneTreeDock::_shader_creation_closed)); } @@ -3860,7 +3860,7 @@ void SceneTreeDock::attach_script_to_selected(bool p_extend) { } script_create_dialog->connect("script_created", callable_mp(this, &SceneTreeDock::_script_created)); - script_create_dialog->connect("confirmed", callable_mp(this, &SceneTreeDock::_script_creation_closed)); + script_create_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_script_creation_closed)); script_create_dialog->connect("canceled", callable_mp(this, &SceneTreeDock::_script_creation_closed)); script_create_dialog->set_inheritance_base_type("Node"); script_create_dialog->config(inherits, path); @@ -3902,7 +3902,7 @@ void SceneTreeDock::attach_shader_to_selected(int p_preferred_mode) { } shader_create_dialog->connect("shader_created", callable_mp(this, &SceneTreeDock::_shader_created)); - shader_create_dialog->connect("confirmed", callable_mp(this, &SceneTreeDock::_shader_creation_closed)); + shader_create_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_shader_creation_closed)); shader_create_dialog->connect("canceled", callable_mp(this, &SceneTreeDock::_shader_creation_closed)); shader_create_dialog->config(path, true, true, -1, p_preferred_mode); shader_create_dialog->popup_centered(); @@ -4550,7 +4550,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec delete_dialog = memnew(ConfirmationDialog); add_child(delete_dialog); - delete_dialog->connect("confirmed", callable_mp(this, &SceneTreeDock::_delete_confirm).bind(false)); + delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_delete_confirm).bind(false)); VBoxContainer *vb = memnew(VBoxContainer); delete_dialog->add_child(vb); @@ -4564,11 +4564,11 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec editable_instance_remove_dialog = memnew(ConfirmationDialog); add_child(editable_instance_remove_dialog); - editable_instance_remove_dialog->connect("confirmed", callable_mp(this, &SceneTreeDock::_toggle_editable_children_from_selection)); + editable_instance_remove_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_toggle_editable_children_from_selection)); placeholder_editable_instance_remove_dialog = memnew(ConfirmationDialog); add_child(placeholder_editable_instance_remove_dialog); - placeholder_editable_instance_remove_dialog->connect("confirmed", callable_mp(this, &SceneTreeDock::_toggle_placeholder_from_selection)); + placeholder_editable_instance_remove_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_toggle_placeholder_from_selection)); new_scene_from_dialog = memnew(EditorFileDialog); new_scene_from_dialog->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE); diff --git a/editor/surface_upgrade_tool.cpp b/editor/surface_upgrade_tool.cpp index 6865985e43a..f532535034d 100644 --- a/editor/surface_upgrade_tool.cpp +++ b/editor/surface_upgrade_tool.cpp @@ -190,7 +190,7 @@ void SurfaceUpgradeDialog::_notification(int p_what) { switch (p_what) { case NOTIFICATION_READY: // Can't do it in the constructor because it doesn't know that the signal exists. - connect("confirmed", callable_mp(SurfaceUpgradeTool::get_singleton(), &SurfaceUpgradeTool::prepare_upgrade)); + connect(SceneStringName(confirmed), callable_mp(SurfaceUpgradeTool::get_singleton(), &SurfaceUpgradeTool::prepare_upgrade)); break; } } diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index 4ad00c719b8..400f51236e7 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -517,7 +517,7 @@ bool EditorFileSystemImportFormatSupportQueryBlend::query() { configure_blender_dialog->set_ok_button_text(TTR("Confirm Path")); configure_blender_dialog->set_cancel_button_text(TTR("Disable '.blend' Import")); configure_blender_dialog->get_cancel_button()->set_tooltip_text(TTR("Disables Blender '.blend' files import for this project. Can be re-enabled in Project Settings.")); - configure_blender_dialog->connect("confirmed", callable_mp(this, &EditorFileSystemImportFormatSupportQueryBlend::_path_confirmed)); + configure_blender_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorFileSystemImportFormatSupportQueryBlend::_path_confirmed)); browse_dialog = memnew(EditorFileDialog); browse_dialog->set_access(EditorFileDialog::ACCESS_FILESYSTEM); diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp index b28572cf72d..98bef48d338 100644 --- a/modules/multiplayer/editor/replication_editor.cpp +++ b/modules/multiplayer/editor/replication_editor.cpp @@ -175,7 +175,7 @@ ReplicationEditor::ReplicationEditor() { delete_dialog = memnew(ConfirmationDialog); delete_dialog->connect("canceled", callable_mp(this, &ReplicationEditor::_dialog_closed).bind(false)); - delete_dialog->connect("confirmed", callable_mp(this, &ReplicationEditor::_dialog_closed).bind(true)); + delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ReplicationEditor::_dialog_closed).bind(true)); add_child(delete_dialog); VBoxContainer *vb = memnew(VBoxContainer); diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index 088c8fca26c..7801c39ce6d 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -134,7 +134,7 @@ void AcceptDialog::_ok_pressed() { set_visible(false); } ok_pressed(); - emit_signal(SNAME("confirmed")); + emit_signal(SceneStringName(confirmed)); set_input_as_handled(); } diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 0818387b727..c9372525bd9 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -1486,7 +1486,7 @@ FileDialog::FileDialog() { dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES); _update_drives(); - connect("confirmed", callable_mp(this, &FileDialog::_action_pressed)); + connect(SceneStringName(confirmed), callable_mp(this, &FileDialog::_action_pressed)); tree->connect("multi_selected", callable_mp(this, &FileDialog::_tree_multi_selected), CONNECT_DEFERRED); tree->connect("cell_selected", callable_mp(this, &FileDialog::_tree_selected), CONNECT_DEFERRED); tree->connect("item_activated", callable_mp(this, &FileDialog::_tree_item_activated)); @@ -1498,7 +1498,7 @@ FileDialog::FileDialog() { confirm_save = memnew(ConfirmationDialog); add_child(confirm_save, false, INTERNAL_MODE_FRONT); - confirm_save->connect("confirmed", callable_mp(this, &FileDialog::_save_confirm_pressed)); + confirm_save->connect(SceneStringName(confirmed), callable_mp(this, &FileDialog::_save_confirm_pressed)); makedialog = memnew(ConfirmationDialog); makedialog->set_title(ETR("Create Folder")); @@ -1510,7 +1510,7 @@ FileDialog::FileDialog() { makevb->add_margin_child(ETR("Name:"), makedirname); add_child(makedialog, false, INTERNAL_MODE_FRONT); makedialog->register_text_enter(makedirname); - makedialog->connect("confirmed", callable_mp(this, &FileDialog::_make_dir_confirm)); + makedialog->connect(SceneStringName(confirmed), callable_mp(this, &FileDialog::_make_dir_confirm)); mkdirerr = memnew(AcceptDialog); mkdirerr->set_text(ETR("Could not create folder.")); add_child(mkdirerr, false, INTERNAL_MODE_FRONT); diff --git a/scene/scene_string_names.cpp b/scene/scene_string_names.cpp index aa1d0ef27dc..915fe58f7cf 100644 --- a/scene/scene_string_names.cpp +++ b/scene/scene_string_names.cpp @@ -136,4 +136,6 @@ SceneStringNames::SceneStringNames() { panel = StaticCString::create("panel"); item_selected = StaticCString::create("item_selected"); + + confirmed = StaticCString::create("confirmed"); } diff --git a/scene/scene_string_names.h b/scene/scene_string_names.h index beb024191de..7e525e1a0f4 100644 --- a/scene/scene_string_names.h +++ b/scene/scene_string_names.h @@ -149,6 +149,8 @@ public: StringName panel; StringName item_selected; + + StringName confirmed; }; #define SceneStringName(m_name) SceneStringNames::get_singleton()->m_name