godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge pull request #23522 from YeldhamDev/find_files_dialog_fixup

Browse Source 
General fixup of the "Find in Files" dialog
This commit is contained in:
Rémi Verschelde
2018-11-05 14:52:45 +01:00
committed by GitHub
parent b23d7c3b66 e030317b6c
commit d4028a3f50
1 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
editor/find_in_files.cpp
View File

@@ -29,6 +29,7 @@
/*************************************************************************/ /*************************************************************************/
#include "find_in_files.h" #include "find_in_files.h"
#include "core/os/dir_access.h" #include "core/os/dir_access.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "editor_node.h" #include "editor_node.h"
@@ -89,8 +90,6 @@ static bool find_next(const String &line, String pattern, int from, bool match_c
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
FindInFiles::FindInFiles() { FindInFiles::FindInFiles() {
_root_prefix = ROOT_PREFIX; _root_prefix = ROOT_PREFIX;
_extension_filter.insert("gd");
_extension_filter.insert("cs");
_searching = false; _searching = false;
_whole_words = true; _whole_words = true;
_match_case = true; _match_case = true;
@@ -301,8 +300,7 @@ const char *FindInFilesDialog::SIGNAL_REPLACE_REQUESTED = "replace_requested";
FindInFilesDialog::FindInFilesDialog() { FindInFilesDialog::FindInFilesDialog() {
set_custom_minimum_size(Size2(400, 190) * EDSCALE); set_custom_minimum_size(Size2(500 * EDSCALE, 0));
set_resizable(true);
set_title(TTR("Find in Files")); set_title(TTR("Find in Files"));
VBoxContainer *vbc = memnew(VBoxContainer); VBoxContainer *vbc = memnew(VBoxContainer);
@@ -317,7 +315,7 @@ FindInFilesDialog::FindInFilesDialog() {
vbc->add_child(gc); vbc->add_child(gc);
Label *find_label = memnew(Label); Label *find_label = memnew(Label);
find_label->set_text(TTR("Find: ")); find_label->set_text(TTR("Find:"));
gc->add_child(find_label); gc->add_child(find_label);
_search_text_line_edit = memnew(LineEdit); _search_text_line_edit = memnew(LineEdit);
@@ -326,10 +324,7 @@ FindInFilesDialog::FindInFilesDialog() {
_search_text_line_edit->connect("text_entered", this, "_on_search_text_entered"); _search_text_line_edit->connect("text_entered", this, "_on_search_text_entered");
gc->add_child(_search_text_line_edit); gc->add_child(_search_text_line_edit);
{ gc->add_child(memnew(Control)); // Space to mantain the grid aligned.
Control *placeholder = memnew(Control);
gc->add_child(placeholder);
}
{ {
HBoxContainer *hbc = memnew(HBoxContainer); HBoxContainer *hbc = memnew(HBoxContainer);
@@ -346,7 +341,7 @@ FindInFilesDialog::FindInFilesDialog() {
} }
Label *folder_label = memnew(Label); Label *folder_label = memnew(Label);
folder_label->set_text(TTR("Folder: ")); folder_label->set_text(TTR("Folder:"));
gc->add_child(folder_label); gc->add_child(folder_label);
{ {
@@ -374,7 +369,7 @@ FindInFilesDialog::FindInFilesDialog() {
} }
Label *filter_label = memnew(Label); Label *filter_label = memnew(Label);
filter_label->set_text(TTR("Filter: ")); filter_label->set_text(TTR("Filters:"));
gc->add_child(filter_label); gc->add_child(filter_label);
{ {
@@ -382,7 +377,8 @@ FindInFilesDialog::FindInFilesDialog() {
Vector<String> exts; Vector<String> exts;
exts.push_back("gd"); exts.push_back("gd");
exts.push_back("cs"); if (Engine::get_singleton()->has_singleton("GodotSharp"))
exts.push_back("cs");
for (int i = 0; i < exts.size(); ++i) { for (int i = 0; i < exts.size(); ++i) {
CheckBox *cb = memnew(CheckBox); CheckBox *cb = memnew(CheckBox);
@@ -395,39 +391,14 @@ FindInFilesDialog::FindInFilesDialog() {
gc->add_child(hbc); gc->add_child(hbc);
} }
{ _find_button = add_button(TTR("Find..."), false, "find");
Control *placeholder = memnew(Control); _find_button->set_disabled(true);
placeholder->set_custom_minimum_size(Size2(0, EDSCALE * 16));
vbc->add_child(placeholder);
}
{ _replace_button = add_button(TTR("Replace..."), false, "replace");
HBoxContainer *hbc = memnew(HBoxContainer); _replace_button->set_disabled(true);
hbc->set_alignment(HBoxContainer::ALIGN_CENTER);
_find_button = add_button(TTR("Find..."), false, "find"); Button *cancel_button = get_ok();
_find_button->set_disabled(true); cancel_button->set_text(TTR("Cancel"));
{
Control *placeholder = memnew(Control);
placeholder->set_custom_minimum_size(Size2(EDSCALE * 16, 0));
hbc->add_child(placeholder);
}
_replace_button = add_button(TTR("Replace..."), false, "replace");
_replace_button->set_disabled(true);
{
Control *placeholder = memnew(Control);
placeholder->set_custom_minimum_size(Size2(EDSCALE * 16, 0));
hbc->add_child(placeholder);
}
Button *cancel_button = get_ok();
cancel_button->set_text(TTR("Cancel"));
vbc->add_child(hbc);
}
} }
void FindInFilesDialog::set_search_text(String text) { void FindInFilesDialog::set_search_text(String text) {