Improve includes of EditorNode (and everything else)

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")

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"

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 {

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) {

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);

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"

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"

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) {

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"

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"
 

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.

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"),

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,14 +90,16 @@
 #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"
 #include "editor/export/export_template_manager.h"
 #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"

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);

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"

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"