livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Potential fix for FIRE-10338, commit spellcheck settings immediately, not on closing the floater

Cinders 2013-05-20 09:30:11 -06:00
parent b451d9982d
commit e29df040bc
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
indra/newview/llfloaterspellchecksettings.cpp
View File

@ -96,6 +96,8 @@ void LLFloaterSpellCheckerSettings::onBtnMove(const std::string& from, const std
to_ctrl->setSelectedByValue( (*sel_it)->getValue(), true );
}
from_ctrl->deleteSelectedItems();
commitChanges();
}
void LLFloaterSpellCheckerSettings::onClose(bool app_quitting)
@ -107,26 +109,7 @@ void LLFloaterSpellCheckerSettings::onClose(bool app_quitting)
}
LLFloaterReg::hideInstance("prefs_spellchecker_import");
std::list<std::string> list_dict;
LLComboBox* dict_combo = findChild<LLComboBox>("spellcheck_main_combo");
const std::string dict_name = dict_combo->getSelectedItemLabel();
if (!dict_name.empty())
{
list_dict.push_back(dict_name);
LLScrollListCtrl* list_ctrl = findChild<LLScrollListCtrl>("spellcheck_active_list");
std::vector<LLScrollListItem*> list_items = list_ctrl->getAllData();
for (std::vector<LLScrollListItem*>::const_iterator item_it = list_items.begin(); item_it != list_items.end(); ++item_it)
{
const std::string language = (*item_it)->getValue().asString();
if (LLSpellChecker::hasDictionary(language, true))
{
list_dict.push_back(language);
}
}
}
gSavedSettings.setString("SpellCheckDictionary", boost::join(list_dict, ","));
commitChanges();
}
void LLFloaterSpellCheckerSettings::onOpen(const LLSD& key)
@ -237,6 +220,31 @@ void LLFloaterSpellCheckerSettings::refreshDictionaries(bool from_settings)
}
}
avail_ctrl->sortByColumnIndex(0, true);
commitChanges();
}
void LLFloaterSpellCheckerSettings::commitChanges()
{
std::list<std::string> list_dict;
LLComboBox* dict_combo = findChild<LLComboBox>("spellcheck_main_combo");
const std::string dict_name = dict_combo->getSelectedItemLabel();
if (!dict_name.empty())
{
list_dict.push_back(dict_name);
LLScrollListCtrl* list_ctrl = findChild<LLScrollListCtrl>("spellcheck_active_list");
std::vector<LLScrollListItem*> list_items = list_ctrl->getAllData();
for (std::vector<LLScrollListItem*>::const_iterator item_it = list_items.begin(); item_it != list_items.end(); ++item_it)
{
const std::string language = (*item_it)->getValue().asString();
if (LLSpellChecker::hasDictionary(language, true))
{
list_dict.push_back(language);
}
}
}
gSavedSettings.setString("SpellCheckDictionary", boost::join(list_dict, ","));
}
///----------------------------------------------------------------------------

3
indra/newview/llfloaterspellchecksettings.h
View File

@ -45,6 +45,9 @@ protected:
void onBtnRemove();
void onSpellCheckSettingsChange();
void refreshDictionaries(bool from_settings);
private:
void commitChanges();
};
class LLFloaterSpellCheckerImport : public LLFloater