mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Improved thesaurus/spellcheck menus

Browse source 
Originally committed to SVN as r614.
This commit is contained in:
Rodrigo Braz Monteiro 2006-12-25 23:10:23 +00:00
parent 929a914024
commit 39a690247a
1 changed files with 57 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
core/subs_edit_ctrl.cpp
View file

@ -439,7 +439,10 @@ void SubsTextEditCtrl::ShowPopupMenu(int activePos) {
// Spell check // Spell check
int style = GetStyleAt(activePos); int style = GetStyleAt(activePos);
if (spellchecker && !spellchecker->CheckWord(currentWord)) { if (spellchecker && currentWord.Length()) {
// Spelled right?
bool rightSpelling = spellchecker->CheckWord(currentWord);
// Set font // Set font
wxFont font; wxFont font;
font.SetWeight(wxFONTWEIGHT_BOLD); font.SetWeight(wxFONTWEIGHT_BOLD);
@ -447,21 +450,41 @@ void SubsTextEditCtrl::ShowPopupMenu(int activePos) {
// Get suggestions // Get suggestions
sugs.Clear(); sugs.Clear();
sugs = spellchecker->GetSuggestions(currentWord); sugs = spellchecker->GetSuggestions(currentWord);
// Build menu
int nSugs = sugs.Count(); int nSugs = sugs.Count();
for (int i=0;i<nSugs;i++) menu.Append(EDIT_MENU_SUGGESTIONS+i,sugs[i])->SetFont(font);
// No suggestions // Spelled wrong
if (!nSugs) menu.Append(EDIT_MENU_SUGGESTION,_("No correction suggestions"))->Enable(false); if (!rightSpelling) {
// No suggestions
if (!nSugs) menu.Append(EDIT_MENU_SUGGESTION,_("No correction suggestions"))->Enable(false);
// Append "add word" // Build menu
menu.Append(EDIT_MENU_ADD_TO_DICT,wxString::Format(_("Add \"%s\" to dictionary"),currentWord.c_str())); for (int i=0;i<nSugs;i++) menu.Append(EDIT_MENU_SUGGESTIONS+i,sugs[i])->SetFont(font);
menu.AppendSeparator();
// Append "add word"
menu.Append(EDIT_MENU_ADD_TO_DICT,wxString::Format(_("Add \"%s\" to dictionary"),currentWord.c_str()));
menu.AppendSeparator();
}
// Spelled right
else {
// No suggestions
if (!nSugs) menu.Append(EDIT_MENU_SUGGESTION,_("No spell checker suggestions"))->Enable(false);
// Has suggestions
else {
// Build list
wxMenu *subMenu = new wxMenu();
for (int i=0;i<nSugs;i++) subMenu->Append(EDIT_MENU_SUGGESTIONS+i,sugs[i]);
menu.AppendSubMenu(subMenu,wxString::Format(_("Spell checker suggestions for \"%s\""),currentWord.c_str()));
}
// Separator
if (!thesaurus) menu.AppendSeparator();
}
} }
// Thesaurus // Thesaurus
if (thesaurus) { if (thesaurus && currentWord.Length()) {
// Get results // Get results
ThesaurusEntryArray result; ThesaurusEntryArray result;
thesaurus->Lookup(currentWord,result); thesaurus->Lookup(currentWord,result);
@ -476,32 +499,38 @@ void SubsTextEditCtrl::ShowPopupMenu(int activePos) {
// Has suggestions // Has suggestions
if (result.size()) { if (result.size()) {
// Set font
wxFont font; wxFont font;
font.SetStyle(wxFONTSTYLE_ITALIC); font.SetStyle(wxFONTSTYLE_ITALIC);
menu.Append(EDIT_MENU_THESAURUS,wxString::Format(_("Thesaurus suggestions for \"%s\":"),currentWord.c_str()))->SetFont(font);
}
// Build menu // Create thesaurus menu
int curThesEntry = 0; wxMenu *thesMenu = new wxMenu();
for (unsigned int i=0;i<result.size();i++) {
// Single word, insert directly
if (result[i].words.Count() == 1) {
menu.Append(EDIT_MENU_THESAURUS_SUGS+curThesEntry,result[i].name);
curThesEntry++;
}
// Multiple, create submenu // Build menu
else { int curThesEntry = 0;
// Insert entries for (unsigned int i=0;i<result.size();i++) {
wxMenu *subMenu = new wxMenu(); // Single word, insert directly
for (unsigned int j=0;j<result[i].words.Count();j++) { if (result[i].words.Count() == 1) {
subMenu->Append(EDIT_MENU_THESAURUS_SUGS+curThesEntry,result[i].words[j]); thesMenu->Append(EDIT_MENU_THESAURUS_SUGS+curThesEntry,result[i].name);
curThesEntry++; curThesEntry++;
} }
// Insert submenu // Multiple, create submenu
menu.AppendSubMenu(subMenu,result[i].name); else {
// Insert entries
wxMenu *subMenu = new wxMenu();
for (unsigned int j=0;j<result[i].words.Count();j++) {
subMenu->Append(EDIT_MENU_THESAURUS_SUGS+curThesEntry,result[i].words[j]);
curThesEntry++;
}
// Insert submenu
thesMenu->AppendSubMenu(subMenu,result[i].name);
}
} }
// Thesaurus menu
menu.AppendSubMenu(thesMenu,wxString::Format(_("Thesaurus suggestions for \"%s\""),currentWord.c_str()));
} }
// No suggestions // No suggestions