From 0303fd3ab567c08b2e98886e11fda5387b5ba1e3 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 14 Nov 2016 14:11:24 +0800 Subject: use libpinyin config namespace --- setup/main2.py | 14 +++++++------- src/PYPConfig.cc | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/setup/main2.py b/setup/main2.py index 3610d9d..167e030 100644 --- a/setup/main2.py +++ b/setup/main2.py @@ -62,8 +62,8 @@ class PreferencesDialog: self.__dialog = self.__builder.get_object("dialog") self.__init_pages() - if engine == "pinyin": - self.__config_namespace = "engine/Pinyin" + if engine == "libpinyin": + self.__config_namespace = "engine/libpinyin" self.__values = dict(self.__config.get_values(self.__config_namespace)) self.__init_general() self.__init_pinyin() @@ -72,8 +72,8 @@ class PreferencesDialog: self.__init_user_data() self.__init_shortcut() self.__init_about() - elif engine == "bopomofo": - self.__config_namespace = "engine/Bopomofo" + elif engine == "libbopomofo": + self.__config_namespace = "engine/libbopomofo" self.__values = dict(self.__config.get_values(self.__config_namespace)) self.__init_general() self.__init_bopomofo() @@ -496,11 +496,11 @@ class PreferencesDialog: return self.__dialog.run() def main(): - name = "pinyin" + name = "libpinyin" if len(sys.argv) == 2: name = sys.argv[1] - if name not in ("pinyin", "bopomofo"): - name = "pinyin" + if name not in ("libpinyin", "libbopomofo"): + name = "libpinyin" PreferencesDialog(name).run() diff --git a/src/PYPConfig.cc b/src/PYPConfig.cc index 1b24666..7d8139f 100644 --- a/src/PYPConfig.cc +++ b/src/PYPConfig.cc @@ -318,7 +318,7 @@ static const struct{ }; PinyinConfig::PinyinConfig (Bus & bus) - : LibPinyinConfig (bus, "pinyin") + : LibPinyinConfig (bus, "libpinyin") { } @@ -475,7 +475,7 @@ static const struct { }; BopomofoConfig::BopomofoConfig (Bus & bus) - : LibPinyinConfig (bus, "bopomofo") + : LibPinyinConfig (bus, "libbopomofo") { } -- cgit