rename full mode to full english mode

2 files changed, 31 insertions, 31 deletions

diff --git a/src/ZYZhuyinProperties.cc b/src/ZYZhuyinProperties.cc
index 7c60d85..aeab138 100644
--- a/src/ZYZhuyinProperties.cc
+++ b/src/ZYZhuyinProperties.cc
@@ -31,7 +31,7 @@ namespace ZY {
 ZhuyinProperties::ZhuyinProperties (Config & config)
     : m_config (config),
       m_mode_chinese (m_config.initChinese ()),
-      m_mode_full (m_config.initFullEnglish ()),
+      m_mode_full_english (m_config.initFullEnglish ()),
       m_mode_full_punct (m_config.initFullPunct ()),
       m_mode_trad (m_config.initTradChinese ()),
       m_prop_chinese ("InputMode",
@@ -45,15 +45,15 @@ ZhuyinProperties::ZhuyinProperties (Config & config)
                 StaticText (m_mode_chinese ?
                             _("Switch to English Mode") :
                             _("Switch to Chinese Mode"))),
-      m_prop_full ("mode.full",
+      m_prop_full_english ("mode.full",
                 PROP_TYPE_NORMAL,
-                StaticText (m_mode_full ?
+                StaticText (m_mode_full_english ?
                             _("Full Width Letter") :
                             _("Half Width Letter")),
-                m_mode_full ?
+                m_mode_full_english ?
                     PKGDATADIR"/icons/full.svg" :
                     PKGDATADIR"/icons/half.svg",
-                StaticText (m_mode_full ?
+                StaticText (m_mode_full_english ?
                             _("Switch to Half Width Letter Mode"):
                             _("Switch to Full Width Letter Mode"))),
       m_prop_full_punct ("mode.full_punct",
@@ -90,7 +90,7 @@ ZhuyinProperties::ZhuyinProperties (Config & config)
         m_prop_chinese.setSymbol(N_("英"));
 
     m_props.append (m_prop_chinese);
-    m_props.append (m_prop_full);
+    m_props.append (m_prop_full_english);
     m_props.append (m_prop_full_punct);
     m_props.append (m_prop_trad);
     m_props.append (m_prop_setup);
@@ -123,19 +123,19 @@ ZhuyinProperties::toggleModeChinese (void)
 }
 
 void
-ZhuyinProperties::toggleModeFull (void)
+ZhuyinProperties::toggleModeFullEnglish (void)
 {
-    m_mode_full = !m_mode_full;
-    m_prop_full.setLabel (m_mode_full ?
-                          _("Full Width Letter") :
-                          _("Half Width Letter"));
-    m_prop_full.setIcon (m_mode_full ?
-                         PKGDATADIR"/icons/full.svg" :
-                         PKGDATADIR"/icons/half.svg");
-    m_prop_full.setTooltip (m_mode_full ?
-                            _("Switch to Half Width Letter Mode"):
-                            _("Switch to Full Width Letter Mode"));
-    updateProperty (m_prop_full);
+    m_mode_full_english = !m_mode_full_english;
+    m_prop_full_english.setLabel (m_mode_full_english ?
+                                  _("Full Width Letter") :
+                                  _("Half Width Letter"));
+    m_prop_full_english.setIcon (m_mode_full_english ?
+                                 PKGDATADIR"/icons/full.svg" :
+                                 PKGDATADIR"/icons/half.svg");
+    m_prop_full_english.setTooltip (m_mode_full_english ?
+                                 _("Switch to Half Width Letter Mode"):
+                                 _("Switch to Full Width Letter Mode"));
+    updateProperty (m_prop_full_english);
 }
 
 void
@@ -176,8 +176,8 @@ ZhuyinProperties::reset (void)
     if (modeChinese () != m_config.initChinese ()) {
         toggleModeChinese ();
     }
-    if (modeFull () != m_config.initFullEnglish ()) {
-        toggleModeFull ();
+    if (modeFullEnglish () != m_config.initFullEnglish ()) {
+        toggleModeFullEnglish ();
     }
     if (modeFullPunct () != m_config.initFullPunct ()) {
         toggleModeFullPunct ();
@@ -199,7 +199,7 @@ ZhuyinProperties::propertyActivate (const gchar *prop_name, guint prop_state) {
         return TRUE;
     }
     else if (mode_full == prop_name) {
-        toggleModeFull ();
+        toggleModeFullEnglish ();
         return TRUE;
     }
     else if (mode_full_punct == prop_name) {
diff --git a/src/ZYZhuyinProperties.h b/src/ZYZhuyinProperties.h
index d5be101..a6d184a 100644
--- a/src/ZYZhuyinProperties.h
+++ b/src/ZYZhuyinProperties.h
@@ -32,17 +32,17 @@ class ZhuyinProperties {
 public:
     ZhuyinProperties (Config & config);
 
-    void toggleModeChinese   (void);
-    void toggleModeFull      (void);
-    void toggleModeFullPunct (void);
-    void toggleModeTrad      (void);
+    void toggleModeChinese      (void);
+    void toggleModeFullEnglish  (void);
+    void toggleModeFullPunct    (void);
+    void toggleModeTrad         (void);
 
     void reset (void);
 
-    gboolean modeChinese (void) const   { return m_mode_chinese; }
-    gboolean modeFull (void) const      { return m_mode_full; }
-    gboolean modeFullPunct (void) const { return m_mode_full_punct; }
-    gboolean modeTrad (void) const      { return m_mode_trad; }
+    gboolean modeChinese (void) const      { return m_mode_chinese; }
+    gboolean modeFullEnglish (void) const  { return m_mode_full_english; }
+    gboolean modeFullPunct (void) const    { return m_mode_full_punct; }
+    gboolean modeTrad (void) const         { return m_mode_trad; }
 
     PropList & properties (void)        { return m_props; }
 
@@ -64,13 +64,13 @@ private:
 private:
     Config    & m_config;
     gboolean    m_mode_chinese;
-    gboolean    m_mode_full;
+    gboolean    m_mode_full_english;
     gboolean    m_mode_full_punct;
     gboolean    m_mode_trad;
 
     /* properties */
     Property    m_prop_chinese;
-    Property    m_prop_full;
+    Property    m_prop_full_english;
     Property    m_prop_full_punct;
     Property    m_prop_trad;
     Property    m_prop_setup;