1 files changed, 33 insertions, 37 deletions

diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h
index c99c2fe9a2..0d7e19b242 100644
--- a/editor/project_settings_editor.h
+++ b/editor/project_settings_editor.h
@@ -35,12 +35,11 @@
 #include "editor/editor_data.h"
 #include "editor/editor_plugin_settings.h"
 #include "editor/editor_sectioned_inspector.h"
+#include "editor/input_map_editor.h"
+#include "editor/localization_editor.h"
+#include "editor/shader_globals_editor.h"
 #include "editor_autoload_settings.h"
-#include "input_map_editor.h"
-#include "localization_editor.h"
-#include "scene/gui/dialogs.h"
 #include "scene/gui/tab_container.h"
-#include "shader_globals_editor.h"
 
 class ProjectSettingsEditor : public AcceptDialog {
 	GDCLASS(ProjectSettingsEditor, AcceptDialog);
@@ -53,28 +52,31 @@ class ProjectSettingsEditor : public AcceptDialog {
 		INPUT_MOUSE_BUTTON
 	};
 
-	TabContainer *tab_container;
-	AcceptDialog *message;
+	static ProjectSettingsEditor *singleton;
+	ProjectSettings *ps;
 	Timer *timer;
 
-	HBoxContainer *search_bar;
-	Button *search_button;
-	LineEdit *search_box;
-	HBoxContainer *add_prop_bar;
-	LineEdit *category;
-	LineEdit *property;
-	OptionButton *type;
-
-	SectionedInspector *globals_editor;
-
-	MenuButton *popup_copy_to_feature;
-
+	TabContainer *tab_container;
+	SectionedInspector *inspector;
 	InputMapEditor *inputmap_editor;
 	LocalizationEditor *localization_editor;
 	EditorAutoloadSettings *autoload_settings;
 	ShaderGlobalsEditor *shaders_global_variables_editor;
 	EditorPluginSettings *plugin_settings;
 
+	HBoxContainer *search_bar;
+	LineEdit *search_box;
+	CheckButton *advanced;
+
+	VBoxContainer *advanced_bar;
+	LineEdit *category_box;
+	LineEdit *property_box;
+	Button *add_button;
+	Button *del_button;
+	OptionButton *type;
+	OptionButton *feature_override;
+	Label *error_label;
+
 	Label *restart_label;
 	TextureRect *restart_icon;
 	PanelContainer *restart_container;
@@ -83,30 +85,25 @@ class ProjectSettingsEditor : public AcceptDialog {
 	EditorData *data;
 	UndoRedo *undo_redo;
 
-	void _item_selected(const String &);
-	void _item_adds(String);
-	void _item_add();
-	void _item_del();
-	void _save();
-
-	void _settings_prop_edited(const String &p_name);
-	void _settings_changed();
+	void _advanced_pressed();
+	void _update_advanced_bar();
+	void _text_field_changed(const String &p_text);
+	void _feature_selected(int p_index);
 
-	void _copy_to_platform(int p_which);
-	void _copy_to_platform_about_to_show();
-
-	void _toggle_search_bar(bool p_pressed);
-
-	ProjectSettingsEditor();
-
-	static ProjectSettingsEditor *singleton;
+	String _get_setting_name() const;
+	void _setting_edited(const String &p_name);
+	void _setting_selected(const String &p_path);
+	void _add_setting();
+	void _delete_setting();
 
 	void _editor_restart_request();
 	void _editor_restart();
 	void _editor_restart_close();
 
+	void _add_feature_overrides();
+	ProjectSettingsEditor();
+
 protected:
-	void _unhandled_input(const Ref<InputEvent> &p_event);
 	void _notification(int p_what);
 	static void _bind_methods();
 
@@ -117,8 +114,7 @@ public:
 	void update_plugins();
 
 	EditorAutoloadSettings *get_autoload_settings() { return autoload_settings; }
-
-	TabContainer *get_tabs();
+	TabContainer *get_tabs() { return tab_container; }
 
 	void queue_save();