diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-30 02:03:45 +0200 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 02:03:45 +0200 | 
| commit | 26bfaf34dda931d5b69713d4fb99e7a73c5dd75c (patch) | |
| tree | fa93f37cf0fd29fb4136aea09140c9a2361a6c2c | |
| parent | 5dd667905f44495868bccbc0514eb582abbeff28 (diff) | |
| parent | 7f7244f04a15a050f5f2a5f1c615ee0d43bf6cf9 (diff) | |
Merge pull request #61488 from fire-forge/filter
| -rw-r--r-- | editor/connections_dialog.cpp | 2 | ||||
| -rw-r--r-- | editor/debugger/script_editor_debugger.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_command_palette.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_log.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_settings_dialog.cpp | 4 | ||||
| -rw-r--r-- | editor/filesystem_dock.cpp | 4 | ||||
| -rw-r--r-- | editor/groups_editor.cpp | 4 | ||||
| -rw-r--r-- | editor/inspector_dock.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/asset_library_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/theme_editor_plugin.cpp | 11 | ||||
| -rw-r--r-- | editor/project_manager.cpp | 2 | ||||
| -rw-r--r-- | editor/project_settings_editor.cpp | 2 | ||||
| -rw-r--r-- | editor/scene_tree_dock.cpp | 2 | ||||
| -rw-r--r-- | editor/scene_tree_editor.cpp | 2 | ||||
| -rw-r--r-- | modules/gridmap/editor/grid_map_editor_plugin.cpp | 2 | 
16 files changed, 24 insertions, 27 deletions
diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 6ed723b891..74fea03fee 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -1126,7 +1126,7 @@ ConnectionsDock::ConnectionsDock() {  	search_box = memnew(LineEdit);  	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->connect("text_changed", callable_mp(this, &ConnectionsDock::_filter_changed));  	vbc->add_child(search_box); diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 60486b5286..8cb984af1b 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -1765,7 +1765,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {  		search = memnew(LineEdit);  		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);  		tools_hb->add_child(search); diff --git a/editor/editor_command_palette.cpp b/editor/editor_command_palette.cpp index e3cbd8ad50..c1cd7f9c7b 100644 --- a/editor/editor_command_palette.cpp +++ b/editor/editor_command_palette.cpp @@ -299,7 +299,7 @@ EditorCommandPalette::EditorCommandPalette() {  	add_child(vbc);  	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("text_changed", callable_mp(this, &EditorCommandPalette::_update_command_search));  	command_search_box->set_v_size_flags(Control::SIZE_EXPAND_FILL); diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 8d45f90ed6..dbe44aee1b 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -353,7 +353,7 @@ EditorLog::EditorLog() {  	// Search box  	search_box = memnew(LineEdit);  	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_visible(true);  	search_box->connect("text_changed", callable_mp(this, &EditorLog::_search_changed)); diff --git a/editor/editor_settings_dialog.cpp b/editor/editor_settings_dialog.cpp index 712a5b150f..bec9f2dc51 100644 --- a/editor/editor_settings_dialog.cpp +++ b/editor/editor_settings_dialog.cpp @@ -697,7 +697,7 @@ EditorSettingsDialog::EditorSettingsDialog() {  	tab_general->add_child(hbc);  	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);  	hbc->add_child(search_box); @@ -739,7 +739,7 @@ EditorSettingsDialog::EditorSettingsDialog() {  	tab_shortcuts->set_name(TTR("Shortcuts"));  	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);  	tab_shortcuts->add_child(shortcut_search_box);  	shortcut_search_box->connect("text_changed", callable_mp(this, &EditorSettingsDialog::_filter_shortcuts)); diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index aaff892c2a..3dd0044ab9 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -3082,7 +3082,7 @@ FileSystemDock::FileSystemDock() {  	tree_search_box = memnew(LineEdit);  	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));  	toolbar2_hbc->add_child(tree_search_box); @@ -3127,7 +3127,7 @@ FileSystemDock::FileSystemDock() {  	file_list_search_box = memnew(LineEdit);  	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));  	path_hb->add_child(file_list_search_box); diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp index bbf9b11be3..f3129db65e 100644 --- a/editor/groups_editor.cpp +++ b/editor/groups_editor.cpp @@ -499,7 +499,7 @@ GroupDialog::GroupDialog() {  	add_filter = memnew(LineEdit);  	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->connect("text_changed", callable_mp(this, &GroupDialog::_add_filter_changed)); @@ -549,7 +549,7 @@ GroupDialog::GroupDialog() {  	remove_filter = memnew(LineEdit);  	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->connect("text_changed", callable_mp(this, &GroupDialog::_remove_filter_changed)); diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index 934d3a82b4..ad92911810 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -657,7 +657,7 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {  	search = memnew(LineEdit);  	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);  	property_tools_hb->add_child(search); diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index d7061a420a..249b3a6d6a 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -1402,9 +1402,9 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {  	filter = memnew(LineEdit);  	if (templates_only) { -		filter->set_placeholder(TTR("Search templates, projects, and demos")); +		filter->set_placeholder(TTR("Search Templates, Projects, and Demos"));  	} 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);  	search_hb->add_child(filter); diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 99b810be44..b9d99fcc93 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -3674,7 +3674,7 @@ ScriptEditor::ScriptEditor() {  	list_split->add_child(scripts_vbox);  	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->connect("text_changed", callable_mp(this, &ScriptEditor::_filter_scripts_text_changed));  	scripts_vbox->add_child(filter_scripts); @@ -3717,7 +3717,7 @@ ScriptEditor::ScriptEditor() {  	buttons_hbox->add_child(members_overview_alphabeta_sort_button);  	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->connect("text_changed", callable_mp(this, &ScriptEditor::_filter_methods_text_changed));  	overview_vbox->add_child(filter_methods); diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index 751751aaaa..400611c0e6 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -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->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.  			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"))); @@ -881,15 +883,10 @@ void ThemeItemImportTree::_bind_methods() {  }  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->set_placeholder(TTR("Filter Items"));  	import_items_filter->set_clear_button_enabled(true); -	import_items_filter->set_h_size_flags(Control::SIZE_EXPAND_FILL); -	import_items_filter_hb->add_child(import_items_filter); +	add_child(import_items_filter);  	import_items_filter->connect("text_changed", callable_mp(this, &ThemeItemImportTree::_filter_text_changed));  	HBoxContainer *import_main_hb = memnew(HBoxContainer); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index a56b6ec9d4..7fcabb1e80 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -2594,7 +2594,7 @@ ProjectManager::ProjectManager() {  		search_tree_vb->add_child(hb);  		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->connect("text_changed", callable_mp(this, &ProjectManager::_on_search_term_changed));  		search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL); diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 14a0427e18..58f69436a5 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -586,7 +586,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {  	general_editor->add_child(header);  	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->connect("text_changed", callable_mp(this, &ProjectSettingsEditor::_property_box_changed));  	header->add_child(property_box); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index c1cc144ff5..1ddefeba77 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -3381,7 +3381,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec  	vbc->add_child(filter_hbc);  	filter = memnew(LineEdit);  	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->add_theme_constant_override("minimum_character_width", 0);  	filter->connect("text_changed", callable_mp(this, &SceneTreeDock::_filter_changed)); diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index 32d43d7c59..b5b70b827b 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -1370,7 +1370,7 @@ SceneTreeDialog::SceneTreeDialog() {  	filter = memnew(LineEdit);  	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->add_theme_constant_override("minimum_character_width", 0);  	filter->connect("text_changed", callable_mp(this, &SceneTreeDialog::_filter_changed)); diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 4902adb827..cfff5c61de 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -1221,7 +1221,7 @@ GridMapEditor::GridMapEditor() {  	search_box = memnew(LineEdit);  	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);  	search_box->connect("text_changed", callable_mp(this, &GridMapEditor::_text_changed));  	search_box->connect("gui_input", callable_mp(this, &GridMapEditor::_sbox_input));  |