From: Mr.LeQuocTuan Date: Sat, 20 Jun 2009 13:53:40 +0000 (+0000) Subject: fix bug non PutChar with fail shift+space X-Git-Tag: accepted/tizen/unified/20230120.182101~1^2~1^2~38 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f06b64c51a19d452892bca13a4e2df73e1ccdcc;p=platform%2Fcore%2Fuifw%2Fise-engine-unikey.git fix bug non PutChar with fail shift+space git-svn-id: svn://localhost/trunk@32 79bd180b-0a32-48ee-ac55-ada8cae9df61 --- diff --git a/configure.ac b/configure.ac index 399c449..a9eb39d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(scim-unikey, 0.3~b1, mr.lequoctuan@gmail.com) +AC_INIT(scim-unikey, 0.3~r32, mr.lequoctuan@gmail.com) cflags_set=${CFLAGS+set} cppflags_set=${CPPFLAGS+set} diff --git a/po/scim-unikey.pot b/po/scim-unikey.pot index f0dc97a..2944be3 100644 --- a/po/scim-unikey.pot +++ b/po/scim-unikey.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: scim-unikey 0.3~b1\n" +"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:32+0700\n" +"POT-Creation-Date: 2009-06-20 20:52+0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,29 +24,29 @@ msgstr "" msgid "Unikey option" msgstr "" -#: src/scim_unikey_setup.cpp:142 src/scim_unikey_imengine.cpp:731 +#: src/scim_unikey_setup.cpp:142 src/scim_unikey_imengine.cpp:735 msgid "Enable spell check" msgstr "" -#: src/scim_unikey_setup.cpp:148 src/scim_unikey_imengine.cpp:733 +#: src/scim_unikey_setup.cpp:148 src/scim_unikey_imengine.cpp:737 msgid "If enable, you can decrease mistake when typing" msgstr "" -#: src/scim_unikey_setup.cpp:151 src/scim_unikey_imengine.cpp:739 +#: src/scim_unikey_setup.cpp:151 src/scim_unikey_imengine.cpp:743 msgid "Auto restore keys with invalid words" msgstr "" -#: src/scim_unikey_setup.cpp:157 src/scim_unikey_imengine.cpp:741 +#: src/scim_unikey_setup.cpp:157 src/scim_unikey_imengine.cpp:745 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:748 +#: src/scim_unikey_setup.cpp:161 src/scim_unikey_imengine.cpp:752 msgid "Use oà, uý (instead of òa, úy)" msgstr "" -#: src/scim_unikey_setup.cpp:167 src/scim_unikey_imengine.cpp:756 +#: src/scim_unikey_setup.cpp:167 src/scim_unikey_imengine.cpp:760 msgid "Allow type with more freedom" msgstr "" @@ -54,7 +54,7 @@ msgstr "" msgid "Macro option" msgstr "" -#: src/scim_unikey_setup.cpp:180 src/scim_unikey_imengine.cpp:764 +#: src/scim_unikey_setup.cpp:180 src/scim_unikey_imengine.cpp:768 msgid "Enable Macro" msgstr "" @@ -70,11 +70,11 @@ msgstr "" msgid "Telex option" msgstr "" -#: src/scim_unikey_setup.cpp:203 src/scim_unikey_imengine.cpp:780 +#: src/scim_unikey_setup.cpp:203 src/scim_unikey_imengine.cpp:784 msgid "Process W at word begin" msgstr "" -#: src/scim_unikey_setup.cpp:209 src/scim_unikey_imengine.cpp:782 +#: src/scim_unikey_setup.cpp:209 src/scim_unikey_imengine.cpp:786 msgid "" "If enable, type W at begin\n" "of word will change to Ư." @@ -92,7 +92,7 @@ msgstr "" msgid "Preedit is default" msgstr "" -#: src/scim_unikey_setup.cpp:245 src/scim_unikey_imengine.cpp:773 +#: 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" @@ -144,22 +144,22 @@ msgid "" " http://forum.ubuntu-vn.org/viewforum.php?f=85" msgstr "" -#: src/scim_unikey_imengine.cpp:691 +#: src/scim_unikey_imengine.cpp:695 msgid "Choose input method" msgstr "" -#: src/scim_unikey_imengine.cpp:708 +#: src/scim_unikey_imengine.cpp:712 msgid "Choose output charset" msgstr "" -#: src/scim_unikey_imengine.cpp:723 +#: src/scim_unikey_imengine.cpp:727 msgid "Options" msgstr "" -#: src/scim_unikey_imengine.cpp:725 +#: src/scim_unikey_imengine.cpp:729 msgid "Configure Unikey here" msgstr "" -#: src/scim_unikey_imengine.cpp:771 +#: src/scim_unikey_imengine.cpp:775 msgid "Enable PreEdit" msgstr "" diff --git a/po/vi.po b/po/vi.po index adce513..afbb3d9 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:32+0700\n" +"POT-Creation-Date: 2009-06-20 20:52+0700\n" "PO-Revision-Date: \n" "Last-Translator: Le Quoc Tuan \n" "Language-Team: Le Quoc Tuan \n" @@ -21,19 +21,19 @@ msgstr "Cài đặt Unikey" msgid "Unikey option" msgstr "Tùy chọn Unikey" -#: src/scim_unikey_setup.cpp:142 src/scim_unikey_imengine.cpp:731 +#: src/scim_unikey_setup.cpp:142 src/scim_unikey_imengine.cpp:735 msgid "Enable spell check" msgstr "Bật kiểm tra chính tả" -#: src/scim_unikey_setup.cpp:148 src/scim_unikey_imengine.cpp:733 +#: src/scim_unikey_setup.cpp:148 src/scim_unikey_imengine.cpp:737 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:739 +#: src/scim_unikey_setup.cpp:151 src/scim_unikey_imengine.cpp:743 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:741 +#: src/scim_unikey_setup.cpp:157 src/scim_unikey_imengine.cpp:745 msgid "" "When typing a word not in Vietnamese,\n" "it will auto restore keystroke into orginal" @@ -41,11 +41,11 @@ 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:748 +#: src/scim_unikey_setup.cpp:161 src/scim_unikey_imengine.cpp:752 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:756 +#: src/scim_unikey_setup.cpp:167 src/scim_unikey_imengine.cpp:760 msgid "Allow type with more freedom" msgstr "Cho phép gõ tự do" @@ -53,7 +53,7 @@ msgstr "Cho phép gõ tự do" msgid "Macro option" msgstr "Tùy chọn gõ tắt" -#: src/scim_unikey_setup.cpp:180 src/scim_unikey_imengine.cpp:764 +#: src/scim_unikey_setup.cpp:180 src/scim_unikey_imengine.cpp:768 msgid "Enable Macro" msgstr "Cho phép gõ tắt" @@ -69,11 +69,11 @@ msgstr "Soạn thảo bảng gõ tắt cho chức năng gõ tắt" msgid "Telex option" msgstr "Tùy chọn cho Telex" -#: src/scim_unikey_setup.cpp:203 src/scim_unikey_imengine.cpp:780 +#: src/scim_unikey_setup.cpp:203 src/scim_unikey_imengine.cpp:784 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:782 +#: src/scim_unikey_setup.cpp:209 src/scim_unikey_imengine.cpp:786 msgid "" "If enable, type W at begin\n" "of word will change to Ư." @@ -93,7 +93,7 @@ msgstr "Phím chuyển chế độ" msgid "Preedit is default" msgstr "Preedit là mặc định" -#: src/scim_unikey_setup.cpp:245 src/scim_unikey_imengine.cpp:773 +#: 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" @@ -164,22 +164,22 @@ msgstr "" "Để 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:691 +#: src/scim_unikey_imengine.cpp:695 msgid "Choose input method" msgstr "Chọn kiểu gõ" -#: src/scim_unikey_imengine.cpp:708 +#: src/scim_unikey_imengine.cpp:712 msgid "Choose output charset" msgstr "Chọn bảng mã" -#: src/scim_unikey_imengine.cpp:723 +#: src/scim_unikey_imengine.cpp:727 msgid "Options" msgstr "Tùy chọn" -#: src/scim_unikey_imengine.cpp:725 +#: src/scim_unikey_imengine.cpp:729 msgid "Configure Unikey here" msgstr "Cấu hình Unikey ở đây" -#: src/scim_unikey_imengine.cpp:771 +#: src/scim_unikey_imengine.cpp:775 msgid "Enable PreEdit" msgstr "Bật PreEdit" diff --git a/src/scim_unikey_imengine.cpp b/src/scim_unikey_imengine.cpp index bedfaf1..5db86d9 100644 --- a/src/scim_unikey_imengine.cpp +++ b/src/scim_unikey_imengine.cpp @@ -408,6 +408,10 @@ bool UnikeyInstance::Unikey_process_key_event_direct(const KeyEvent& key) && !UnikeyAtWordBeginning()) { UnikeyRestoreKeyStrokes(); + if (UnikeyBackspaces == 0) + { + UnikeyPutChar(key.code); + } } else if ((key.code >= SCIM_KEY_KP_0 &&