diff --git a/scim-wnn/ChangeLog b/scim-wnn/ChangeLog index e4535bb..bb650f9 100644 --- a/scim-wnn/ChangeLog +++ b/scim-wnn/ChangeLog @@ -1,3 +1,236 @@ +2004-12-07 11:17:29 Rev 66 tamra + + * src/romkan.h src/preeditor.cpp src/preeditor.h src/romkan.cpp + src/scim_wnn_imengine.cpp: + PreEditor��ConfigPointer���Ϥ��� + +2004-12-06 01:42:19 Rev 65 tamra + + * src/romkan.h src/preeditor.cpp src/preeditor.h src/romkan.cpp + src/scim_wnn_imengine.cpp: + insert(char)���ѻߤ�inputEvent(const KeyEvent &)�˰ܹԡ� + +2004-12-05 11:14:28 Rev 64 tamra + + * src/scim_wnn_def.h src/scim_wnn_imengine.cpp: + �����������Ĵ���� + +2004-12-03 15:37:11 Rev 63 tamra + + * po/ja.po po/POTFILES.in po/scim-wnn.pot: + ��å����������� + +2004-12-03 15:27:10 Rev 62 tamra + + * src/scim_wnn_imengine.h src/romkan.cpp src/scim_wnn_imengine.cpp: + ��������(�¸�Ū�˾��ON)�� + +2004-12-03 14:13:43 Rev 61 tamra + + * src/preeditor.cpp src/preeditor.h src/romkan.cpp: + ���ѱѻ��⡼�ɤ��ɲá� + +2004-12-03 07:18:23 Rev 60 tamra + + * src/romkan.cpp src/scim_wnn_imengine.cpp: + preedit�κǸ��ʸ�����ä��ʤ��Х������� + +2004-12-03 06:21:45 Rev 59 tamra + + * src/romkan.h src/preeditor.cpp src/scim_wnn_imengine.h + src/preeditor.h src/romkan.cpp src/scim_wnn_imengine.cpp: + �ѻ�ľ�����ϥ⡼�ɤβ������� + +2004-12-02 06:08:01 Rev 58 tamra + + * src/romkan.h src/preeditor.cpp src/preeditor.h src/romkan.cpp + src/scim_wnn_imengine.cpp: + ���ϥ⡼�ɤ�ɽ��������Ȥߤ����(��������)�� + +2004-12-01 05:30:53 Rev 57 makeinu + + * po/ja.po po/scim-wnn.pot src/scim_wnn_imengine_setup.cpp: + �ۤΤ���������ܸ�򶵤��Ƥߤޤ��� + + +2004-11-30 23:58:19 Rev 56 tamra + + * src/preeditor.h: + virtual�Ǥ�˺���ɲá� + +2004-11-30 23:53:29 Rev 55 tamra + + * src/romkan.h src/preeditor.cpp src/scim_wnn_imengine.h + src/preeditor.h src/romkan.cpp src/Makefile.am + src/scim_wnn_imengine.cpp: + preedit��ưŪ�ڤ��ؤ��б������� + +2004-11-30 20:58:04 Rev 54 tamra + + * po/ja.po po/scim-wnn.pot src/scim_wnn_imengine.cpp: + ��å�������꽤���� + +2004-11-30 19:47:51 Rev 53 tamra + + * src/scim_wnn_imengine.h src/scim_wnn_imengine.cpp: + ������������ + +2004-11-30 19:43:20 Rev 52 tamra + + * src/scim_wnn_imengine.cpp: + ������������ + +2004-11-30 19:23:40 Rev 51 tamra + + * src/romkan.cpp src/scim_wnn_imengine.cpp: + �Хåե������Υ��ڡ����ν����ڤӥ����������� + +2004-11-30 18:38:20 Rev 50 tamra + + * src/romkan_table.h: + ���޻������Ѵ��ơ��֥����­���䴰(thx! zoe)�� + +2004-11-30 18:34:09 Rev 49 makeinu + + * AUTHORS: + ���ߥåȥƥ��� + + +2004-11-30 07:47:48 Rev 48 tamra + + * src/scim_wnn_imengine_setup.cpp: + ashie���󤫤�������ʬ������ĺ���ޤ�����������ޤ����ġ� + +2004-11-29 02:45:58 Rev 45 tamra + + * po/ja.po po/scim-wnn.pot: + ��å����������� + +2004-11-29 02:34:15 Rev 44 tamra + + * src/scim_wnn_imengine.cpp: + ����ɽ����˿����ʳ��Υ�����preedit������ + +2004-11-29 02:23:38 Rev 43 tamra + + * src/scim_wnn_imengine.cpp: + �Ķ�̾�Ƚ�����ѹ��� + +2004-11-29 01:42:10 Rev 42 tamra + + * src/romkan.cpp: + Ķ���ߥ�������orz + +2004-11-29 01:13:47 Rev 41 tamra + + * src/romkan.cpp: + �٤��Х������� + +2004-11-29 00:46:14 Rev 40 tamra + + * src/romkan.cpp src/scim_wnn_imengine.cpp: + ��Ƭ�˥���������ư����������Х������� + +2004-11-28 00:02:47 Rev 39 tamra + + * src/romkan.h src/romkan.cpp src/scim_wnn_imengine.cpp: + ���޻������Ѵ��Υ������٥�ȥեå������� + +2004-11-27 06:21:32 Rev 38 tamra + + * src/scim_wnn_imengine.h src/scim_wnn_imengine.cpp + src/wnnconversion.cpp: + �Ҥ餬��/���������Ѵ��δ��������� + +2004-11-27 05:37:09 Rev 37 tamra + + * src/romkan.h src/scim_wnn_imengine.h src/scim_wnn_def.h + src/romkan_table.h src/romkan.cpp src/scim_wnn_imengine.cpp: + �Ҥ餬��/���������Ѵ������� + +2004-11-27 00:36:59 Rev 36 tamra + + * src/romkan_table.h: + ���椽��¾���Ѵ��ơ��֥���ɲá� + +2004-11-26 23:16:37 Rev 35 tamra + + * src/scim_wnn_imengine.cpp: + ������ɽ�����ֽ����� + +2004-11-26 22:10:55 Rev 34 tamra + + * src/scim_wnn_imengine.cpp: + ALP==-1��ư������� + +2004-11-26 21:41:30 Rev 33 tamra + + * src/scim_wnn_imengine.cpp src/wnnconversion.cpp: + setPos��۴Ĥ���褦�˽����� + +2004-11-26 21:06:45 Rev 32 tamra + + * src/scim_wnn_imengine.cpp: + ��ư�����ݥåץ��åפΥ�������������� + +2004-11-26 20:40:52 Rev 31 tamra + + * src/scim_wnn_imengine_setup.cpp: + ������̼�������(ư���ޤ���)�� + +2004-11-26 09:14:13 Rev 30 tamra + + * src/scim_wnn_imengine.cpp: + Ctrl��Alt���Ȥ߹�碌�Υ�������äƤ��ޤ����Ȥ����ä��Τ����� + +2004-11-26 08:05:08 Rev 29 tamra + + * src/scim_wnn_imengine.cpp src/wnnconversion.cpp: + ��³�����å��� + +2004-11-26 07:48:10 Rev 28 tamra + + * src/scim_wnn_imengine.h src/scim_wnn_def.h src/Makefile.am + src/scim_wnn_imengine.cpp src/wnnconversion.cpp: + �ǥե��������ʬΥ�� + +2004-11-26 07:41:06 Rev 27 tamra + + * src/wnnproto.h: + �����ץߥ������� + +2004-11-26 00:22:24 Rev 26 tamra + + * src/scim_wnn_imengine.h src/scim_wnn_imengine.cpp: + �����μ���/��������ɲá� + +2004-11-24 09:32:20 Rev 25 tamra + + * configure.ac src/wnnproto.h src/wnnstruct.h INSTALL COPYING + src/wnnconversion.cpp: + �⤷��������FreeWnn�Ǥ⥳��ѥ����̤뤫�⡣ + +2004-11-24 06:17:46 Rev 24 tamra + + * src/scim_wnn_imengine.cpp: + �ե������������줿�����ư��򤹤�褦�˽����� + +2004-11-24 05:16:55 Rev 23 tamra + + * src/scim_wnn_imengine.h src/scim_wnn_imengine.cpp + src/wnnconversion.cpp: + ��������ɲá� + +2004-11-24 03:48:36 Rev 22 tamra + + * src/wnnconversion.h src/wnnconversion.cpp: + �Ѵ����Υ���������ַ׻����ɲá� + +2004-11-23 22:52:15 Rev 21 tamra + + * AUTHORS ChangeLog README: + �����ɰʳ��ν����� + 2004-11-23 08:40:13 Rev 20 tamra * src/scim_wnn_imengine.cpp: diff --git a/scim-wnn/po/ja.po b/scim-wnn/po/ja.po index 32ee0fa..ce81e19 100644 --- a/scim-wnn/po/ja.po +++ b/scim-wnn/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ja\n" -"POT-Creation-Date: 2004-12-04 00:36+0900\n" +"POT-Creation-Date: 2004-12-10 23:15+0900\n" "PO-Revision-Date: 2004-12-01 14:29+0900\n" "Last-Translator: ＴＡＭ (Teppei Tamra) \n" "Language-Team: Japanese\n" @@ -35,11 +35,19 @@ msgid "SCIM-WNN HELP" msgstr "適当にそれっぽく操作して下さい。" -#: src/scim_wnn_imengine.cpp:632 src/scim_wnn_imengine.cpp:639 +#: src/scim_wnn_imengine.cpp:276 +msgid "mode status" +msgstr "入力モード" + +#: src/scim_wnn_imengine.cpp:282 +msgid "Kanji" +msgstr "[漢]" + +#: src/scim_wnn_imengine.cpp:652 src/scim_wnn_imengine.cpp:659 msgid "could not connect to jserver." msgstr "サーバに接続できませんでした" -#: src/scim_wnn_imengine.cpp:680 +#: src/scim_wnn_imengine.cpp:700 msgid "lookup result" msgstr "候補一覧" @@ -227,6 +235,30 @@ msgid "The key events to select page down candidates. " msgstr "次のページへ移動するキーイベント" +#: src/scim_wnn_imengine_setup.cpp:345 +msgid "Common keys" +msgstr "一般キー" + +#: src/scim_wnn_imengine_setup.cpp:346 +msgid "Preedit keys" +msgstr "編集キー:" + +#: src/scim_wnn_imengine_setup.cpp:347 +msgid "Candidates keys" +msgstr "候補キー" + +#: src/scim_wnn_imengine_setup.cpp:387 +msgid "_Server: " +msgstr "サーバ(_S):" + +#: src/scim_wnn_imengine_setup.cpp:403 +msgid "_wnnenvrc: " +msgstr "wnnenvrc(_W):" + +#: src/scim_wnn_imengine_setup.cpp:418 src/scim_wnn_imengine_setup.cpp:471 +msgid "..." +msgstr "..." + #: src/scim_wnn_imengine_setup.cpp:511 msgid "Options" msgstr "オプション" @@ -243,23 +275,5 @@ msgid "Wide Latin" msgstr "[ａ]" -#~ msgid "Common keys" -#~ msgstr "一般キー" - -#~ msgid "Preedit keys" -#~ msgstr "編集キー:" - -#~ msgid "Candidates keys" -#~ msgstr "候補キー" - -#~ msgid "_Server: " -#~ msgstr "サーバ(_S):" - -#~ msgid "_wnnenvrc: " -#~ msgstr "wnnenvrc(_W):" - -#~ msgid "..." -#~ msgstr "..." - #~ msgid "WNN" #~ msgstr "WNN" diff --git a/scim-wnn/po/scim-wnn.pot b/scim-wnn/po/scim-wnn.pot index 30bca33..653fda7 100644 --- a/scim-wnn/po/scim-wnn.pot +++ b/scim-wnn/po/scim-wnn.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-12-04 00:36+0900\n" +"POT-Creation-Date: 2004-12-10 23:15+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,11 +32,19 @@ msgid "SCIM-WNN HELP" msgstr "" -#: src/scim_wnn_imengine.cpp:632 src/scim_wnn_imengine.cpp:639 +#: src/scim_wnn_imengine.cpp:276 +msgid "mode status" +msgstr "" + +#: src/scim_wnn_imengine.cpp:282 +msgid "Kanji" +msgstr "" + +#: src/scim_wnn_imengine.cpp:652 src/scim_wnn_imengine.cpp:659 msgid "could not connect to jserver." msgstr "" -#: src/scim_wnn_imengine.cpp:680 +#: src/scim_wnn_imengine.cpp:700 msgid "lookup result" msgstr "" @@ -224,6 +232,30 @@ msgid "The key events to select page down candidates. " msgstr "" +#: src/scim_wnn_imengine_setup.cpp:345 +msgid "Common keys" +msgstr "" + +#: src/scim_wnn_imengine_setup.cpp:346 +msgid "Preedit keys" +msgstr "" + +#: src/scim_wnn_imengine_setup.cpp:347 +msgid "Candidates keys" +msgstr "" + +#: src/scim_wnn_imengine_setup.cpp:387 +msgid "_Server: " +msgstr "" + +#: src/scim_wnn_imengine_setup.cpp:403 +msgid "_wnnenvrc: " +msgstr "" + +#: src/scim_wnn_imengine_setup.cpp:418 src/scim_wnn_imengine_setup.cpp:471 +msgid "..." +msgstr "" + #: src/scim_wnn_imengine_setup.cpp:511 msgid "Options" msgstr "" diff --git a/scim-wnn/src/scim_wnn_def.h b/scim-wnn/src/scim_wnn_def.h index 265017c..257eb86 100644 --- a/scim-wnn/src/scim_wnn_def.h +++ b/scim-wnn/src/scim_wnn_def.h @@ -66,7 +66,7 @@ #define SCIM_DEFAULT_WNN_RC "/usr/lib/wnn7/ja_JP/wnnenvrc" #define SCIM_CONFIG_WNN_MINISTATUS "/IMEngine/Wnn/MiniStatus" -#define SCIM_DEFAULT_WNN_MINISTATUS true +#define SCIM_DEFAULT_WNN_MINISTATUS false #endif diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp index 9ea0f99..efae732 100644 --- a/scim-wnn/src/scim_wnn_imengine.cpp +++ b/scim-wnn/src/scim_wnn_imengine.cpp @@ -266,6 +266,26 @@ } +/*! + \fn WnnInstance::updateProperty() + */ +void WnnInstance::updateProperty() +{ + if (m_proplist.empty()) { + Property p; + p = Property("/IMEngine/Wnn/ModeStatus","",String(""),_("mode status")); + m_proplist.push_back(p); + + } + PropertyList::iterator it = find(m_proplist.begin(),m_proplist.end(),"/IMEngine/Wnn/ModeStatus"); + if (it != m_proplist.end()) { + if (m_conversion) it->set_label(_("Kanji")); + else it->set_label(m_preeditor->getModeName()); + } + update_property(*it); + register_properties(m_proplist); +} + /*! \fn WnnInstance::updatePreEditor() @@ -281,8 +301,25 @@ update_aux_string(utf8_mbstowcs(m_preeditor->getModeName())); show_aux_string(); } + updateProperty(); } - +/*! + \fn WnnInstance::updateConversion() + */ +void WnnInstance::updateConversion() +{ + update_preedit_string(wnn.getText(),wnn.getAttributeList()); + update_preedit_caret(wnn.getCaretPos()); + if (m_lookup) { + m_lookup_table.set_cursor_pos(m_convList.pos); + update_lookup_table(m_lookup_table); + show_lookup_table(); + } else { + hide_lookup_table(); + hide_aux_string(); + } + updateProperty(); +} bool WnnInstance::process_key_event (const KeyEvent& key) @@ -413,13 +450,7 @@ alp_count ++; wnn.select(m_convList.pos); - update_preedit_string(wnn.getText(),wnn.getAttributeList()); - update_preedit_caret(wnn.getCaretPos()); - if (m_lookup) { - m_lookup_table.set_cursor_pos(m_convList.pos); - update_lookup_table(m_lookup_table); - show_lookup_table(); - } + updateConversion(); return(true); } else if (k_conversion_expand.comp(key) || k_conversion_shrink.comp(key)) { @@ -427,30 +458,20 @@ k_conversion_shrink.comp(key) ? r = wnn.resizeRegion(-1) : r = wnn.resizeRegion(1); if (!r) return(true); m_convList = wnn.getConversionList(); - update_preedit_string(wnn.getText(),wnn.getAttributeList()); - update_preedit_caret(wnn.getCaretPos()); if (alp == -1) { startLookup(); - } else { - hide_lookup_table(); - hide_aux_string(); - m_lookup = false; - } + } else m_lookup = false; + updateConversion(); alp_count = 1; return(true); } else if (k_conversion_forward.comp(key) || k_conversion_backward.comp(key)) { k_conversion_backward.comp(key) ? wnn.setPos(wnn.getPos() - 1) : wnn.setPos(wnn.getPos() + 1); m_convList = wnn.getConversionList(); - update_preedit_string(wnn.getText(),wnn.getAttributeList()); - update_preedit_caret(wnn.getCaretPos()); if (alp == -1) { startLookup(); - } else { - hide_lookup_table(); - hide_aux_string(); - m_lookup = false; - } + } else m_lookup = false; + updateConversion(); alp_count = 1; return(true); } else @@ -461,13 +482,7 @@ if (res == m_convList.kouho[i]) { m_convList.pos = i; wnn.select(m_convList.pos); - update_preedit_string(wnn.getText(),wnn.getAttributeList()); - update_preedit_caret(wnn.getCaretPos()); - if (m_lookup) { - m_lookup_table.set_cursor_pos(m_convList.pos); - update_lookup_table(m_lookup_table); - show_lookup_table(); - } + updateConversion(); break; } } @@ -491,8 +506,7 @@ wnn.select(m_convList.pos); wnn.setPos(wnn.getPos() + 1); m_convList = wnn.getConversionList(); - update_preedit_string(wnn.getText(),wnn.getAttributeList()); - update_preedit_caret(wnn.getCaretPos()); + updateConversion(); startLookup(); return(true); } @@ -586,6 +600,7 @@ void WnnInstance::focus_in () { if (!m_conversion) updatePreEditor(); + updateProperty(); } void WnnInstance::focus_out () @@ -649,7 +664,7 @@ if (alp == -1) { if (!m_lookup) startLookup(); } - + updateProperty(); } @@ -683,3 +698,4 @@ + diff --git a/scim-wnn/src/scim_wnn_imengine.h b/scim-wnn/src/scim_wnn_imengine.h index 0f4d91b..c78b6a9 100644 --- a/scim-wnn/src/scim_wnn_imengine.h +++ b/scim-wnn/src/scim_wnn_imengine.h @@ -102,6 +102,8 @@ void createLookupTable(WnnConversionList cList); void init(); void updatePreEditor(); + void updateProperty(); + void updateConversion(); private: WnnKeyEventList