Merge branch 'gtk3' of https://github.com/epico/ibus-handwrite

Thanks to Wu Peng, ibus-handwrite now has been ported to GTK3. Nice job!

Makefile.am

@@ -23,6 +23,7 @@
 SUBDIRS = \
 	src \
 	icons \
+	po \
 	data \
 	doc \
 	$(NULL)

configure.ac

@@ -21,20 +21,21 @@
 
 # if not 1, append datestamp to the version number.
 m4_define([package_name], [ibus-handwrite])
-
+    
 AC_PREREQ([2.53])
-AC_INIT([package_name], [2.1.5], [http://code.google.com/p/ibus/issues/entry], [package_name])
+AC_INIT([package_name], [2.2.0], [http://code.google.com/p/ibus/issues/entry], [package_name])
 AM_INIT_AUTOMAKE([-Wall])
 AC_GNU_SOURCE
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # define PACKAGE_VERSION_* variables
-AC_PROG_CC_C99
+AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
-AC_PROG_MKDIR_P
+
+AC_CHECK_LIB([m],[atan2])
 
 PKG_PROG_PKG_CONFIG
 
@@ -49,15 +50,15 @@ AC_SUBST(zinnia,"")
 AC_ARG_WITH(zinnia-tomoe,[AC_HELP_STRING([--with-zinnia-tomoe=[[dir]]],[specify the dir that hold zinnia-tomoe data file])],
 	[
 		tomoedir=${withval}
-
-		rpm_sepc_with_tomoe="--with-zinnia-tomoe=${withval}"
-		zinnia_tomoe="zinnia-tomoe"
+		
+		rpm_sepc_with_tomoe="--with-zinnia-tomoe=${withval}"		
+		zinnia_tomoe="zinnia-tomoe"	
 		zinnia="zinnia"
-
+		
 		AC_DEFINE_UNQUOTED(TOMOE_DATA_DIR,"${tomoedir}",[the dir that hold zinnia-tomoe data file])
 	],[
 			AS_IF([test "x${enable_zinnia}" = "xyes"],
-			[AC_MSG_WARN(zinnia engine disabled due to the missing --with-zinnia-tomoe)])
+			[AC_MSG_WARN(zinnia engine disabled due to the missing --with-zinnia-tomoe)])	
 			enable_zinnia=no;
 ])
 
@@ -78,27 +79,26 @@ AS_IF([test "x${enable_zinnia}" = "xyes"],
 AS_IF([test "x${have_zinnia}" = "xyes" ],[
 		AM_CONDITIONAL(WITH_ZINNIA,[true])
 	],[
-		AM_CONDITIONAL(WITH_ZINNIA,[false])
+		AM_CONDITIONAL(WITH_ZINNIA,[false])		
 ])
 
-AC_CHECK_LIB(m, main)
-AC_CHECK_LIB(GL, main)
-
 # check ibus
 PKG_CHECK_MODULES(IBUS, [
     ibus-1.0 >= 1.3
 ])
 
-PKG_CHECK_MODULES(CLUTTOR, [
-    clutter-1.0 clutter-cogl-1.0
+PKG_CHECK_MODULES(GTK3, [
+    gtk+-3.0 >= 3.0
 ])
 
 PKG_CHECK_MODULES(ALL_NEED, [
-  clutter-1.0 clutter-cogl-1.0  ibus-1.0 >= 1.3
+    ibus-1.0 >= 1.2 gtk+-3.0 >= 3.0
 ])
 
-AC_DEFINE_UNQUOTED(ICONDIR,"${sharedstatedir}/ibus/icons",[icon filedir])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.16.1)
 
+#AC_DEFINE_UNQUOTED(ICONDIR,"${sharedstatedir}/ibus/icons",[icon filedir])
 
 AC_CHECK_DECL(MAP_ANONYMOUS,[],
 	[
@@ -111,7 +111,7 @@ AC_CHECK_DECL(MAP_ANONYMOUS,[],
 
 AC_DEFINE(MICROCAI_WITHEMAIL,"[email protected]",[author microcai and his email])
 # OUTPUT files
-AC_CONFIG_FILES(
+AC_CONFIG_FILES(po/Makefile.in
 Makefile
 ibus-handwrite.spec
 src/Makefile

po/LINGUAS

@@ -0,0 +1,2 @@
+zh_CN
+ja

po/Makevars

@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = microcai <[email protected]>
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT)
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES = 

po/POTFILES.in

@@ -0,0 +1,2 @@
+src/main.c
+src/engine.c

po/ja.po

@@ -0,0 +1,73 @@
+# Copyright (C) 2010 microcai <[email protected]>
+# This file is distributed under the same license as the ibus-handwrite package.
+# FIRST AUTHOR <[email protected]>, 2010.
+# microcai <[email protected]>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.01\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
+"POT-Creation-Date: 2011-01-26 08:05+0800\n"
+"PO-Revision-Date: 2010-01-28 01:44+0800\n"
+"Last-Translator: microcai <[email protected]>\n"
+"Language-Team: ja <[email protected]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: UTF-8\n"
+
+#: src/main.c:49
+msgid "the icon file"
+msgstr ""
+
+#: src/main.c:49
+msgid "icon file"
+msgstr ""
+
+#: src/main.c:50
+msgid "set table file path"
+msgstr ""
+
+#: src/main.c:50
+msgid "tablefile"
+msgstr ""
+
+#: src/main.c:51
+msgid "set locale path"
+msgstr ""
+
+#: src/main.c:51
+msgid "locale"
+msgstr ""
+
+#: src/main.c:52
+msgid "set languate, accept zh and jp"
+msgstr ""
+
+#: src/main.c:52
+msgid "lang"
+msgstr ""
+
+#: src/main.c:120
+msgid "hand write recognizer"
+msgstr ""
+
+#: src/main.c:151
+#, c-format
+msgid "ibus-handwrite Version %s Start Up\n"
+msgstr "ibus-handwrite バージョン %s を起動\n"
+
+#: src/engine.c:126
+msgid "color"
+msgstr "顔色"
+
+#: src/engine.c:127
+msgid "click to set color"
+msgstr "をクリックして色を設定"
+
+#: src/engine.c:142
+msgid "engine"
+msgstr "エンジン"
+
+#: src/engine.c:143
+msgid "click to set engine"
+msgstr "をクリックしてエンジンを設定する"

po/zh_CN.po

@@ -0,0 +1,75 @@
+# Copyright (C) 2010 microcai <[email protected]>
+# This file is distributed under the same license as the ibus-handwrite package.
+# FIRST AUTHOR <[email protected]>, 2010.
+# microcai <[email protected]>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.01\n"
+"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
+"POT-Creation-Date: 2011-01-26 08:05+0800\n"
+"PO-Revision-Date: 2010-01-28 01:44+0800\n"
+"Last-Translator: microcai <[email protected]>\n"
+"Language-Team: zh_CN <[email protected]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: UTF-8\n"
+
+#: src/main.c:49
+msgid "the icon file"
+msgstr "icon 文件"
+
+#: src/main.c:49
+msgid "icon file"
+msgstr "icon 文件"
+
+#: src/main.c:50
+msgid "set table file path"
+msgstr "设置表"
+
+#: src/main.c:50
+msgid "tablefile"
+msgstr "表文件"
+
+#: src/main.c:51
+#, fuzzy
+msgid "set locale path"
+msgstr "设置表"
+
+#: src/main.c:51
+msgid "locale"
+msgstr ""
+
+#: src/main.c:52
+msgid "set languate, accept zh and jp"
+msgstr "设置语言，接受zh和jp"
+
+#: src/main.c:52
+msgid "lang"
+msgstr "语言"
+
+#: src/main.c:120
+msgid "hand write recognizer"
+msgstr "手写识别"
+
+#: src/main.c:151
+#, c-format
+msgid "ibus-handwrite Version %s Start Up\n"
+msgstr "ibus-handwrite 版本 %s 启动\n"
+
+#: src/engine.c:126
+msgid "color"
+msgstr ""
+
+#: src/engine.c:127
+#, fuzzy
+msgid "click to set color"
+msgstr "单击切换引擎"
+
+#: src/engine.c:142
+msgid "engine"
+msgstr "识别引擎"
+
+#: src/engine.c:143
+msgid "click to set engine"
+msgstr "单击切换引擎"

src/Makefile.am

@@ -24,7 +24,7 @@ test: ibus-engine-handwrite
 	$(builddir)/ibus-engine-handwrite \
 		--icondir $(top_srcdir)/icons/ \
 		--table $(top_srcdir)/data/table.txt \
-		--locale /tmp/${prefix}/share/locale/
+		--locale /tmp/${prefix}/share/locale/ 
 if WITH_ZINNIA		
 test-jp: ibus-engine-handwrite
 	$(builddir)/ibus-engine-handwrite \
@@ -50,7 +50,7 @@ ibus_engine_handwrite_SOURCES =  main.c	\
 				$(NULL)
 
 
-ibus_engine_handwrite_SOURCES +=   UI_clutter.c \
+ibus_engine_handwrite_SOURCES +=   UI_gtk.c \
  					  $(NULL)
 
 if WITH_ZINNIA