asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Merge pull request #21149 from godotengine/revert-21146-import-export-editorinspector

Browse source 
Revert "Port ImportDock and ProjectExport to new property editor"
This commit is contained in:
Rémi Verschelde 2018-08-18 15:25:01 +02:00 committed by GitHub
commit ff8e6f920c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/import_dock.cpp
View file

@ -420,9 +420,10 @@ ImportDock::ImportDock() {
preset->get_popup()->connect("index_pressed", this, "_preset_selected"); preset->get_popup()->connect("index_pressed", this, "_preset_selected");
hb->add_child(preset); hb->add_child(preset);
import_opts = memnew(EditorInspector); import_opts = memnew(PropertyEditor);
add_child(import_opts); add_child(import_opts);
import_opts->set_v_size_flags(SIZE_EXPAND_FILL); import_opts->set_v_size_flags(SIZE_EXPAND_FILL);
import_opts->hide_top_label();
hb = memnew(HBoxContainer); hb = memnew(HBoxContainer);
add_child(hb); add_child(hb);

10
editor/import_dock.h
View file

@ -31,12 +31,10 @@
#ifndef IMPORTDOCK_H #ifndef IMPORTDOCK_H
#define IMPORTDOCK_H #define IMPORTDOCK_H
#include "core/io/config_file.h" #include "editor_file_system.h"
#include "core/io/resource_import.h" #include "io/resource_import.h"
#include "editor/editor_file_system.h" #include "property_editor.h"
#include "editor/editor_inspector.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
#include "scene/gui/menu_button.h"
#include "scene/gui/option_button.h" #include "scene/gui/option_button.h"
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
@ -47,7 +45,7 @@ class ImportDock : public VBoxContainer {
Label *imported; Label *imported;
OptionButton *import_as; OptionButton *import_as;
MenuButton *preset; MenuButton *preset;
EditorInspector *import_opts; PropertyEditor *import_opts;
List<PropertyInfo> properties; List<PropertyInfo> properties;
Map<StringName, Variant> property_values; Map<StringName, Variant> property_values;

4
editor/project_export.cpp
View file

@ -29,7 +29,6 @@
/*************************************************************************/ /*************************************************************************/
#include "project_export.h" #include "project_export.h"
#include "compressed_translation.h" #include "compressed_translation.h"
#include "editor_data.h" #include "editor_data.h"
#include "editor_node.h" #include "editor_node.h"
@ -843,9 +842,10 @@ ProjectExportDialog::ProjectExportDialog() {
settings_vb->add_child(sections); settings_vb->add_child(sections);
sections->set_v_size_flags(SIZE_EXPAND_FILL); sections->set_v_size_flags(SIZE_EXPAND_FILL);
parameters = memnew(EditorInspector); parameters = memnew(PropertyEditor);
sections->add_child(parameters); sections->add_child(parameters);
parameters->set_name(TTR("Options")); parameters->set_name(TTR("Options"));
parameters->hide_top_label();
parameters->set_v_size_flags(SIZE_EXPAND_FILL); parameters->set_v_size_flags(SIZE_EXPAND_FILL);
parameters->connect("property_edited", this, "_update_parameters"); parameters->connect("property_edited", this, "_update_parameters");

20
editor/project_export.h
View file

@ -31,27 +31,26 @@
#ifndef PROJECT_EXPORT_SETTINGS_H #ifndef PROJECT_EXPORT_SETTINGS_H
#define PROJECT_EXPORT_SETTINGS_H #define PROJECT_EXPORT_SETTINGS_H
#include "core/os/dir_access.h"
#include "core/os/thread.h"
#include "editor/editor_export.h"
#include "editor/editor_file_dialog.h" #include "editor/editor_file_dialog.h"
#include "editor/editor_file_system.h" #include "os/dir_access.h"
#include "editor/editor_inspector.h" #include "os/thread.h"
#include "scene/gui/button.h" #include "scene/gui/button.h"
#include "scene/gui/check_button.h"
#include "scene/gui/control.h" #include "scene/gui/control.h"
#include "scene/gui/dialogs.h" #include "scene/gui/dialogs.h"
#include "scene/gui/file_dialog.h" #include "scene/gui/file_dialog.h"
#include "scene/gui/label.h" #include "scene/gui/label.h"
#include "scene/gui/link_button.h" #include "scene/gui/link_button.h"
#include "scene/gui/menu_button.h"
#include "scene/gui/option_button.h" #include "scene/gui/option_button.h"
#include "scene/gui/rich_text_label.h" #include "scene/gui/rich_text_label.h"
#include "scene/gui/slider.h"
#include "scene/gui/tab_container.h" #include "scene/gui/tab_container.h"
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "scene/main/timer.h" #include "scene/main/timer.h"
#include "editor/editor_file_system.h"
#include "editor_export.h"
#include "property_editor.h"
#include "scene/gui/slider.h"
class EditorNode; class EditorNode;
class ProjectExportDialog : public ConfirmationDialog { class ProjectExportDialog : public ConfirmationDialog {
@ -65,9 +64,12 @@ private:
ItemList *presets; ItemList *presets;
LineEdit *name; LineEdit *name;
EditorInspector *parameters; PropertyEditor *parameters;
CheckButton *runnable; CheckButton *runnable;
//EditorFileDialog *pck_export;
//EditorFileDialog *file_export;
Button *button_export; Button *button_export;
bool updating; bool updating;