From 4154039832cb79459975e46a3007c83c4864ccb3 Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Fri, 7 Apr 2023 18:59:49 +0200 Subject: [PATCH] Improve includes of EditorNode (and everything else) Also start organizing editor-specific GUI components into a dedicated folder, `editor/gui`. Also move `editor_file_server` next to the rest of debugger classes. --- editor/SCsub | 2 +- editor/animation_track_editor.cpp | 8 +++ editor/animation_track_editor.h | 19 ++++--- editor/connections_dialog.cpp | 9 ++++ editor/connections_dialog.h | 20 ++++--- editor/debugger/editor_debugger_tree.cpp | 2 +- .../editor_file_server.cpp | 0 .../editor_file_server.h | 0 editor/debugger/script_editor_debugger.cpp | 2 +- editor/dependency_editor.cpp | 2 +- editor/editor_audio_buses.cpp | 4 +- editor/editor_autoload_settings.cpp | 4 +- editor/editor_build_profile.cpp | 2 +- editor/editor_feature_profile.cpp | 2 +- editor/editor_node.cpp | 6 ++- editor/editor_node.h | 52 +++++++++---------- editor/editor_plugin.cpp | 1 + editor/editor_properties.cpp | 5 +- editor/editor_properties_array_dict.cpp | 2 + editor/editor_properties_array_dict.h | 5 +- editor/editor_resource_picker.cpp | 2 +- editor/export/project_export.cpp | 3 +- editor/fbx_importer_manager.h | 2 +- editor/filesystem_dock.cpp | 5 ++ editor/filesystem_dock.h | 10 ++-- editor/groups_editor.cpp | 6 ++- editor/groups_editor.h | 11 ++-- editor/{fileserver => gui}/SCsub | 0 editor/{ => gui}/editor_dir_dialog.cpp | 0 editor/{ => gui}/editor_dir_dialog.h | 0 editor/{ => gui}/editor_file_dialog.cpp | 2 +- editor/{ => gui}/editor_file_dialog.h | 0 .../editor_object_selector.cpp} | 32 ++++++------ .../editor_object_selector.h} | 14 ++--- editor/{ => gui}/editor_spin_slider.cpp | 0 editor/{ => gui}/editor_spin_slider.h | 0 editor/{ => gui}/editor_title_bar.cpp | 2 +- editor/{ => gui}/editor_title_bar.h | 0 editor/{ => gui}/editor_toaster.cpp | 0 editor/{ => gui}/editor_toaster.h | 0 editor/{ => gui}/editor_zoom_widget.cpp | 0 editor/{ => gui}/editor_zoom_widget.h | 0 editor/{ => gui}/scene_tree_editor.cpp | 2 + editor/{ => gui}/scene_tree_editor.h | 0 .../import/dynamic_font_import_settings.cpp | 2 +- editor/import/scene_import_settings.cpp | 2 +- editor/inspector_dock.cpp | 15 +++--- editor/inspector_dock.h | 4 +- editor/localization_editor.cpp | 2 +- editor/plugins/abstract_polygon_2d_editor.cpp | 2 + editor/plugins/abstract_polygon_2d_editor.h | 1 + .../animation_blend_space_1d_editor.cpp | 2 +- .../animation_blend_space_2d_editor.cpp | 2 +- .../animation_blend_tree_editor_plugin.cpp | 2 +- editor/plugins/animation_library_editor.cpp | 2 +- .../animation_player_editor_plugin.cpp | 2 +- .../animation_state_machine_editor.cpp | 2 +- .../plugins/animation_tree_editor_plugin.cpp | 2 +- .../plugins/asset_library_editor_plugin.cpp | 2 +- editor/plugins/canvas_item_editor_plugin.cpp | 5 +- .../cpu_particles_2d_editor_plugin.cpp | 2 +- .../cpu_particles_3d_editor_plugin.cpp | 2 +- editor/plugins/debugger_editor_plugin.cpp | 2 +- .../gpu_particles_2d_editor_plugin.cpp | 2 +- ..._particles_collision_sdf_editor_plugin.cpp | 2 +- .../gradient_texture_2d_editor_plugin.cpp | 2 + .../gradient_texture_2d_editor_plugin.h | 4 +- editor/plugins/lightmap_gi_editor_plugin.cpp | 2 +- editor/plugins/material_editor_plugin.cpp | 6 +++ editor/plugins/material_editor_plugin.h | 9 ++-- .../mesh_instance_3d_editor_plugin.cpp | 4 +- .../plugins/mesh_instance_3d_editor_plugin.h | 2 +- editor/plugins/mesh_library_editor_plugin.cpp | 4 +- editor/plugins/multimesh_editor_plugin.cpp | 4 +- editor/plugins/node_3d_editor_plugin.cpp | 1 + .../occluder_instance_3d_editor_plugin.cpp | 2 +- editor/plugins/polygon_2d_editor_plugin.cpp | 3 ++ editor/plugins/polygon_2d_editor_plugin.h | 1 + editor/plugins/polygon_3d_editor_plugin.cpp | 4 +- .../resource_preloader_editor_plugin.cpp | 2 +- editor/plugins/root_motion_editor_plugin.cpp | 2 + editor/plugins/root_motion_editor_plugin.h | 3 ++ editor/plugins/script_editor_plugin.cpp | 2 +- editor/plugins/skeleton_2d_editor_plugin.cpp | 4 +- editor/plugins/skeleton_2d_editor_plugin.h | 1 - editor/plugins/skeleton_3d_editor_plugin.cpp | 1 + editor/plugins/skeleton_3d_editor_plugin.h | 4 +- .../plugins/skeleton_ik_3d_editor_plugin.cpp | 1 + editor/plugins/skeleton_ik_3d_editor_plugin.h | 1 + .../plugins/sprite_frames_editor_plugin.cpp | 2 +- editor/plugins/theme_editor_plugin.cpp | 9 +++- editor/plugins/theme_editor_plugin.h | 13 ++--- editor/plugins/theme_editor_preview.cpp | 4 ++ editor/plugins/theme_editor_preview.h | 8 +-- editor/plugins/tiles/atlas_merging_dialog.cpp | 3 +- editor/plugins/tiles/tile_atlas_view.h | 2 +- ...le_set_scenes_collection_source_editor.cpp | 2 + ...tile_set_scenes_collection_source_editor.h | 6 ++- editor/plugins/voxel_gi_editor_plugin.cpp | 2 +- editor/project_manager.cpp | 2 +- editor/register_editor_types.cpp | 3 +- editor/rename_dialog.cpp | 4 ++ editor/rename_dialog.h | 16 +++--- editor/reparent_dialog.cpp | 4 +- editor/reparent_dialog.h | 8 ++- editor/scene_tree_dock.cpp | 2 +- editor/scene_tree_dock.h | 3 +- editor/script_create_dialog.cpp | 2 +- editor/shader_create_dialog.cpp | 2 +- .../editor_scene_exporter_gltf_plugin.cpp | 2 +- .../editor/editor_scene_importer_blend.cpp | 2 +- .../gridmap/editor/grid_map_editor_plugin.cpp | 2 + .../multiplayer/editor/replication_editor.cpp | 2 +- .../editor/navigation_mesh_editor_plugin.cpp | 3 ++ .../editor/navigation_mesh_editor_plugin.h | 2 + .../editor/openxr_action_map_editor.cpp | 2 +- 116 files changed, 283 insertions(+), 195 deletions(-) rename editor/{fileserver => debugger}/editor_file_server.cpp (100%) rename editor/{fileserver => debugger}/editor_file_server.h (100%) rename editor/{fileserver => gui}/SCsub (100%) rename editor/{ => gui}/editor_dir_dialog.cpp (100%) rename editor/{ => gui}/editor_dir_dialog.h (100%) rename editor/{ => gui}/editor_file_dialog.cpp (99%) rename editor/{ => gui}/editor_file_dialog.h (100%) rename editor/{editor_path.cpp => gui/editor_object_selector.cpp} (90%) rename editor/{editor_path.h => gui/editor_object_selector.h} (90%) rename editor/{ => gui}/editor_spin_slider.cpp (100%) rename editor/{ => gui}/editor_spin_slider.h (100%) rename editor/{ => gui}/editor_title_bar.cpp (99%) rename editor/{ => gui}/editor_title_bar.h (100%) rename editor/{ => gui}/editor_toaster.cpp (100%) rename editor/{ => gui}/editor_toaster.h (100%) rename editor/{ => gui}/editor_zoom_widget.cpp (100%) rename editor/{ => gui}/editor_zoom_widget.h (100%) rename editor/{ => gui}/scene_tree_editor.cpp (99%) rename editor/{ => gui}/scene_tree_editor.h (100%) diff --git a/editor/SCsub b/editor/SCsub index dddec55ed654..d1781487ca7c 100644 --- a/editor/SCsub +++ b/editor/SCsub @@ -119,7 +119,7 @@ if env.editor_build: SConscript("debugger/SCsub") SConscript("export/SCsub") - SConscript("fileserver/SCsub") + SConscript("gui/SCsub") SConscript("icons/SCsub") SConscript("import/SCsub") SConscript("plugins/SCsub") diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index c27417f03750..e87c381e3281 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -37,12 +37,20 @@ #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_spin_slider.h" +#include "editor/gui/scene_tree_editor.h" #include "editor/inspector_dock.h" #include "editor/plugins/animation_player_editor_plugin.h" #include "scene/animation/animation_player.h" #include "scene/animation/tween.h" +#include "scene/gui/check_box.h" #include "scene/gui/grid_container.h" +#include "scene/gui/option_button.h" +#include "scene/gui/panel_container.h" #include "scene/gui/separator.h" +#include "scene/gui/slider.h" +#include "scene/gui/spin_box.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/view_panner.h" #include "scene/main/window.h" #include "scene/scene_string_names.h" diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index c733f397e3cd..cef726f6c013 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation_track_editor.h @@ -33,25 +33,24 @@ #include "editor/editor_data.h" #include "editor/editor_properties.h" -#include "editor/editor_spin_slider.h" #include "editor/property_selector.h" - #include "scene/3d/node_3d.h" -#include "scene/gui/check_box.h" #include "scene/gui/control.h" #include "scene/gui/menu_button.h" -#include "scene/gui/option_button.h" -#include "scene/gui/panel_container.h" #include "scene/gui/scroll_bar.h" -#include "scene/gui/slider.h" -#include "scene/gui/spin_box.h" -#include "scene/gui/tab_container.h" -#include "scene/gui/texture_rect.h" +#include "scene/gui/tree.h" #include "scene/resources/animation.h" -#include "scene_tree_editor.h" class AnimationTrackEditor; class AnimationTrackEdit; +class CheckBox; +class EditorSpinSlider; +class HSlider; +class OptionButton; +class PanelContainer; +class SceneTreeDialog; +class SpinBox; +class TextureRect; class ViewPanner; class AnimationTrackKeyEdit : public Object { diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index befe84f31156..c34b7ad57517 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -33,12 +33,21 @@ #include "core/config/project_settings.h" #include "editor/doc_tools.h" #include "editor/editor_help.h" +#include "editor/editor_inspector.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/scene_tree_editor.h" #include "editor/scene_tree_dock.h" #include "plugins/script_editor_plugin.h" +#include "scene/gui/button.h" +#include "scene/gui/check_box.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/option_button.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/spin_box.h" #include "scene/resources/packed_scene.h" static Node *_find_first_script(Node *p_root, Node *p_node) { diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h index e5375a3fc894..003d4125afc6 100644 --- a/editor/connections_dialog.h +++ b/editor/connections_dialog.h @@ -31,22 +31,20 @@ #ifndef CONNECTIONS_DIALOG_H #define CONNECTIONS_DIALOG_H -#include "editor/editor_inspector.h" -#include "editor/scene_tree_editor.h" -#include "scene/gui/button.h" -#include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/dialogs.h" -#include "scene/gui/label.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/option_button.h" -#include "scene/gui/popup.h" -#include "scene/gui/popup_menu.h" -#include "scene/gui/spin_box.h" #include "scene/gui/tree.h" +class Button; +class CheckBox; class ConnectDialogBinds; +class EditorInspector; +class Label; +class LineEdit; +class OptionButton; +class PopupMenu; +class SceneTreeEditor; +class SpinBox; class ConnectDialog : public ConfirmationDialog { GDCLASS(ConnectDialog, ConfirmationDialog); diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp index c67ac69946d0..65f8951c3090 100644 --- a/editor/debugger/editor_debugger_tree.cpp +++ b/editor/debugger/editor_debugger_tree.cpp @@ -30,8 +30,8 @@ #include "editor_debugger_tree.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/scene_tree_dock.h" #include "scene/debugger/scene_debugger.h" #include "scene/gui/texture_rect.h" diff --git a/editor/fileserver/editor_file_server.cpp b/editor/debugger/editor_file_server.cpp similarity index 100% rename from editor/fileserver/editor_file_server.cpp rename to editor/debugger/editor_file_server.cpp diff --git a/editor/fileserver/editor_file_server.h b/editor/debugger/editor_file_server.h similarity index 100% rename from editor/fileserver/editor_file_server.h rename to editor/debugger/editor_file_server.h diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index f805a4aecd68..a696e1ff1fca 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -40,13 +40,13 @@ #include "editor/debugger/editor_performance_profiler.h" #include "editor/debugger/editor_profiler.h" #include "editor/debugger/editor_visual_profiler.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_log.h" #include "editor/editor_node.h" #include "editor/editor_property_name_processor.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/inspector_dock.h" #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/plugins/editor_debugger_plugin.h" diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index c98ec7b2d533..9cff7e37711c 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -33,11 +33,11 @@ #include "core/config/project_settings.h" #include "core/io/file_access.h" #include "core/io/resource_loader.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/gui/margin_container.h" void DependencyEditor::_searched(const String &p_path) { diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index f2a0ec901f85..9ed8cf7c2132 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -34,12 +34,12 @@ #include "core/input/input.h" #include "core/io/resource_saver.h" #include "core/os/keyboard.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" -#include "filesystem_dock.h" +#include "editor/filesystem_dock.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/gui/separator.h" #include "scene/resources/font.h" #include "servers/audio_server.h" diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index a6defd0e14b6..7a1dc2e33b08 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -32,12 +32,12 @@ #include "core/config/project_settings.h" #include "core/core_constants.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_undo_redo_manager.h" #include "editor/filesystem_dock.h" -#include "project_settings_editor.h" +#include "editor/gui/editor_file_dialog.h" +#include "editor/project_settings_editor.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" diff --git a/editor/editor_build_profile.cpp b/editor/editor_build_profile.cpp index b112818e830a..137753724597 100644 --- a/editor/editor_build_profile.cpp +++ b/editor/editor_build_profile.cpp @@ -32,13 +32,13 @@ #include "core/io/dir_access.h" #include "core/io/json.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" #include "editor/editor_property_name_processor.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" const char *EditorBuildProfile::build_option_identifiers[BUILD_OPTION_MAX] = { // This maps to SCons build options. diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index f8bc37798af3..7c77fec81acd 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -32,12 +32,12 @@ #include "core/io/dir_access.h" #include "core/io/json.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" #include "editor/editor_property_name_processor.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" const char *EditorFeatureProfile::feature_names[FEATURE_MAX] = { TTRC("3D Editor"), diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 2fc229f9f275..f98274da8bcd 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -72,12 +72,12 @@ #include "editor/editor_command_palette.h" #include "editor/editor_data.h" #include "editor/editor_feature_profile.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_folding.h" #include "editor/editor_help.h" #include "editor/editor_inspector.h" #include "editor/editor_layouts_dialog.h" #include "editor/editor_log.h" +#include "editor/editor_native_shader_source_visualizer.h" #include "editor/editor_paths.h" #include "editor/editor_plugin.h" #include "editor/editor_properties.h" @@ -90,7 +90,6 @@ #include "editor/editor_settings.h" #include "editor/editor_settings_dialog.h" #include "editor/editor_themes.h" -#include "editor/editor_toaster.h" #include "editor/editor_translation_parser.h" #include "editor/editor_undo_redo_manager.h" #include "editor/export/editor_export.h" @@ -98,6 +97,9 @@ #include "editor/export/project_export.h" #include "editor/fbx_importer_manager.h" #include "editor/filesystem_dock.h" +#include "editor/gui/editor_file_dialog.h" +#include "editor/gui/editor_title_bar.h" +#include "editor/gui/editor_toaster.h" #include "editor/history_dock.h" #include "editor/import/audio_stream_import_settings.h" #include "editor/import/dynamic_font_import_settings.h" diff --git a/editor/editor_node.h b/editor/editor_node.h index f9ba2b8b1735..8f17932cb099 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -34,10 +34,8 @@ #include "core/templates/safe_refcount.h" #include "editor/editor_data.h" #include "editor/editor_folding.h" -#include "editor/editor_native_shader_source_visualizer.h" #include "editor/editor_plugin.h" #include "editor/editor_run.h" -#include "editor/editor_title_bar.h" #include "editor/export/editor_export.h" typedef void (*EditorNodeInitCallback)(); @@ -46,71 +44,73 @@ typedef bool (*EditorBuildCallback)(); class AcceptDialog; class AcceptDialogAutoReparent; -class AudioStreamPreviewGenerator; -class BackgroundProgress; class CenterContainer; class CheckBox; class ColorPicker; class ConfirmationDialog; class Control; +class FileDialog; +class HBoxContainer; +class HSplitContainer; +class LinkButton; +class MenuBar; +class MenuButton; +class Node2D; +class OptionButton; +class Panel; +class PanelContainer; +class SubViewport; +class TabBar; +class TabContainer; +class TextureRect; +class TextureProgressBar; +class Tree; +class VSplitContainer; +class Window; + +class AudioStreamImportSettings; +class AudioStreamPreviewGenerator; +class BackgroundProgress; class DependencyEditor; class DependencyErrorDialog; class DynamicFontImportSettings; class EditorAbout; +class EditorBuildProfileManager; class EditorCommandPalette; class EditorExport; class EditorExtensionManager; class EditorFeatureProfileManager; class EditorFileDialog; -class EditorFileServer; class EditorFolding; class EditorInspector; class EditorLayoutsDialog; class EditorLog; +class EditorNativeShaderSourceVisualizer; class EditorPluginList; class EditorQuickOpen; class EditorPropertyResource; class EditorResourcePreview; class EditorResourceConversionPlugin; -class EditorRun; class EditorRunNative; class EditorSelectionHistory; class EditorSettingsDialog; +class EditorTitleBar; class EditorToaster; class EditorUndoRedoManager; class ExportTemplateManager; class FBXImporterManager; -class FileDialog; class FileSystemDock; class HistoryDock; -class HSplitContainer; class ImportDock; -class LinkButton; -class MenuBar; -class MenuButton; -class Node2D; class NodeDock; -class OptionButton; class OrphanResourcesDialog; -class Panel; -class PanelContainer; class PluginConfigDialog; class ProgressDialog; class ProjectExportDialog; class ProjectSettingsEditor; class RunSettingsDialog; class SceneImportSettings; -class AudioStreamImportSettings; class ScriptCreateDialog; -class SubViewport; -class TabBar; -class TabContainer; -class TextureRect; -class TextureProgressBar; -class Tree; -class VSplitContainer; -class Window; -class EditorBuildProfileManager; class EditorNode : public Node { GDCLASS(EditorNode, Node); @@ -738,7 +738,7 @@ class EditorNode : public Node { static EditorData &get_editor_data() { return singleton->editor_data; } static EditorFolding &get_editor_folding() { return singleton->editor_folding; } - static HBoxContainer *get_menu_hb() { return singleton->menu_hb; } + static EditorTitleBar *get_menu_hb() { return singleton->menu_hb; } static VSplitContainer *get_top_split() { return singleton->top_split; } static String adjust_scene_name_casing(const String &root_name); diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index fb2110dea37f..9281965e6f87 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -40,6 +40,7 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/export/editor_export.h" #include "editor/filesystem_dock.h" +#include "editor/gui/editor_title_bar.h" #include "editor/import/editor_import_plugin.h" #include "editor/import/resource_importer_scene.h" #include "editor/inspector_dock.h" diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 5147237ac262..9f8b12e029f8 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -33,17 +33,18 @@ #include "core/config/project_settings.h" #include "core/core_string_names.h" #include "editor/create_dialog.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_properties_array_dict.h" #include "editor/editor_resource_picker.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" +#include "editor/gui/editor_spin_slider.h" +#include "editor/gui/scene_tree_editor.h" #include "editor/inspector_dock.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/project_settings_editor.h" #include "editor/property_selector.h" -#include "editor/scene_tree_editor.h" #include "scene/2d/gpu_particles_2d.h" #include "scene/3d/fog_volume.h" #include "scene/3d/gpu_particles_3d.h" diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp index 80ebd32295ca..f7c789a45349 100644 --- a/editor/editor_properties_array_dict.cpp +++ b/editor/editor_properties_array_dict.cpp @@ -35,7 +35,9 @@ #include "editor/editor_properties.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_spin_slider.h" #include "editor/inspector_dock.h" +#include "scene/gui/button.h" bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) { String name = p_name; diff --git a/editor/editor_properties_array_dict.h b/editor/editor_properties_array_dict.h index 3b880c60a887..2ca1931f8555 100644 --- a/editor/editor_properties_array_dict.h +++ b/editor/editor_properties_array_dict.h @@ -33,9 +33,10 @@ #include "editor/editor_inspector.h" #include "editor/editor_locale_dialog.h" -#include "editor/editor_spin_slider.h" #include "editor/filesystem_dock.h" -#include "scene/gui/button.h" + +class Button; +class EditorSpinSlider; class EditorPropertyArrayObject : public RefCounted { GDCLASS(EditorPropertyArrayObject, RefCounted); diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index 4e7b7a84343f..2d6feac0078e 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -31,13 +31,13 @@ #include "editor_resource_picker.h" #include "editor/audio_stream_preview.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_quick_open.h" #include "editor/editor_resource_preview.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/filesystem_dock.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/plugins/editor_resource_conversion_plugin.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/scene_tree_dock.h" diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index 2516e5df96ae..95c79ab58c78 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -32,13 +32,13 @@ #include "core/config/project_settings.h" #include "core/version.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_properties.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/export/editor_export.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/item_list.h" @@ -47,6 +47,7 @@ #include "scene/gui/option_button.h" #include "scene/gui/popup_menu.h" #include "scene/gui/split_container.h" +#include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" diff --git a/editor/fbx_importer_manager.h b/editor/fbx_importer_manager.h index dd5fcfd16e7b..55061c041aa8 100644 --- a/editor/fbx_importer_manager.h +++ b/editor/fbx_importer_manager.h @@ -31,7 +31,7 @@ #ifndef FBX_IMPORTER_MANAGER_H #define FBX_IMPORTER_MANAGER_H -#include "editor/editor_file_dialog.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/gui/dialogs.h" #include "scene/gui/line_edit.h" diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index e96f902b6453..066e8cb84ef1 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -37,17 +37,22 @@ #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/templates/list.h" +#include "editor/create_dialog.h" #include "editor/editor_feature_profile.h" #include "editor/editor_node.h" #include "editor/editor_resource_preview.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_dir_dialog.h" #include "editor/import/resource_importer_scene.h" #include "editor/import_dock.h" #include "editor/scene_create_dialog.h" #include "editor/scene_tree_dock.h" #include "editor/shader_create_dialog.h" +#include "scene/gui/item_list.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/progress_bar.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" #include "servers/display_server.h" diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 35ca3eaccb02..7c67be44bea3 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -31,22 +31,22 @@ #ifndef FILESYSTEM_DOCK_H #define FILESYSTEM_DOCK_H -#include "editor/create_dialog.h" #include "editor/dependency_editor.h" -#include "editor/editor_dir_dialog.h" #include "editor/editor_file_system.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/script_create_dialog.h" #include "scene/gui/box_container.h" #include "scene/gui/control.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" -#include "scene/gui/progress_bar.h" #include "scene/gui/split_container.h" #include "scene/gui/tree.h" +class CreateDialog; +class EditorDirDialog; +class ItemList; +class LineEdit; +class ProgressBar; class SceneCreateDialog; class ShaderCreateDialog; diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp index 7f0417ea2964..37b4654113f5 100644 --- a/editor/groups_editor.cpp +++ b/editor/groups_editor.cpp @@ -33,10 +33,12 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/scene_tree_editor.h" #include "editor/scene_tree_dock.h" -#include "editor/scene_tree_editor.h" -#include "scene/gui/box_container.h" +#include "scene/gui/button.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/tree.h" #include "scene/resources/packed_scene.h" static bool can_edit(Node *p_node, String p_group) { diff --git a/editor/groups_editor.h b/editor/groups_editor.h index cd9d458f4b58..27322b63dab8 100644 --- a/editor/groups_editor.h +++ b/editor/groups_editor.h @@ -31,13 +31,12 @@ #ifndef GROUPS_EDITOR_H #define GROUPS_EDITOR_H -#include "editor/scene_tree_editor.h" -#include "scene/gui/button.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/popup.h" -#include "scene/gui/tree.h" + +class Button; +class LineEdit; +class Tree; +class TreeItem; class GroupDialog : public AcceptDialog { GDCLASS(GroupDialog, AcceptDialog); diff --git a/editor/fileserver/SCsub b/editor/gui/SCsub similarity index 100% rename from editor/fileserver/SCsub rename to editor/gui/SCsub diff --git a/editor/editor_dir_dialog.cpp b/editor/gui/editor_dir_dialog.cpp similarity index 100% rename from editor/editor_dir_dialog.cpp rename to editor/gui/editor_dir_dialog.cpp diff --git a/editor/editor_dir_dialog.h b/editor/gui/editor_dir_dialog.h similarity index 100% rename from editor/editor_dir_dialog.h rename to editor/gui/editor_dir_dialog.h diff --git a/editor/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp similarity index 99% rename from editor/editor_file_dialog.cpp rename to editor/gui/editor_file_dialog.cpp index 192f4b2edbbb..62e05207998c 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/gui/editor_file_dialog.cpp @@ -34,7 +34,7 @@ #include "core/io/file_access.h" #include "core/os/keyboard.h" #include "core/os/os.h" -#include "dependency_editor.h" +#include "editor/dependency_editor.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_resource_preview.h" diff --git a/editor/editor_file_dialog.h b/editor/gui/editor_file_dialog.h similarity index 100% rename from editor/editor_file_dialog.h rename to editor/gui/editor_file_dialog.h diff --git a/editor/editor_path.cpp b/editor/gui/editor_object_selector.cpp similarity index 90% rename from editor/editor_path.cpp rename to editor/gui/editor_object_selector.cpp index bb464ee36608..9988e285c7c3 100644 --- a/editor/editor_path.cpp +++ b/editor/gui/editor_object_selector.cpp @@ -1,5 +1,5 @@ /**************************************************************************/ -/* editor_path.cpp */ +/* editor_object_selector.cpp */ /**************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,20 +28,20 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "editor_path.h" +#include "editor_object_selector.h" #include "editor/editor_data.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/multi_node_edit.h" -Size2 EditorPath::get_minimum_size() const { +Size2 EditorObjectSelector::get_minimum_size() const { Ref font = get_theme_font(SNAME("font")); int font_size = get_theme_font_size(SNAME("font_size")); return Button::get_minimum_size() + Size2(0, font->get_height(font_size)); } -void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) { +void EditorObjectSelector::_add_children_to_popup(Object *p_obj, int p_depth) { if (p_depth > 8) { return; } @@ -86,7 +86,7 @@ void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) { } } -void EditorPath::_show_popup() { +void EditorObjectSelector::_show_popup() { if (sub_objects_menu->is_visible()) { sub_objects_menu->hide(); return; @@ -106,7 +106,7 @@ void EditorPath::_show_popup() { sub_objects_menu->popup(); } -void EditorPath::_about_to_show() { +void EditorObjectSelector::_about_to_show() { Object *obj = ObjectDB::get_instance(history->get_path_object(history->get_path_size() - 1)); if (!obj) { return; @@ -121,7 +121,7 @@ void EditorPath::_about_to_show() { } } -void EditorPath::update_path() { +void EditorObjectSelector::update_path() { for (int i = 0; i < history->get_path_size(); i++) { Object *obj = ObjectDB::get_instance(history->get_path_object(i)); if (!obj) { @@ -170,7 +170,7 @@ void EditorPath::update_path() { } } -void EditorPath::clear_path() { +void EditorObjectSelector::clear_path() { set_disabled(true); set_tooltip_text(""); @@ -179,12 +179,12 @@ void EditorPath::clear_path() { sub_objects_icon->hide(); } -void EditorPath::enable_path() { +void EditorObjectSelector::enable_path() { set_disabled(false); sub_objects_icon->show(); } -void EditorPath::_id_pressed(int p_idx) { +void EditorObjectSelector::_id_pressed(int p_idx) { ERR_FAIL_INDEX(p_idx, objects.size()); Object *obj = ObjectDB::get_instance(objects[p_idx]); @@ -195,7 +195,7 @@ void EditorPath::_id_pressed(int p_idx) { EditorNode::get_singleton()->push_item(obj); } -void EditorPath::_notification(int p_what) { +void EditorObjectSelector::_notification(int p_what) { switch (p_what) { case NOTIFICATION_ENTER_TREE: case NOTIFICATION_THEME_CHANGED: { @@ -210,15 +210,15 @@ void EditorPath::_notification(int p_what) { } break; case NOTIFICATION_READY: { - connect("pressed", callable_mp(this, &EditorPath::_show_popup)); + connect("pressed", callable_mp(this, &EditorObjectSelector::_show_popup)); } break; } } -void EditorPath::_bind_methods() { +void EditorObjectSelector::_bind_methods() { } -EditorPath::EditorPath(EditorSelectionHistory *p_history) { +EditorObjectSelector::EditorObjectSelector(EditorSelectionHistory *p_history) { history = p_history; MarginContainer *main_mc = memnew(MarginContainer); @@ -249,8 +249,8 @@ EditorPath::EditorPath(EditorSelectionHistory *p_history) { sub_objects_menu = memnew(PopupMenu); sub_objects_menu->set_auto_translate(false); add_child(sub_objects_menu); - sub_objects_menu->connect("about_to_popup", callable_mp(this, &EditorPath::_about_to_show)); - sub_objects_menu->connect("id_pressed", callable_mp(this, &EditorPath::_id_pressed)); + sub_objects_menu->connect("about_to_popup", callable_mp(this, &EditorObjectSelector::_about_to_show)); + sub_objects_menu->connect("id_pressed", callable_mp(this, &EditorObjectSelector::_id_pressed)); set_tooltip_text(TTR("Open a list of sub-resources.")); } diff --git a/editor/editor_path.h b/editor/gui/editor_object_selector.h similarity index 90% rename from editor/editor_path.h rename to editor/gui/editor_object_selector.h index b6778b682e81..72ff285cf68f 100644 --- a/editor/editor_path.h +++ b/editor/gui/editor_object_selector.h @@ -1,5 +1,5 @@ /**************************************************************************/ -/* editor_path.h */ +/* editor_object_selector.h */ /**************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#ifndef EDITOR_PATH_H -#define EDITOR_PATH_H +#ifndef EDITOR_OBJECT_SELECTOR_H +#define EDITOR_OBJECT_SELECTOR_H #include "scene/gui/box_container.h" #include "scene/gui/button.h" @@ -39,8 +39,8 @@ class EditorSelectionHistory; -class EditorPath : public Button { - GDCLASS(EditorPath, Button); +class EditorObjectSelector : public Button { + GDCLASS(EditorObjectSelector, Button); EditorSelectionHistory *history = nullptr; @@ -67,7 +67,7 @@ class EditorPath : public Button { void clear_path(); void enable_path(); - EditorPath(EditorSelectionHistory *p_history); + EditorObjectSelector(EditorSelectionHistory *p_history); }; -#endif // EDITOR_PATH_H +#endif // EDITOR_OBJECT_SELECTOR_H diff --git a/editor/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp similarity index 100% rename from editor/editor_spin_slider.cpp rename to editor/gui/editor_spin_slider.cpp diff --git a/editor/editor_spin_slider.h b/editor/gui/editor_spin_slider.h similarity index 100% rename from editor/editor_spin_slider.h rename to editor/gui/editor_spin_slider.h diff --git a/editor/editor_title_bar.cpp b/editor/gui/editor_title_bar.cpp similarity index 99% rename from editor/editor_title_bar.cpp rename to editor/gui/editor_title_bar.cpp index ae5cdfd72b27..c251c70c6de9 100644 --- a/editor/editor_title_bar.cpp +++ b/editor/gui/editor_title_bar.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "editor/editor_title_bar.h" +#include "editor_title_bar.h" void EditorTitleBar::gui_input(const Ref &p_event) { if (!can_move) { diff --git a/editor/editor_title_bar.h b/editor/gui/editor_title_bar.h similarity index 100% rename from editor/editor_title_bar.h rename to editor/gui/editor_title_bar.h diff --git a/editor/editor_toaster.cpp b/editor/gui/editor_toaster.cpp similarity index 100% rename from editor/editor_toaster.cpp rename to editor/gui/editor_toaster.cpp diff --git a/editor/editor_toaster.h b/editor/gui/editor_toaster.h similarity index 100% rename from editor/editor_toaster.h rename to editor/gui/editor_toaster.h diff --git a/editor/editor_zoom_widget.cpp b/editor/gui/editor_zoom_widget.cpp similarity index 100% rename from editor/editor_zoom_widget.cpp rename to editor/gui/editor_zoom_widget.cpp diff --git a/editor/editor_zoom_widget.h b/editor/gui/editor_zoom_widget.h similarity index 100% rename from editor/editor_zoom_widget.h rename to editor/gui/editor_zoom_widget.h diff --git a/editor/scene_tree_editor.cpp b/editor/gui/scene_tree_editor.cpp similarity index 99% rename from editor/scene_tree_editor.cpp rename to editor/gui/scene_tree_editor.cpp index 808c058ecd2b..5b9f2c3b21c8 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/gui/scene_tree_editor.cpp @@ -42,6 +42,8 @@ #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/plugins/script_editor_plugin.h" #include "scene/gui/label.h" +#include "scene/gui/tab_container.h" +#include "scene/gui/texture_rect.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" diff --git a/editor/scene_tree_editor.h b/editor/gui/scene_tree_editor.h similarity index 100% rename from editor/scene_tree_editor.h rename to editor/gui/scene_tree_editor.h diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index 6be6682232e1..65fc79a7a57b 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -31,7 +31,6 @@ #include "dynamic_font_import_settings.h" #include "core/config/project_settings.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_inspector.h" #include "editor/editor_locale_dialog.h" @@ -39,6 +38,7 @@ #include "editor/editor_property_name_processor.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" /*************************************************************************/ /* Settings data */ diff --git a/editor/import/scene_import_settings.cpp b/editor/import/scene_import_settings.cpp index 4dd3de8ca27d..e7ba47e2a137 100644 --- a/editor/import/scene_import_settings.cpp +++ b/editor/import/scene_import_settings.cpp @@ -31,12 +31,12 @@ #include "scene_import_settings.h" #include "core/config/project_settings.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_inspector.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/animation/animation_player.h" #include "scene/resources/importer_mesh.h" diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index f7bbeb92c6f2..2acc83cead75 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -30,12 +30,13 @@ #include "inspector_dock.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/filesystem_dock.h" +#include "editor/gui/editor_file_dialog.h" +#include "editor/gui/editor_object_selector.h" #include "editor/plugins/script_editor_plugin.h" InspectorDock *InspectorDock::singleton = nullptr; @@ -510,7 +511,7 @@ void InspectorDock::update(Object *p_object) { if (editor_history->get_history_len() > 0) { history_menu->set_disabled(false); } - editor_path->update_path(); + object_selector->update_path(); current = p_object; @@ -530,11 +531,11 @@ void InspectorDock::update(Object *p_object) { if (!is_object || is_text_file) { info->hide(); - editor_path->clear_path(); + object_selector->clear_path(); return; } - editor_path->enable_path(); + object_selector->enable_path(); PopupMenu *p = object_menu->get_popup(); @@ -689,9 +690,9 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { HBoxContainer *subresource_hb = memnew(HBoxContainer); add_child(subresource_hb); - editor_path = memnew(EditorPath(EditorNode::get_singleton()->get_editor_selection_history())); - editor_path->set_h_size_flags(Control::SIZE_EXPAND_FILL); - subresource_hb->add_child(editor_path); + object_selector = memnew(EditorObjectSelector(EditorNode::get_singleton()->get_editor_selection_history())); + object_selector->set_h_size_flags(Control::SIZE_EXPAND_FILL); + subresource_hb->add_child(object_selector); open_docs_button = memnew(Button); open_docs_button->set_flat(true); diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index c2c1b55fb153..622a2521b314 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -34,7 +34,6 @@ #include "editor/create_dialog.h" #include "editor/editor_data.h" #include "editor/editor_inspector.h" -#include "editor/editor_path.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/dialogs.h" @@ -43,6 +42,7 @@ #include "scene/gui/tree.h" class EditorFileDialog; +class EditorObjectSelector; class InspectorDock : public VBoxContainer { GDCLASS(InspectorDock, VBoxContainer); @@ -92,7 +92,7 @@ class InspectorDock : public VBoxContainer { Button *open_docs_button = nullptr; MenuButton *object_menu = nullptr; - EditorPath *editor_path = nullptr; + EditorObjectSelector *object_selector = nullptr; bool info_is_warning = false; // Display in yellow and use warning icon if true. Button *info = nullptr; diff --git a/editor/localization_editor.cpp b/editor/localization_editor.cpp index fac1ec3523b8..351986a80b10 100644 --- a/editor/localization_editor.cpp +++ b/editor/localization_editor.cpp @@ -32,11 +32,11 @@ #include "core/config/project_settings.h" #include "core/string/translation.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_scale.h" #include "editor/editor_translation_parser.h" #include "editor/editor_undo_redo_manager.h" #include "editor/filesystem_dock.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/pot_generator.h" #include "scene/gui/control.h" diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index 7c23e19564a5..4375a33b4f30 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -37,6 +37,8 @@ #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/gui/button.h" +#include "scene/gui/dialogs.h" #include "scene/gui/separator.h" bool AbstractPolygon2DEditor::Vertex::operator==(const AbstractPolygon2DEditor::Vertex &p_vertex) const { diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h index 832972c3988c..31c20ac1464b 100644 --- a/editor/plugins/abstract_polygon_2d_editor.h +++ b/editor/plugins/abstract_polygon_2d_editor.h @@ -35,6 +35,7 @@ #include "scene/2d/polygon_2d.h" #include "scene/gui/box_container.h" +class Button; class CanvasItemEditor; class ConfirmationDialog; diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp index df94815105e3..15fa60f11b77 100644 --- a/editor/plugins/animation_blend_space_1d_editor.cpp +++ b/editor/plugins/animation_blend_space_1d_editor.cpp @@ -31,11 +31,11 @@ #include "animation_blend_space_1d_editor.h" #include "core/os/keyboard.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/animation/animation_blend_tree.h" #include "scene/gui/check_box.h" #include "scene/gui/option_button.h" diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index 0daf934e17c7..e96cd5770c9a 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -35,11 +35,11 @@ #include "core/io/resource_loader.h" #include "core/math/geometry_2d.h" #include "core/os/keyboard.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" #include "scene/gui/check_box.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index 77785b15caec..9dff5127ae5d 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -34,12 +34,12 @@ #include "core/input/input.h" #include "core/io/resource_loader.h" #include "core/os/keyboard.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_inspector.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/animation/animation_player.h" #include "scene/gui/check_box.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/animation_library_editor.cpp b/editor/plugins/animation_library_editor.cpp index bf7e419fe400..4db4f870ca80 100644 --- a/editor/plugins/animation_library_editor.cpp +++ b/editor/plugins/animation_library_editor.cpp @@ -29,11 +29,11 @@ /**************************************************************************/ #include "animation_library_editor.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" void AnimationLibraryEditor::set_animation_player(Object *p_player) { player = p_player; diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 2abb74d9e96b..d9d057d0e8e7 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -35,11 +35,11 @@ #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" #include "core/os/keyboard.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/inspector_dock.h" #include "editor/plugins/canvas_item_editor_plugin.h" // For onion skinning. #include "editor/plugins/node_3d_editor_plugin.h" // For onion skinning. diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp index 9632670658d4..715f2b9ad4a1 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/plugins/animation_state_machine_editor.cpp @@ -35,11 +35,11 @@ #include "core/io/resource_loader.h" #include "core/math/geometry_2d.h" #include "core/os/keyboard.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index ab46e8f04a83..80e9bf7eda15 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -39,9 +39,9 @@ #include "core/io/resource_loader.h" #include "core/math/delaunay_2d.h" #include "core/os/keyboard.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index a80d57d272e3..eeb0fd5f6645 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -35,11 +35,11 @@ #include "core/io/stream_peer_tls.h" #include "core/os/keyboard.h" #include "core/version.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/project_settings_editor.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index e969f9ab30d2..097211a78f66 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -37,9 +37,9 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "editor/editor_toaster.h" #include "editor/editor_undo_redo_manager.h" -#include "editor/editor_zoom_widget.h" +#include "editor/gui/editor_toaster.h" +#include "editor/gui/editor_zoom_widget.h" #include "editor/plugins/animation_player_editor_plugin.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/scene_tree_dock.h" @@ -56,6 +56,7 @@ #include "scene/gui/separator.h" #include "scene/gui/split_container.h" #include "scene/gui/subviewport_container.h" +#include "scene/gui/texture_rect.h" #include "scene/gui/view_panner.h" #include "scene/main/canvas_layer.h" #include "scene/main/window.h" diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.cpp b/editor/plugins/cpu_particles_2d_editor_plugin.cpp index 85897742fbc2..ef00af592f3a 100644 --- a/editor/plugins/cpu_particles_2d_editor_plugin.cpp +++ b/editor/plugins/cpu_particles_2d_editor_plugin.cpp @@ -32,8 +32,8 @@ #include "canvas_item_editor_plugin.h" #include "core/io/image_loader.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/2d/cpu_particles_2d.h" #include "scene/gui/check_box.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/cpu_particles_3d_editor_plugin.cpp b/editor/plugins/cpu_particles_3d_editor_plugin.cpp index 61702493da2c..6edfc2ef2e17 100644 --- a/editor/plugins/cpu_particles_3d_editor_plugin.cpp +++ b/editor/plugins/cpu_particles_3d_editor_plugin.cpp @@ -31,8 +31,8 @@ #include "cpu_particles_3d_editor_plugin.h" #include "editor/editor_node.h" +#include "editor/gui/scene_tree_editor.h" #include "editor/plugins/node_3d_editor_plugin.h" -#include "editor/scene_tree_editor.h" #include "scene/gui/menu_button.h" void CPUParticles3DEditor::_node_removed(Node *p_node) { diff --git a/editor/plugins/debugger_editor_plugin.cpp b/editor/plugins/debugger_editor_plugin.cpp index 224d221d9aee..7863e6d19e4f 100644 --- a/editor/plugins/debugger_editor_plugin.cpp +++ b/editor/plugins/debugger_editor_plugin.cpp @@ -33,10 +33,10 @@ #include "core/os/keyboard.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/editor_debugger_server.h" +#include "editor/debugger/editor_file_server.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "editor/fileserver/editor_file_server.h" #include "editor/plugins/script_editor_plugin.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/gpu_particles_2d_editor_plugin.cpp b/editor/plugins/gpu_particles_2d_editor_plugin.cpp index 04b2a9337ee8..8631ee05c82a 100644 --- a/editor/plugins/gpu_particles_2d_editor_plugin.cpp +++ b/editor/plugins/gpu_particles_2d_editor_plugin.cpp @@ -32,9 +32,9 @@ #include "canvas_item_editor_plugin.h" #include "core/io/image_loader.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/scene_tree_dock.h" #include "scene/2d/cpu_particles_2d.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp index 477a094d019c..abecba144c53 100644 --- a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp +++ b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp @@ -30,8 +30,8 @@ #include "gpu_particles_collision_sdf_editor_plugin.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" +#include "editor/gui/editor_file_dialog.h" void GPUParticlesCollisionSDF3DEditorPlugin::_bake() { if (col_sdf) { diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.cpp b/editor/plugins/gradient_texture_2d_editor_plugin.cpp index 7bd159a5b825..e91afe28ee8b 100644 --- a/editor/plugins/gradient_texture_2d_editor_plugin.cpp +++ b/editor/plugins/gradient_texture_2d_editor_plugin.cpp @@ -33,7 +33,9 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_spin_slider.h" #include "scene/gui/box_container.h" +#include "scene/gui/button.h" #include "scene/gui/flow_container.h" #include "scene/gui/separator.h" diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.h b/editor/plugins/gradient_texture_2d_editor_plugin.h index 724ec63b4e86..0b496b210e03 100644 --- a/editor/plugins/gradient_texture_2d_editor_plugin.h +++ b/editor/plugins/gradient_texture_2d_editor_plugin.h @@ -33,7 +33,9 @@ #include "editor/editor_inspector.h" #include "editor/editor_plugin.h" -#include "editor/editor_spin_slider.h" + +class Button; +class EditorSpinSlider; class GradientTexture2DEditorRect : public Control { GDCLASS(GradientTexture2DEditorRect, Control); diff --git a/editor/plugins/lightmap_gi_editor_plugin.cpp b/editor/plugins/lightmap_gi_editor_plugin.cpp index 519cfcaa9421..6ba2072f72e7 100644 --- a/editor/plugins/lightmap_gi_editor_plugin.cpp +++ b/editor/plugins/lightmap_gi_editor_plugin.cpp @@ -30,8 +30,8 @@ #include "lightmap_gi_editor_plugin.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" +#include "editor/gui/editor_file_dialog.h" void LightmapGIEditorPlugin::_bake_select_file(const String &p_file) { if (lightmap) { diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index 36c143ca8d83..328fe9b95083 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -35,7 +35,13 @@ #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/3d/camera_3d.h" +#include "scene/3d/light_3d.h" +#include "scene/3d/mesh_instance_3d.h" +#include "scene/gui/box_container.h" +#include "scene/gui/color_rect.h" #include "scene/gui/subviewport_container.h" +#include "scene/gui/texture_button.h" #include "scene/resources/fog_material.h" #include "scene/resources/particle_process_material.h" #include "scene/resources/sky_material.h" diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index 63ee053b1d16..deb1211c5404 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -34,13 +34,14 @@ #include "editor/editor_inspector.h" #include "editor/editor_plugin.h" #include "editor/plugins/editor_resource_conversion_plugin.h" -#include "scene/3d/camera_3d.h" -#include "scene/3d/light_3d.h" -#include "scene/3d/mesh_instance_3d.h" -#include "scene/gui/color_rect.h" #include "scene/resources/material.h" #include "scene/resources/primitive_meshes.h" +class Camera3D; +class ColorRect; +class DirectionalLight3D; +class HBoxContainer; +class MeshInstance3D; class SubViewport; class SubViewportContainer; class TextureButton; diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp index e8976667dd5e..18bb1d91b388 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_3d_editor_plugin.cpp @@ -33,12 +33,14 @@ #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_undo_redo_manager.h" -#include "node_3d_editor_plugin.h" +#include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/collision_shape_3d.h" #include "scene/3d/navigation_region_3d.h" #include "scene/3d/physics_body_3d.h" #include "scene/gui/box_container.h" +#include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" +#include "scene/gui/spin_box.h" #include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/convex_polygon_shape_3d.h" #include "scene/scene_string_names.h" diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.h b/editor/plugins/mesh_instance_3d_editor_plugin.h index aa72d4fa33c2..ea67d1aae9be 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.h +++ b/editor/plugins/mesh_instance_3d_editor_plugin.h @@ -33,11 +33,11 @@ #include "editor/editor_plugin.h" #include "scene/3d/mesh_instance_3d.h" -#include "scene/gui/spin_box.h" class AcceptDialog; class ConfirmationDialog; class MenuButton; +class SpinBox; class MeshInstance3DEditor : public Control { GDCLASS(MeshInstance3DEditor, Control); diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp index cf8555d07d74..3959ed297642 100644 --- a/editor/plugins/mesh_library_editor_plugin.cpp +++ b/editor/plugins/mesh_library_editor_plugin.cpp @@ -30,12 +30,12 @@ #include "mesh_library_editor_plugin.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/inspector_dock.h" +#include "editor/plugins/node_3d_editor_plugin.h" #include "main/main.h" -#include "node_3d_editor_plugin.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/navigation_region_3d.h" #include "scene/3d/physics_body_3d.h" diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp index 9845e8a9c3d7..15647e1364b2 100644 --- a/editor/plugins/multimesh_editor_plugin.cpp +++ b/editor/plugins/multimesh_editor_plugin.cpp @@ -31,8 +31,8 @@ #include "multimesh_editor_plugin.h" #include "editor/editor_node.h" -#include "editor/scene_tree_editor.h" -#include "node_3d_editor_plugin.h" +#include "editor/gui/scene_tree_editor.h" +#include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/gui/box_container.h" #include "scene/gui/menu_button.h" diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 27c97ff9f433..5245dea67f44 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -40,6 +40,7 @@ #include "editor/editor_node.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_spin_slider.h" #include "editor/plugins/animation_player_editor_plugin.h" #include "editor/plugins/node_3d_editor_gizmos.h" #include "editor/scene_tree_dock.h" diff --git a/editor/plugins/occluder_instance_3d_editor_plugin.cpp b/editor/plugins/occluder_instance_3d_editor_plugin.cpp index cfe95f1cfa31..9e9e602841e4 100644 --- a/editor/plugins/occluder_instance_3d_editor_plugin.cpp +++ b/editor/plugins/occluder_instance_3d_editor_plugin.cpp @@ -30,8 +30,8 @@ #include "occluder_instance_3d_editor_plugin.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" +#include "editor/gui/editor_file_dialog.h" void OccluderInstance3DEditorPlugin::_bake_select_file(const String &p_file) { if (occluder_instance) { diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index e5e77be7aa30..a2549c73763d 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -39,7 +39,10 @@ #include "editor/plugins/canvas_item_editor_plugin.h" #include "scene/2d/skeleton_2d.h" #include "scene/gui/check_box.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/label.h" #include "scene/gui/menu_button.h" +#include "scene/gui/panel.h" #include "scene/gui/scroll_container.h" #include "scene/gui/separator.h" #include "scene/gui/slider.h" diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h index 2c55a5f631b2..3547c031207d 100644 --- a/editor/plugins/polygon_2d_editor_plugin.h +++ b/editor/plugins/polygon_2d_editor_plugin.h @@ -37,6 +37,7 @@ class AcceptDialog; class ButtonGroup; class HScrollBar; class HSlider; +class Label; class MenuButton; class Panel; class ScrollContainer; diff --git a/editor/plugins/polygon_3d_editor_plugin.cpp b/editor/plugins/polygon_3d_editor_plugin.cpp index f4d97a5427ef..efbb2b0d2bb1 100644 --- a/editor/plugins/polygon_3d_editor_plugin.cpp +++ b/editor/plugins/polygon_3d_editor_plugin.cpp @@ -30,7 +30,6 @@ #include "polygon_3d_editor_plugin.h" -#include "canvas_item_editor_plugin.h" #include "core/core_string_names.h" #include "core/input/input.h" #include "core/io/file_access.h" @@ -39,7 +38,8 @@ #include "editor/editor_node.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" -#include "node_3d_editor_plugin.h" +#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/camera_3d.h" #include "scene/gui/separator.h" diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp index dcbff2c75688..a057bbe05e71 100644 --- a/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/editor/plugins/resource_preloader_editor_plugin.cpp @@ -32,11 +32,11 @@ #include "core/config/project_settings.h" #include "core/io/resource_loader.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" void ResourcePreloaderEditor::_notification(int p_what) { switch (p_what) { diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp index e8abecd11536..6094b5bef630 100644 --- a/editor/plugins/root_motion_editor_plugin.cpp +++ b/editor/plugins/root_motion_editor_plugin.cpp @@ -32,6 +32,8 @@ #include "editor/editor_node.h" #include "scene/animation/animation_player.h" #include "scene/animation/animation_tree.h" +#include "scene/gui/button.h" +#include "scene/gui/dialogs.h" #include "scene/gui/tree.h" #include "scene/main/window.h" diff --git a/editor/plugins/root_motion_editor_plugin.h b/editor/plugins/root_motion_editor_plugin.h index d27f0d30ccb4..5befdb6006e7 100644 --- a/editor/plugins/root_motion_editor_plugin.h +++ b/editor/plugins/root_motion_editor_plugin.h @@ -33,10 +33,13 @@ #include "editor/editor_inspector.h" +class Button; +class ConfirmationDialog; class Tree; class EditorPropertyRootMotion : public EditorProperty { GDCLASS(EditorPropertyRootMotion, EditorProperty); + Button *assign = nullptr; Button *clear = nullptr; NodePath base_hint; diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index a749e6de410b..16184e6bc0b0 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -40,7 +40,6 @@ #include "core/version.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_help_search.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" @@ -49,6 +48,7 @@ #include "editor/editor_settings.h" #include "editor/filesystem_dock.h" #include "editor/find_in_files.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/inspector_dock.h" #include "editor/node_dock.h" #include "editor/plugins/shader_editor_plugin.h" diff --git a/editor/plugins/skeleton_2d_editor_plugin.cpp b/editor/plugins/skeleton_2d_editor_plugin.cpp index 06db69633063..6cf73fc48d3d 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.cpp +++ b/editor/plugins/skeleton_2d_editor_plugin.cpp @@ -30,11 +30,11 @@ #include "skeleton_2d_editor_plugin.h" -#include "canvas_item_editor_plugin.h" #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/plugins/canvas_item_editor_plugin.h" #include "scene/2d/mesh_instance_2d.h" -#include "scene/gui/box_container.h" +#include "scene/gui/dialogs.h" #include "scene/gui/menu_button.h" #include "thirdparty/misc/clipper.hpp" diff --git a/editor/plugins/skeleton_2d_editor_plugin.h b/editor/plugins/skeleton_2d_editor_plugin.h index e4551593f35a..9f3f1c3b345d 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.h +++ b/editor/plugins/skeleton_2d_editor_plugin.h @@ -33,7 +33,6 @@ #include "editor/editor_plugin.h" #include "scene/2d/skeleton_2d.h" -#include "scene/gui/spin_box.h" class AcceptDialog; class MenuButton; diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp index 120cfbdefbae..85906ef9d369 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.cpp +++ b/editor/plugins/skeleton_3d_editor_plugin.cpp @@ -43,6 +43,7 @@ #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/physics_body_3d.h" #include "scene/gui/separator.h" +#include "scene/gui/texture_rect.h" #include "scene/resources/capsule_shape_3d.h" #include "scene/resources/skeleton_profile.h" #include "scene/resources/sphere_shape_3d.h" diff --git a/editor/plugins/skeleton_3d_editor_plugin.h b/editor/plugins/skeleton_3d_editor_plugin.h index 3eb840cfa9b0..7b924d1e9b21 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.h +++ b/editor/plugins/skeleton_3d_editor_plugin.h @@ -31,10 +31,10 @@ #ifndef SKELETON_3D_EDITOR_PLUGIN_H #define SKELETON_3D_EDITOR_PLUGIN_H -#include "editor/editor_file_dialog.h" #include "editor/editor_plugin.h" #include "editor/editor_properties.h" -#include "node_3d_editor_plugin.h" +#include "editor/gui/editor_file_dialog.h" +#include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/camera_3d.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/skeleton_3d.h" diff --git a/editor/plugins/skeleton_ik_3d_editor_plugin.cpp b/editor/plugins/skeleton_ik_3d_editor_plugin.cpp index 1b78293a8794..6331209281b8 100644 --- a/editor/plugins/skeleton_ik_3d_editor_plugin.cpp +++ b/editor/plugins/skeleton_ik_3d_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "editor/editor_node.h" #include "scene/3d/skeleton_ik_3d.h" +#include "scene/gui/button.h" void SkeletonIK3DEditorPlugin::_play() { if (!skeleton_ik) { diff --git a/editor/plugins/skeleton_ik_3d_editor_plugin.h b/editor/plugins/skeleton_ik_3d_editor_plugin.h index 86d883f9fe41..3d311e581e31 100644 --- a/editor/plugins/skeleton_ik_3d_editor_plugin.h +++ b/editor/plugins/skeleton_ik_3d_editor_plugin.h @@ -33,6 +33,7 @@ #include "editor/editor_plugin.h" +class Button; class SkeletonIK3D; class SkeletonIK3DEditorPlugin : public EditorPlugin { diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 8d1aadd095a9..8d0eac38c47a 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -33,12 +33,12 @@ #include "core/config/project_settings.h" #include "core/io/resource_loader.h" #include "core/os/keyboard.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/scene_tree_dock.h" #include "scene/gui/center_container.h" #include "scene/gui/margin_container.h" diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index c91d6536922c..715db9cf5112 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -31,15 +31,22 @@ #include "theme_editor_plugin.h" #include "core/os/keyboard.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_resource_picker.h" #include "editor/editor_scale.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/progress_dialog.h" +#include "scene/gui/check_button.h" #include "scene/gui/color_picker.h" +#include "scene/gui/item_list.h" +#include "scene/gui/option_button.h" #include "scene/gui/panel_container.h" +#include "scene/gui/scroll_container.h" #include "scene/gui/split_container.h" +#include "scene/gui/tab_bar.h" +#include "scene/gui/tab_container.h" +#include "scene/gui/texture_rect.h" #include "scene/theme/theme_db.h" void ThemeItemImportTree::_update_items_tree() { diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h index c8c944118cff..077ce8e8f75a 100644 --- a/editor/plugins/theme_editor_plugin.h +++ b/editor/plugins/theme_editor_plugin.h @@ -33,20 +33,21 @@ #include "editor/editor_plugin.h" #include "editor/plugins/theme_editor_preview.h" -#include "scene/gui/check_button.h" #include "scene/gui/dialogs.h" -#include "scene/gui/item_list.h" #include "scene/gui/margin_container.h" -#include "scene/gui/option_button.h" -#include "scene/gui/scroll_container.h" -#include "scene/gui/tab_bar.h" -#include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" #include "scene/resources/theme.h" +class Button; +class CheckButton; class EditorFileDialog; +class ItemList; +class Label; +class OptionButton; class PanelContainer; +class TabBar; class TabContainer; +class TextureRect; class ThemeItemImportTree : public VBoxContainer { GDCLASS(ThemeItemImportTree, VBoxContainer); diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/plugins/theme_editor_preview.cpp index 5218ef67c594..f4a6c4af2d33 100644 --- a/editor/plugins/theme_editor_preview.cpp +++ b/editor/plugins/theme_editor_preview.cpp @@ -39,7 +39,11 @@ #include "scene/gui/check_box.h" #include "scene/gui/check_button.h" #include "scene/gui/color_picker.h" +#include "scene/gui/color_rect.h" +#include "scene/gui/margin_container.h" #include "scene/gui/progress_bar.h" +#include "scene/gui/scroll_container.h" +#include "scene/gui/tab_container.h" #include "scene/gui/text_edit.h" #include "scene/gui/tree.h" #include "scene/resources/packed_scene.h" diff --git a/editor/plugins/theme_editor_preview.h b/editor/plugins/theme_editor_preview.h index 640a931c999f..bd9663904a48 100644 --- a/editor/plugins/theme_editor_preview.h +++ b/editor/plugins/theme_editor_preview.h @@ -32,13 +32,13 @@ #define THEME_EDITOR_PREVIEW_H #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/color_rect.h" -#include "scene/gui/margin_container.h" -#include "scene/gui/scroll_container.h" #include "scene/resources/theme.h" +class Button; class ColorPickerButton; +class ColorRect; +class MarginContainer; +class ScrollContainer; class ThemeEditorPreview : public VBoxContainer { GDCLASS(ThemeEditorPreview, VBoxContainer); diff --git a/editor/plugins/tiles/atlas_merging_dialog.cpp b/editor/plugins/tiles/atlas_merging_dialog.cpp index ce5da811c1e9..274d52da4739 100644 --- a/editor/plugins/tiles/atlas_merging_dialog.cpp +++ b/editor/plugins/tiles/atlas_merging_dialog.cpp @@ -30,10 +30,9 @@ #include "atlas_merging_dialog.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_scale.h" #include "editor/editor_undo_redo_manager.h" - +#include "editor/gui/editor_file_dialog.h" #include "scene/gui/control.h" #include "scene/gui/split_container.h" diff --git a/editor/plugins/tiles/tile_atlas_view.h b/editor/plugins/tiles/tile_atlas_view.h index 2be3fadd21e3..0e2ae49f0a0a 100644 --- a/editor/plugins/tiles/tile_atlas_view.h +++ b/editor/plugins/tiles/tile_atlas_view.h @@ -31,7 +31,7 @@ #ifndef TILE_ATLAS_VIEW_H #define TILE_ATLAS_VIEW_H -#include "editor/editor_zoom_widget.h" +#include "editor/gui/editor_zoom_widget.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/center_container.h" diff --git a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp index 101ec5f66c82..935046717644 100644 --- a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp +++ b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp @@ -38,7 +38,9 @@ #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "scene/gui/button.h" #include "scene/gui/item_list.h" +#include "scene/gui/label.h" #include "scene/gui/split_container.h" #include "core/core_string_names.h" diff --git a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h index 2a0e8595c413..dd9ec3228d68 100644 --- a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h +++ b/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h @@ -33,10 +33,12 @@ #include "editor/editor_inspector.h" #include "scene/gui/box_container.h" -#include "scene/gui/button.h" -#include "scene/gui/item_list.h" #include "scene/resources/tile_set.h" +class Button; +class ItemList; +class Label; + class TileSetScenesCollectionSourceEditor : public HBoxContainer { GDCLASS(TileSetScenesCollectionSourceEditor, HBoxContainer); diff --git a/editor/plugins/voxel_gi_editor_plugin.cpp b/editor/plugins/voxel_gi_editor_plugin.cpp index 1087a50df60a..9906399d67e9 100644 --- a/editor/plugins/voxel_gi_editor_plugin.cpp +++ b/editor/plugins/voxel_gi_editor_plugin.cpp @@ -30,8 +30,8 @@ #include "voxel_gi_editor_plugin.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" +#include "editor/gui/editor_file_dialog.h" void VoxelGIEditorPlugin::_bake() { if (voxel_gi) { diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 97761040280a..fcbcde25ba7d 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -41,12 +41,12 @@ #include "core/os/os.h" #include "core/string/translation.h" #include "core/version.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_paths.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_themes.h" #include "editor/editor_vcs_interface.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/plugins/asset_library_editor_plugin.h" #include "main/main.h" #include "scene/gui/center_container.h" diff --git a/editor/register_editor_types.cpp b/editor/register_editor_types.cpp index 44624d201bfb..d0c441b02738 100644 --- a/editor/register_editor_types.cpp +++ b/editor/register_editor_types.cpp @@ -34,7 +34,6 @@ #include "editor/debugger/debug_adapter/debug_adapter_server.h" #include "editor/editor_command_palette.h" #include "editor/editor_feature_profile.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" @@ -45,6 +44,8 @@ #include "editor/editor_translation_parser.h" #include "editor/editor_undo_redo_manager.h" #include "editor/filesystem_dock.h" +#include "editor/gui/editor_file_dialog.h" +#include "editor/gui/editor_spin_slider.h" #include "editor/import/editor_import_plugin.h" #include "editor/import/resource_importer_scene.h" #include "editor/plugins/animation_tree_editor_plugin.h" diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index c3a99e96ef61..f42f34e110d5 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -41,10 +41,14 @@ #include "editor/editor_undo_redo_manager.h" #include "modules/regex/regex.h" #include "plugins/script_editor_plugin.h" +#include "scene/gui/check_box.h" +#include "scene/gui/check_button.h" #include "scene/gui/control.h" #include "scene/gui/grid_container.h" #include "scene/gui/label.h" +#include "scene/gui/option_button.h" #include "scene/gui/separator.h" +#include "scene/gui/spin_box.h" #include "scene/gui/tab_container.h" RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) { diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h index 47ff51f52a7a..6821cab98259 100644 --- a/editor/rename_dialog.h +++ b/editor/rename_dialog.h @@ -34,13 +34,17 @@ #include "modules/modules_enabled.gen.h" // For regex. #ifdef MODULE_REGEX_ENABLED -#include "editor/scene_tree_editor.h" -#include "scene/gui/check_box.h" -#include "scene/gui/check_button.h" +#include "editor/gui/scene_tree_editor.h" #include "scene/gui/dialogs.h" -#include "scene/gui/option_button.h" -#include "scene/gui/spin_box.h" -#include "scene/gui/tab_container.h" +#include "scene/gui/line_edit.h" + +class Button; +class CheckBox; +class CheckButton; +class Label; +class OptionButton; +class SpinBox; +class TabContainer; class RenameDialog : public ConfirmationDialog { GDCLASS(RenameDialog, ConfirmationDialog); diff --git a/editor/reparent_dialog.cpp b/editor/reparent_dialog.cpp index 9f61d63a8034..ec5208b54922 100644 --- a/editor/reparent_dialog.cpp +++ b/editor/reparent_dialog.cpp @@ -31,9 +31,9 @@ #include "reparent_dialog.h" #include "core/string/print_string.h" +#include "editor/gui/scene_tree_editor.h" #include "scene/gui/box_container.h" -#include "scene/gui/label.h" -#include "scene/gui/tree.h" +#include "scene/gui/check_box.h" void ReparentDialog::_notification(int p_what) { switch (p_what) { diff --git a/editor/reparent_dialog.h b/editor/reparent_dialog.h index af26eada3d3e..2ca26fcde38c 100644 --- a/editor/reparent_dialog.h +++ b/editor/reparent_dialog.h @@ -31,12 +31,10 @@ #ifndef REPARENT_DIALOG_H #define REPARENT_DIALOG_H -#include "editor/scene_tree_editor.h" -#include "scene/gui/button.h" -#include "scene/gui/check_box.h" -#include "scene/gui/check_button.h" #include "scene/gui/dialogs.h" -#include "scene/gui/line_edit.h" + +class CheckBox; +class SceneTreeEditor; class ReparentDialog : public ConfirmationDialog { GDCLASS(ReparentDialog, ConfirmationDialog); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 7e5d85e1a8fe..968cd5ab2330 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -38,13 +38,13 @@ #include "core/os/keyboard.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/editor_feature_profile.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" #include "editor/editor_quick_open.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/editor_file_dialog.h" #include "editor/inspector_dock.h" #include "editor/multi_node_edit.h" #include "editor/plugins/animation_player_editor_plugin.h" diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index 52a7d6d6c1c9..779bfd53e372 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -31,9 +31,8 @@ #ifndef SCENE_TREE_DOCK_H #define SCENE_TREE_DOCK_H -#include "scene_tree_editor.h" - #include "editor/editor_data.h" +#include "editor/gui/scene_tree_editor.h" #include "editor/script_create_dialog.h" #include "scene/gui/box_container.h" #include "scene/resources/animation.h" diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 599f2ea6d2f7..f3f0e7308c88 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -35,12 +35,12 @@ #include "core/io/resource_saver.h" #include "core/string/string_builder.h" #include "editor/create_dialog.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" static String _get_parent_class_of_script(String p_path) { if (!ResourceLoader::exists(p_path, "Script")) { diff --git a/editor/shader_create_dialog.cpp b/editor/shader_create_dialog.cpp index 443237b448a6..7d7ea2f509d7 100644 --- a/editor/shader_create_dialog.cpp +++ b/editor/shader_create_dialog.cpp @@ -31,8 +31,8 @@ #include "shader_create_dialog.h" #include "core/config/project_settings.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_scale.h" +#include "editor/gui/editor_file_dialog.h" #include "scene/resources/shader_include.h" #include "scene/resources/visual_shader.h" #include "servers/rendering/shader_types.h" diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp index 3b8d2cc7012e..5f6ec5904cf5 100644 --- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp +++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp @@ -34,9 +34,9 @@ #include "../gltf_document.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" +#include "editor/gui/editor_file_dialog.h" String SceneExporterGLTFPlugin::get_name() const { return "ConvertGLTF2"; diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index a736e36c6a42..2efaaa7d4de4 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -37,10 +37,10 @@ #include "editor_import_blend_runner.h" #include "core/config/project_settings.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" #include "main/main.h" #include "scene/gui/line_edit.h" diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index bb5eb8e6435d..20f1aa357bb1 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -40,6 +40,8 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/camera_3d.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/label.h" #include "scene/gui/menu_button.h" #include "scene/gui/separator.h" #include "scene/main/window.h" diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp index 9e542828ee0c..1f707f1192e8 100644 --- a/modules/multiplayer/editor/replication_editor.cpp +++ b/modules/multiplayer/editor/replication_editor.cpp @@ -36,9 +36,9 @@ #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" +#include "editor/gui/scene_tree_editor.h" #include "editor/inspector_dock.h" #include "editor/property_selector.h" -#include "editor/scene_tree_editor.h" #include "scene/gui/dialogs.h" #include "scene/gui/separator.h" #include "scene/gui/tree.h" diff --git a/modules/navigation/editor/navigation_mesh_editor_plugin.cpp b/modules/navigation/editor/navigation_mesh_editor_plugin.cpp index 557d45b386c8..dd2c539c9538 100644 --- a/modules/navigation/editor/navigation_mesh_editor_plugin.cpp +++ b/modules/navigation/editor/navigation_mesh_editor_plugin.cpp @@ -38,6 +38,9 @@ #include "editor/editor_node.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/gui/box_container.h" +#include "scene/gui/button.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/label.h" void NavigationMeshEditor::_node_removed(Node *p_node) { if (p_node == node) { diff --git a/modules/navigation/editor/navigation_mesh_editor_plugin.h b/modules/navigation/editor/navigation_mesh_editor_plugin.h index 010be411d6e5..b73d8d2e69d4 100644 --- a/modules/navigation/editor/navigation_mesh_editor_plugin.h +++ b/modules/navigation/editor/navigation_mesh_editor_plugin.h @@ -36,7 +36,9 @@ #include "editor/editor_plugin.h" class AcceptDialog; +class Button; class HBoxContainer; +class Label; class NavigationRegion3D; class NavigationMeshEditor : public Control { diff --git a/modules/openxr/editor/openxr_action_map_editor.cpp b/modules/openxr/editor/openxr_action_map_editor.cpp index ad5a515a01ec..64e07eff2113 100644 --- a/modules/openxr/editor/openxr_action_map_editor.cpp +++ b/modules/openxr/editor/openxr_action_map_editor.cpp @@ -31,10 +31,10 @@ #include "openxr_action_map_editor.h" #include "core/config/project_settings.h" -#include "editor/editor_file_dialog.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" +#include "editor/gui/editor_file_dialog.h" // TODO implement redo/undo system