diff --git a/honoka/plugins/anthyconversion.cpp b/honoka/plugins/anthyconversion.cpp index e346419..fd647eb 100644 --- a/honoka/plugins/anthyconversion.cpp +++ b/honoka/plugins/anthyconversion.cpp @@ -191,7 +191,7 @@ String AnthyConversion::getPropertyName() { - return String("Anthy"); + return String(_("AnthyConversion")); } diff --git a/honoka/plugins/kanainput.cpp b/honoka/plugins/kanainput.cpp index ee2e2b1..542e95a 100644 --- a/honoka/plugins/kanainput.cpp +++ b/honoka/plugins/kanainput.cpp @@ -132,7 +132,7 @@ */ String KanaInput::getModeName() { - return _("KANA"); + return String(_("KANA")); } /*! @@ -140,6 +140,14 @@ */ String KanaInput::getName() { + return String("KanaInput"); +} + +/*! + \fn KanaInput::getPropertyName() + */ +String KanaInput::getPropertyName() +{ return String(_("Kana")); } diff --git a/honoka/plugins/kanainput.h b/honoka/plugins/kanainput.h index fb7f70e..0c2870d 100644 --- a/honoka/plugins/kanainput.h +++ b/honoka/plugins/kanainput.h @@ -42,7 +42,7 @@ virtual bool inputEvent(const KeyEvent &key); virtual String getName(); virtual String getModeName(); - virtual String getPropertyName() {return String("KanaInput");}; + virtual String getPropertyName(); protected: bool fakeKanaInput; diff --git a/honoka/plugins/romkan.cpp b/honoka/plugins/romkan.cpp index 138bb83..839d828 100644 --- a/honoka/plugins/romkan.cpp +++ b/honoka/plugins/romkan.cpp @@ -612,6 +612,14 @@ */ String Romkan::getName() { + return String("Romkan"); +} + +/*! + \fn Romkan::getPropertyName() + */ +String Romkan::getPropertyName() +{ return String(_("Roma")); } diff --git a/honoka/plugins/romkan.h b/honoka/plugins/romkan.h index f107c56..5b53c9e 100644 --- a/honoka/plugins/romkan.h +++ b/honoka/plugins/romkan.h @@ -68,7 +68,7 @@ virtual bool cancelEvent(); virtual bool inputEvent(const KeyEvent &key); virtual String getName(); - virtual String getPropertyName() {return String("Romkan");}; + virtual String getPropertyName(); virtual void setText(const WideString &t); virtual AttributeList getAttributeList(); diff --git a/honoka/plugins/skkdicconversion.cpp b/honoka/plugins/skkdicconversion.cpp index 41c6013..ebfba63 100644 --- a/honoka/plugins/skkdicconversion.cpp +++ b/honoka/plugins/skkdicconversion.cpp @@ -192,5 +192,5 @@ String SKKDicConversion::getPropertyName() { - return getName(); + return String(_("SKKDic")); } diff --git a/honoka/plugins/wnnconversion.cpp b/honoka/plugins/wnnconversion.cpp index 585ae06..f7a17f7 100644 --- a/honoka/plugins/wnnconversion.cpp +++ b/honoka/plugins/wnnconversion.cpp @@ -511,7 +511,7 @@ String WnnConversion::getPropertyName() { - return String("Wnn"); + return String(_("WnnConversion")); } diff --git a/honoka/plugins/wnnprediction.cpp b/honoka/plugins/wnnprediction.cpp index f0632ea..67f212c 100644 --- a/honoka/plugins/wnnprediction.cpp +++ b/honoka/plugins/wnnprediction.cpp @@ -87,7 +87,7 @@ */ String WnnPrediction::getPropertyName() { - return getName(); + return String(_("WnnPrediction")); } /*! @@ -95,7 +95,7 @@ */ String WnnPrediction::getName() { - return String(_("WnnPrediction")); + return String("WnnPrediction"); } /*! diff --git a/honoka/src/honoka_imengine.cpp b/honoka/src/honoka_imengine.cpp index 43383bd..dd4d5e7 100644 --- a/honoka/src/honoka_imengine.cpp +++ b/honoka/src/honoka_imengine.cpp @@ -428,7 +428,6 @@ sl = split(defaultPredictor); for(unsigned int i = 0;i < sl.size();i ++) if (changePredictor(sl[i])) break; - if (prediction) m_predictor->connect(); } @@ -440,7 +439,7 @@ { // PreEditor���ѹ�����᥽�åɡ� for(unsigned int i = 0;i < preeditors.size();i ++) { - if (preeditors[i]->getPropertyName() == name) { + if (preeditors[i]->getName() == name) { m_preeditor = preeditors[i]; return true; } @@ -457,7 +456,7 @@ { // Convertor���ѹ�����᥽�åɡ� for(unsigned int i = 0;i < convertors.size();i ++) { - if (convertors[i]->getPropertyName() == name) { + if (convertors[i]->getName() == name) { m_convertor = convertors[i]; return true; } @@ -474,8 +473,9 @@ { // Predictor���ѹ�����᥽�åɡ� for(unsigned int i = 0;i < predictors.size();i ++) { - if (predictors[i]->getPropertyName() == name) { + if (predictors[i]->getName() == name) { m_predictor = predictors[i]; + if (prediction && (!m_predictor->isConnected())) m_predictor->connect(); return true; } } @@ -494,24 +494,24 @@ p = Property(HONOKA_PROP_INPUTMODE,"",String(""),_("input mode")); m_proplist.push_back(p); for(unsigned int i = 0;i < preeditors.size();i ++) { - p = Property(String(HONOKA_PROP_INPUTMODE) + String("/") + preeditors[i]->getPropertyName(), - preeditors[i]->getName(),String(""),_("mode status")); + p = Property(String(HONOKA_PROP_INPUTMODE) + String("/") + preeditors[i]->getName(), + preeditors[i]->getPropertyName(),String(""),_("mode status")); m_proplist.push_back(p); } p = Property(HONOKA_PROP_PREDICTOR,"",String(""),_("predictor")); m_proplist.push_back(p); for(unsigned int i = 0;i < predictors.size();i ++) { - p = Property(String(HONOKA_PROP_PREDICTOR) + String("/") + predictors[i]->getPropertyName(), - predictors[i]->getName(),String(""),_("mode status")); + p = Property(String(HONOKA_PROP_PREDICTOR) + String("/") + predictors[i]->getName(), + predictors[i]->getPropertyName(),String(""),_("mode status")); m_proplist.push_back(p); } p = Property(HONOKA_PROP_CONVERTOR,"",String(""),_("convertor")); m_proplist.push_back(p); for(unsigned int i = 0;i < convertors.size();i ++) { - p = Property(String(HONOKA_PROP_CONVERTOR) + String("/") + convertors[i]->getPropertyName(), - convertors[i]->getName(),String(""),_("mode status")); + p = Property(String(HONOKA_PROP_CONVERTOR) + String("/") + convertors[i]->getName(), + convertors[i]->getPropertyName(),String(""),_("mode status")); m_proplist.push_back(p); } p = Property(HONOKA_PROP_MODESTATUS,"",String(""),_("mode status")); @@ -522,17 +522,17 @@ PropertyList::iterator it; it = find(m_proplist.begin(),m_proplist.end(),HONOKA_PROP_INPUTMODE); if (it != m_proplist.end()) { - it->set_label(m_preeditor->getName()); + it->set_label(m_preeditor->getPropertyName()); } update_property(*it); it = find(m_proplist.begin(),m_proplist.end(),HONOKA_PROP_PREDICTOR); if (it != m_proplist.end()) { - it->set_label(m_predictor->getName()); + it->set_label(m_predictor->getPropertyName()); } update_property(*it); it = find(m_proplist.begin(),m_proplist.end(),HONOKA_PROP_CONVERTOR); if (it != m_proplist.end()) { - it->set_label(m_convertor->getName()); + it->set_label(m_convertor->getPropertyName()); } update_property(*it); it = find(m_proplist.begin(),m_proplist.end(),HONOKA_PROP_MODESTATUS); @@ -745,7 +745,7 @@ if (k_next_convertor.comp(key) || k_prev_convertor.comp(key)) { for(unsigned int i = 0;i < convertors.size();i ++) { - if (convertors[i]->getPropertyName() == m_convertor->getPropertyName()) { + if (convertors[i]->getName() == m_convertor->getName()) { if (k_next_convertor.comp(key)) { if (i == (convertors.size() - 1)) i = 0; else i ++; @@ -753,7 +753,7 @@ if (i == 0) i = convertors.size() - 1; else i --; } - changeConvertor(convertors[i]->getPropertyName()); + changeConvertor(convertors[i]->getName()); updatePreEditor(); return true; } @@ -927,7 +927,7 @@ } else if ((k_next_convertor.comp(key) || k_prev_convertor.comp(key)) && (m_convertor != m_multi)) { for(unsigned int i = 0;i < convertors.size();i ++) { - if (convertors[i]->getPropertyName() == m_convertor->getPropertyName()) { + if (convertors[i]->getName() == m_convertor->getName()) { if (k_next_convertor.comp(key)) { if (i == (convertors.size() - 1)) i = 0; else i ++; @@ -935,7 +935,7 @@ if (i == 0) i = convertors.size() - 1; else i --; } - changeConvertor(convertors[i]->getPropertyName()); + changeConvertor(convertors[i]->getName()); if (m_def_convertor != m_convertor) { m_def_convertor->reset(); startConversion();