Commit upstream/0.1.0 - ibus-array

Imported Upstream version 0.1.0 Keng-Yu Lin 9 years ago

8 changed file(s) with 140 addition(s) and 174 deletion(s). Raw diff Collapse all Expand all

-2

Makefile.am less more

19	19
20	20	SUBDIRS = \
21	21	src \
22		setup \
	22	setup \
23	23	icons \
24		data \
	24	data \
25	25	m4 \
26	26	po \
27	27	$(NULL)

-1

po/LINGUAS less more

0
	0	zh_TW

-1

po/Makevars less more

17	17	# or entity, or to disclaim their copyright. The empty string stands for
18	18	# the public domain; in this case the translators are expected to disclaim
19	19	# their copyright.
20		COPYRIGHT_HOLDER = Huang Peng <shawn.p.huang@gmail.com>
	20	COPYRIGHT_HOLDER = Keng-Yu Lin <kengyu@lexical.tw>
21	21
22	22	# This is the email address or URL to which the translators shall report
23	23	# bugs in the untranslated strings:

-0

po/POTFILES.in less more

	0	src/engine.c
	1	setup/main.py

+43

-0

po/zh_TW.po less more

	0	# ibus-array Traditional Chinese Translation
	1	# Copyright (C) 2014 Keng-Yu Lin <kengyu@lexical.tw>
	2	# This file is distributed under the same license as the ibus-package package.
	3	# Keng-Yu Lin <kengyu@lexical.tw>, 2014
	4	#
	5	msgid ""
	6	msgstr ""
	7	"Project-Id-Version: 0.0.4\n"
	8	"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
	9	"POT-Creation-Date: 2014-11-01 18:21+0800\n"
	10	"PO-Revision-Date: 2014-11-01 16:44+0800\n"
	11	"Last-Translator: Keng-Yu Lin <kengyu@lexical.tw>\n"
	12	"Language-Team: Chinese (traditional)\n"
	13	"Language: zh_TW\n"
	14	"MIME-Version: 1.0\n"
	15	"Content-Type: text/plain; charset=UTF-8\n"
	16	"Content-Transfer-Encoding: 8bit\n"
	17
	18	#: src/engine.c:179
	19	msgid "Setup"
	20	msgstr "設定"
	21
	22	#: src/engine.c:180
	23	msgid "Configure Array 30 engine"
	24	msgstr "設定行列輸入法"
	25
	26	#: src/engine.c:422
	27	msgid ""
	28	"1.comma 2.bracket 3.symbol 4.math 5.arrow 6.unit 7.table 8.roman 9.greek 0."
	29	"bopomo"
	30	msgstr "1.標點 2.括弧 3.符號 4.數學 5.箭頭 6.單位 7.圖表 8.羅馬 9.希臘 0.注音"
	31
	32	#: setup/main.py:43
	33	msgid "ibus-array setup"
	34	msgstr "行列輸入法設定"
	35
	36	#: setup/main.py:50
	37	msgid "Special Code Notification"
	38	msgstr "當有特別碼時，顯示提示"
	39
	40	#: setup/main.py:52
	41	msgid "Speical Code Only Mode"
	42	msgstr "當有特別碼時，只能用特別碼輸入 (特別碼練習模式)"

+34

-24

setup/main.py less more

22	22
23	23	import sys
24	24	import os
25		import gobject
26		import gtk
27		import ibus
	25	from gi.repository import GLib
	26	from gi.repository import Gtk
	27	from gi.repository import IBus
	28	from gettext import gettext as _
28	29	import gettext
29	30	import config
30	31
31	32	class Setup:
32		def __init__(self):
33		self.__bus = ibus.Bus()
	33	def __init__(self, bus):
	34	self.__bus = bus
34	35	self.__config = self.__bus.get_config()
35	36	self.__config.connect("value-changed", self.on_value_changed, None)
36	37	self.__create_ui()
37	38
38	39	def __create_ui(self):
39		self.__window = gtk.Dialog('ibus-array setup', None,
40		gtk.DIALOG_MODAL,
41		(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
42		gtk.STOCK_OK, gtk.RESPONSE_OK)
	40	gettext.bindtextdomain("ibus-array")
	41	gettext.textdomain("ibus-array")
	42	self.__window = Gtk.Dialog(_('ibus-array setup'), None,
	43	Gtk.DialogFlags.MODAL,
	44	(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
	45	Gtk.STOCK_OK, Gtk.ResponseType.OK)
43	46	)
44	47	icon_file = os.path.join(config.datadir, "ibus-array", "icons", "ibus-array.png")
45	48	self.__window.set_icon_from_file(icon_file)
46		self.__special_notify_button = gtk.CheckButton("Special Code Notification")
	49	self.__special_notify_button = Gtk.CheckButton(_("Special Code Notification"))
47	50	self.__window.vbox.pack_start(self.__special_notify_button, True, True, 10)
48		self.__special_only_button = gtk.CheckButton("Speical Code Only Mode")
	51	self.__special_only_button = Gtk.CheckButton(_("Speical Code Only Mode"))
49	52	self.__window.vbox.pack_start(self.__special_only_button, True, True ,10)
50	53
51		current_special_mode = self.__read("SpecialOnly", "0")
52		current_special_notify = self.__read("SpecialNotify", "0")
	54	current_special_mode = self.__read("SpecialOnly", False)
	55	current_special_notify = self.__read("SpecialNotify", False)
53	56
54		if current_special_notify == "1":
	57	if current_special_notify:
55	58	self.__special_notify_button.set_active(True)
56		if current_special_mode == "1":
	59	if current_special_mode:
57	60	self.__special_only_button.set_active(True)
58	61
59	62	self.__window.show_all()
60	63
61	64	def run(self):
62	65	res = self.__window.run()
63		if res == gtk.RESPONSE_OK:
	66	if res == Gtk.ResponseType.OK:
64	67	self.apply()
65	68	self.__window.destroy()
66	69

69	72	select_special_mode = self.__special_only_button.get_active()
70	73
71	74	if select_special_notify:
72		self.__write("SpecialNotify", "1")
	75	self.__write("SpecialNotify", GLib.Variant.new_boolean(True))
73	76	else:
74		self.__write("SpecialNotify", "0")
	77	self.__write("SpecialNotify", GLib.Variant.new_boolean(False))
	78
75	79	if select_special_mode:
76		self.__write("SpecialOnly", "1")
	80	self.__write("SpecialOnly", GLib.Variant.new_boolean(True))
77	81	else:
78		self.__write("SpecialOnly", "0")
	82	self.__write("SpecialOnly", GLib.Variant.new_boolean(False))
79	83
80	84	def on_value_changed(self, config, section, name, value, data):
81	85	if section == 'engine/Array':
82	86	if name == 'SpecialNotify':
83		if value == '1':
	87	if value:
84	88	self.__special_notify_button.set_active(True)
85	89	else:
86	90	self.__special_notify_button.set_active(False)
	91
87	92	elif name == 'SpecialOnly':
88		if value == '1':
	93	if value:
89	94	self.__special_notify_button.set_active(True)
90	95	else:
91	96	self.__special_notify_button.set_active(False)
92	97
93	98	def __read(self, name, v):
94		return self.__config.get_value("engine/Array", name, v)
	99	value = self.__config.get_value("engine/Array", name)
	100	if value is None:
	101	return v
	102	return value
95	103
96	104	def __write(self, name, v):
97	105	return self.__config.set_value("engine/Array", name, v)
98	106
99	107	if __name__ == '__main__':
100		Setup().run()
	108	bus = IBus.Bus()
	109	if bus.is_connected():
	110	Setup(bus).run()

-3

src/Makefile.am less more

24	24	main.c \
25	25	engine.c \
26	26	engine.h \
27		array.c \
28		array.h \
	27	array.c \
	28	array.h \
29	29	$(NULL)
30	30	ibus_engine_array_CFLAGS = \
31	31	@IBUS_CFLAGS@ \
32	32	@SQLITE3_CFLAGS@ \
	33	-DLOCALEDIR=\"$(localedir)\" \
33	34	-DPKGDATADIR=\"$(pkgdatadir)\" \
34		-DLIBEXECDIR=\"$(libexecdir)\" \
	35	-DLIBEXECDIR=\"$(libexecdir)\" \
35	36	$(NULL)
36	37	ibus_engine_array_LDFLAGS = \
37	38	@IBUS_LIBS@ \
38	39	@SQLITE3_LIBS@ \
	40	@LIBINTL@ \
39	41	$(NULL)
40	42
41	43	component_DATA = \

+52

-143

src/engine.c less more

0	0	/* vim:set et sts=4: */
1	1
	2	#include <locale.h>
	3	#include <libintl.h>
2	4	#include "engine.h"
3	5	#include "array.h"
4
	6	#include "config.h"
	7
	8	#define _(String) gettext(String)
5	9	#define ARRAY_SHORT_CODE_EMPTY_STRING "⎔"
6	10
7	11	typedef struct _IBusArrayEngine IBusArrayEngine;
8	12	typedef struct _IBusArrayEngineClass IBusArrayEngineClass;
9	13
10		struct _IBusArrayEngine {
	14	struct _IBusArrayEngine
	15	{
11	16	IBusEngine parent;
12	17
13	18	/* members */

19	24	IBusPropList *prop_list;
20	25	};
21	26
22		struct _IBusArrayEngineClass {
	27	struct _IBusArrayEngineClass
	28	{
23	29	IBusEngineClass parent;
24	30	};
25	31

67	73	static void ibus_array_engine_show_special_code(IBusArrayEngine *arrayeng);
68	74	static void ibus_array_engine_show_special_code_for_char(IBusArrayEngine arrayeng, gchar ch);
69	75
70		static void ibus_config_value_changed (IBusConfig config, const gchar section, const gchar *name,
71		#if IBUS_CHECK_VERSION(1,3,99)
72		GVariant *value,
73		#else
74		GValue *value,
75		#endif /* !IBUS_CHECK_VERSION(1,3,99) */
76		gpointer user_data);
77
78		static gboolean config_get_string (IBusConfig config, const gchar section, const gchar name, gchar *result);
	76	static void ibus_config_value_changed_cb (IBusConfig config, const gchar section, const gchar name, GVariant value, gpointer unused);
79	77
80	78	static IBusEngineClass *parent_class = NULL;
81	79	static IBusConfig *config = NULL;
82	80	static gboolean is_special_notify;
83	81	static gboolean is_special_only;
84	82	static gboolean is_aux_shown = FALSE;
85
86	83	static ArrayContext *array_context = NULL;
87	84
88		GType
89		ibus_array_engine_get_type (void)
	85	GType ibus_array_engine_get_type (void)
90	86	{
91	87	static GType type = 0;
92	88

103	99	};
104	100
105	101	if (type == 0)
106		{
107	102	type = g_type_register_static (IBUS_TYPE_ENGINE, "IBusArrayEngine", &type_info, (GTypeFlags) 0);
108		}
109	103
110	104	return type;
111	105	}

113	107	void ibus_array_init (IBusBus *bus)
114	108	{
115	109	gboolean res;
116		gchar *str;
117	110
118	111	array_context = array_create_context();
119	112
120	113	config = ibus_bus_get_config (bus);
	114	if (config)
	115	g_object_ref_sink (config);
121	116
122	117	is_special_notify = FALSE;
123	118	is_special_only = FALSE;
124	119
125		str = NULL;
126		res = config_get_string (config, "engine/Array", "SpecialNotify", &str);
127		if (res)
128		{
129		if (g_strcmp0(str, "1") == 0)
130		is_special_notify = TRUE;
131		g_free (str);
132		}
133
134		res = config_get_string (config, "engine/Array", "SpecialOnly", &str);
135		if (res)
136		{
137		if (g_strcmp0(str, "1") == 0)
138		is_special_only = TRUE;
139		g_free (str);
140		}
	120	/* load config */
	121	GVariant* value;
	122
	123	value = ibus_config_get_value (config, "engine/Array", "SpecialNotify");
	124	if (value && g_variant_classify(value) == G_VARIANT_CLASS_BOOLEAN)
	125	is_special_notify = g_variant_get_boolean(value);
	126
	127	value = ibus_config_get_value (config, "engine/Array", "SpecialOnly");
	128	if (value && g_variant_classify(value) == G_VARIANT_CLASS_BOOLEAN)
	129	is_special_only = g_variant_get_boolean(value);
	130
	131	/* gettext preparation */
	132	setlocale (LC_ALL, "");
	133	bindtextdomain (PACKAGE, LOCALEDIR);
	134	textdomain (PACKAGE);
141	135	}
142	136
143	137	void ibus_array_exit (void)

146	140
147	141	if (g_object_is_floating (config))
148	142	g_object_unref(config);
149		config = NULL;
150	143	}
151	144
152	145	static void ibus_array_engine_class_init (IBusArrayEngineClass *klass)

182	175
183	176	arrayeng->table = ibus_lookup_table_new (10, 0, FALSE, TRUE);
184	177	g_object_ref_sink (arrayeng->table);
185		setup_label = ibus_text_new_from_string("Setup");
186		setup_tooltip = ibus_text_new_from_string("Configure Array 30 engine");
	178	setup_label = ibus_text_new_from_string (_("Setup"));
	179	setup_tooltip = ibus_text_new_from_string (_("Configure Array 30 engine"));
187	180	setup_prop = ibus_property_new("setup", PROP_TYPE_NORMAL, setup_label, "gtk-preferences", setup_tooltip, TRUE, TRUE, 0, NULL);
188	181	g_object_ref_sink (setup_prop);
189	182

192	185
193	186	ibus_prop_list_append(arrayeng->prop_list, setup_prop);
194	187
195		g_signal_connect (config, "value-changed", G_CALLBACK(ibus_config_value_changed), arrayeng);
	188	g_signal_connect (config, "value-changed", G_CALLBACK(ibus_config_value_changed_cb), NULL);
196	189	}
197	190
198	191	static void ibus_array_engine_destroy (IBusArrayEngine *arrayeng)

201	194	g_object_unref(arrayeng->prop_list);
202	195	arrayeng->prop_list = NULL;
203	196	}
	197
204	198	if (arrayeng->preedit) {
205	199	g_string_free (arrayeng->preedit, TRUE);
206	200	arrayeng->preedit = NULL;

220	214	g_string_assign (arrayeng->preedit, "");
221	215	arrayeng->cursor_pos = 0;
222	216	arrayeng->space_press_count = 0;
	217
223	218	ibus_array_engine_update_preedit (arrayeng);
224	219	ibus_engine_hide_lookup_table (engine);
225	220	ibus_engine_hide_auxiliary_text (engine);
226
227	221	parent_class->reset(engine);
228	222	}
229	223

240	234	static void ibus_array_engine_focus_in (IBusEngine *engine)
241	235	{
242	236	IBusArrayEngine arrayeng = (IBusArrayEngine)engine;
243
244	237	ibus_engine_register_properties (engine, arrayeng->prop_list);
245
246	238	parent_class->focus_in (engine);
247	239	}
248	240

267	259	GArray *candidates = NULL;
268	260
269	261	if (arrayeng->preedit->len <= 2 && arrayeng->space_press_count == 0)
270		{
271	262	candidates = array_get_candidates_from_short(array_context, arrayeng->preedit->str);
272		}
273	263	else
274		{
275	264	candidates = array_get_candidates_from_main(array_context, arrayeng->preedit->str);
276		}
277	265
278	266	if (candidates == NULL)
279	267	{

288	276	}
289	277
290	278	for (i = 0; i < candidates->len; i++)
291		{
292	279	ibus_lookup_table_append_candidate (arrayeng->table, ibus_text_new_from_string (g_array_index(candidates, gchar*, i)));
293		}
294	280
295	281	array_release_candidates(candidates);
296	282

315	301	{
316	302	retval = 0;
317	303	if (retval != 0)
318		{
319		ibus_attr_list_append (text->attrs,
320		ibus_attr_foreground_new (0xff0000, 0, array_preedit->len));
321		}
	304	ibus_attr_list_append (text->attrs, ibus_attr_foreground_new (0xff0000, 0, array_preedit->len));
322	305	}
323	306
324	307	ibus_engine_update_preedit_text ((IBusEngine *)arrayeng, text, array_preedit->len, TRUE);
	308
325	309	if (G_IS_OBJECT (text) && g_object_is_floating (text))
326	310	g_object_unref (text);
327	311

358	342	}
359	343
360	344	for (i = 0; i < candidates->len; i++)
361		{
362	345	ibus_lookup_table_append_candidate (arrayeng->table, ibus_text_new_from_string (g_array_index(candidates, gchar*, i)));
363		}
364	346
365	347	array_release_candidates(candidates);
366	348

388	370	if (check_special)
389	371	{
390	372	if (is_special_notify)
391		{
392	373	ibus_array_engine_show_special_code_for_char (arrayeng, text->text);
393		}
394		if (is_special_only) {
	374
	375	if (is_special_only)
395	376	return FALSE;
396		}
397	377	}
398	378	}
399	379	ibus_engine_commit_text((IBusEngine*)arrayeng, text);

401	381	ibus_array_engine_reset((IBusEngine*)arrayeng);
402	382
403	383	if (is_special_notify && check_special)
404		{
405	384	ibus_array_engine_show_special_code_for_char(arrayeng, temptext);
406		}
407	385
408	386	g_free(temptext);
409	387

440	418
441	419	if (g_strcmp0(arrayeng->preedit->str, "w") == 0)
442	420	{
443		ibus_array_engine_update_auxiliary_text(arrayeng, "1.標點 2.括弧 3.符號 4.數學 5.方向 6.單位 7.圖表 8.羅馬 9.希臘 0.注音");
	421	ibus_array_engine_update_auxiliary_text(arrayeng, _("1.comma 2.bracket 3.symbol 4.math 5.arrow 6.unit 7.table 8.roman 9.greek 0.bopomo"));
444	422	is_aux_shown = TRUE;
445	423	}
446	424	else if (is_aux_shown)

460	438	return FALSE;
461	439
462	440
463		switch (keyval) {
	441	switch (keyval)
	442	{
464	443	case IBUS_space:
465	444	if (arrayeng->preedit->len == 0)
466	445	return FALSE;
467	446	ibus_array_engine_space_press(arrayeng);
468	447	return TRUE;
	448
469	449	case IBUS_Return:
470	450	if (arrayeng->preedit->len == 0)
471	451	return FALSE;

523	503
524	504	if (is_alpha (keyval) \|\| keyval == IBUS_period \|\| keyval == IBUS_comma \|\| keyval == IBUS_slash \|\| keyval == IBUS_semicolon)
525	505	{
526		if (arrayeng->space_press_count == 1) {
	506	if (arrayeng->space_press_count == 1)
527	507	if (arrayeng->table->candidates->len > 0)
528	508	{
529	509	gboolean commit_rev;

534	514	} else {
535	515	ibus_array_engine_reset((IBusEngine*)arrayeng);
536	516	}
537		}
538	517
539	518	if (arrayeng->preedit->len >= 5)
540		{
541	519	return TRUE;
542		}
543	520
544	521	g_string_insert_c (arrayeng->preedit, arrayeng->cursor_pos, keyval);
545	522

611	588
612	589	if (arrayeng->table->candidates->len > 0)
613	590	{
614
615	591	ibus_lookup_table_set_cursor_pos (arrayeng->table, 0);
616
617	592	commit_rev = ibus_array_engine_commit_current_candidate(arrayeng);
618	593	}
619	594	else
620		{
621	595	ibus_array_engine_reset((IBusEngine*)arrayeng);
622		}
623	596	}
624	597	}
625	598

631	604	{
632	605	text = ibus_text_new_from_string(aux_string);
633	606	ibus_engine_update_auxiliary_text((IBusEngine*)arrayeng, text, TRUE);
634
635		if (g_object_is_floating (text))
636		g_object_unref (text);
637	607	}
638	608	}
639	609

660	630	g_string_free(keystr, TRUE);
661	631	g_free(show_str);
662	632	}
663		else {
	633	else
664	634	ibus_engine_hide_auxiliary_text((IBusEngine*)arrayeng);
665		}
666	635
667	636	array_release_candidates(candidates);
668	637	}

687	656	g_free(show_str);
688	657	}
689	658	else
690		{
691	659	ibus_engine_hide_auxiliary_text((IBusEngine*)arrayeng);
692		}
693	660
694	661	array_release_candidates(candidates);
695	662	}

716	683	}
717	684	}
718	685
719		static gboolean config_get_string (IBusConfig config, const gchar section, const gchar name, gchar *result)
720		{
721		#if IBUS_CHECK_VERSION(1,3,99)
722		GVariant *value = NULL;
723
724		g_return_val_if_fail (result != NULL, FALSE);
725
726		value = ibus_config_get_value (config, section, name);
727		if (value)
728		{
729		*result = g_strdup (g_variant_get_string (value, NULL));
730		g_variant_unref (value);
731		return TRUE;
732		}
733		return FALSE;
734		#else
735		GValue value = { 0 };
736
737		g_return_val_if_fail (result != NULL, FALSE);
738
739		if (ibus_config_get_value (config, section, name, &value)) {
740		*result = g_strdup (g_value_get_string (&value));
741		g_value_unset (&value);
742		return TRUE;
743		}
744		return FALSE;
745		#endif /* !IBUS_CHECK_VERSION(1,3,99) */
746		}
747
748		#if IBUS_CHECK_VERSION(1,3,99)
749		#define _g_variant_get_string g_variant_get_string
750		#else
751		#define _g_variant_get_string(value, length) g_value_get_string(value)
752		#endif /* !IBUS_CHECK_VERSION(1,3,99) */
753
754		static void ibus_config_value_changed (IBusConfig config, const gchar section, const gchar *name,
755		#if IBUS_CHECK_VERSION(1,3,99)
756		GVariant *value,
757		#else
758		GValue *value,
759		#endif /* !IBUS_CHECK_VERSION(1,3,99) */
760		gpointer user_data)
761		{
762		IBusArrayEngine arrayeng = (IBusArrayEngine)user_data;
763
764		if (g_strcmp0(section, "engine/Array") == 0)
765		{
766		if (g_strcmp0(name, "SpecialNotify") == 0) {
767		const gchar* str = _g_variant_get_string(value, NULL);
768		if (g_strcmp0(str, "1") == 0) {
769		is_special_notify = TRUE;
770		}
771		else {
772		is_special_notify = FALSE;
773		}
774		}
775		else if (g_strcmp0(name, "SpecialOnly") == 0) {
776		const gchar* str = _g_variant_get_string(value, NULL);
777		if (g_strcmp0(str, "1") == 0) {
778		is_special_only = TRUE;
779		}
780		else {
781		is_special_only = FALSE;
782		}
783		}
784		}
785		}
	686	static void ibus_config_value_changed_cb (IBusConfig config, const gchar section, const gchar name, GVariant value, gpointer unused)
	687	{
	688	if (g_strcmp0(section, "engine/array") == 0)
	689	if (g_strcmp0(name, "specialnotify") == 0)
	690	is_special_notify = g_variant_get_boolean (value);
	691	else if (g_strcmp0(name, "specialonly") == 0)
	692	is_special_only = g_variant_get_boolean (value);
	693	}
	694