|
@@ -30,14 +30,13 @@
|
|
|
|
|
|
#include "editor_settings_dialog.h"
|
|
#include "editor_settings_dialog.h"
|
|
|
|
|
|
-#include "core/config/project_settings.h"
|
|
|
|
#include "core/input/input_map.h"
|
|
#include "core/input/input_map.h"
|
|
#include "core/os/keyboard.h"
|
|
#include "core/os/keyboard.h"
|
|
#include "editor/debugger/editor_debugger_node.h"
|
|
#include "editor/debugger/editor_debugger_node.h"
|
|
-#include "editor/editor_file_system.h"
|
|
|
|
#include "editor/editor_log.h"
|
|
#include "editor/editor_log.h"
|
|
#include "editor/editor_node.h"
|
|
#include "editor/editor_node.h"
|
|
#include "editor/editor_property_name_processor.h"
|
|
#include "editor/editor_property_name_processor.h"
|
|
|
|
+#include "editor/editor_sectioned_inspector.h"
|
|
#include "editor/editor_settings.h"
|
|
#include "editor/editor_settings.h"
|
|
#include "editor/editor_string_names.h"
|
|
#include "editor/editor_string_names.h"
|
|
#include "editor/editor_undo_redo_manager.h"
|
|
#include "editor/editor_undo_redo_manager.h"
|
|
@@ -45,7 +44,9 @@
|
|
#include "editor/input_event_configuration_dialog.h"
|
|
#include "editor/input_event_configuration_dialog.h"
|
|
#include "editor/themes/editor_scale.h"
|
|
#include "editor/themes/editor_scale.h"
|
|
#include "editor/themes/editor_theme_manager.h"
|
|
#include "editor/themes/editor_theme_manager.h"
|
|
-#include "scene/gui/margin_container.h"
|
|
|
|
|
|
+#include "scene/gui/panel_container.h"
|
|
|
|
+#include "scene/gui/tab_container.h"
|
|
|
|
+#include "scene/gui/texture_rect.h"
|
|
|
|
|
|
void EditorSettingsDialog::ok_pressed() {
|
|
void EditorSettingsDialog::ok_pressed() {
|
|
if (!EditorSettings::get_singleton()) {
|
|
if (!EditorSettings::get_singleton()) {
|
|
@@ -499,6 +500,9 @@ void EditorSettingsDialog::_update_shortcuts() {
|
|
memdelete(section);
|
|
memdelete(section);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ // Update UI.
|
|
|
|
+ clear_all_search->set_disabled(shortcut_search_box->get_text().is_empty() && shortcut_search_by_event->get_event().is_null());
|
|
}
|
|
}
|
|
|
|
|
|
void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column, int p_idx, MouseButton p_button) {
|
|
void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column, int p_idx, MouseButton p_button) {
|
|
@@ -782,8 +786,9 @@ EditorSettingsDialog::EditorSettingsDialog() {
|
|
shortcut_search_by_event->connect(SceneStringName(focus_exited), callable_mp((AcceptDialog *)this, &AcceptDialog::set_close_on_escape).bind(true));
|
|
shortcut_search_by_event->connect(SceneStringName(focus_exited), callable_mp((AcceptDialog *)this, &AcceptDialog::set_close_on_escape).bind(true));
|
|
top_hbox->add_child(shortcut_search_by_event);
|
|
top_hbox->add_child(shortcut_search_by_event);
|
|
|
|
|
|
- Button *clear_all_search = memnew(Button);
|
|
|
|
|
|
+ clear_all_search = memnew(Button);
|
|
clear_all_search->set_text(TTR("Clear All"));
|
|
clear_all_search->set_text(TTR("Clear All"));
|
|
|
|
+ clear_all_search->set_tooltip_text(TTR("Clear all search filters."));
|
|
clear_all_search->connect(SceneStringName(pressed), callable_mp(shortcut_search_box, &LineEdit::clear));
|
|
clear_all_search->connect(SceneStringName(pressed), callable_mp(shortcut_search_box, &LineEdit::clear));
|
|
clear_all_search->connect(SceneStringName(pressed), callable_mp(shortcut_search_by_event, &EventListenerLineEdit::clear_event));
|
|
clear_all_search->connect(SceneStringName(pressed), callable_mp(shortcut_search_by_event, &EventListenerLineEdit::clear_event));
|
|
top_hbox->add_child(clear_all_search);
|
|
top_hbox->add_child(clear_all_search);
|