update setup dialog

2 files changed, 15 insertions, 36 deletions

diff --git a/setup/ibus-libzhuyin-preferences.ui b/setup/ibus-libzhuyin-preferences.ui
index eee2b25..4a0fab4 100644
--- a/setup/ibus-libzhuyin-preferences.ui
+++ b/setup/ibus-libzhuyin-preferences.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Jan 22 13:02:09 2014 -->
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
+  <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="adjustmentCandidate">
     <property name="lower">1</property>
     <property name="upper">10</property>
@@ -108,8 +108,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="fullhalfshape">
-                <property name="label" translatable="yes">Use Full Width Glyphs When Start-up</property>
+              <object class="GtkCheckButton" id="fullhalfenglish">
+                <property name="label" translatable="yes">Use Full Width English When Start-up</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -126,8 +126,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="autoshiftcursor">
-                <property name="label" translatable="yes">Auto Shift Cursor</property>
+              <object class="GtkCheckButton" id="fullhalfpunct">
+                <property name="label" translatable="yes">Use Full Width Punctuation When Start-up</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -144,8 +144,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="addphraseforward">
-                <property name="label" translatable="yes">Add Phrase Forward</property>
+              <object class="GtkCheckButton" id="autoshiftcursor">
+                <property name="label" translatable="yes">Auto Shift Cursor</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -198,24 +198,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="rearwardchoice">
-                <property name="label" translatable="yes">Rearward Phrase Choice</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="margin_left">10</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">6</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkCheckButton" id="spaceasselection">
                 <property name="label" translatable="yes">Space as Selection Key</property>
                 <property name="visible">True</property>
@@ -230,7 +212,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">7</property>
+                <property name="position">6</property>
               </packing>
             </child>
           </object>
diff --git a/setup/main.py b/setup/main.py
index 61ca19b..f91e6d9 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -83,32 +83,29 @@ class PreferencesWindow:
 
         # init state
         self.__chinese_mode = self.__builder.get_object("chinesemode")
-        self.__full_half_shape = self.__builder.get_object("fullhalfshape")
+        self.__full_half_english = self.__builder.get_object("fullhalfenglish")
+        self.__full_half_punct = self.__builder.get_object("fullhalfpunct")
         self.__auto_shift_cursor = self.__builder.get_object("autoshiftcursor")
-        self.__add_phrase_forward = self.__builder.get_object("addphraseforward")
         self.__clean_all_buffer = self.__builder.get_object("cleanallbuffer")
         self.__always_input_num = self.__builder.get_object("alwaysinputnum")
-        self.__rearward_choice = self.__builder.get_object("rearwardchoice")
         self.__space_as_selection = self.__builder.get_object("spaceasselection")
 
         # read values
         self.__chinese_mode.set_active(self.__get_value("chinesemode", True))
-        self.__full_half_shape.set_active(self.__get_value("fullhalfshape", False))
+        self.__full_half_english.set_active(self.__get_value("fullhalfenglish", False))
+        self.__full_half_punct.set_active(self.__get_value("fullhalfpunct", True))
         self.__auto_shift_cursor.set_active(self.__get_value("autoshiftcursor", True))
-        self.__add_phrase_forward.set_active(self.__get_value("addphraseforward", True))
         self.__clean_all_buffer.set_active(self.__get_value("cleanallbuffer", False))
         self.__always_input_num.set_active(self.__get_value("alwaysinputnum", True))
-        self.__rearward_choice.set_active(self.__get_value("rearwardchoice", True))
         self.__space_as_selection.set_active(self.__get_value("spaceasselection", False))
 
         # connect signals
         self.__chinese_mode.connect("toggled", self.__toggled_cb, "chinesemode")
-        self.__full_half_shape.connect("toggled", self.__toggled_cb, "fullhalfshape")
+        self.__full_half_english.connect("toggled", self.__toggled_cb, "fullhalfenglish")
+        self.__full_half_punct.connect("toggled", self.__toggled_cb, "fullhalfpunct")
         self.__auto_shift_cursor.connect("toggled", self.__toggled_cb, "autoshiftcursor")
-        self.__add_phrase_forward.connect("toggled", self.__toggled_cb, "addphraseforward")
         self.__clean_all_buffer.connect("toggled", self.__toggled_cb, "cleanallbuffer")
         self.__always_input_num.connect("toggled", self.__toggled_cb, "alwaysinputnum")
-        self.__rearward_choice.connect("toggled", self.__toggled_cb, "rearwardchoice")
         self.__space_as_selection.connect("toggled", self.__toggled_cb, "spaceasselection")