feat: updated godot version
This commit is contained in:
parent
0c508b0831
commit
42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
|
|
@ -30,10 +30,6 @@
|
|||
|
||||
#ifndef DISABLE_DEPRECATED
|
||||
|
||||
#include "editor_plugin.h"
|
||||
|
||||
#include "core/object/class_db.h"
|
||||
|
||||
Button *EditorPlugin::_add_control_to_bottom_panel_compat_88081(Control *p_control, const String &p_title) {
|
||||
return add_control_to_bottom_panel(p_control, p_title, nullptr);
|
||||
}
|
||||
|
|
@ -47,4 +43,4 @@ void EditorPlugin::_bind_compatibility_methods() {
|
|||
ClassDB::bind_compatibility_method(D_METHOD("add_control_to_dock", "slot", "control"), &EditorPlugin::_add_control_to_dock_compat_88081);
|
||||
}
|
||||
|
||||
#endif // DISABLE_DEPRECATED
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -31,9 +31,6 @@
|
|||
#include "editor_plugin.h"
|
||||
#include "editor_plugin.compat.inc"
|
||||
|
||||
#include "core/io/resource_importer.h"
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "editor/debugger/editor_debugger_node.h"
|
||||
#include "editor/debugger/editor_debugger_plugin.h"
|
||||
#include "editor/docks/editor_dock.h"
|
||||
|
|
@ -708,10 +705,10 @@ void EditorPlugin::_bind_methods() {
|
|||
GDVIRTUAL_BIND(_enable_plugin);
|
||||
GDVIRTUAL_BIND(_disable_plugin);
|
||||
|
||||
ADD_SIGNAL(MethodInfo("scene_changed", PropertyInfo(Variant::OBJECT, "scene_root", PROPERTY_HINT_RESOURCE_TYPE, Node::get_class_static())));
|
||||
ADD_SIGNAL(MethodInfo("scene_changed", PropertyInfo(Variant::OBJECT, "scene_root", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
|
||||
ADD_SIGNAL(MethodInfo("scene_closed", PropertyInfo(Variant::STRING, "filepath")));
|
||||
ADD_SIGNAL(MethodInfo("main_screen_changed", PropertyInfo(Variant::STRING, "screen_name")));
|
||||
ADD_SIGNAL(MethodInfo("resource_saved", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, Resource::get_class_static())));
|
||||
ADD_SIGNAL(MethodInfo("resource_saved", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource")));
|
||||
ADD_SIGNAL(MethodInfo("scene_saved", PropertyInfo(Variant::STRING, "filepath")));
|
||||
ADD_SIGNAL(MethodInfo("project_settings_changed"));
|
||||
|
||||
|
|
@ -728,7 +725,6 @@ void EditorPlugin::_bind_methods() {
|
|||
BIND_ENUM_CONSTANT(CONTAINER_PROJECT_SETTING_TAB_LEFT);
|
||||
BIND_ENUM_CONSTANT(CONTAINER_PROJECT_SETTING_TAB_RIGHT);
|
||||
|
||||
#ifndef DISABLE_DEPRECATED
|
||||
BIND_ENUM_CONSTANT(DOCK_SLOT_NONE);
|
||||
BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_UL);
|
||||
BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_BL);
|
||||
|
|
@ -740,7 +736,6 @@ void EditorPlugin::_bind_methods() {
|
|||
BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_BR);
|
||||
BIND_ENUM_CONSTANT(DOCK_SLOT_BOTTOM);
|
||||
BIND_ENUM_CONSTANT(DOCK_SLOT_MAX);
|
||||
#endif
|
||||
|
||||
BIND_ENUM_CONSTANT(AFTER_GUI_INPUT_PASS);
|
||||
BIND_ENUM_CONSTANT(AFTER_GUI_INPUT_STOP);
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/io/config_file.h"
|
||||
#include "editor/docks/dock_constants.h"
|
||||
#include "editor/inspector/editor_context_menu_plugin.h"
|
||||
#include "scene/3d/camera_3d.h"
|
||||
#include "scene/gui/control.h"
|
||||
#include "scene/main/node.h"
|
||||
|
||||
class Node3D;
|
||||
class Button;
|
||||
|
|
@ -88,21 +88,19 @@ public:
|
|||
CONTAINER_PROJECT_SETTING_TAB_RIGHT,
|
||||
};
|
||||
|
||||
#ifndef DISABLE_DEPRECATED
|
||||
enum DockSlot {
|
||||
DOCK_SLOT_NONE = -1,
|
||||
DOCK_SLOT_LEFT_UL,
|
||||
DOCK_SLOT_LEFT_BL,
|
||||
DOCK_SLOT_LEFT_UR,
|
||||
DOCK_SLOT_LEFT_BR,
|
||||
DOCK_SLOT_RIGHT_UL,
|
||||
DOCK_SLOT_RIGHT_BL,
|
||||
DOCK_SLOT_RIGHT_UR,
|
||||
DOCK_SLOT_RIGHT_BR,
|
||||
DOCK_SLOT_BOTTOM,
|
||||
DOCK_SLOT_MAX
|
||||
DOCK_SLOT_NONE = DockConstants::DOCK_SLOT_NONE,
|
||||
DOCK_SLOT_LEFT_UL = DockConstants::DOCK_SLOT_LEFT_UL,
|
||||
DOCK_SLOT_LEFT_BL = DockConstants::DOCK_SLOT_LEFT_BL,
|
||||
DOCK_SLOT_LEFT_UR = DockConstants::DOCK_SLOT_LEFT_UR,
|
||||
DOCK_SLOT_LEFT_BR = DockConstants::DOCK_SLOT_LEFT_BR,
|
||||
DOCK_SLOT_RIGHT_UL = DockConstants::DOCK_SLOT_RIGHT_UL,
|
||||
DOCK_SLOT_RIGHT_BL = DockConstants::DOCK_SLOT_RIGHT_BL,
|
||||
DOCK_SLOT_RIGHT_UR = DockConstants::DOCK_SLOT_RIGHT_UR,
|
||||
DOCK_SLOT_RIGHT_BR = DockConstants::DOCK_SLOT_RIGHT_BR,
|
||||
DOCK_SLOT_BOTTOM = DockConstants::DOCK_SLOT_BOTTOM,
|
||||
DOCK_SLOT_MAX = DockConstants::DOCK_SLOT_MAX
|
||||
};
|
||||
#endif
|
||||
|
||||
enum AfterGUIInput {
|
||||
AFTER_GUI_INPUT_PASS,
|
||||
|
|
@ -270,10 +268,8 @@ public:
|
|||
void disable_plugin();
|
||||
};
|
||||
|
||||
#ifndef DISABLE_DEPRECATED
|
||||
VARIANT_ENUM_CAST(EditorPlugin::DockSlot);
|
||||
#endif
|
||||
VARIANT_ENUM_CAST(EditorPlugin::CustomControlContainer);
|
||||
VARIANT_ENUM_CAST(EditorPlugin::DockSlot);
|
||||
VARIANT_ENUM_CAST(EditorPlugin::AfterGUIInput);
|
||||
|
||||
typedef EditorPlugin *(*EditorPluginCreateFunc)();
|
||||
|
|
|
|||
|
|
@ -30,15 +30,14 @@
|
|||
|
||||
#include "editor_plugin_settings.h"
|
||||
|
||||
#include "core/config/engine.h"
|
||||
#include "core/config/project_settings.h"
|
||||
#include "core/io/config_file.h"
|
||||
#include "core/io/dir_access.h"
|
||||
#include "core/io/file_access.h"
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_string_names.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/gui/margin_container.h"
|
||||
#include "scene/gui/separator.h"
|
||||
#include "scene/gui/texture_rect.h"
|
||||
#include "scene/gui/tree.h"
|
||||
|
|
@ -116,18 +115,15 @@ void EditorPluginSettings::update_plugins() {
|
|||
|
||||
TreeItem *item = plugin_list->create_item(root);
|
||||
item->set_text(COLUMN_NAME, name);
|
||||
item->set_auto_translate_mode(COLUMN_NAME, AUTO_TRANSLATE_MODE_DISABLED);
|
||||
if (!is_enabled) {
|
||||
item->set_custom_color(COLUMN_NAME, disabled_color);
|
||||
}
|
||||
item->set_tooltip_text(COLUMN_NAME, vformat(TTR("Name: %s\nPath: %s\nMain Script: %s\n\n%s"), name, path, scr, wrapped_description));
|
||||
item->set_metadata(COLUMN_NAME, path);
|
||||
item->set_text(COLUMN_VERSION, version);
|
||||
item->set_auto_translate_mode(COLUMN_VERSION, AUTO_TRANSLATE_MODE_DISABLED);
|
||||
item->set_custom_font(COLUMN_VERSION, get_theme_font("source", EditorStringName(EditorFonts)));
|
||||
item->set_metadata(COLUMN_VERSION, scr);
|
||||
item->set_text(COLUMN_AUTHOR, author);
|
||||
item->set_auto_translate_mode(COLUMN_AUTHOR, AUTO_TRANSLATE_MODE_DISABLED);
|
||||
item->set_metadata(COLUMN_AUTHOR, description);
|
||||
item->set_cell_mode(COLUMN_STATUS, TreeItem::CELL_MODE_CHECK);
|
||||
item->set_text(COLUMN_STATUS, TTRC("On"));
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@
|
|||
|
||||
#include "editor_resource_conversion_plugin.h"
|
||||
|
||||
#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
|
||||
|
||||
void EditorResourceConversionPlugin::_bind_methods() {
|
||||
GDVIRTUAL_BIND(_converts_to);
|
||||
GDVIRTUAL_BIND(_handles, "resource");
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/io/resource.h"
|
||||
#include "core/object/gdvirtual.gen.h"
|
||||
#include "core/object/gdvirtual.gen.inc"
|
||||
|
||||
class EditorResourceConversionPlugin : public RefCounted {
|
||||
GDCLASS(EditorResourceConversionPlugin, RefCounted);
|
||||
|
|
|
|||
|
|
@ -32,9 +32,6 @@
|
|||
|
||||
#include "core/io/config_file.h"
|
||||
#include "core/io/dir_access.h"
|
||||
#include "core/io/resource_saver.h"
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
|
||||
#include "core/object/script_language.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/file_system/editor_file_system.h"
|
||||
|
|
@ -110,15 +107,15 @@ void PluginConfigDialog::_on_canceled() {
|
|||
|
||||
void PluginConfigDialog::_on_required_text_changed() {
|
||||
if (name_edit->get_text().is_empty()) {
|
||||
validation_panel->set_message(MSG_ID_PLUGIN, TTRC("Plugin name cannot be blank."), EditorValidationPanel::MSG_ERROR);
|
||||
validation_panel->set_message(MSG_ID_PLUGIN, TTR("Plugin name cannot be blank."), EditorValidationPanel::MSG_ERROR);
|
||||
}
|
||||
if (subfolder_edit->is_visible()) {
|
||||
if (!subfolder_edit->get_text().is_empty() && !subfolder_edit->get_text().is_valid_filename()) {
|
||||
validation_panel->set_message(MSG_ID_SUBFOLDER, TTRC("Subfolder name is not a valid folder name."), EditorValidationPanel::MSG_ERROR);
|
||||
validation_panel->set_message(MSG_ID_SUBFOLDER, TTR("Subfolder name is not a valid folder name."), EditorValidationPanel::MSG_ERROR);
|
||||
} else {
|
||||
String path = "res://addons/" + _get_subfolder();
|
||||
if (!_edit_mode && DirAccess::exists(path)) { // Only show this error if in "create" mode.
|
||||
validation_panel->set_message(MSG_ID_SUBFOLDER, TTRC("Subfolder cannot be one which already exists."), EditorValidationPanel::MSG_ERROR);
|
||||
validation_panel->set_message(MSG_ID_SUBFOLDER, TTR("Subfolder cannot be one which already exists."), EditorValidationPanel::MSG_ERROR);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
@ -135,7 +132,7 @@ void PluginConfigDialog::_on_required_text_changed() {
|
|||
validation_panel->set_message(MSG_ID_SCRIPT, vformat(TTR("Script extension must match chosen language extension (.%s)."), ext), EditorValidationPanel::MSG_ERROR);
|
||||
}
|
||||
if (language->get_name() == "GDScript") {
|
||||
validation_panel->set_message(MSG_ID_ENABLE_WARNINGS, TTRC("Consider enabling GDScript warnings for this plugin by adding an entry for it to the project setting Debug > GDScript > Warnings > Directory Rules."), EditorValidationPanel::MSG_INFO);
|
||||
validation_panel->set_message(MSG_ID_ENABLE_WARNINGS, TTR("Consider enabling GDScript warnings for this plugin by adding an entry for it to the project setting Debug > GDScript > Warnings > Directory Rules."), EditorValidationPanel::MSG_INFO);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -319,10 +316,11 @@ PluginConfigDialog::PluginConfigDialog() {
|
|||
|
||||
validation_panel = memnew(EditorValidationPanel);
|
||||
vbox->add_child(validation_panel);
|
||||
validation_panel->add_line(MSG_ID_PLUGIN, TTRC("Plugin name is valid."));
|
||||
validation_panel->add_line(MSG_ID_SCRIPT, TTRC("Script extension is valid."));
|
||||
validation_panel->add_line(MSG_ID_SUBFOLDER, TTRC("Subfolder name is valid."));
|
||||
validation_panel->add_line(MSG_ID_ENABLE_WARNINGS);
|
||||
validation_panel->add_line(MSG_ID_PLUGIN, TTR("Plugin name is valid."));
|
||||
validation_panel->add_line(MSG_ID_SCRIPT, TTR("Script extension is valid."));
|
||||
validation_panel->add_line(MSG_ID_SUBFOLDER, TTR("Subfolder name is valid."));
|
||||
validation_panel->add_line(MSG_ID_ACTIVE, "");
|
||||
validation_panel->add_line(MSG_ID_ENABLE_WARNINGS, "");
|
||||
validation_panel->set_update_callback(callable_mp(this, &PluginConfigDialog::_on_required_text_changed));
|
||||
validation_panel->set_accept_button(get_ok_button());
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "scene/gui/check_box.h"
|
||||
#include "scene/gui/dialogs.h"
|
||||
#include "scene/gui/line_edit.h"
|
||||
#include "scene/gui/option_button.h"
|
||||
|
|
@ -45,6 +46,7 @@ class PluginConfigDialog : public ConfirmationDialog {
|
|||
MSG_ID_PLUGIN,
|
||||
MSG_ID_SUBFOLDER,
|
||||
MSG_ID_SCRIPT,
|
||||
MSG_ID_ACTIVE,
|
||||
MSG_ID_ENABLE_WARNINGS,
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue