Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 00:13:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #61488 from fire-forge/filter

Browse source
This commit is contained in:
Rémi Verschelde 2022-05-30 02:03:45 +02:00 • committed by GitHub
commit 26bfaf34dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
editor/connections_dialog.cpp
View file

@ -1126,7 +1126,7 @@ ConnectionsDock::ConnectionsDock() {
search_box = memnew(LineEdit); search_box = memnew(LineEdit);
search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
search_box->set_placeholder(TTR("Filter signals")); search_box->set_placeholder(TTR("Filter Signals"));
search_box->set_clear_button_enabled(true); search_box->set_clear_button_enabled(true);
search_box->connect("text_changed", callable_mp(this, &ConnectionsDock::_filter_changed)); search_box->connect("text_changed", callable_mp(this, &ConnectionsDock::_filter_changed));
vbc->add_child(search_box); vbc->add_child(search_box);

2
editor/debugger/script_editor_debugger.cpp
View file

@ -1765,7 +1765,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
search = memnew(LineEdit); search = memnew(LineEdit);
search->set_h_size_flags(Control::SIZE_EXPAND_FILL); search->set_h_size_flags(Control::SIZE_EXPAND_FILL);
search->set_placeholder(TTR("Filter stack variables")); search->set_placeholder(TTR("Filter Stack Variables"));
search->set_clear_button_enabled(true); search->set_clear_button_enabled(true);
tools_hb->add_child(search); tools_hb->add_child(search);

2
editor/editor_command_palette.cpp
View file

@ -299,7 +299,7 @@ EditorCommandPalette::EditorCommandPalette() {
add_child(vbc); add_child(vbc);
command_search_box = memnew(LineEdit); command_search_box = memnew(LineEdit);
command_search_box->set_placeholder(TTR("Filter commands")); command_search_box->set_placeholder(TTR("Filter Commands"));
command_search_box->connect("gui_input", callable_mp(this, &EditorCommandPalette::_sbox_input)); command_search_box->connect("gui_input", callable_mp(this, &EditorCommandPalette::_sbox_input));
command_search_box->connect("text_changed", callable_mp(this, &EditorCommandPalette::_update_command_search)); command_search_box->connect("text_changed", callable_mp(this, &EditorCommandPalette::_update_command_search));
command_search_box->set_v_size_flags(Control::SIZE_EXPAND_FILL); command_search_box->set_v_size_flags(Control::SIZE_EXPAND_FILL);

2
editor/editor_log.cpp
View file

@ -353,7 +353,7 @@ EditorLog::EditorLog() {
// Search box // Search box
search_box = memnew(LineEdit); search_box = memnew(LineEdit);
search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
search_box->set_placeholder(TTR("Filter messages")); search_box->set_placeholder(TTR("Filter Messages"));
search_box->set_clear_button_enabled(true); search_box->set_clear_button_enabled(true);
search_box->set_visible(true); search_box->set_visible(true);
search_box->connect("text_changed", callable_mp(this, &EditorLog::_search_changed)); search_box->connect("text_changed", callable_mp(this, &EditorLog::_search_changed));

4
editor/editor_settings_dialog.cpp
View file

@ -697,7 +697,7 @@ EditorSettingsDialog::EditorSettingsDialog() {
tab_general->add_child(hbc); tab_general->add_child(hbc);
search_box = memnew(LineEdit); search_box = memnew(LineEdit);
search_box->set_placeholder(TTR("Search")); search_box->set_placeholder(TTR("Filter Settings"));
search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
hbc->add_child(search_box); hbc->add_child(search_box);
@ -739,7 +739,7 @@ EditorSettingsDialog::EditorSettingsDialog() {
tab_shortcuts->set_name(TTR("Shortcuts")); tab_shortcuts->set_name(TTR("Shortcuts"));
shortcut_search_box = memnew(LineEdit); shortcut_search_box = memnew(LineEdit);
shortcut_search_box->set_placeholder(TTR("Search")); shortcut_search_box->set_placeholder(TTR("Filter Shortcuts"));
shortcut_search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); shortcut_search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
tab_shortcuts->add_child(shortcut_search_box); tab_shortcuts->add_child(shortcut_search_box);
shortcut_search_box->connect("text_changed", callable_mp(this, &EditorSettingsDialog::_filter_shortcuts)); shortcut_search_box->connect("text_changed", callable_mp(this, &EditorSettingsDialog::_filter_shortcuts));

4
editor/filesystem_dock.cpp
View file

@ -3082,7 +3082,7 @@ FileSystemDock::FileSystemDock() {
tree_search_box = memnew(LineEdit); tree_search_box = memnew(LineEdit);
tree_search_box->set_h_size_flags(SIZE_EXPAND_FILL); tree_search_box->set_h_size_flags(SIZE_EXPAND_FILL);
tree_search_box->set_placeholder(TTR("Search files")); tree_search_box->set_placeholder(TTR("Filter Files"));
tree_search_box->connect("text_changed", callable_mp(this, &FileSystemDock::_search_changed), varray(tree_search_box)); tree_search_box->connect("text_changed", callable_mp(this, &FileSystemDock::_search_changed), varray(tree_search_box));
toolbar2_hbc->add_child(tree_search_box); toolbar2_hbc->add_child(tree_search_box);
@ -3127,7 +3127,7 @@ FileSystemDock::FileSystemDock() {
file_list_search_box = memnew(LineEdit); file_list_search_box = memnew(LineEdit);
file_list_search_box->set_h_size_flags(SIZE_EXPAND_FILL); file_list_search_box->set_h_size_flags(SIZE_EXPAND_FILL);
file_list_search_box->set_placeholder(TTR("Search files")); file_list_search_box->set_placeholder(TTR("Filter Files"));
file_list_search_box->connect("text_changed", callable_mp(this, &FileSystemDock::_search_changed), varray(file_list_search_box)); file_list_search_box->connect("text_changed", callable_mp(this, &FileSystemDock::_search_changed), varray(file_list_search_box));
path_hb->add_child(file_list_search_box); path_hb->add_child(file_list_search_box);

4
editor/groups_editor.cpp
View file

@ -499,7 +499,7 @@ GroupDialog::GroupDialog() {
add_filter = memnew(LineEdit); add_filter = memnew(LineEdit);
add_filter->set_h_size_flags(Control::SIZE_EXPAND_FILL); add_filter->set_h_size_flags(Control::SIZE_EXPAND_FILL);
add_filter->set_placeholder(TTR("Filter nodes")); add_filter->set_placeholder(TTR("Filter Nodes"));
add_filter_hbc->add_child(add_filter); add_filter_hbc->add_child(add_filter);
add_filter->connect("text_changed", callable_mp(this, &GroupDialog::_add_filter_changed)); add_filter->connect("text_changed", callable_mp(this, &GroupDialog::_add_filter_changed));
@ -549,7 +549,7 @@ GroupDialog::GroupDialog() {
remove_filter = memnew(LineEdit); remove_filter = memnew(LineEdit);
remove_filter->set_h_size_flags(Control::SIZE_EXPAND_FILL); remove_filter->set_h_size_flags(Control::SIZE_EXPAND_FILL);
remove_filter->set_placeholder(TTR("Filter nodes")); remove_filter->set_placeholder(TTR("Filter Nodes"));
remove_filter_hbc->add_child(remove_filter); remove_filter_hbc->add_child(remove_filter);
remove_filter->connect("text_changed", callable_mp(this, &GroupDialog::_remove_filter_changed)); remove_filter->connect("text_changed", callable_mp(this, &GroupDialog::_remove_filter_changed));

2
editor/inspector_dock.cpp
View file

@ -657,7 +657,7 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
search = memnew(LineEdit); search = memnew(LineEdit);
search->set_h_size_flags(Control::SIZE_EXPAND_FILL); search->set_h_size_flags(Control::SIZE_EXPAND_FILL);
search->set_placeholder(TTR("Filter properties")); search->set_placeholder(TTR("Filter Properties"));
search->set_clear_button_enabled(true); search->set_clear_button_enabled(true);
property_tools_hb->add_child(search); property_tools_hb->add_child(search);

4
editor/plugins/asset_library_editor_plugin.cpp
View file

@ -1402,9 +1402,9 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
filter = memnew(LineEdit); filter = memnew(LineEdit);
if (templates_only) { if (templates_only) {
filter->set_placeholder(TTR("Search templates, projects, and demos")); filter->set_placeholder(TTR("Search Templates, Projects, and Demos"));
} else { } else {
filter->set_placeholder(TTR("Search assets (excluding templates, projects, and demos)")); filter->set_placeholder(TTR("Search Assets (Excluding Templates, Projects, and Demos)"));
} }
filter->set_clear_button_enabled(true); filter->set_clear_button_enabled(true);
search_hb->add_child(filter); search_hb->add_child(filter);

4
editor/plugins/script_editor_plugin.cpp
View file

@ -3674,7 +3674,7 @@ ScriptEditor::ScriptEditor() {
list_split->add_child(scripts_vbox); list_split->add_child(scripts_vbox);
filter_scripts = memnew(LineEdit); filter_scripts = memnew(LineEdit);
filter_scripts->set_placeholder(TTR("Filter scripts")); filter_scripts->set_placeholder(TTR("Filter Scripts"));
filter_scripts->set_clear_button_enabled(true); filter_scripts->set_clear_button_enabled(true);
filter_scripts->connect("text_changed", callable_mp(this, &ScriptEditor::_filter_scripts_text_changed)); filter_scripts->connect("text_changed", callable_mp(this, &ScriptEditor::_filter_scripts_text_changed));
scripts_vbox->add_child(filter_scripts); scripts_vbox->add_child(filter_scripts);
@ -3717,7 +3717,7 @@ ScriptEditor::ScriptEditor() {
buttons_hbox->add_child(members_overview_alphabeta_sort_button); buttons_hbox->add_child(members_overview_alphabeta_sort_button);
filter_methods = memnew(LineEdit); filter_methods = memnew(LineEdit);
filter_methods->set_placeholder(TTR("Filter methods")); filter_methods->set_placeholder(TTR("Filter Methods"));
filter_methods->set_clear_button_enabled(true); filter_methods->set_clear_button_enabled(true);
filter_methods->connect("text_changed", callable_mp(this, &ScriptEditor::_filter_methods_text_changed)); filter_methods->connect("text_changed", callable_mp(this, &ScriptEditor::_filter_methods_text_changed));
overview_vbox->add_child(filter_methods); overview_vbox->add_child(filter_methods);

11
editor/plugins/theme_editor_plugin.cpp
View file

@ -834,6 +834,8 @@ void ThemeItemImportTree::_notification(int p_what) {
select_icons_warning_icon->set_texture(get_theme_icon(SNAME("StatusWarning"), SNAME("EditorIcons"))); select_icons_warning_icon->set_texture(get_theme_icon(SNAME("StatusWarning"), SNAME("EditorIcons")));
select_icons_warning->add_theme_color_override("font_color", get_theme_color(SNAME("disabled_font_color"), SNAME("Editor"))); select_icons_warning->add_theme_color_override("font_color", get_theme_color(SNAME("disabled_font_color"), SNAME("Editor")));
import_items_filter->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
// Bottom panel buttons. // Bottom panel buttons.
import_collapse_types_button->set_icon(get_theme_icon(SNAME("CollapseTree"), SNAME("EditorIcons"))); import_collapse_types_button->set_icon(get_theme_icon(SNAME("CollapseTree"), SNAME("EditorIcons")));
import_expand_types_button->set_icon(get_theme_icon(SNAME("ExpandTree"), SNAME("EditorIcons"))); import_expand_types_button->set_icon(get_theme_icon(SNAME("ExpandTree"), SNAME("EditorIcons")));
@ -881,15 +883,10 @@ void ThemeItemImportTree::_bind_methods() {
} }
ThemeItemImportTree::ThemeItemImportTree() { ThemeItemImportTree::ThemeItemImportTree() {
HBoxContainer *import_items_filter_hb = memnew(HBoxContainer);
add_child(import_items_filter_hb);
Label *import_items_filter_label = memnew(Label);
import_items_filter_label->set_text(TTR("Filter:"));
import_items_filter_hb->add_child(import_items_filter_label);
import_items_filter = memnew(LineEdit); import_items_filter = memnew(LineEdit);
import_items_filter->set_placeholder(TTR("Filter Items"));
import_items_filter->set_clear_button_enabled(true); import_items_filter->set_clear_button_enabled(true);
import_items_filter->set_h_size_flags(Control::SIZE_EXPAND_FILL); add_child(import_items_filter);
import_items_filter_hb->add_child(import_items_filter);
import_items_filter->connect("text_changed", callable_mp(this, &ThemeItemImportTree::_filter_text_changed)); import_items_filter->connect("text_changed", callable_mp(this, &ThemeItemImportTree::_filter_text_changed));
HBoxContainer *import_main_hb = memnew(HBoxContainer); HBoxContainer *import_main_hb = memnew(HBoxContainer);

2
editor/project_manager.cpp
View file

@ -2594,7 +2594,7 @@ ProjectManager::ProjectManager() {
search_tree_vb->add_child(hb); search_tree_vb->add_child(hb);
search_box = memnew(LineEdit); search_box = memnew(LineEdit);
search_box->set_placeholder(TTR("Filter projects")); search_box->set_placeholder(TTR("Filter Projects"));
search_box->set_tooltip(TTR("This field filters projects by name and last path component.\nTo filter projects by name and full path, the query must contain at least one `/` character.")); search_box->set_tooltip(TTR("This field filters projects by name and last path component.\nTo filter projects by name and full path, the query must contain at least one `/` character."));
search_box->connect("text_changed", callable_mp(this, &ProjectManager::_on_search_term_changed)); search_box->connect("text_changed", callable_mp(this, &ProjectManager::_on_search_term_changed));
search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);

2
editor/project_settings_editor.cpp
View file

@ -586,7 +586,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
general_editor->add_child(header); general_editor->add_child(header);
property_box = memnew(LineEdit); property_box = memnew(LineEdit);
property_box->set_placeholder(TTR("Select a setting or type its name")); property_box->set_placeholder(TTR("Select a Setting or Type its Name"));
property_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); property_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
property_box->connect("text_changed", callable_mp(this, &ProjectSettingsEditor::_property_box_changed)); property_box->connect("text_changed", callable_mp(this, &ProjectSettingsEditor::_property_box_changed));
header->add_child(property_box); header->add_child(property_box);

2
editor/scene_tree_dock.cpp
View file

@ -3381,7 +3381,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
vbc->add_child(filter_hbc); vbc->add_child(filter_hbc);
filter = memnew(LineEdit); filter = memnew(LineEdit);
filter->set_h_size_flags(SIZE_EXPAND_FILL); filter->set_h_size_flags(SIZE_EXPAND_FILL);
filter->set_placeholder(TTR("Filter nodes")); filter->set_placeholder(TTR("Filter Nodes"));
filter_hbc->add_child(filter); filter_hbc->add_child(filter);
filter->add_theme_constant_override("minimum_character_width", 0); filter->add_theme_constant_override("minimum_character_width", 0);
filter->connect("text_changed", callable_mp(this, &SceneTreeDock::_filter_changed)); filter->connect("text_changed", callable_mp(this, &SceneTreeDock::_filter_changed));

2
editor/scene_tree_editor.cpp
View file

@ -1370,7 +1370,7 @@ SceneTreeDialog::SceneTreeDialog() {
filter = memnew(LineEdit); filter = memnew(LineEdit);
filter->set_h_size_flags(Control::SIZE_EXPAND_FILL); filter->set_h_size_flags(Control::SIZE_EXPAND_FILL);
filter->set_placeholder(TTR("Filter nodes")); filter->set_placeholder(TTR("Filter Nodes"));
filter->set_clear_button_enabled(true); filter->set_clear_button_enabled(true);
filter->add_theme_constant_override("minimum_character_width", 0); filter->add_theme_constant_override("minimum_character_width", 0);
filter->connect("text_changed", callable_mp(this, &SceneTreeDialog::_filter_changed)); filter->connect("text_changed", callable_mp(this, &SceneTreeDialog::_filter_changed));

2
modules/gridmap/editor/grid_map_editor_plugin.cpp
View file

@ -1221,7 +1221,7 @@ GridMapEditor::GridMapEditor() {
search_box = memnew(LineEdit); search_box = memnew(LineEdit);
search_box->set_h_size_flags(SIZE_EXPAND_FILL); search_box->set_h_size_flags(SIZE_EXPAND_FILL);
search_box->set_placeholder(TTR("Filter meshes")); search_box->set_placeholder(TTR("Filter Meshes"));
hb->add_child(search_box); hb->add_child(search_box);
search_box->connect("text_changed", callable_mp(this, &GridMapEditor::_text_changed)); search_box->connect("text_changed", callable_mp(this, &GridMapEditor::_text_changed));
search_box->connect("gui_input", callable_mp(this, &GridMapEditor::_sbox_input)); search_box->connect("gui_input", callable_mp(this, &GridMapEditor::_sbox_input));