godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22866 from Calinou/improve-find-in-files 

Improve the editor's Find in Files function
This commit is contained in:
Rémi Verschelde 2018-10-09 17:43:33 +02:00 committed by GitHub
parent 745ae39837 f7848f234f
commit 4c1a5d9cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/find_in_files.cpp
View File

@ -336,12 +336,10 @@ FindInFilesDialog::FindInFilesDialog() {
_whole_words_checkbox = memnew(CheckBox); _whole_words_checkbox = memnew(CheckBox);
_whole_words_checkbox->set_text(TTR("Whole Words")); _whole_words_checkbox->set_text(TTR("Whole Words"));
_whole_words_checkbox->set_pressed(true);
hbc->add_child(_whole_words_checkbox); hbc->add_child(_whole_words_checkbox);
_match_case_checkbox = memnew(CheckBox); _match_case_checkbox = memnew(CheckBox);
_match_case_checkbox->set_text(TTR("Match Case")); _match_case_checkbox->set_text(TTR("Match Case"));
_match_case_checkbox->set_pressed(true);
hbc->add_child(_match_case_checkbox); hbc->add_child(_match_case_checkbox);
gc->add_child(hbc); gc->add_child(hbc);
@ -563,7 +561,7 @@ FindInFilesPanel::FindInFilesPanel() {
_cancel_button = memnew(Button); _cancel_button = memnew(Button);
_cancel_button->set_text(TTR("Cancel")); _cancel_button->set_text(TTR("Cancel"));
_cancel_button->connect("pressed", this, "_on_cancel_button_clicked"); _cancel_button->connect("pressed", this, "_on_cancel_button_clicked");
_cancel_button->set_disabled(true); _cancel_button->hide();
hbc->add_child(_cancel_button); hbc->add_child(_cancel_button);
vbc->add_child(hbc); vbc->add_child(hbc);
@ -642,7 +640,7 @@ void FindInFilesPanel::start_search() {
_finder->start(); _finder->start();
update_replace_buttons(); update_replace_buttons();
_cancel_button->set_disabled(false); _cancel_button->show();
} }
void FindInFilesPanel::stop_search() { void FindInFilesPanel::stop_search() {
@ -652,7 +650,7 @@ void FindInFilesPanel::stop_search() {
_status_label->set_text(""); _status_label->set_text("");
update_replace_buttons(); update_replace_buttons();
set_progress_visible(false); set_progress_visible(false);
_cancel_button->set_disabled(true); _cancel_button->hide();
} }
void FindInFilesPanel::_notification(int p_what) { void FindInFilesPanel::_notification(int p_what) {
@ -688,7 +686,7 @@ void FindInFilesPanel::_on_result_found(String fpath, int line_number, int begin
// Do this first because it resets properties of the cell... // Do this first because it resets properties of the cell...
item->set_cell_mode(text_index, TreeItem::CELL_MODE_CUSTOM); item->set_cell_mode(text_index, TreeItem::CELL_MODE_CUSTOM);
String item_text = String::num_int64(line_number) + ": " + text.replace("\t", " "); String item_text = vformat("%3s: %s", line_number, text.replace("\t", " "));
item->set_text(text_index, item_text); item->set_text(text_index, item_text);
item->set_custom_draw(text_index, this, "_draw_result_text"); item->set_custom_draw(text_index, this, "_draw_result_text");
@ -754,7 +752,7 @@ void FindInFilesPanel::_on_finished() {
_status_label->set_text(TTR("Search complete")); _status_label->set_text(TTR("Search complete"));
update_replace_buttons(); update_replace_buttons();
set_progress_visible(false); set_progress_visible(false);
_cancel_button->set_disabled(true); _cancel_button->hide();
} }
void FindInFilesPanel::_on_cancel_button_clicked() { void FindInFilesPanel::_on_cancel_button_clicked() {