update class ZhuyinConfig

3 files changed, 8 insertions, 16 deletions

diff --git a/src/ZYConfig.cc b/src/ZYConfig.cc
index bc6fad5..4686dbe 100644
--- a/src/ZYConfig.cc
+++ b/src/ZYConfig.cc
@@ -49,8 +49,7 @@ Config::initDefaultValues (void)
     m_keyboard_layout = CHEWING_DEFAULT;
 
     m_init_chinese = TRUE;
-    m_init_full_english = FALSE;
-    m_init_full_punct = TRUE;
+    m_init_full_width = FALSE;
     m_init_trad_chinese = TRUE;
 
     m_always_input_numbers = FALSE;
diff --git a/src/ZYConfig.h b/src/ZYConfig.h
index 8a1c5d6..8745061 100644
--- a/src/ZYConfig.h
+++ b/src/ZYConfig.h
@@ -46,8 +46,7 @@ public:
     guint pageSize (void) const                 { return m_page_size; }
     ZhuyinScheme keyboardLayout (void) const    { return m_keyboard_layout; }
     gboolean initChinese (void) const           { return m_init_chinese; }
-    gboolean initFullEnglish (void) const       { return m_init_full_english; }
-    gboolean initFullPunct (void) const         { return m_init_full_punct; }
+    gboolean initFullWidth (void) const         { return m_init_full_width; }
     gboolean initTradChinese (void) const       { return m_init_trad_chinese; }
     gboolean alwaysInputNumbers (void) const    { return m_always_input_numbers; }
     gboolean spaceShowCandidates (void) const   { return m_space_show_candidates; }
@@ -85,8 +84,7 @@ protected:
     ZhuyinScheme m_keyboard_layout;
 
     gboolean m_init_chinese;
-    gboolean m_init_full_english;
-    gboolean m_init_full_punct;
+    gboolean m_init_full_width;
     gboolean m_init_trad_chinese;
 
     gboolean m_always_input_numbers;
diff --git a/src/ZYZConfig.cc b/src/ZYZConfig.cc
index db785e6..a6d7300 100644
--- a/src/ZYZConfig.cc
+++ b/src/ZYZConfig.cc
@@ -31,8 +31,7 @@ const gchar * const CONFIG_ORIENTATION               = "LookupTableOrientation";
 const gchar * const CONFIG_PAGE_SIZE                 = "candidatenum";
 
 const gchar * const CONFIG_INIT_CHINESE              = "chinesemode";
-const gchar * const CONFIG_INIT_FULL_ENGLISH         = "fullhalfenglish";
-const gchar * const CONFIG_INIT_FULL_PUNCT           = "fullhalfpunct";
+const gchar * const CONFIG_INIT_FULL_WIDTH           = "fullhalfwidth";
 const gchar * const CONFIG_INIT_TRAD_CHINESE         = "traditionalchinese";
 const gchar * const CONFIG_ALWAYS_INPUT_NUMBERS      = "alwaysinputnum";
 const gchar * const CONFIG_SPACE_SHOW_CANDIDATES     = "spaceshowcandidates";
@@ -91,8 +90,7 @@ ZhuyinConfig::initDefaultValues (void)
     m_keyboard_layout = CHEWING_DEFAULT;
 
     m_init_chinese = TRUE;
-    m_init_full_english = FALSE;
-    m_init_full_punct = TRUE;
+    m_init_full_width = FALSE;
     m_init_trad_chinese = TRUE;
 
     m_always_input_numbers = FALSE;
@@ -184,8 +182,7 @@ ZhuyinConfig::readDefaultValues (void)
 
     /* init states */
     m_init_chinese = read (CONFIG_INIT_CHINESE, true);
-    m_init_full_english = read (CONFIG_INIT_FULL_ENGLISH, false);
-    m_init_full_punct = read (CONFIG_INIT_FULL_PUNCT, true);
+    m_init_full_width = read (CONFIG_INIT_FULL_WIDTH, false);
     m_init_trad_chinese = read (CONFIG_INIT_TRAD_CHINESE, true);
 
     m_always_input_numbers = read (CONFIG_ALWAYS_INPUT_NUMBERS, false);
@@ -239,10 +236,8 @@ ZhuyinConfig::valueChanged (const std::string &section,
     /* init states */
     if (CONFIG_INIT_CHINESE == name)
         m_init_chinese = normalizeGVariant (value, true);
-    else if (CONFIG_INIT_FULL_ENGLISH == name)
-        m_init_full_english = normalizeGVariant (value, false);
-    else if (CONFIG_INIT_FULL_PUNCT == name)
-        m_init_full_punct = normalizeGVariant (value, true);
+    else if (CONFIG_INIT_FULL_WIDTH == name)
+        m_init_full_width = normalizeGVariant (value, false);
     else if (CONFIG_INIT_TRAD_CHINESE == name)
         m_init_trad_chinese = normalizeGVariant (value, true);
     else if (CONFIG_ALWAYS_INPUT_NUMBERS == name)