diff options
| author | Peng Wu <alexepico@gmail.com> | 2014-07-01 15:45:10 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2014-07-01 15:45:10 +0800 |
| commit | 19e5caec8ff73a7b8e3307a490ec5930706633aa (patch) | |
| tree | a1f4ca27633b39a5cbbd01000db738f6ac5e3689 /src | |
| parent | a922b865710b961817b5cce3d5f53f74cffc494d (diff) | |
| download | ibus-libzhuyin-19e5caec8ff73a7b8e3307a490ec5930706633aa.tar.gz ibus-libzhuyin-19e5caec8ff73a7b8e3307a490ec5930706633aa.tar.xz ibus-libzhuyin-19e5caec8ff73a7b8e3307a490ec5930706633aa.zip | |
add STATE_BOPOMOFO_SYMBOL_SHOWN
Diffstat (limited to 'src')
| -rw-r--r-- | src/ZYZPhoneticEditor.cc | 10 | ||||
| -rw-r--r-- | src/ZYZPhoneticEditor.h | 1 | ||||
| -rw-r--r-- | src/ZYZPinyinEditor.cc | 3 | ||||
| -rw-r--r-- | src/ZYZZhuyinEditor.cc | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/src/ZYZPhoneticEditor.cc b/src/ZYZPhoneticEditor.cc index 3faa59d..b670614 100644 --- a/src/ZYZPhoneticEditor.cc +++ b/src/ZYZPhoneticEditor.cc @@ -25,6 +25,7 @@ #include "ZYZhuyinProperties.h" #include "ZYZPhoneticSection.h" #include "ZYZBuiltinSymbolSection.h" +#include "ZYZBopomofoSymbolSection.h" #include "ZYEnhancedText.h" #include "ZYLibZhuyin.h" #include "ZYSymbols.h" @@ -55,6 +56,9 @@ PhoneticEditor::PhoneticEditor (ZhuyinProperties & props, Config & config) m_symbol_sections[STATE_BUILTIN_SYMBOL_SHOWN].reset (new BuiltinSymbolSection (*this, props)); + m_symbol_sections[STATE_BOPOMOFO_SYMBOL_SHOWN].reset + (new BopomofoSymbolSection (*this, props)); + m_phonetic_section.reset (new PhoneticSection (*this, props)); } @@ -271,7 +275,8 @@ PhoneticEditor::fillLookupTableByPage (void) if (STATE_CANDIDATE_SHOWN == m_input_state) return m_phonetic_section->fillLookupTableByPage (); - if (STATE_BUILTIN_SYMBOL_SHOWN == m_input_state /* || + if (STATE_BUILTIN_SYMBOL_SHOWN == m_input_state || + STATE_BOPOMOFO_SYMBOL_SHOWN == m_input_state /* || STATE_USER_SYMBOL_LIST_ALL == m_input_state || STATE_USER_SYMBOL_SHOWN == m_input_state */) { return m_symbol_sections[m_input_state]-> @@ -369,7 +374,8 @@ PhoneticEditor::selectCandidate (guint index) if (STATE_CANDIDATE_SHOWN == m_input_state) return m_phonetic_section->selectCandidate (index); - if (STATE_BUILTIN_SYMBOL_SHOWN == m_input_state /* || + if (STATE_BUILTIN_SYMBOL_SHOWN == m_input_state || + STATE_BOPOMOFO_SYMBOL_SHOWN == m_input_state /* || STATE_USER_SYMBOL_LIST_ALL == m_input_state || STATE_USER_SYMBOL_SHOWN == m_input_state */) { return m_symbol_sections[m_input_state]-> diff --git a/src/ZYZPhoneticEditor.h b/src/ZYZPhoneticEditor.h index ca9631f..6652ac6 100644 --- a/src/ZYZPhoneticEditor.h +++ b/src/ZYZPhoneticEditor.h @@ -102,6 +102,7 @@ protected: STATE_INPUT = 0, // input state STATE_CANDIDATE_SHOWN, // candidates shown state STATE_BUILTIN_SYMBOL_SHOWN, // built-in symbol shown state + STATE_BOPOMOFO_SYMBOL_SHOWN, // bopomofo symbol shown state #if 0 STATE_USER_SYMBOL_LIST_ALL, // user symbol input state STATE_USER_SYMBOL_SHOWN, // user symbol shown state diff --git a/src/ZYZPinyinEditor.cc b/src/ZYZPinyinEditor.cc index 3ffffff..a5113ee 100644 --- a/src/ZYZPinyinEditor.cc +++ b/src/ZYZPinyinEditor.cc @@ -216,7 +216,8 @@ PinyinEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) } if (STATE_CANDIDATE_SHOWN == m_input_state || - STATE_BUILTIN_SYMBOL_SHOWN == m_input_state /* || + STATE_BUILTIN_SYMBOL_SHOWN == m_input_state || + STATE_BOPOMOFO_SYMBOL_SHOWN == m_input_state /* || STATE_USER_SYMBOL_LIST_ALL == m_input_state || STATE_USER_SYMBOL_SHOWN == m_input_state */) { if (processCandidateKey (keyval, keycode, modifiers)) diff --git a/src/ZYZZhuyinEditor.cc b/src/ZYZZhuyinEditor.cc index d31a258..221f20f 100644 --- a/src/ZYZZhuyinEditor.cc +++ b/src/ZYZZhuyinEditor.cc @@ -224,7 +224,8 @@ ZhuyinEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) } if (STATE_CANDIDATE_SHOWN == m_input_state || - STATE_BUILTIN_SYMBOL_SHOWN == m_input_state /* || + STATE_BUILTIN_SYMBOL_SHOWN == m_input_state || + STATE_BOPOMOFO_SYMBOL_SHOWN == m_input_state /* || STATE_USER_SYMBOL_LIST_ALL == m_input_state || STATE_USER_SYMBOL_SHOWN == m_input_state */) { if (processCandidateKey (keyval, keycode, modifiers)) |