From: Mr.LeQuocTuan Date: Thu, 25 Jun 2009 11:35:10 +0000 (+0000) Subject: change layout X-Git-Tag: accepted/tizen/8.0/unified/20231005.094147~1^2~1^2~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12d2fd3e3357e8c70e5dfcf0663d95493e8d21e0;hp=6f06b64c51a19d452892bca13a4e2df73e1ccdcc;p=platform%2Fcore%2Fuifw%2Fise-engine-unikey.git change layout git-svn-id: svn://localhost/trunk@33 79bd180b-0a32-48ee-ac55-ada8cae9df61 --- diff --git a/Makefile.am b/Makefile.am index 3bd4e6c..071b1d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = po ukengine src icon +ACLOCAL_AMFLAGS = -I m4 + +SUBDIRS = icon po ukengine src setup + EXTRA_DIST = config.rpath README -ACLOCAL_AMFLAGS = -I m4 + diff --git a/configure.ac b/configure.ac index a9eb39d..df50777 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,7 @@ AC_CONFIG_FILES([Makefile ukengine/Makefile icon/Makefile po/Makefile.in + setup/Makefile ]) AC_OUTPUT diff --git a/icon/Makefile.am b/icon/Makefile.am index 7396ab8..0645cc2 100644 --- a/icon/Makefile.am +++ b/icon/Makefile.am @@ -1,4 +1,7 @@ -icondir = $(SCIM_ICONDIR) -icon_DATA = scim-unikey.png scim-unikey-configure.png scim-unikey-check.png +icondir = $(SCIM_ICONDIR) +icon_DATA = \ + scim-unikey.png \ + scim-unikey-configure.png \ + scim-unikey-check.png -EXTRA_DIST = $(icon_DATA) +EXTRA_DIST = $(icon_DATA) diff --git a/po/POTFILES.in b/po/POTFILES.in index 37a7a3b..90bf9f7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ # List of source files which contain translatable strings. -src/scim_unikey_setup.cpp src/scim_unikey_imengine.cpp +setup/scim_unikey_setup.cpp diff --git a/po/scim-unikey.pot b/po/scim-unikey.pot index 2944be3..de3c28a 100644 --- a/po/scim-unikey.pot +++ b/po/scim-unikey.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: scim-unikey 0.3~r32\n" "Report-Msgid-Bugs-To: mr.lequoctuan@gmail.com\n" -"POT-Creation-Date: 2009-06-20 20:52+0700\n" +"POT-Creation-Date: 2009-06-25 18:20+0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,150 +16,150 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/scim_unikey_setup.cpp:100 -msgid "Unikey Setup" +#: src/scim_unikey_imengine.cpp:135 +msgid "" +"This IME work best when environment variable are\n" +"- GTK_IM_MODULE=scim-bridge\n" +"- QT_IM_MODULE=xim\n" +" If you use preedit, you don't not need that\n" +"\n" +"Some time, in some application, you \"must\"\n" +"enable Preedit to type best\n" +"\n" +"In some application, scim can't enable,\n" +"this is not a bug of scim-unikey.\n" +"You can try this in terminal: app_name | scim\n" +"\n" +"This IME come into being not intend to\n" +"replace scim-m17n, just a choose, I recommend\n" +"use this combine with scim-m17n\n" +"\n" +"For other support goto:\n" +" http://forum.ubuntu-vn.org/viewforum.php?f=85" msgstr "" -#: src/scim_unikey_setup.cpp:133 -msgid "Unikey option" +#: src/scim_unikey_imengine.cpp:700 +msgid "Choose input method" +msgstr "" + +#: src/scim_unikey_imengine.cpp:717 +msgid "Choose output charset" +msgstr "" + +#: src/scim_unikey_imengine.cpp:732 +msgid "Options" +msgstr "" + +#: src/scim_unikey_imengine.cpp:734 +msgid "Configure Unikey here" msgstr "" -#: src/scim_unikey_setup.cpp:142 src/scim_unikey_imengine.cpp:735 +#: src/scim_unikey_imengine.cpp:740 setup/scim_unikey_setup.cpp:146 msgid "Enable spell check" msgstr "" -#: src/scim_unikey_setup.cpp:148 src/scim_unikey_imengine.cpp:737 +#: src/scim_unikey_imengine.cpp:742 setup/scim_unikey_setup.cpp:152 msgid "If enable, you can decrease mistake when typing" msgstr "" -#: src/scim_unikey_setup.cpp:151 src/scim_unikey_imengine.cpp:743 +#: src/scim_unikey_imengine.cpp:748 setup/scim_unikey_setup.cpp:155 msgid "Auto restore keys with invalid words" msgstr "" -#: src/scim_unikey_setup.cpp:157 src/scim_unikey_imengine.cpp:745 +#: src/scim_unikey_imengine.cpp:750 setup/scim_unikey_setup.cpp:161 msgid "" "When typing a word not in Vietnamese,\n" "it will auto restore keystroke into orginal" msgstr "" -#: src/scim_unikey_setup.cpp:161 src/scim_unikey_imengine.cpp:752 +#: src/scim_unikey_imengine.cpp:757 setup/scim_unikey_setup.cpp:165 msgid "Use oà, uý (instead of òa, úy)" msgstr "" -#: src/scim_unikey_setup.cpp:167 src/scim_unikey_imengine.cpp:760 +#: src/scim_unikey_imengine.cpp:765 setup/scim_unikey_setup.cpp:171 msgid "Allow type with more freedom" msgstr "" -#: src/scim_unikey_setup.cpp:173 -msgid "Macro option" -msgstr "" - -#: src/scim_unikey_setup.cpp:180 src/scim_unikey_imengine.cpp:768 +#: src/scim_unikey_imengine.cpp:773 setup/scim_unikey_setup.cpp:184 msgid "Enable Macro" msgstr "" -#: src/scim_unikey_setup.cpp:186 -msgid "Macro Table" -msgstr "" - -#: src/scim_unikey_setup.cpp:192 -msgid "Edit the macro table for Macro function" +#: src/scim_unikey_imengine.cpp:780 +msgid "Enable PreEdit" msgstr "" -#: src/scim_unikey_setup.cpp:196 -msgid "Telex option" +#: src/scim_unikey_imengine.cpp:782 setup/scim_unikey_setup.cpp:249 +msgid "" +"This option is best for most application\n" +"But you may don't like it because it have an underline when typing" msgstr "" -#: src/scim_unikey_setup.cpp:203 src/scim_unikey_imengine.cpp:784 +#: src/scim_unikey_imengine.cpp:789 setup/scim_unikey_setup.cpp:207 msgid "Process W at word begin" msgstr "" -#: src/scim_unikey_setup.cpp:209 src/scim_unikey_imengine.cpp:786 +#: src/scim_unikey_imengine.cpp:791 setup/scim_unikey_setup.cpp:213 msgid "" "If enable, type W at begin\n" "of word will change to Ư." msgstr "" -#: src/scim_unikey_setup.cpp:213 -msgid "Typing mode" -msgstr "" - -#: src/scim_unikey_setup.cpp:224 -msgid "Mode switch key:" +#: setup/scim_unikey_setup.cpp:104 +msgid "Unikey Setup" msgstr "" -#: src/scim_unikey_setup.cpp:239 -msgid "Preedit is default" +#: setup/scim_unikey_setup.cpp:137 +msgid "Unikey option" msgstr "" -#: src/scim_unikey_setup.cpp:245 src/scim_unikey_imengine.cpp:777 -msgid "" -"This option is best for most application\n" -"But you may don't like it because it have an underline when typing" +#: setup/scim_unikey_setup.cpp:177 +msgid "Macro option" msgstr "" -#: src/scim_unikey_setup.cpp:396 -msgid "Macro table definition" +#: setup/scim_unikey_setup.cpp:190 +msgid "Macro Table" msgstr "" -#: src/scim_unikey_setup.cpp:424 -msgid "Word" +#: setup/scim_unikey_setup.cpp:196 +msgid "Edit the macro table for Macro function" msgstr "" -#: src/scim_unikey_setup.cpp:432 -msgid "Replace with" +#: setup/scim_unikey_setup.cpp:200 +msgid "Telex option" msgstr "" -#: src/scim_unikey_setup.cpp:439 -msgid "Delete" +#: setup/scim_unikey_setup.cpp:217 +msgid "Typing mode" msgstr "" -#: src/scim_unikey_setup.cpp:444 -msgid "Delete All" +#: setup/scim_unikey_setup.cpp:228 +msgid "Mode switch key:" msgstr "" -#: src/scim_unikey_setup.cpp:596 -msgid "(replace text)" +#: setup/scim_unikey_setup.cpp:243 +msgid "Preedit is default" msgstr "" -#: src/scim_unikey_imengine.cpp:131 -msgid "" -"This IME work best when environment variable are\n" -"- GTK_IM_MODULE=scim-bridge\n" -"- QT_IM_MODULE=xim\n" -" If you use preedit, you don't not need that\n" -"\n" -"Some time, in some application, you \"must\"\n" -"enable Preedit to type best\n" -"\n" -"In some application, scim can't enable,\n" -"this is not a bug of scim-unikey.\n" -"You can try this in terminal: app_name | scim\n" -"\n" -"This IME come into being not intend to\n" -"replace scim-m17n, just a choose, I recommend\n" -"use this combine with scim-m17n\n" -"\n" -"For other support goto:\n" -" http://forum.ubuntu-vn.org/viewforum.php?f=85" +#: setup/scim_unikey_setup.cpp:400 +msgid "Macro table definition" msgstr "" -#: src/scim_unikey_imengine.cpp:695 -msgid "Choose input method" +#: setup/scim_unikey_setup.cpp:428 +msgid "Word" msgstr "" -#: src/scim_unikey_imengine.cpp:712 -msgid "Choose output charset" +#: setup/scim_unikey_setup.cpp:436 +msgid "Replace with" msgstr "" -#: src/scim_unikey_imengine.cpp:727 -msgid "Options" +#: setup/scim_unikey_setup.cpp:443 +msgid "Delete" msgstr "" -#: src/scim_unikey_imengine.cpp:729 -msgid "Configure Unikey here" +#: setup/scim_unikey_setup.cpp:448 +msgid "Delete All" msgstr "" -#: src/scim_unikey_imengine.cpp:775 -msgid "Enable PreEdit" +#: setup/scim_unikey_setup.cpp:600 +msgid "(replace text)" msgstr "" diff --git a/po/vi.po b/po/vi.po index afbb3d9..c179c12 100644 --- a/po/vi.po +++ b/po/vi.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: scim-unikey\n" "Report-Msgid-Bugs-To: mr.lequoctuan@gmail.com\n" -"POT-Creation-Date: 2009-06-20 20:52+0700\n" +"POT-Creation-Date: 2009-06-25 18:20+0700\n" "PO-Revision-Date: \n" "Last-Translator: Le Quoc Tuan \n" "Language-Team: Le Quoc Tuan \n" @@ -13,27 +13,74 @@ msgstr "" "X-Poedit-Country: VIET NAM\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/scim_unikey_setup.cpp:100 -msgid "Unikey Setup" -msgstr "Cài đặt Unikey" +#: src/scim_unikey_imengine.cpp:135 +msgid "" +"This IME work best when environment variable are\n" +"- GTK_IM_MODULE=scim-bridge\n" +"- QT_IM_MODULE=xim\n" +" If you use preedit, you don't not need that\n" +"\n" +"Some time, in some application, you \"must\"\n" +"enable Preedit to type best\n" +"\n" +"In some application, scim can't enable,\n" +"this is not a bug of scim-unikey.\n" +"You can try this in terminal: app_name | scim\n" +"\n" +"This IME come into being not intend to\n" +"replace scim-m17n, just a choose, I recommend\n" +"use this combine with scim-m17n\n" +"\n" +"For other support goto:\n" +" http://forum.ubuntu-vn.org/viewforum.php?f=85" +msgstr "" +"IME này hoạt động tốt nhất khi giá trị biến mỗi trường là\n" +"- GTK_IM_MODULE=scim-bridge\n" +"- QT_IM_MODULE=ximNếu bạn dùng preedit, bạn không cần điều đó\n" +"\n" +"Thỉnh thoảng, trong một vài ứng dụng, bạn \"phải\"\n" +"bật chức năng Preedit để gõ được tốt\n" +"\n" +"Trong vài ứng dụng, scim không thể bật,\n" +"đây không phải là bug của scim-unikey.\n" +"Bạn có thể thử chạy lệnh này trong terminal: app_name | scim\n" +"\n" +"IME này tồn tại không có ý định \n" +"thay thế scim-m17n, chỉ là một lựa chọn, tôi khuyến cáo\n" +"dùng kết hợp với scim-m17n\n" +"\n" +"Để nhận được sự hỗ trợ hãy ghé thăm:\n" +" http://forum.ubuntu-vn.org/viewforum.php?f=85" -#: src/scim_unikey_setup.cpp:133 -msgid "Unikey option" -msgstr "Tùy chọn Unikey" +#: src/scim_unikey_imengine.cpp:700 +msgid "Choose input method" +msgstr "Chọn kiểu gõ" -#: src/scim_unikey_setup.cpp:142 src/scim_unikey_imengine.cpp:735 +#: src/scim_unikey_imengine.cpp:717 +msgid "Choose output charset" +msgstr "Chọn bảng mã" + +#: src/scim_unikey_imengine.cpp:732 +msgid "Options" +msgstr "Tùy chọn" + +#: src/scim_unikey_imengine.cpp:734 +msgid "Configure Unikey here" +msgstr "Cấu hình Unikey ở đây" + +#: src/scim_unikey_imengine.cpp:740 setup/scim_unikey_setup.cpp:146 msgid "Enable spell check" msgstr "Bật kiểm tra chính tả" -#: src/scim_unikey_setup.cpp:148 src/scim_unikey_imengine.cpp:737 +#: src/scim_unikey_imengine.cpp:742 setup/scim_unikey_setup.cpp:152 msgid "If enable, you can decrease mistake when typing" msgstr "Nếu bật, bạn có thể giảm lỗi chính tả khi gõ" -#: src/scim_unikey_setup.cpp:151 src/scim_unikey_imengine.cpp:743 +#: src/scim_unikey_imengine.cpp:748 setup/scim_unikey_setup.cpp:155 msgid "Auto restore keys with invalid words" msgstr "Tự động khôi phục phím với từ sai" -#: src/scim_unikey_setup.cpp:157 src/scim_unikey_imengine.cpp:745 +#: src/scim_unikey_imengine.cpp:750 setup/scim_unikey_setup.cpp:161 msgid "" "When typing a word not in Vietnamese,\n" "it will auto restore keystroke into orginal" @@ -41,39 +88,35 @@ msgstr "" "Khi gõ một từ không phải tiếng Việt,\n" "nó sẽ tự động khôi phục phím gốc" -#: src/scim_unikey_setup.cpp:161 src/scim_unikey_imengine.cpp:752 +#: src/scim_unikey_imengine.cpp:757 setup/scim_unikey_setup.cpp:165 msgid "Use oà, uý (instead of òa, úy)" msgstr "Đặt dấu oà, uý (thay vì òa, úy)" -#: src/scim_unikey_setup.cpp:167 src/scim_unikey_imengine.cpp:760 +#: src/scim_unikey_imengine.cpp:765 setup/scim_unikey_setup.cpp:171 msgid "Allow type with more freedom" msgstr "Cho phép gõ tự do" -#: src/scim_unikey_setup.cpp:173 -msgid "Macro option" -msgstr "Tùy chọn gõ tắt" - -#: src/scim_unikey_setup.cpp:180 src/scim_unikey_imengine.cpp:768 +#: src/scim_unikey_imengine.cpp:773 setup/scim_unikey_setup.cpp:184 msgid "Enable Macro" msgstr "Cho phép gõ tắt" -#: src/scim_unikey_setup.cpp:186 -msgid "Macro Table" -msgstr "Bảng gõ tắt" - -#: src/scim_unikey_setup.cpp:192 -msgid "Edit the macro table for Macro function" -msgstr "Soạn thảo bảng gõ tắt cho chức năng gõ tắt" +#: src/scim_unikey_imengine.cpp:780 +msgid "Enable PreEdit" +msgstr "Bật PreEdit" -#: src/scim_unikey_setup.cpp:196 -msgid "Telex option" -msgstr "Tùy chọn cho Telex" +#: src/scim_unikey_imengine.cpp:782 setup/scim_unikey_setup.cpp:249 +msgid "" +"This option is best for most application\n" +"But you may don't like it because it have an underline when typing" +msgstr "" +"Tùy chọn này thì tốt cho hầu hết mọi ứng dụng\n" +"Nhưng bạn có thể không thích nó, bởi vì nó có một đường gạch chân khi gõ" -#: src/scim_unikey_setup.cpp:203 src/scim_unikey_imengine.cpp:784 +#: src/scim_unikey_imengine.cpp:789 setup/scim_unikey_setup.cpp:207 msgid "Process W at word begin" msgstr "Xử lý phím W ở đầu từ" -#: src/scim_unikey_setup.cpp:209 src/scim_unikey_imengine.cpp:786 +#: src/scim_unikey_imengine.cpp:791 setup/scim_unikey_setup.cpp:213 msgid "" "If enable, type W at begin\n" "of word will change to Ư." @@ -81,105 +124,62 @@ msgstr "" "Nếu bật, gõ W ở đầu\n" "của từ sẽ chuyển thành Ư." -#: src/scim_unikey_setup.cpp:213 +#: setup/scim_unikey_setup.cpp:104 +msgid "Unikey Setup" +msgstr "Cài đặt Unikey" + +#: setup/scim_unikey_setup.cpp:137 +msgid "Unikey option" +msgstr "Tùy chọn Unikey" + +#: setup/scim_unikey_setup.cpp:177 +msgid "Macro option" +msgstr "Tùy chọn gõ tắt" + +#: setup/scim_unikey_setup.cpp:190 +msgid "Macro Table" +msgstr "Bảng gõ tắt" + +#: setup/scim_unikey_setup.cpp:196 +msgid "Edit the macro table for Macro function" +msgstr "Soạn thảo bảng gõ tắt cho chức năng gõ tắt" + +#: setup/scim_unikey_setup.cpp:200 +msgid "Telex option" +msgstr "Tùy chọn cho Telex" + +#: setup/scim_unikey_setup.cpp:217 msgid "Typing mode" msgstr "Chế độ gõ" -#: src/scim_unikey_setup.cpp:224 +#: setup/scim_unikey_setup.cpp:228 msgid "Mode switch key:" msgstr "Phím chuyển chế độ" -#: src/scim_unikey_setup.cpp:239 +#: setup/scim_unikey_setup.cpp:243 msgid "Preedit is default" msgstr "Preedit là mặc định" -#: src/scim_unikey_setup.cpp:245 src/scim_unikey_imengine.cpp:777 -msgid "" -"This option is best for most application\n" -"But you may don't like it because it have an underline when typing" -msgstr "" -"Tùy chọn này thì tốt cho hầu hết mọi ứng dụng\n" -"Nhưng bạn có thể không thích nó, bởi vì nó có một đường gạch chân khi gõ" - -#: src/scim_unikey_setup.cpp:396 +#: setup/scim_unikey_setup.cpp:400 msgid "Macro table definition" msgstr "Định nghĩa bảng gõ tắt" -#: src/scim_unikey_setup.cpp:424 +#: setup/scim_unikey_setup.cpp:428 msgid "Word" msgstr "Từ" -#: src/scim_unikey_setup.cpp:432 +#: setup/scim_unikey_setup.cpp:436 msgid "Replace with" msgstr "Thay thế bởi" -#: src/scim_unikey_setup.cpp:439 +#: setup/scim_unikey_setup.cpp:443 msgid "Delete" msgstr "Xóa" -#: src/scim_unikey_setup.cpp:444 +#: setup/scim_unikey_setup.cpp:448 msgid "Delete All" msgstr "Xóa tất cả" -#: src/scim_unikey_setup.cpp:596 +#: setup/scim_unikey_setup.cpp:600 msgid "(replace text)" msgstr "(chuỗi thay thế)" - -#: src/scim_unikey_imengine.cpp:131 -msgid "" -"This IME work best when environment variable are\n" -"- GTK_IM_MODULE=scim-bridge\n" -"- QT_IM_MODULE=xim\n" -" If you use preedit, you don't not need that\n" -"\n" -"Some time, in some application, you \"must\"\n" -"enable Preedit to type best\n" -"\n" -"In some application, scim can't enable,\n" -"this is not a bug of scim-unikey.\n" -"You can try this in terminal: app_name | scim\n" -"\n" -"This IME come into being not intend to\n" -"replace scim-m17n, just a choose, I recommend\n" -"use this combine with scim-m17n\n" -"\n" -"For other support goto:\n" -" http://forum.ubuntu-vn.org/viewforum.php?f=85" -msgstr "" -"IME này hoạt động tốt nhất khi giá trị biến mỗi trường là\n" -"- GTK_IM_MODULE=scim-bridge\n" -"- QT_IM_MODULE=ximNếu bạn dùng preedit, bạn không cần điều đó\n" -"\n" -"Thỉnh thoảng, trong một vài ứng dụng, bạn \"phải\"\n" -"bật chức năng Preedit để gõ được tốt\n" -"\n" -"Trong vài ứng dụng, scim không thể bật,\n" -"đây không phải là bug của scim-unikey.\n" -"Bạn có thể thử chạy lệnh này trong terminal: app_name | scim\n" -"\n" -"IME này tồn tại không có ý định \n" -"thay thế scim-m17n, chỉ là một lựa chọn, tôi khuyến cáo\n" -"dùng kết hợp với scim-m17n\n" -"\n" -"Để nhận được sự hỗ trợ hãy ghé thăm:\n" -" http://forum.ubuntu-vn.org/viewforum.php?f=85" - -#: src/scim_unikey_imengine.cpp:695 -msgid "Choose input method" -msgstr "Chọn kiểu gõ" - -#: src/scim_unikey_imengine.cpp:712 -msgid "Choose output charset" -msgstr "Chọn bảng mã" - -#: src/scim_unikey_imengine.cpp:727 -msgid "Options" -msgstr "Tùy chọn" - -#: src/scim_unikey_imengine.cpp:729 -msgid "Configure Unikey here" -msgstr "Cấu hình Unikey ở đây" - -#: src/scim_unikey_imengine.cpp:775 -msgid "Enable PreEdit" -msgstr "Bật PreEdit" diff --git a/setup/Makefile.am b/setup/Makefile.am new file mode 100644 index 0000000..10c72a1 --- /dev/null +++ b/setup/Makefile.am @@ -0,0 +1,24 @@ +if SCIM_BUILD_SETUP + +INCLUDES = \ + -I$(top_srcdir)/ukengine \ + -I$(top_srcdir)/src \ + -DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \ + -DSCIM_UNIKEY_VERSION=\"@PACKAGE_VERSION@\" + +setupdir = @SCIM_MODULEDIR@/SetupUI +setup_LTLIBRARIES = unikey-setup.la +unikey_setup_la_SOURCES = scim_unikey_setup.cpp + +noinst_HEADERS = scimkeyselection.h + +unikey_setup_la_LIBADD = $(top_builddir)/ukengine/libunikey-scim.la + +unikey_setup_la_CFLAGS = @SCIM_GTKUTILS_CFLAGS@ @SCIM_CFLAGS@ +unikey_setup_la_CXXFLAGS = @SCIM_GTKUTILS_CFLAGS@ @SCIM_CFLAGS@ +unikey_setup_la_LDFLAGS = -avoid-version -rpath $(setupdir) \ + -module @LIBTOOL_EXPORT_OPTIONS@ \ + @SCIM_GTKUTILS_LIBS@ @SCIM_LIBS@ \ + $(top_builddir)/src/unikey_la-scim_unikey_utils.lo +endif + diff --git a/src/scim_unikey_setup.cpp b/setup/scim_unikey_setup.cpp similarity index 99% rename from src/scim_unikey_setup.cpp rename to setup/scim_unikey_setup.cpp index 9fd6f9b..14d89c1 100644 --- a/src/scim_unikey_setup.cpp +++ b/setup/scim_unikey_setup.cpp @@ -7,6 +7,10 @@ License: GNU LESSER GENERAL PUBLIC LICENSE v2.1 */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #define Uses_SCIM_CONFIG_BASE #include diff --git a/src/scimkeyselection.h b/setup/scimkeyselection.h similarity index 100% rename from src/scimkeyselection.h rename to setup/scimkeyselection.h diff --git a/src/Makefile.am b/src/Makefile.am index e0cfcdf..44e1c41 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,44 +1,18 @@ -INCLUDES = -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/ukengine \ - -DPACKAGE_NAME=\"@PACKAGE_NAME@\" \ - -DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \ - -DSCIM_UNIKEY_VERSION=\"@PACKAGE_VERSION@\" \ - -DSCIM_LOCALEDIR=\"@SCIM_LOCALEDIR@\" +INCLUDES = \ + -I$(top_srcdir)/ukengine \ + -DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \ + -DSCIM_UNIKEY_VERSION=\"@PACKAGE_VERSION@\" -#IME module imenginedir = @SCIM_MODULEDIR@/IMEngine imengine_LTLIBRARIES = unikey.la unikey_la_SOURCES = scim_unikey_imengine.cpp \ scim_unikey_imengine.h \ scim_unikey_const.h \ scim_unikey_utils.cpp \ - scim_unikey_utils.h \ - scimkeyselection.h + scim_unikey_utils.h unikey_la_LIBADD = $(top_builddir)/ukengine/libunikey-scim.la unikey_la_CFLAGS = @SCIM_CFLAGS@ @SCIM_DEBUG_FLAGS@ unikey_la_CXXFLAGS = @SCIM_CFLAGS@ @SCIM_DEBUG_FLAGS@ unikey_la_LDFLAGS = -avoid-version -rpath $(imenginedir) -module @LIBTOOL_EXPORT_OPTIONS@ @SCIM_LIBS@ -#Setup module -if SCIM_BUILD_SETUP - -setupdir = @SCIM_MODULEDIR@/SetupUI -setup_LTLIBRARIES = unikey-setup.la -unikey_setup_la_SOURCES = scim_unikey_setup.cpp \ - scim_unikey_const.h - -unikey_setup_la_LIBADD = $(top_builddir)/ukengine/libunikey-scim.la - -unikey_setup_la_CFLAGS = @SCIM_GTKUTILS_CFLAGS@ @SCIM_CFLAGS@ -unikey_setup_la_CXXFLAGS = @SCIM_GTKUTILS_CFLAGS@ @SCIM_CFLAGS@ -unikey_setup_la_LDFLAGS = -avoid-version -rpath $(setupdir) \ - -module @LIBTOOL_EXPORT_OPTIONS@ \ - @SCIM_GTKUTILS_LIBS@ @SCIM_LIBS@ \ - unikey_la-scim_unikey_utils.lo - -endif - - diff --git a/src/scim_unikey_imengine.cpp b/src/scim_unikey_imengine.cpp index 5db86d9..8106424 100644 --- a/src/scim_unikey_imengine.cpp +++ b/src/scim_unikey_imengine.cpp @@ -12,6 +12,10 @@ #define Uses_SCIM_CONFIG_BASE #define Uses_SCIM_CONFIG_PATH +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #define _(String) dgettext(PACKAGE_NAME,String) @@ -289,21 +293,21 @@ void UnikeyInstance::Unikey_send_backspace(int nBackspace) void UnikeyInstance::Unikey_update_preedit_string(const WideString s, const bool visible) { - AttributeList list; + AttributeList attlist; Attribute att; // underline preedit string att = Attribute(0, s.length(), SCIM_ATTR_DECORATE, SCIM_ATTR_DECORATE_UNDERLINE); - list.push_back(att); + attlist.push_back(att); if (m_ukopt.spellCheckEnabled==1 && UnikeyLastWordIsNonVn()) { // red preedit string att = Attribute(0, s.length(), SCIM_ATTR_FOREGROUND, 0xff0000); - list.push_back(att); + attlist.push_back(att); } - update_preedit_string(s, list); + update_preedit_string(s, attlist); update_preedit_caret(s.length()); if (visible == true) @@ -489,14 +493,12 @@ bool UnikeyInstance::Unikey_process_key_event_preedit(const KeyEvent& key) if (key.is_key_release()) return false; - if (key.code >= SCIM_KEY_Shift_L && key.code <= SCIM_KEY_Hyper_R) - return false; - - else if (key.code == SCIM_KEY_Tab || key.code == SCIM_KEY_Return - || key.code == SCIM_KEY_Delete || key.code == SCIM_KEY_KP_Enter + if (key.code == SCIM_KEY_Tab + || key.code == SCIM_KEY_Return + || key.code == SCIM_KEY_Delete + || key.code == SCIM_KEY_KP_Enter || (key.code >= SCIM_KEY_Home && key.code <= SCIM_KEY_Insert) - || (key.code >= SCIM_KEY_KP_Home && key.code <= SCIM_KEY_KP_Delete) - ) + || (key.code >= SCIM_KEY_KP_Home && key.code <= SCIM_KEY_KP_Delete)) { if (m_preeditstring.length()) { @@ -509,6 +511,9 @@ bool UnikeyInstance::Unikey_process_key_event_preedit(const KeyEvent& key) return false; } + else if (key.code >= SCIM_KEY_Shift_L && key.code <= SCIM_KEY_Hyper_R) + return false; + else if (key.code == SCIM_KEY_BackSpace) { UnikeyBackspacePress(); // process Backspace diff --git a/ukengine/Makefile.am b/ukengine/Makefile.am index f5ffbea..89f962d 100644 --- a/ukengine/Makefile.am +++ b/ukengine/Makefile.am @@ -7,25 +7,27 @@ libunikey_scim_la_LDFLAGS= -version-info $(UNIKEY_CURRENT):$(UNIKEY_REVISION):$( libunikey_scim_la_SOURCES = \ byteio.cpp \ - byteio.h \ charset.cpp \ - charset.h \ convert.cpp \ data.cpp \ - data.h \ error.cpp \ inputproc.cpp \ + mactab.cpp \ + pattern.cpp \ + ukengine.cpp \ + unikey.cpp \ + usrkeymap.cpp + +noinst_HEADERS = \ + byteio.h \ + charset.h \ + data.h \ inputproc.h \ keycons.h \ - mactab.cpp \ mactab.h \ - pattern.cpp \ pattern.h \ - ukengine.cpp \ ukengine.h \ - unikey.cpp \ unikey.h \ - usrkeymap.cpp \ usrkeymap.h \ vnconv.h \ vnlexi.h