summaryrefslogtreecommitdiffstats
path: root/editor/project_settings_editor.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2018-07-19 18:58:15 -0300
committerJuan Linietsky <reduzio@gmail.com>2018-07-19 19:02:04 -0300
commitc69de2ba46463adeadf90f38660d6b6e034d7e0b (patch)
treeddeb1c8e40c080a6544eba86fc12f138b54be0ed /editor/project_settings_editor.h
parent76bfe14e00ee5c8b65275d8b8e0c4cdc25b4b899 (diff)
downloadredot-engine-c69de2ba46463adeadf90f38660d6b6e034d7e0b.tar.gz
-Project/Editor settings now use new inspector
-Project/Editor settings now show tooltips properly -Settings thar require restart now will show a restart warning -Video driver is now visible all the time, can be changed easily -Added function to request current video driver
Diffstat (limited to 'editor/project_settings_editor.h')
-rw-r--r--editor/project_settings_editor.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h
index 0ced88d7f6..3b74ae1909 100644
--- a/editor/project_settings_editor.h
+++ b/editor/project_settings_editor.h
@@ -35,7 +35,7 @@
#include "editor/editor_autoload_settings.h"
#include "editor/editor_data.h"
#include "editor/editor_plugin_settings.h"
-#include "editor/property_editor.h"
+#include "editor/editor_sectioned_inspector.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/tab_container.h"
@@ -64,7 +64,7 @@ class ProjectSettingsEditor : public AcceptDialog {
EditorData *data;
UndoRedo *undo_redo;
- SectionedPropertyEditor *globals_editor;
+ SectionedInspector *globals_editor;
HBoxContainer *search_bar;
Button *search_button;
@@ -112,7 +112,7 @@ class ProjectSettingsEditor : public AcceptDialog {
EditorPluginSettings *plugin_settings;
- void _item_selected();
+ void _item_selected(const String &);
void _item_adds(String);
void _item_add();
void _item_del();
@@ -166,6 +166,15 @@ class ProjectSettingsEditor : public AcceptDialog {
static ProjectSettingsEditor *singleton;
+ Label *restart_label;
+ TextureRect *restart_icon;
+ PanelContainer *restart_container;
+ ToolButton *restart_close_button;
+
+ void _editor_restart_request();
+ void _editor_restart();
+ void _editor_restart_close();
+
protected:
void _notification(int p_what);
static void _bind_methods();