|
 |
5679f3 |
diff -Nru ibus-table-1.9.18/engine/table.py ibus-table-1.9.18.new/engine/table.py
|
|
|
5679f3 |
--- ibus-table-1.9.18/engine/table.py 2020-07-23 17:21:31.934904346 +0200
|
|
|
5679f3 |
+++ ibus-table-1.9.18.new/engine/table.py 2020-07-23 17:28:19.342746241 +0200
|
|
|
5679f3 |
@@ -1752,6 +1752,9 @@
|
|
|
5679f3 |
self._input_mode)
|
|
|
5679f3 |
self._update_ui()
|
|
|
5679f3 |
|
|
|
5679f3 |
+ def get_pinyin_mode(self):
|
|
|
5679f3 |
+ return self._editor._py_mode
|
|
|
5679f3 |
+
|
|
|
5679f3 |
def set_onechar_mode(self, mode=False, update_dconf=True):
|
|
|
5679f3 |
if mode == self._editor._onechar:
|
|
|
5679f3 |
return
|
|
|
5679f3 |
diff -Nru ibus-table-1.9.18/tests/test_0_gtk.py ibus-table-1.9.18.new/tests/test_0_gtk.py
|
|
|
5679f3 |
--- ibus-table-1.9.18/tests/test_0_gtk.py 2020-07-23 17:21:31.940904285 +0200
|
|
|
5679f3 |
+++ ibus-table-1.9.18.new/tests/test_0_gtk.py 2020-07-23 17:37:23.234210681 +0200
|
|
|
5679f3 |
@@ -205,14 +205,14 @@
|
|
|
5679f3 |
object_path = '%s/%d' % (self.ENGINE_PATH, self.__id)
|
|
|
5679f3 |
db_dir = '/usr/share/ibus-table/tables'
|
|
|
5679f3 |
db_file = os.path.join(db_dir, engine_name + '.db')
|
|
|
5679f3 |
- database = tabsqlitedb.TabSqliteDb(filename=db_file, user_db=':memory:')
|
|
|
5679f3 |
- self.__engine = table.TabEngine(
|
|
|
5679f3 |
+ database = tabsqlitedb.tabsqlitedb(filename=db_file, user_db=':memory:')
|
|
|
5679f3 |
+ self.__engine = table.tabengine(
|
|
|
5679f3 |
self.__bus,
|
|
|
5679f3 |
object_path,
|
|
|
5679f3 |
database)
|
|
|
5679f3 |
self.__engine.connect('focus-in', self.__engine_focus_in)
|
|
|
5679f3 |
self.__engine.connect('focus-out', self.__engine_focus_out)
|
|
|
5679f3 |
- # FIXME: Need to connect 'reset' after TabEngine.clear_all_input_and_preedit()
|
|
|
5679f3 |
+ # FIXME: Need to connect 'reset' after tabengine.clear_all_input_and_preedit()
|
|
|
5679f3 |
# is called.
|
|
|
5679f3 |
self.__engine.connect_after('reset', self.__engine_reset)
|
|
|
5679f3 |
self.__bus.get_connection().signal_subscribe(
|
|
|
5679f3 |
diff -Nru ibus-table-1.9.18/tests/test_it.py ibus-table-1.9.18.new/tests/test_it.py
|
|
|
5679f3 |
--- ibus-table-1.9.18/tests/test_it.py 2020-07-23 17:21:31.940904285 +0200
|
|
|
5679f3 |
+++ ibus-table-1.9.18.new/tests/test_it.py 2020-07-23 17:29:52.032800325 +0200
|
|
|
5679f3 |
@@ -78,7 +78,6 @@
|
|
|
5679f3 |
ORIG_SINGLE_WILDCARD_CHAR = None
|
|
|
5679f3 |
ORIG_MULTI_WILDCARD_CHAR = None
|
|
|
5679f3 |
ORIG_PINYIN_MODE = None
|
|
|
5679f3 |
-ORIG_SUGGESTION_MODE = None
|
|
|
5679f3 |
|
|
|
5679f3 |
def backup_original_settings():
|
|
|
5679f3 |
global ENGINE
|
|
|
5679f3 |
@@ -97,7 +96,6 @@
|
|
|
5679f3 |
global ORIG_SINGLE_WILDCARD_CHAR
|
|
|
5679f3 |
global ORIG_MULTI_WILDCARD_CHAR
|
|
|
5679f3 |
global ORIG_PINYIN_MODE
|
|
|
5679f3 |
- global ORIG_SUGGESTION_MODE
|
|
|
5679f3 |
ORIG_INPUT_MODE = ENGINE.get_input_mode()
|
|
|
5679f3 |
ORIG_CHINESE_MODE = ENGINE.get_chinese_mode()
|
|
|
5679f3 |
ORIG_LETTER_WIDTH = ENGINE.get_letter_width()
|
|
|
5679f3 |
@@ -113,7 +111,6 @@
|
|
|
5679f3 |
ORIG_SINGLE_WILDCARD_CHAR = ENGINE.get_single_wildcard_char()
|
|
|
5679f3 |
ORIG_MULTI_WILDCARD_CHAR = ENGINE.get_multi_wildcard_char()
|
|
|
5679f3 |
ORIG_PINYIN_MODE = ENGINE.get_pinyin_mode()
|
|
|
5679f3 |
- ORIG_SUGGESTION_MODE = ENGINE.get_suggestion_mode()
|
|
|
5679f3 |
|
|
|
5679f3 |
def restore_original_settings():
|
|
|
5679f3 |
global ENGINE
|
|
|
5679f3 |
@@ -132,7 +129,6 @@
|
|
|
5679f3 |
global ORIG_SINGLE_WILDCARD_CHAR
|
|
|
5679f3 |
global ORIG_MULTI_WILDCARD_CHAR
|
|
|
5679f3 |
global ORIG_PINYIN_MODE
|
|
|
5679f3 |
- global ORIG_SUGGESTION_MODE
|
|
|
5679f3 |
ENGINE.set_input_mode(ORIG_INPUT_MODE)
|
|
|
5679f3 |
ENGINE.set_chinese_mode(ORIG_CHINESE_MODE)
|
|
|
5679f3 |
ENGINE.set_letter_width(ORIG_LETTER_WIDTH[0], input_mode=0)
|
|
|
5679f3 |
@@ -150,7 +146,6 @@
|
|
|
5679f3 |
ENGINE.set_single_wildcard_char(ORIG_SINGLE_WILDCARD_CHAR)
|
|
|
5679f3 |
ENGINE.set_multi_wildcard_char(ORIG_MULTI_WILDCARD_CHAR)
|
|
|
5679f3 |
ENGINE.set_pinyin_mode(ORIG_PINYIN_MODE)
|
|
|
5679f3 |
- ENGINE.set_suggestion_mode(ORIG_SUGGESTION_MODE)
|
|
|
5679f3 |
|
|
|
5679f3 |
def set_default_settings():
|
|
|
5679f3 |
global ENGINE
|
|
|
5679f3 |
@@ -256,7 +251,6 @@
|
|
|
5679f3 |
ENGINE.set_multi_wildcard_char(multi_wildcard_char)
|
|
|
5679f3 |
|
|
|
5679f3 |
ENGINE.set_pinyin_mode(False)
|
|
|
5679f3 |
- ENGINE.set_suggestion_mode(False)
|
|
|
5679f3 |
|
|
|
5679f3 |
def set_up(engine_name):
|
|
|
5679f3 |
'''
|
|
|
5679f3 |
@@ -290,7 +284,7 @@
|
|
|
5679f3 |
assert IBus.PropList is not IBUS_PROP_LIST
|
|
|
5679f3 |
assert IBus.PropList is MockPropList
|
|
|
5679f3 |
# Reload the table module so that the patches
|
|
|
5679f3 |
- # are applied to TabEngine:
|
|
|
5679f3 |
+ # are applied to tabengine:
|
|
|
5679f3 |
sys.path.insert(0, '../engine')
|
|
|
5679f3 |
importlib.reload(table)
|
|
|
5679f3 |
sys.path.pop(0)
|
|
|
5679f3 |
@@ -302,9 +296,9 @@
|
|
|
5679f3 |
ENGINE = None
|
|
|
5679f3 |
tear_down()
|
|
|
5679f3 |
return False
|
|
|
5679f3 |
- TABSQLITEDB = tabsqlitedb.TabSqliteDb(
|
|
|
5679f3 |
+ TABSQLITEDB = tabsqlitedb.tabsqlitedb(
|
|
|
5679f3 |
filename=db_file, user_db=':memory:')
|
|
|
5679f3 |
- ENGINE = table.TabEngine(
|
|
|
5679f3 |
+ ENGINE = table.tabengine(
|
|
|
5679f3 |
bus,
|
|
|
5679f3 |
'/com/redhat/IBus/engines/table/%s/engine/0' %engine_name,
|
|
|
5679f3 |
TABSQLITEDB,
|
|
|
5679f3 |
@@ -380,59 +374,6 @@
|
|
|
5679f3 |
self.assertEqual(ENGINE.mock_preedit_text, '')
|
|
|
5679f3 |
self.assertEqual(ENGINE.mock_committed_text, '工爱工')
|
|
|
5679f3 |
|
|
|
5679f3 |
- def test_suggestion_mode(self):
|
|
|
5679f3 |
- if not ENGINE._ime_sg:
|
|
|
5679f3 |
- self.skipTest("This engine does not have a suggestion mode.")
|
|
|
5679f3 |
- # Suggestion mode is False by default:
|
|
|
5679f3 |
- self.assertEqual(ENGINE.get_suggestion_mode(), False)
|
|
|
5679f3 |
- self.assertEqual(ENGINE.get_pinyin_mode(), False)
|
|
|
5679f3 |
- ENGINE.do_process_key_event(IBus.KEY_a, 0, 0)
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_preedit_text, '工')
|
|
|
5679f3 |
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_committed_text, '工')
|
|
|
5679f3 |
- self.assertEqual(ENGINE._editor._lookup_table.mock_candidates, [])
|
|
|
5679f3 |
- ENGINE.set_suggestion_mode(True)
|
|
|
5679f3 |
- ENGINE.do_process_key_event(IBus.KEY_a, 0, 0)
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_preedit_text, '工')
|
|
|
5679f3 |
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_committed_text, '工工')
|
|
|
5679f3 |
- self.assertEqual(ENGINE._editor._lookup_table.mock_candidates,
|
|
|
5679f3 |
- ['工作人员 673 0',
|
|
|
5679f3 |
- '工作会议 310 0',
|
|
|
5679f3 |
- '工作报告 267 0',
|
|
|
5679f3 |
- '工人阶级 146 0',
|
|
|
5679f3 |
- '工作重点 78 0',
|
|
|
5679f3 |
- '工作小组 73 0',
|
|
|
5679f3 |
- '工业企业 71 0',
|
|
|
5679f3 |
- '工业大学 69 0',
|
|
|
5679f3 |
- '工作单位 61 0',
|
|
|
5679f3 |
- '工业生产 58 0'])
|
|
|
5679f3 |
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_committed_text, '工工作人员')
|
|
|
5679f3 |
- ENGINE.set_pinyin_mode(True)
|
|
|
5679f3 |
- ENGINE.do_process_key_event(IBus.KEY_a, 0, 0)
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_preedit_text, '爱')
|
|
|
5679f3 |
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_committed_text, '工工作人员爱')
|
|
|
5679f3 |
- self.assertEqual(ENGINE._editor._lookup_table.mock_candidates,
|
|
|
5679f3 |
- ['爱因斯坦 1109 0',
|
|
|
5679f3 |
- '爱情故事 519 0',
|
|
|
5679f3 |
- '爱国主义 191 0',
|
|
|
5679f3 |
- '爱尔兰语 91 0',
|
|
|
5679f3 |
- '爱好和平 62 0',
|
|
|
5679f3 |
- '爱情小说 58 0',
|
|
|
5679f3 |
- '爱不释手 39 0',
|
|
|
5679f3 |
- '爱国热情 35 0',
|
|
|
5679f3 |
- '爱莫能助 34 0',
|
|
|
5679f3 |
- '爱理不理 32 0'])
|
|
|
5679f3 |
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
|
|
5679f3 |
- self.assertEqual(ENGINE.mock_committed_text, '工工作人员爱因斯坦')
|
|
|
5679f3 |
-
|
|
|
5679f3 |
def test_commit_to_preedit_switching_to_pinyin_defining_a_phrase(self):
|
|
|
5679f3 |
ENGINE.do_process_key_event(IBus.KEY_a, 0, 0)
|
|
|
5679f3 |
# commit to preëdit needs a press and release of either
|