Revision: 6659
Author: ek.kato
Date: Mon Aug 2 23:52:38 2010
Log: * Merge r6655:6658 from trunk.
http://code.google.com/p/uim/source/detail?r=6659
Modified:
/branches/1.6
/branches/1.6/NEWS
/branches/1.6/po
/branches/1.6/po/fr.po
/branches/1.6/po/ja.po
/branches/1.6/po/ko.po
/branches/1.6/scm/prime-custom.scm
/branches/1.6/scm/prime.scm
=======================================
--- /branches/1.6/NEWS Fri Jul 30 01:28:07 2010
+++ /branches/1.6/NEWS Mon Aug 2 23:52:38 2010
@@ -2,15 +2,39 @@
=============================================
* Fixes
- Generic IM
- - Fix crash in some cases when generic-show-prediction-candidates?
+ * Fix crash in some cases when generic-show-prediction-candidates?
is #f
+
- uim-toolbar-{gtk,gtk-systray,applet}
- - Fix freezing toolbar when tool buttons are clicked
+ * Fix freezing toolbar when tool buttons are clicked
+
+ - uim-prime
+ - uim-annotation-filter
+ * Fix crash when command is not found
+
+ - uim-tutcode
+ * Fix some recursive learning mode behavior
+ * Show correct auto help sequences when tutcode-rule-userconfig is
+ used
+
+ - uim-pref-qt4
+ * Fix compilation error due to the wrong version of uic is used in
+ some environments
+
+* Enhancements
+ - uim-tutcode
+ * Change to be able to purge mazegaki entry which is only one
+ candidate
+
+ - uim-prime
+ * Enable customization of prime command path
* Others
- Run unittest in test directory only when --enable-debug=yes and
required tools (Gauche and GaUnit) are installed
+ - disable-kde4-applet in the configure script by default
+
Overview of changes from 1.5.x to 1.6.0-alpha
=============================================
=======================================
--- /branches/1.6/po/fr.po Mon Aug 2 22:43:55 2010
+++ /branches/1.6/po/fr.po Mon Aug 2 23:52:38 2010
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: uim 1.4.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-08-03 14:29+0900\n"
+"POT-Creation-Date: 2010-08-03 15:08+0900\n"
"PO-Revision-Date: 2009-01-05 20:52+0900\n"
"Last-Translator: Thierry Vignaud <[email protected]>\n"
"Language-Team: fr <[email protected]>\n"
@@ -833,15 +833,16 @@
#: ../scm/prime-custom.scm:70 ../scm/prime-custom.scm:76
#: ../scm/prime-custom.scm:84 ../scm/prime-custom.scm:90
#: ../scm/prime-custom.scm:105 ../scm/prime-custom.scm:111
-#: ../scm/prime-custom.scm:123 ../scm/prime-custom.scm:147
-#: ../scm/prime-custom.scm:153 ../scm/prime-custom.scm:160
-#: ../scm/prime-custom.scm:167 ../scm/prime-custom.scm:175
-#: ../scm/prime-custom.scm:196 ../scm/prime-custom.scm:202
-#: ../scm/prime-custom.scm:213 ../scm/prime-key-custom.scm:65
-#: ../scm/prime-key-custom.scm:69 ../scm/prime-key-custom.scm:73
-#: ../scm/sj3-custom.scm:44 ../scm/sj3-custom.scm:48 ../scm/sj3-custom.scm:52
-#: ../scm/sj3-custom.scm:62 ../scm/sj3-custom.scm:68 ../scm/sj3-custom.scm:83
-#: ../scm/sj3-custom.scm:89 ../scm/sj3-custom.scm:95 ../scm/sj3-custom.scm:101
+#: ../scm/prime-custom.scm:117 ../scm/prime-custom.scm:129
+#: ../scm/prime-custom.scm:153 ../scm/prime-custom.scm:159
+#: ../scm/prime-custom.scm:166 ../scm/prime-custom.scm:173
+#: ../scm/prime-custom.scm:181 ../scm/prime-custom.scm:202
+#: ../scm/prime-custom.scm:208 ../scm/prime-custom.scm:219
+#: ../scm/prime-key-custom.scm:65 ../scm/prime-key-custom.scm:69
+#: ../scm/prime-key-custom.scm:73 ../scm/sj3-custom.scm:44
+#: ../scm/sj3-custom.scm:48 ../scm/sj3-custom.scm:52 ../scm/sj3-custom.scm:62
+#: ../scm/sj3-custom.scm:68 ../scm/sj3-custom.scm:83 ../scm/sj3-custom.scm:89
+#: ../scm/sj3-custom.scm:95 ../scm/sj3-custom.scm:101
#: ../scm/sj3-custom.scm:200 ../scm/sj3-custom.scm:219
#: ../scm/sj3-custom.scm:228 ../scm/sj3-custom.scm:270
#: ../scm/sj3-custom.scm:279 ../scm/sj3-custom.scm:322
@@ -975,7 +976,7 @@
#: ../scm/ajax-ime-custom.scm:94 ../scm/anthy-custom.scm:90
#: ../scm/anthy-utf8-custom.scm:97 ../scm/canna-custom.scm:94
#: ../scm/generic-custom.scm:54 ../scm/mana-custom.scm:86
-#: ../scm/prime-custom.scm:146 ../scm/sj3-custom.scm:94
+#: ../scm/prime-custom.scm:152 ../scm/sj3-custom.scm:94
#: ../scm/skk-custom.scm:100 ../scm/social-ime-custom.scm:93
#: ../scm/tutcode-custom.scm:135 ../scm/wnn-custom.scm:94
#: ../scm/yahoo-jp-custom.scm:94
@@ -985,7 +986,7 @@
#: ../scm/ajax-ime-custom.scm:100 ../scm/anthy-custom.scm:96
#: ../scm/anthy-utf8-custom.scm:103 ../scm/canna-custom.scm:100
#: ../scm/elatin-custom.scm:264 ../scm/generic-custom.scm:60
-#: ../scm/mana-custom.scm:92 ../scm/prime-custom.scm:195
+#: ../scm/mana-custom.scm:92 ../scm/prime-custom.scm:201
#: ../scm/sj3-custom.scm:100 ../scm/social-ime-custom.scm:99
#: ../scm/wnn-custom.scm:100 ../scm/yahoo-jp-custom.scm:100
msgid "Select candidate by numeral keys"
@@ -993,7 +994,7 @@
#: ../scm/ajax-ime-custom.scm:130 ../scm/anthy-custom.scm:126
#: ../scm/anthy-utf8-custom.scm:133 ../scm/canna-custom.scm:130
-#: ../scm/mana-custom.scm:122 ../scm/prime-custom.scm:232
+#: ../scm/mana-custom.scm:122 ../scm/prime-custom.scm:238
#: ../scm/sj3-custom.scm:130 ../scm/skk-custom.scm:178
#: ../scm/social-ime-custom.scm:129 ../scm/wnn-custom.scm:130
#: ../scm/yahoo-jp-custom.scm:130
@@ -1074,7 +1075,7 @@
#: ../scm/ajax-ime-custom.scm:156 ../scm/anthy-custom.scm:151
#: ../scm/anthy-utf8-custom.scm:158 ../scm/canna-custom.scm:156
-#: ../scm/mana-custom.scm:147 ../scm/prime-custom.scm:247
+#: ../scm/mana-custom.scm:147 ../scm/prime-custom.scm:253
#: ../scm/sj3-custom.scm:156 ../scm/skk-custom.scm:198
#: ../scm/social-ime-custom.scm:155 ../scm/wnn-custom.scm:156
#: ../scm/yahoo-jp-custom.scm:156
@@ -1083,7 +1084,7 @@
#: ../scm/ajax-ime-custom.scm:157 ../scm/anthy-custom.scm:152
#: ../scm/anthy-utf8-custom.scm:159 ../scm/canna-custom.scm:157
-#: ../scm/mana-custom.scm:148 ../scm/prime-custom.scm:248
+#: ../scm/mana-custom.scm:148 ../scm/prime-custom.scm:254
#: ../scm/sj3-custom.scm:157 ../scm/skk-custom.scm:199
#: ../scm/social-ime-custom.scm:156 ../scm/wnn-custom.scm:157
#: ../scm/yahoo-jp-custom.scm:157
@@ -1250,7 +1251,7 @@
#: ../scm/ajax-ime-custom.scm:334 ../scm/anthy-custom.scm:361
#: ../scm/anthy-utf8-custom.scm:368 ../scm/canna-custom.scm:401
-#: ../scm/mana-custom.scm:307 ../scm/prime-custom.scm:201
+#: ../scm/mana-custom.scm:307 ../scm/prime-custom.scm:207
#: ../scm/sj3-custom.scm:356 ../scm/skk-custom.scm:515
#: ../scm/social-ime-custom.scm:344 ../scm/tutcode-custom.scm:86
#: ../scm/wnn-custom.scm:345 ../scm/yahoo-jp-custom.scm:350
@@ -3354,7 +3355,7 @@
msgstr ""
#: ../scm/iso-639-1.scm:72 ../scm/prime-custom.scm:54
-#: ../scm/prime-custom.scm:62 ../scm/prime-custom.scm:242
+#: ../scm/prime-custom.scm:62 ../scm/prime-custom.scm:248
msgid "English"
msgstr "Anglais"
@@ -3476,7 +3477,7 @@
msgstr "Italien"
#: ../scm/iso-639-1.scm:103 ../scm/prime-custom.scm:50
-#: ../scm/prime-custom.scm:61 ../scm/prime-custom.scm:237
+#: ../scm/prime-custom.scm:61 ../scm/prime-custom.scm:243
msgid "Japanese"
msgstr "Japonais"
@@ -4262,46 +4263,50 @@
msgstr ""
#: ../scm/prime-custom.scm:110
+msgid "Prime command path"
+msgstr ""
+
+#: ../scm/prime-custom.scm:116
msgid "PRIME server address"
msgstr ""
-#: ../scm/prime-custom.scm:122
+#: ../scm/prime-custom.scm:128
msgid "PRIME server port"
msgstr ""
-#: ../scm/prime-custom.scm:152
+#: ../scm/prime-custom.scm:158
msgid "Always showing candidate window"
msgstr ""
-#: ../scm/prime-custom.scm:159
+#: ../scm/prime-custom.scm:165
msgid "Show usage examples of candidate words"
msgstr ""
-#: ../scm/prime-custom.scm:166
+#: ../scm/prime-custom.scm:172
msgid "Show candidate annotations"
msgstr ""
-#: ../scm/prime-custom.scm:174
+#: ../scm/prime-custom.scm:180
msgid "Show candidate forms"
msgstr ""
-#: ../scm/prime-custom.scm:212
+#: ../scm/prime-custom.scm:218
msgid "Enable pseudo mode cursor"
msgstr ""
-#: ../scm/prime-custom.scm:233
+#: ../scm/prime-custom.scm:239
msgid "PRIME off"
msgstr "PRIME désactivé"
-#: ../scm/prime-custom.scm:238 ../scm/prime-custom.scm:243
+#: ../scm/prime-custom.scm:244 ../scm/prime-custom.scm:249
msgid "PRIME on"
msgstr "PRIME sactivé"
-#: ../scm/prime-custom.scm:252
+#: ../scm/prime-custom.scm:258
msgid "Peculiar"
msgstr ""
-#: ../scm/prime-custom.scm:253
+#: ../scm/prime-custom.scm:259
msgid "Application specific input mode"
msgstr ""
=======================================
--- /branches/1.6/po/ja.po Mon Aug 2 22:43:55 2010
+++ /branches/1.6/po/ja.po Mon Aug 2 23:52:38 2010
@@ -99,7 +99,7 @@
msgstr ""
"Project-Id-Version: uim 1.5.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-08-03 14:29+0900\n"
+"POT-Creation-Date: 2010-08-03 15:08+0900\n"
"PO-Revision-Date: 2009-02-14 21:58+0900\n"
"Last-Translator: YamaKen <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -940,15 +940,16 @@
#: ../scm/prime-custom.scm:70 ../scm/prime-custom.scm:76
#: ../scm/prime-custom.scm:84 ../scm/prime-custom.scm:90
#: ../scm/prime-custom.scm:105 ../scm/prime-custom.scm:111
-#: ../scm/prime-custom.scm:123 ../scm/prime-custom.scm:147
-#: ../scm/prime-custom.scm:153 ../scm/prime-custom.scm:160
-#: ../scm/prime-custom.scm:167 ../scm/prime-custom.scm:175
-#: ../scm/prime-custom.scm:196 ../scm/prime-custom.scm:202
-#: ../scm/prime-custom.scm:213 ../scm/prime-key-custom.scm:65
-#: ../scm/prime-key-custom.scm:69 ../scm/prime-key-custom.scm:73
-#: ../scm/sj3-custom.scm:44 ../scm/sj3-custom.scm:48 ../scm/sj3-custom.scm:52
-#: ../scm/sj3-custom.scm:62 ../scm/sj3-custom.scm:68 ../scm/sj3-custom.scm:83
-#: ../scm/sj3-custom.scm:89 ../scm/sj3-custom.scm:95 ../scm/sj3-custom.scm:101
+#: ../scm/prime-custom.scm:117 ../scm/prime-custom.scm:129
+#: ../scm/prime-custom.scm:153 ../scm/prime-custom.scm:159
+#: ../scm/prime-custom.scm:166 ../scm/prime-custom.scm:173
+#: ../scm/prime-custom.scm:181 ../scm/prime-custom.scm:202
+#: ../scm/prime-custom.scm:208 ../scm/prime-custom.scm:219
+#: ../scm/prime-key-custom.scm:65 ../scm/prime-key-custom.scm:69
+#: ../scm/prime-key-custom.scm:73 ../scm/sj3-custom.scm:44
+#: ../scm/sj3-custom.scm:48 ../scm/sj3-custom.scm:52 ../scm/sj3-custom.scm:62
+#: ../scm/sj3-custom.scm:68 ../scm/sj3-custom.scm:83 ../scm/sj3-custom.scm:89
+#: ../scm/sj3-custom.scm:95 ../scm/sj3-custom.scm:101
#: ../scm/sj3-custom.scm:200 ../scm/sj3-custom.scm:219
#: ../scm/sj3-custom.scm:228 ../scm/sj3-custom.scm:270
#: ../scm/sj3-custom.scm:279 ../scm/sj3-custom.scm:322
@@ -1082,7 +1083,7 @@
#: ../scm/ajax-ime-custom.scm:94 ../scm/anthy-custom.scm:90
#: ../scm/anthy-utf8-custom.scm:97 ../scm/canna-custom.scm:94
#: ../scm/generic-custom.scm:54 ../scm/mana-custom.scm:86
-#: ../scm/prime-custom.scm:146 ../scm/sj3-custom.scm:94
+#: ../scm/prime-custom.scm:152 ../scm/sj3-custom.scm:94
#: ../scm/skk-custom.scm:100 ../scm/social-ime-custom.scm:93
#: ../scm/tutcode-custom.scm:135 ../scm/wnn-custom.scm:94
#: ../scm/yahoo-jp-custom.scm:94
@@ -1092,7 +1093,7 @@
#: ../scm/ajax-ime-custom.scm:100 ../scm/anthy-custom.scm:96
#: ../scm/anthy-utf8-custom.scm:103 ../scm/canna-custom.scm:100
#: ../scm/elatin-custom.scm:264 ../scm/generic-custom.scm:60
-#: ../scm/mana-custom.scm:92 ../scm/prime-custom.scm:195
+#: ../scm/mana-custom.scm:92 ../scm/prime-custom.scm:201
#: ../scm/sj3-custom.scm:100 ../scm/social-ime-custom.scm:99
#: ../scm/wnn-custom.scm:100 ../scm/yahoo-jp-custom.scm:100
msgid "Select candidate by numeral keys"
@@ -1100,7 +1101,7 @@
#: ../scm/ajax-ime-custom.scm:130 ../scm/anthy-custom.scm:126
#: ../scm/anthy-utf8-custom.scm:133 ../scm/canna-custom.scm:130
-#: ../scm/mana-custom.scm:122 ../scm/prime-custom.scm:232
+#: ../scm/mana-custom.scm:122 ../scm/prime-custom.scm:238
#: ../scm/sj3-custom.scm:130 ../scm/skk-custom.scm:178
#: ../scm/social-ime-custom.scm:129 ../scm/wnn-custom.scm:130
#: ../scm/yahoo-jp-custom.scm:130
@@ -1181,7 +1182,7 @@
#: ../scm/ajax-ime-custom.scm:156 ../scm/anthy-custom.scm:151
#: ../scm/anthy-utf8-custom.scm:158 ../scm/canna-custom.scm:156
-#: ../scm/mana-custom.scm:147 ../scm/prime-custom.scm:247
+#: ../scm/mana-custom.scm:147 ../scm/prime-custom.scm:253
#: ../scm/sj3-custom.scm:156 ../scm/skk-custom.scm:198
#: ../scm/social-ime-custom.scm:155 ../scm/wnn-custom.scm:156
#: ../scm/yahoo-jp-custom.scm:156
@@ -1190,7 +1191,7 @@
#: ../scm/ajax-ime-custom.scm:157 ../scm/anthy-custom.scm:152
#: ../scm/anthy-utf8-custom.scm:159 ../scm/canna-custom.scm:157
-#: ../scm/mana-custom.scm:148 ../scm/prime-custom.scm:248
+#: ../scm/mana-custom.scm:148 ../scm/prime-custom.scm:254
#: ../scm/sj3-custom.scm:157 ../scm/skk-custom.scm:199
#: ../scm/social-ime-custom.scm:156 ../scm/wnn-custom.scm:157
#: ../scm/yahoo-jp-custom.scm:157
@@ -1359,7 +1360,7 @@
#: ../scm/ajax-ime-custom.scm:334 ../scm/anthy-custom.scm:361
#: ../scm/anthy-utf8-custom.scm:368 ../scm/canna-custom.scm:401
-#: ../scm/mana-custom.scm:307 ../scm/prime-custom.scm:201
+#: ../scm/mana-custom.scm:307 ../scm/prime-custom.scm:207
#: ../scm/sj3-custom.scm:356 ../scm/skk-custom.scm:515
#: ../scm/social-ime-custom.scm:344 ../scm/tutcode-custom.scm:86
#: ../scm/wnn-custom.scm:345 ../scm/yahoo-jp-custom.scm:350
@@ -3485,7 +3486,7 @@
msgstr "ディヴェヒ語"
#: ../scm/iso-639-1.scm:72 ../scm/prime-custom.scm:54
-#: ../scm/prime-custom.scm:62 ../scm/prime-custom.scm:242
+#: ../scm/prime-custom.scm:62 ../scm/prime-custom.scm:248
msgid "English"
msgstr "英語"
@@ -3607,7 +3608,7 @@
msgstr "イタリア語"
#: ../scm/iso-639-1.scm:103 ../scm/prime-custom.scm:50
-#: ../scm/prime-custom.scm:61 ../scm/prime-custom.scm:237
+#: ../scm/prime-custom.scm:61 ../scm/prime-custom.scm:243
msgid "Japanese"
msgstr "日本語"
@@ -4393,46 +4394,50 @@
msgstr "PRIME通信設定"
#: ../scm/prime-custom.scm:110
+msgid "Prime command path"
+msgstr "PRIMEコマンドのパス"
+
+#: ../scm/prime-custom.scm:116
msgid "PRIME server address"
msgstr "PRIMEサーバアドレス"
-#: ../scm/prime-custom.scm:122
+#: ../scm/prime-custom.scm:128
msgid "PRIME server port"
msgstr "PRIMEサーバポート番号"
-#: ../scm/prime-custom.scm:152
+#: ../scm/prime-custom.scm:158
msgid "Always showing candidate window"
msgstr "常に候補ウィンドウを表示する"
-#: ../scm/prime-custom.scm:159
+#: ../scm/prime-custom.scm:165
msgid "Show usage examples of candidate words"
msgstr "候補単語の用例を表示"
-#: ../scm/prime-custom.scm:166
+#: ../scm/prime-custom.scm:172
msgid "Show candidate annotations"
msgstr "候補単語の註釈を表示"
-#: ../scm/prime-custom.scm:174
+#: ../scm/prime-custom.scm:180
msgid "Show candidate forms"
msgstr "候補単語の活用形を表示"
-#: ../scm/prime-custom.scm:212
+#: ../scm/prime-custom.scm:218
msgid "Enable pseudo mode cursor"
msgstr "擬似モードカーソルを有効にする"
-#: ../scm/prime-custom.scm:233
+#: ../scm/prime-custom.scm:239
msgid "PRIME off"
msgstr "PRIME オフ"
-#: ../scm/prime-custom.scm:238 ../scm/prime-custom.scm:243
+#: ../scm/prime-custom.scm:244 ../scm/prime-custom.scm:249
msgid "PRIME on"
msgstr "PRIME オン"
-#: ../scm/prime-custom.scm:252
+#: ../scm/prime-custom.scm:258
msgid "Peculiar"
msgstr "特有"
-#: ../scm/prime-custom.scm:253
+#: ../scm/prime-custom.scm:259
msgid "Application specific input mode"
msgstr "アプリケーション特有の入力モード"
=======================================
--- /branches/1.6/po/ko.po Mon Aug 2 22:43:55 2010
+++ /branches/1.6/po/ko.po Mon Aug 2 23:52:38 2010
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: uim 1.4.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-08-03 14:29+0900\n"
+"POT-Creation-Date: 2010-08-03 15:08+0900\n"
"PO-Revision-Date: 2009-01-05 20:54+0900\n"
"Last-Translator: Jae-hyeon Park <[email protected]>\n"
"Language-Team: Korean <[email protected]>\n"
@@ -844,15 +844,16 @@
#: ../scm/prime-custom.scm:70 ../scm/prime-custom.scm:76
#: ../scm/prime-custom.scm:84 ../scm/prime-custom.scm:90
#: ../scm/prime-custom.scm:105 ../scm/prime-custom.scm:111
-#: ../scm/prime-custom.scm:123 ../scm/prime-custom.scm:147
-#: ../scm/prime-custom.scm:153 ../scm/prime-custom.scm:160
-#: ../scm/prime-custom.scm:167 ../scm/prime-custom.scm:175
-#: ../scm/prime-custom.scm:196 ../scm/prime-custom.scm:202
-#: ../scm/prime-custom.scm:213 ../scm/prime-key-custom.scm:65
-#: ../scm/prime-key-custom.scm:69 ../scm/prime-key-custom.scm:73
-#: ../scm/sj3-custom.scm:44 ../scm/sj3-custom.scm:48 ../scm/sj3-custom.scm:52
-#: ../scm/sj3-custom.scm:62 ../scm/sj3-custom.scm:68 ../scm/sj3-custom.scm:83
-#: ../scm/sj3-custom.scm:89 ../scm/sj3-custom.scm:95 ../scm/sj3-custom.scm:101
+#: ../scm/prime-custom.scm:117 ../scm/prime-custom.scm:129
+#: ../scm/prime-custom.scm:153 ../scm/prime-custom.scm:159
+#: ../scm/prime-custom.scm:166 ../scm/prime-custom.scm:173
+#: ../scm/prime-custom.scm:181 ../scm/prime-custom.scm:202
+#: ../scm/prime-custom.scm:208 ../scm/prime-custom.scm:219
+#: ../scm/prime-key-custom.scm:65 ../scm/prime-key-custom.scm:69
+#: ../scm/prime-key-custom.scm:73 ../scm/sj3-custom.scm:44
+#: ../scm/sj3-custom.scm:48 ../scm/sj3-custom.scm:52 ../scm/sj3-custom.scm:62
+#: ../scm/sj3-custom.scm:68 ../scm/sj3-custom.scm:83 ../scm/sj3-custom.scm:89
+#: ../scm/sj3-custom.scm:95 ../scm/sj3-custom.scm:101
#: ../scm/sj3-custom.scm:200 ../scm/sj3-custom.scm:219
#: ../scm/sj3-custom.scm:228 ../scm/sj3-custom.scm:270
#: ../scm/sj3-custom.scm:279 ../scm/sj3-custom.scm:322
@@ -986,7 +987,7 @@
#: ../scm/ajax-ime-custom.scm:94 ../scm/anthy-custom.scm:90
#: ../scm/anthy-utf8-custom.scm:97 ../scm/canna-custom.scm:94
#: ../scm/generic-custom.scm:54 ../scm/mana-custom.scm:86
-#: ../scm/prime-custom.scm:146 ../scm/sj3-custom.scm:94
+#: ../scm/prime-custom.scm:152 ../scm/sj3-custom.scm:94
#: ../scm/skk-custom.scm:100 ../scm/social-ime-custom.scm:93
#: ../scm/tutcode-custom.scm:135 ../scm/wnn-custom.scm:94
#: ../scm/yahoo-jp-custom.scm:94
@@ -996,7 +997,7 @@
#: ../scm/ajax-ime-custom.scm:100 ../scm/anthy-custom.scm:96
#: ../scm/anthy-utf8-custom.scm:103 ../scm/canna-custom.scm:100
#: ../scm/elatin-custom.scm:264 ../scm/generic-custom.scm:60
-#: ../scm/mana-custom.scm:92 ../scm/prime-custom.scm:195
+#: ../scm/mana-custom.scm:92 ../scm/prime-custom.scm:201
#: ../scm/sj3-custom.scm:100 ../scm/social-ime-custom.scm:99
#: ../scm/wnn-custom.scm:100 ../scm/yahoo-jp-custom.scm:100
msgid "Select candidate by numeral keys"
@@ -1004,7 +1005,7 @@
#: ../scm/ajax-ime-custom.scm:130 ../scm/anthy-custom.scm:126
#: ../scm/anthy-utf8-custom.scm:133 ../scm/canna-custom.scm:130
-#: ../scm/mana-custom.scm:122 ../scm/prime-custom.scm:232
+#: ../scm/mana-custom.scm:122 ../scm/prime-custom.scm:238
#: ../scm/sj3-custom.scm:130 ../scm/skk-custom.scm:178
#: ../scm/social-ime-custom.scm:129 ../scm/wnn-custom.scm:130
#: ../scm/yahoo-jp-custom.scm:130
@@ -1085,7 +1086,7 @@
#: ../scm/ajax-ime-custom.scm:156 ../scm/anthy-custom.scm:151
#: ../scm/anthy-utf8-custom.scm:158 ../scm/canna-custom.scm:156
-#: ../scm/mana-custom.scm:147 ../scm/prime-custom.scm:247
+#: ../scm/mana-custom.scm:147 ../scm/prime-custom.scm:253
#: ../scm/sj3-custom.scm:156 ../scm/skk-custom.scm:198
#: ../scm/social-ime-custom.scm:155 ../scm/wnn-custom.scm:156
#: ../scm/yahoo-jp-custom.scm:156
@@ -1094,7 +1095,7 @@
#: ../scm/ajax-ime-custom.scm:157 ../scm/anthy-custom.scm:152
#: ../scm/anthy-utf8-custom.scm:159 ../scm/canna-custom.scm:157
-#: ../scm/mana-custom.scm:148 ../scm/prime-custom.scm:248
+#: ../scm/mana-custom.scm:148 ../scm/prime-custom.scm:254
#: ../scm/sj3-custom.scm:157 ../scm/skk-custom.scm:199
#: ../scm/social-ime-custom.scm:156 ../scm/wnn-custom.scm:157
#: ../scm/yahoo-jp-custom.scm:157
@@ -1261,7 +1262,7 @@
#: ../scm/ajax-ime-custom.scm:334 ../scm/anthy-custom.scm:361
#: ../scm/anthy-utf8-custom.scm:368 ../scm/canna-custom.scm:401
-#: ../scm/mana-custom.scm:307 ../scm/prime-custom.scm:201
+#: ../scm/mana-custom.scm:307 ../scm/prime-custom.scm:207
#: ../scm/sj3-custom.scm:356 ../scm/skk-custom.scm:515
#: ../scm/social-ime-custom.scm:344 ../scm/tutcode-custom.scm:86
#: ../scm/wnn-custom.scm:345 ../scm/yahoo-jp-custom.scm:350
@@ -3365,7 +3366,7 @@
msgstr ""
#: ../scm/iso-639-1.scm:72 ../scm/prime-custom.scm:54
-#: ../scm/prime-custom.scm:62 ../scm/prime-custom.scm:242
+#: ../scm/prime-custom.scm:62 ../scm/prime-custom.scm:248
msgid "English"
msgstr ""
@@ -3487,7 +3488,7 @@
msgstr ""
#: ../scm/iso-639-1.scm:103 ../scm/prime-custom.scm:50
-#: ../scm/prime-custom.scm:61 ../scm/prime-custom.scm:237
+#: ../scm/prime-custom.scm:61 ../scm/prime-custom.scm:243
msgid "Japanese"
msgstr ""
@@ -4273,46 +4274,50 @@
msgstr ""
#: ../scm/prime-custom.scm:110
+msgid "Prime command path"
+msgstr ""
+
+#: ../scm/prime-custom.scm:116
msgid "PRIME server address"
msgstr ""
-#: ../scm/prime-custom.scm:122
+#: ../scm/prime-custom.scm:128
msgid "PRIME server port"
msgstr ""
-#: ../scm/prime-custom.scm:152
+#: ../scm/prime-custom.scm:158
msgid "Always showing candidate window"
msgstr ""
-#: ../scm/prime-custom.scm:159
+#: ../scm/prime-custom.scm:165
msgid "Show usage examples of candidate words"
msgstr ""
-#: ../scm/prime-custom.scm:166
+#: ../scm/prime-custom.scm:172
msgid "Show candidate annotations"
msgstr ""
-#: ../scm/prime-custom.scm:174
+#: ../scm/prime-custom.scm:180
msgid "Show candidate forms"
msgstr ""
-#: ../scm/prime-custom.scm:212
+#: ../scm/prime-custom.scm:218
msgid "Enable pseudo mode cursor"
msgstr ""
-#: ../scm/prime-custom.scm:233
+#: ../scm/prime-custom.scm:239
msgid "PRIME off"
msgstr ""
-#: ../scm/prime-custom.scm:238 ../scm/prime-custom.scm:243
+#: ../scm/prime-custom.scm:244 ../scm/prime-custom.scm:249
msgid "PRIME on"
msgstr ""
-#: ../scm/prime-custom.scm:252
+#: ../scm/prime-custom.scm:258
msgid "Peculiar"
msgstr ""
-#: ../scm/prime-custom.scm:253
+#: ../scm/prime-custom.scm:259
msgid "Application specific input mode"
msgstr ""
=======================================
--- /branches/1.6/scm/prime-custom.scm Mon Apr 26 23:25:31 2010
+++ /branches/1.6/scm/prime-custom.scm Mon Aug 2 23:52:38 2010
@@ -104,6 +104,12 @@
(N_ "Prime connection setting")
(N_ "long description will be here."))
+(define-custom 'prime-command-path "prime"
+ '(prime advanced)
+ '(pathname regular-file)
+ (N_ "Prime command path")
+ (N_ "long description will be here."))
+
(define-custom 'prime-tcpserver-name "localhost"
'(prime advanced)
'(string ".*")
=======================================
--- /branches/1.6/scm/prime.scm Mon Aug 2 22:43:55 2010
+++ /branches/1.6/scm/prime.scm Mon Aug 2 23:52:38 2010
@@ -825,7 +825,7 @@
(or fds
(begin
(unlink socket-path)
- (process-with-daemon "prime" (list "prime" "-u" socket-path))
+ (process-with-daemon prime-command-path (list
prime-command-path "-u" socket-path))
(let loop ((fds (prime-open-unix-domain-socket socket-path))
(giveup 10))
(cond ((= giveup 0)
@@ -865,7 +865,7 @@
((eq? prime-server-setting? 'tcpserver)
(prime-open-with-tcp-socket prime-tcpserver-name
prime-tcpserver-port))
((eq? prime-server-setting? 'pipe)
- (prime-open-with-pipe "prime"))
+ (prime-open-with-pipe prime-command-path))
(else
(uim-notify-fatal (N_ "Prime connection is not
defined"))
#f))))
