diff --git a/honoka/src/honoka_def.h b/honoka/src/honoka_def.h index 5307226..5415a44 100644 --- a/honoka/src/honoka_def.h +++ b/honoka/src/honoka_def.h @@ -77,10 +77,12 @@ #define HONOKA_DEFAULT_KEY_PREV_CONVERTOR "Control+Page_Up" #define HONOKA_CONFIG_KEY_SELECTION_PREFIX "/IMEngine/Honoka/Key/Selection" -#define HONOKA_CONFIG_KEY_CONVERSION_IKEIJI "/IMEngine/Honoka/Key/ConversionIkeiji" -#define HONOKA_DEFAULT_KEY_CONVERSION_IKEIJI "Shift+F8" -#define HONOKA_CONFIG_KEY_CONVERSION_RENSOU "/IMEngine/Honoka/Key/ConversionRensou" -#define HONOKA_DEFAULT_KEY_CONVERSION_RENSOU "Shift+F9" +#define HONOKA_CONFIG_KEY_CONVERSION_SPECIAL1 "/IMEngine/Honoka/Key/ConversionSpecial1" +#define HONOKA_DEFAULT_KEY_CONVERSION_SPECIAL1 "Shift+F9" +#define HONOKA_CONFIG_KEY_CONVERSION_SPECIAL2 "/IMEngine/Honoka/Key/ConversionSpecial2" +#define HONOKA_DEFAULT_KEY_CONVERSION_SPECIAL2 "Shift+F8" +#define HONOKA_CONFIG_KEY_CONVERSION_SPECIAL3 "/IMEngine/Honoka/Key/ConversionSpecial3" +#define HONOKA_DEFAULT_KEY_CONVERSION_SPECIAL3 "Shift+F7" #define HONOKA_CONFIG_KEY_SELECT_PREDICTION "/IMEngine/Honoka/Key/SelectPrediction" #define HONOKA_DEFAULT_KEY_SELECT_PREDICTION "Tab" #define HONOKA_CONFIG_KEY_AUTO_CONVERSION "/IMEngine/Honoka/Key/AutoConversion" diff --git a/honoka/src/honoka_imengine.cpp b/honoka/src/honoka_imengine.cpp index d9936e2..19e729f 100644 --- a/honoka/src/honoka_imengine.cpp +++ b/honoka/src/honoka_imengine.cpp @@ -429,12 +429,16 @@ _scim_config->read(String(HONOKA_CONFIG_KEY_CONVERT_WIDE), String(HONOKA_DEFAULT_KEY_CONVERT_WIDE))); - scim_string_to_key_list(k_conversion_rensou, - _scim_config->read(String(HONOKA_CONFIG_KEY_CONVERSION_RENSOU), - String(HONOKA_DEFAULT_KEY_CONVERSION_RENSOU))); - scim_string_to_key_list(k_conversion_ikeiji, - _scim_config->read(String(HONOKA_CONFIG_KEY_CONVERSION_IKEIJI), - String(HONOKA_DEFAULT_KEY_CONVERSION_IKEIJI))); + scim_string_to_key_list(k_conversion_special1, + _scim_config->read(String(HONOKA_CONFIG_KEY_CONVERSION_SPECIAL1), + String(HONOKA_DEFAULT_KEY_CONVERSION_SPECIAL1))); + scim_string_to_key_list(k_conversion_special2, + _scim_config->read(String(HONOKA_CONFIG_KEY_CONVERSION_SPECIAL2), + String(HONOKA_DEFAULT_KEY_CONVERSION_SPECIAL2))); + scim_string_to_key_list(k_conversion_special3, + _scim_config->read(String(HONOKA_CONFIG_KEY_CONVERSION_SPECIAL3), + String(HONOKA_DEFAULT_KEY_CONVERSION_SPECIAL3))); + scim_string_to_key_list(k_select_prediction, _scim_config->read(String(HONOKA_CONFIG_KEY_SELECT_PREDICTION), String(HONOKA_DEFAULT_KEY_SELECT_PREDICTION))); @@ -1294,7 +1298,7 @@ } else // 連想変換(特殊1)キー - if (k_conversion_rensou.comp(key)) { + if (k_conversion_special1.comp(key)) { m_no_update = false; m_convList = m_convertor->getResultList(m_convertor->getPos(),SPECIAL1); if (m_convList.count() == 0) return true; @@ -1305,7 +1309,7 @@ } else // 異形字変換(特殊2)キー。 - if (k_conversion_ikeiji.comp(key)) { + if (k_conversion_special2.comp(key)) { m_no_update = false; m_convList = m_convertor->getResultList(m_convertor->getPos(),SPECIAL2); if (m_convList.count() == 0) return true; diff --git a/honoka/src/honoka_imengine.h b/honoka/src/honoka_imengine.h index 1d47bdb..73a78b9 100644 --- a/honoka/src/honoka_imengine.h +++ b/honoka/src/honoka_imengine.h @@ -218,9 +218,11 @@ k_furigana_commit, // ふりがな付き確定 k_allreset, // 機能全リセット - // for Wnn7 - k_conversion_ikeiji, // 異形字変換 - k_conversion_rensou, // 連想変換 + // for すぺさるキー + k_conversion_special1, // SP1(連想変換) + k_conversion_special2, // SP2(異形字変換) + k_conversion_special3, // SP3 + k_select_prediction, // 予測選択 k_selection[9], // 候補選択ショートカット k_dummy; diff --git a/honoka/src/honoka_imengine_setup.cpp b/honoka/src/honoka_imengine_setup.cpp index 54721da..3f617dc 100644 --- a/honoka/src/honoka_imengine_setup.cpp +++ b/honoka/src/honoka_imengine_setup.cpp @@ -370,15 +370,15 @@ )); page->append(new HonokaSetupKeyItem( _("Convert to ikeiji keys:"), - HONOKA_CONFIG_KEY_CONVERSION_IKEIJI, + HONOKA_CONFIG_KEY_CONVERSION_SPECIAL2, _("The key events to convert the selected candidate to ikei-kanji. "), - HONOKA_DEFAULT_KEY_CONVERSION_IKEIJI + HONOKA_DEFAULT_KEY_CONVERSION_SPECIAL2 )); page->append(new HonokaSetupKeyItem( _("Convert to rensou keys:"), - HONOKA_CONFIG_KEY_CONVERSION_RENSOU, + HONOKA_CONFIG_KEY_CONVERSION_SPECIAL1, _("The key events to convert the selected candidate to the associated acceptation string. "), - HONOKA_DEFAULT_KEY_CONVERSION_RENSOU + HONOKA_DEFAULT_KEY_CONVERSION_SPECIAL1 )); page->append(new HonokaSetupKeyItem( _("Character type conversion :"),