From d093c2d0837266fe21ff01016819dd4e2bfdd83c Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 26 Mar 2012 13:50:28 +0800 Subject: [PATCH] update main.py --- setup/main.py | 21 ++++++--------------- setup/main2.py | 22 +++++++--------------- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/setup/main.py b/setup/main.py index 197ea8b..0e3a729 100644 --- a/setup/main.py +++ b/setup/main.py @@ -31,13 +31,12 @@ from xdg import BaseDirectory _ = lambda a : gettext.dgettext("ibus-pinyin", a) class PreferencesDialog: - def __init__(self,engine,libpinyin): + def __init__(self,engine): locale.setlocale(locale.LC_ALL, "") localedir = os.getenv("IBUS_LOCALEDIR") gettext.bindtextdomain("ibus-pinyin", localedir) gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8") - self.__libpinyin = libpinyin self.__bus = ibus.Bus() self.__config = self.__bus.get_config() self.__builder = gtk.Builder() @@ -51,16 +50,14 @@ class PreferencesDialog: self.__init_general() self.__init_pinyin() self.__init_fuzzy() - if not self.__libpinyin: - self.__init_dictionary() + self.__init_dictionary() self.__init_about() elif engine == "bopomofo": self.__config_namespace = "engine/Bopomofo" self.__init_general() self.__init_bopomofo() self.__init_fuzzy() - if not self.__libpinyin: - self.__init_dictionary() + self.__init_dictionary() self.__init_about() self.__convert_fuzzy_pinyin_to_bopomofo() @@ -141,8 +138,6 @@ class PreferencesDialog: self.__double_pinyin_schema = self.__builder.get_object("DoublePinyinSchema") # self.__double_pinyin_schema_label = self.__builder.get_object("labelDoublePinyinSchema") self.__double_pinyin_show_raw = self.__builder.get_object("DoublePinyinShowRaw") - if self.__libpinyin: - self.__double_pinyin_show_raw.hide () renderer = gtk.CellRendererText() self.__double_pinyin_schema.pack_start(renderer) @@ -414,15 +409,11 @@ class PreferencesDialog: def main(): name = "pinyin" - libpinyin = False - for arg in sys.argv[1:]: - if arg == "--libpinyin": - libpinyin = True - else: - name = arg + if len(sys.argv) == 2: + name = sys.argv[1] if name not in ("pinyin", "bopomofo"): name = "pinyin" - PreferencesDialog(name, libpinyin).run() + PreferencesDialog(name).run() if __name__ == "__main__": diff --git a/setup/main2.py b/setup/main2.py index 197ea8b..a21acad 100644 --- a/setup/main2.py +++ b/setup/main2.py @@ -31,13 +31,12 @@ from xdg import BaseDirectory _ = lambda a : gettext.dgettext("ibus-pinyin", a) class PreferencesDialog: - def __init__(self,engine,libpinyin): + def __init__(self,engine): locale.setlocale(locale.LC_ALL, "") localedir = os.getenv("IBUS_LOCALEDIR") gettext.bindtextdomain("ibus-pinyin", localedir) gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8") - self.__libpinyin = libpinyin self.__bus = ibus.Bus() self.__config = self.__bus.get_config() self.__builder = gtk.Builder() @@ -51,16 +50,14 @@ class PreferencesDialog: self.__init_general() self.__init_pinyin() self.__init_fuzzy() - if not self.__libpinyin: - self.__init_dictionary() + #self.__init_dictionary() self.__init_about() elif engine == "bopomofo": self.__config_namespace = "engine/Bopomofo" self.__init_general() self.__init_bopomofo() self.__init_fuzzy() - if not self.__libpinyin: - self.__init_dictionary() + #self.__init_dictionary() self.__init_about() self.__convert_fuzzy_pinyin_to_bopomofo() @@ -141,8 +138,7 @@ class PreferencesDialog: self.__double_pinyin_schema = self.__builder.get_object("DoublePinyinSchema") # self.__double_pinyin_schema_label = self.__builder.get_object("labelDoublePinyinSchema") self.__double_pinyin_show_raw = self.__builder.get_object("DoublePinyinShowRaw") - if self.__libpinyin: - self.__double_pinyin_show_raw.hide () + self.__double_pinyin_show_raw.hide () renderer = gtk.CellRendererText() self.__double_pinyin_schema.pack_start(renderer) @@ -414,15 +410,11 @@ class PreferencesDialog: def main(): name = "pinyin" - libpinyin = False - for arg in sys.argv[1:]: - if arg == "--libpinyin": - libpinyin = True - else: - name = arg + if len(sys.argv) == 2: + name = sys.argv[1] if name not in ("pinyin", "bopomofo"): name = "pinyin" - PreferencesDialog(name, libpinyin).run() + PreferencesDialog(name).run() if __name__ == "__main__": -- 2.7.4