summaryrefslogtreecommitdiffstats
path: root/setup
diff options
context:
space:
mode:
authorBYVoid <byvoid1@gmail.com>2010-06-04 15:07:13 +0800
committerPeng Huang <shawn.p.huang@gmail.com>2010-06-05 07:31:08 +0800
commit8a23fe6b8b4f5028887d797db25ad2aac13d8747 (patch)
tree566a428e3f1d13786798dfd012a04f187ef364b0 /setup
parent38b97ecdf29a66709a9aa284cd065a99dca30a5e (diff)
downloadibus-libpinyin-8a23fe6b8b4f5028887d797db25ad2aac13d8747.tar.gz
ibus-libpinyin-8a23fe6b8b4f5028887d797db25ad2aac13d8747.tar.xz
ibus-libpinyin-8a23fe6b8b4f5028887d797db25ad2aac13d8747.zip
Disabled Custom of SelectKey
Diffstat (limited to 'setup')
-rw-r--r--setup/ibus-pinyin-preferences.ui23
-rw-r--r--setup/main.py7
2 files changed, 20 insertions, 10 deletions
diff --git a/setup/ibus-pinyin-preferences.ui b/setup/ibus-pinyin-preferences.ui
index 876afe3..2686191 100644
--- a/setup/ibus-pinyin-preferences.ui
+++ b/setup/ibus-pinyin-preferences.ui
@@ -848,7 +848,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="SelectKeys">
+ <object class="GtkComboBox" id="SelectKeys">
<property name="visible">True</property>
<property name="model">liststoreSelectionKeys</property>
<property name="button_sensitivity">on</property>
@@ -1695,22 +1695,31 @@ koterpilla, Zerng07
</columns>
<data>
<row>
- <col id="0" translatable="no">1234567890</col>
+ <col id="0">1234567890</col>
</row>
<row>
- <col id="0" translatable="no">asdfghjkl;</col>
+ <col id="0">asdfghjkl;</col>
</row>
<row>
- <col id="0" translatable="no">1qaz2wsxed</col>
+ <col id="0">1qaz2wsxed</col>
</row>
<row>
- <col id="0" translatable="no">asdfzxcvgb</col>
+ <col id="0">asdfzxcvgb</col>
</row>
<row>
- <col id="0" translatable="no">1234qweras</col>
+ <col id="0">1234qweras</col>
</row>
<row>
- <col id="0" translatable="no">aoeu;qjkix</col>
+ <col id="0">aoeu;qjkix</col>
+ </row>
+ <row>
+ <col id="0">aoeuhtnsid</col>
+ </row>
+ <row>
+ <col id="0">aoeuidhtns</col>
+ </row>
+ <row>
+ <col id="0">qweasdzxcr</col>
</row>
</data>
</object>
diff --git a/setup/main.py b/setup/main.py
index 7ffb4f3..e3166c1 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -190,7 +190,8 @@ class PreferencesDialog:
# selection mode
self.__select_keys = self.__builder.get_object("SelectKeys")
- self.__select_keys.set_text_column(0)
+ self.__select_keys.pack_start(renderer)
+ self.__select_keys.set_attributes(renderer, text=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")
@@ -198,7 +199,7 @@ class PreferencesDialog:
# 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.__select_keys.set_active(self.__get_value("SelectKeys", 0))
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))
@@ -207,7 +208,7 @@ class PreferencesDialog:
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.__set_value("SelectKeys", widget.get_active())
self.__bopomofo_keyboard_mapping.connect("changed", __bopomofo_keyboard_mapping_changed_cb)
self.__incomplete_bopomofo.connect("toggled", self.__toggled_cb, "IncompletePinyin")