iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Add an option to ignore uppercase words when spellchecking. Closes #1460.

This commit is contained in:
Thomas Goyne 2013-05-06 18:36:06 -07:00
parent 3154090d2f
commit ef459770a0
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
aegisub/src/dialog_spellchecker.cpp
View File

@ -40,6 +40,7 @@
#include <libaegisub/exception.h>
#include <libaegisub/spellchecker.h>
#include <boost/locale/conversion.hpp>
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/intl.h>
@ -124,11 +125,16 @@ DialogSpellChecker::DialogSpellChecker(agi::Context *context)
{
wxSizerFlags button_flags = wxSizerFlags().Expand().Bottom().Border(wxBOTTOM, 5);
skip_comments = new wxCheckBox(this, -1, _("&Skip Comments"));
actions_sizer->Add(skip_comments, button_flags);
skip_comments->SetValue(OPT_GET("Tool/Spell Checker/Skip Comments")->GetBool());
skip_comments->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED,
[](wxCommandEvent &evt) { OPT_SET("Tool/Spell Checker/Skip Comments")->SetBool(!!evt.GetInt()); });
auto make_checkbox = [&](wxString const& text, const char *opt) {
auto checkbox = new wxCheckBox(this, -1, text);
actions_sizer->Add(checkbox, button_flags);
checkbox->SetValue(OPT_GET(opt)->GetBool());
checkbox->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED,
[=](wxCommandEvent &evt) { OPT_SET(opt)->SetBool(!!evt.GetInt()); });
};
make_checkbox(_("&Skip Comments"), "Tool/Spell Checker/Skip Comments");
make_checkbox(_("Ignore &UPPERCASE words"), "Tool/Spell Checker/Skip Uppercase");
wxButton *button;
@ -240,12 +246,14 @@ bool DialogSpellChecker::FindNext() {
}
bool DialogSpellChecker::CheckLine(AssDialogue *active_line, int start_pos, int *commit_id) {
if (active_line->Comment && skip_comments->GetValue()) return false;
if (active_line->Comment && OPT_GET("Tool/Spell Checker/Skip Comments")->GetBool()) return false;
std::string text = active_line->Text;
auto tokens = agi::ass::TokenizeDialogueBody(text);
agi::ass::SplitWords(text, tokens);
bool ignore_uppercase = OPT_GET("Tool/Spell Checker/Skip Uppercase")->GetBool();
word_start = 0;
for (auto const& tok : tokens) {
if (tok.type != agi::ass::DialogueTokenType::WORD || word_start < start_pos) {
@ -256,7 +264,7 @@ bool DialogSpellChecker::CheckLine(AssDialogue *active_line, int start_pos, int
word_len = tok.length;
std::string word = text.substr(word_start, word_len);
if (auto_ignore.count(word) || spellchecker->CheckWord(word)) {
if (auto_ignore.count(word) || spellchecker->CheckWord(word) || (ignore_uppercase && word == boost::locale::to_upper(word))) {
word_start += tok.length;
continue;
}

1
aegisub/src/dialog_spellchecker.h
View File

@ -59,7 +59,6 @@ class DialogSpellChecker : public wxDialog {
wxComboBox *language; ///< The list of available languages
wxButton *add_button; ///< Add word to currently active dictionary
wxButton *remove_button; ///< Remove word from currently active dictionary
wxCheckBox *skip_comments; ///< Skip over commented lines
AssDialogue *start_line; ///< The first line checked
AssDialogue *active_line; ///< The most recently checked line

3
aegisub/src/libresrc/default_config.json
View File

@ -490,7 +490,8 @@
"Spell Checker" : {
"Backend" : "hunspell",
"Language" : "en_US",
"Skip Comments" : false
"Skip Comments" : false,
"Skip Uppercase" : false
},
"Style Editor" : {
"Last" : {

3
aegisub/src/libresrc/osx/default_config.json
View File

@ -490,7 +490,8 @@
"Spell Checker" : {
"Backend" : "hunspell",
"Language" : "en_US",
"Skip Comments" : false
"Skip Comments" : false,
"Skip Uppercase" : false
},
"Style Editor" : {
"Last" : {