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

Merge pull request #56240 from KoBeWi/frankenstein's_PR

This commit is contained in:
Rémi Verschelde 2022-01-05 11:00:18 +01:00 committed by GitHub
parent c0b3da78ad cff0a1a896
commit e9c50c9c50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
editor/import_dock.cpp
View File

@ -31,6 +31,7 @@
#include "import_dock.h" #include "import_dock.h"
#include "editor_node.h" #include "editor_node.h"
#include "editor_resource_preview.h" #include "editor_resource_preview.h"
#include "editor_scale.h"
class ImportDockParameters : public Object { class ImportDockParameters : public Object {
GDCLASS(ImportDockParameters, Object); GDCLASS(ImportDockParameters, Object);
@ -135,6 +136,8 @@ void ImportDock::set_edit_path(const String &p_path) {
_set_dirty(false); _set_dirty(false);
import_as->set_disabled(false); import_as->set_disabled(false);
preset->set_disabled(false); preset->set_disabled(false);
content->show();
select_a_resource->hide();
imported->set_text(p_path.get_file()); imported->set_text(p_path.get_file());
} }
@ -423,6 +426,8 @@ void ImportDock::clear() {
params->properties.clear(); params->properties.clear();
params->update(); params->update();
preset->get_popup()->clear(); preset->get_popup()->clear();
content->hide();
select_a_resource->show();
} }
static bool _find_owners(EditorFileSystemDirectory *efsd, const String &p_path) { static bool _find_owners(EditorFileSystemDirectory *efsd, const String &p_path) {
@ -600,12 +605,18 @@ void ImportDock::initialize_import_options() const {
ImportDock::ImportDock() { ImportDock::ImportDock() {
set_name("Import"); set_name("Import");
content = memnew(VBoxContainer);
content->set_v_size_flags(SIZE_EXPAND_FILL);
add_child(content);
content->hide();
imported = memnew(Label); imported = memnew(Label);
imported->add_theme_style_override("normal", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("normal"), SNAME("LineEdit"))); imported->add_theme_style_override("normal", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("normal"), SNAME("LineEdit")));
imported->set_clip_text(true); imported->set_clip_text(true);
add_child(imported); content->add_child(imported);
HBoxContainer *hb = memnew(HBoxContainer); HBoxContainer *hb = memnew(HBoxContainer);
add_margin_child(TTR("Import As:"), hb); content->add_margin_child(TTR("Import As:"), hb);
import_as = memnew(OptionButton); import_as = memnew(OptionButton);
import_as->set_disabled(true); import_as->set_disabled(true);
import_as->connect("item_selected", callable_mp(this, &ImportDock::_importer_selected)); import_as->connect("item_selected", callable_mp(this, &ImportDock::_importer_selected));
@ -618,13 +629,13 @@ ImportDock::ImportDock() {
hb->add_child(preset); hb->add_child(preset);
import_opts = memnew(EditorInspector); import_opts = memnew(EditorInspector);
add_child(import_opts); content->add_child(import_opts);
import_opts->set_v_size_flags(SIZE_EXPAND_FILL); import_opts->set_v_size_flags(SIZE_EXPAND_FILL);
import_opts->connect("property_edited", callable_mp(this, &ImportDock::_property_edited)); import_opts->connect("property_edited", callable_mp(this, &ImportDock::_property_edited));
import_opts->connect("property_toggled", callable_mp(this, &ImportDock::_property_toggled)); import_opts->connect("property_toggled", callable_mp(this, &ImportDock::_property_toggled));
hb = memnew(HBoxContainer); hb = memnew(HBoxContainer);
add_child(hb); content->add_child(hb);
import = memnew(Button); import = memnew(Button);
import->set_text(TTR("Reimport")); import->set_text(TTR("Reimport"));
import->set_disabled(true); import->set_disabled(true);
@ -652,7 +663,7 @@ ImportDock::ImportDock() {
reimport_confirm = memnew(ConfirmationDialog); reimport_confirm = memnew(ConfirmationDialog);
reimport_confirm->get_ok_button()->set_text(TTR("Save Scenes, Re-Import, and Restart")); reimport_confirm->get_ok_button()->set_text(TTR("Save Scenes, Re-Import, and Restart"));
add_child(reimport_confirm); content->add_child(reimport_confirm);
reimport_confirm->connect("confirmed", callable_mp(this, &ImportDock::_reimport_and_restart)); reimport_confirm->connect("confirmed", callable_mp(this, &ImportDock::_reimport_and_restart));
VBoxContainer *vbc_confirm = memnew(VBoxContainer()); VBoxContainer *vbc_confirm = memnew(VBoxContainer());
@ -662,6 +673,15 @@ ImportDock::ImportDock() {
reimport_confirm->add_child(vbc_confirm); reimport_confirm->add_child(vbc_confirm);
params = memnew(ImportDockParameters); params = memnew(ImportDockParameters);
select_a_resource = memnew(Label);
select_a_resource->set_text(TTR("Select a resource file in the filesystem or in the inspector to adjust import settings."));
select_a_resource->set_autowrap_mode(Label::AUTOWRAP_WORD);
select_a_resource->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
select_a_resource->set_v_size_flags(SIZE_EXPAND_FILL);
select_a_resource->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
select_a_resource->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER);
add_child(select_a_resource);
} }
ImportDock::~ImportDock() { ImportDock::~ImportDock() {

3
editor/import_dock.h
View File

@ -62,6 +62,9 @@ class ImportDock : public VBoxContainer {
ImportDockParameters *params; ImportDockParameters *params;
VBoxContainer *content;
Label *select_a_resource;
void _preset_selected(int p_idx); void _preset_selected(int p_idx);
void _importer_selected(int i_idx); void _importer_selected(int i_idx);
void _update_options(const String &p_path, const Ref<ConfigFile> &p_config = Ref<ConfigFile>()); void _update_options(const String &p_path, const Ref<ConfigFile> &p_config = Ref<ConfigFile>());