Update Config & Preferences UI for BopomofoEditor

2 files changed, 151 insertions, 8 deletions

diff --git a/setup/ibus-pinyin-preferences.ui b/setup/ibus-pinyin-preferences.ui
index f559518..876afe3 100644
--- a/setup/ibus-pinyin-preferences.ui
+++ b/setup/ibus-pinyin-preferences.ui
@@ -762,13 +762,26 @@
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
                                 <child>
+                                  <object class="GtkCheckButton" id="IncompleteBopomofo">
+                                    <property name="label" translatable="yes">Incomplete Bopomofo</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
                                   <object class="GtkHBox" id="hbox5">
                                     <property name="visible">True</property>
                                     <child>
                                       <object class="GtkLabel" id="labelBopomofoKeyboardMapping">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Keyboard Mappming:</property>
+                                        <property name="label" translatable="yes">Keyboard Mapping:</property>
                                       </object>
                                       <packing>
                                         <property name="position">0</property>
@@ -786,12 +799,72 @@
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label2">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Bopomofo mode&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame1">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment1">
+                            <property name="visible">True</property>
+                            <property name="top_padding">6</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkVBox" id="vbox2">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkHBox" id="hbox9">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <object class="GtkLabel" id="labelSelectionKeys">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Selection Keys:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxEntry" id="SelectKeys">
+                                        <property name="visible">True</property>
+                                        <property name="model">liststoreSelectionKeys</property>
+                                        <property name="button_sensitivity">on</property>
+                                      </object>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" id="IncompleteBopomofo">
-                                    <property name="label" translatable="yes">Incomplete Bopomofo</property>
+                                  <object class="GtkCheckButton" id="GuideKey">
+                                    <property name="label" translatable="yes">Enable Guidekey for Candidates Selection</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -802,14 +875,40 @@
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="AuxiliarySelectKey_F">
+                                    <property name="label" translatable="yes">Enable Auxiliary Select Keys F1 .. F10</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="AuxiliarySelectKey_KP">
+                                    <property name="label" translatable="yes">Enable Auxiliary Select Keys Numbers on Keypad</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
                         <child type="label">
-                          <object class="GtkLabel" id="label2">
+                          <object class="GtkLabel" id="label23">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Bopomofo mode&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Selection mode&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
@@ -817,7 +916,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">0</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
@@ -1589,4 +1688,30 @@ koterpilla, Zerng07
       </row>
     </data>
   </object>
+  <object class="GtkListStore" id="liststoreSelectionKeys">
+    <columns>
+      <!-- column-name select_keys -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="no">1234567890</col>
+      </row>
+      <row>
+        <col id="0" translatable="no">asdfghjkl;</col>
+      </row>
+      <row>
+        <col id="0" translatable="no">1qaz2wsxed</col>
+      </row>
+      <row>
+        <col id="0" translatable="no">asdfzxcvgb</col>
+      </row>
+      <row>
+        <col id="0" translatable="no">1234qweras</col>
+      </row>
+      <row>
+        <col id="0" translatable="no">aoeu;qjkix</col>
+      </row>
+    </data>
+  </object>
 </interface>
diff --git a/setup/main.py b/setup/main.py
index 3a41b31..7ffb4f3 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -181,23 +181,40 @@ class PreferencesDialog:
         # page Bopomodo Mode
         self.__page_bopomofo_mode.show()
         
-        # bopomofo
-        self.__bopomofo_keyboard_mapping = self.__builder.get_object("BopomofoKeyboardMapping")
+        # bopomofo mode
         self.__incomplete_bopomofo = self.__builder.get_object("IncompleteBopomofo")
+        self.__bopomofo_keyboard_mapping = self.__builder.get_object("BopomofoKeyboardMapping")
         renderer = gtk.CellRendererText()
         self.__bopomofo_keyboard_mapping.pack_start(renderer)
         self.__bopomofo_keyboard_mapping.set_attributes(renderer, text=0)
         
+        # selection mode
+        self.__select_keys = self.__builder.get_object("SelectKeys")
+        self.__select_keys.set_text_column(0)
+        self.__guide_key = self.__builder.get_object("GuideKey")
+        self.__auxiliary_select_key_f = self.__builder.get_object("AuxiliarySelectKey_F")
+        self.__auxiliary_select_key_kp = self.__builder.get_object("AuxiliarySelectKey_KP")
+
         # read value
         self.__bopomofo_keyboard_mapping.set_active(self.__get_value("BopomofoKeyboardMapping", 0))
         self.__incomplete_bopomofo.set_active(self.__get_value("IncompletePinyin", False))
+        self.__select_keys.get_child().set_text(self.__get_value("SelectKeys", "1234567890"))
+        self.__guide_key.set_active(self.__get_value("GuideKey", 1))
+        self.__auxiliary_select_key_f.set_active(self.__get_value("AuxiliarySelectKey_F", 1))
+        self.__auxiliary_select_key_kp.set_active(self.__get_value("AuxiliarySelectKey_KP", 1))
 
         # connect signals
         def __bopomofo_keyboard_mapping_changed_cb(widget):
             self.__set_value("BopomofoKeyboardMapping", widget.get_active())
+        def __select_keys_changed_cb(widget):
+            self.__set_value("SelectKeys", widget.get_active_text())
         
         self.__bopomofo_keyboard_mapping.connect("changed", __bopomofo_keyboard_mapping_changed_cb)
         self.__incomplete_bopomofo.connect("toggled", self.__toggled_cb, "IncompletePinyin")
+        self.__select_keys.connect("changed", __select_keys_changed_cb)
+        self.__guide_key.connect("toggled", self.__toggled_cb, "GuideKey")
+        self.__auxiliary_select_key_f.connect("toggled", self.__toggled_cb, "AuxiliarySelectKey_F")
+        self.__auxiliary_select_key_kp.connect("toggled", self.__toggled_cb, "AuxiliarySelectKey_KP")
 
     def __init_input_custom(self):
         # others
@@ -373,6 +390,7 @@ class PreferencesDialog:
 
     def __set_value(self, name, val):
         self.__config.set_value(self.__config_namespace, name, val)
+        print name,val
 
     def run(self):
         return self.__dialog.run()