Revision: 6739
Author: ek.kato
Date: Sun Sep 5 22:25:49 2010
Log: * Merge r6720, r6721:6738 from trunk.
http://code.google.com/p/uim/source/detail?r=6739
Modified:
/branches/1.6/helper/pref-gtk.c
/branches/1.6/po/ko.po
/branches/1.6/scm/Makefile.am
/branches/1.6/scm/tutcode.scm
=======================================
--- /branches/1.6/helper/pref-gtk.c Thu Jul 15 19:00:23 2010
+++ /branches/1.6/helper/pref-gtk.c Sun Sep 5 22:25:49 2010
@@ -43,6 +43,7 @@
#include "uim/uim.h"
#include "uim/uim-custom.h"
+#include "uim/uim-scm.h"
#include "uim/gettext.h"
#include "pref-gtk-custom-widgets.h"
#include "../gtk/key-util-gtk.h"
@@ -567,14 +568,23 @@
static gboolean
check_dot_uim_file(void)
{
- GString *dot_uim = g_string_new(g_get_home_dir());
+ GString *dot_uim;
GtkWidget *dialog;
const gchar *message =
N_("The user customize file \"~/.uim\" is found.\n"
"This file will override all conflicted settings set by\n"
"this tool (stored in ~/.uim.d/customs/*.scm).\n"
- "Please check the file if you find your settings aren't applied.");
-
+ "Please check the file if you find your settings aren't
applied.\n\n"
+ "(To suppress this dialog, add following line to ~/.uim)\n"
+ "(define uim-pref-suppress-dot-uim-warning-dialog? #t)");
+ uim_bool suppress_dialog;
+
+ suppress_dialog =
uim_scm_symbol_value_bool("uim-pref-suppress-dot-uim-warning-dialog?");
+ if (suppress_dialog) {
+ return FALSE;
+ }
+
+ dot_uim = g_string_new(g_get_home_dir());
g_string_append(dot_uim, "/.uim");
if (!g_file_test(dot_uim->str, G_FILE_TEST_EXISTS)) {
@@ -592,12 +602,6 @@
gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(pref_window));
gtk_window_set_position(GTK_WINDOW(dialog),
GTK_WIN_POS_CENTER_ON_PARENT);
}
-
- /*
- * 2005-02-07 Takuro Ashie <[email protected]>
- * FIXME! We shoud add a check box like
- * "Show this message every time on start up.".
- */
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(GTK_WIDGET(dialog));
=======================================
--- /branches/1.6/po/ko.po Tue Aug 10 06:09:56 2010
+++ /branches/1.6/po/ko.po Sun Sep 5 22:25:49 2010
@@ -2053,7 +2053,7 @@
#: ../scm/byeoru-custom.scm:155 ../scm/elatin-custom.scm:258
msgid "Candidate window size"
-msgstr "한자메뉴창의 크기"
+msgstr "후보창의 크기"
#: ../scm/byeoru-custom.scm:161
msgid "Symbol cache size"
=======================================
--- /branches/1.6/scm/Makefile.am Fri Jul 23 00:27:19 2010
+++ /branches/1.6/scm/Makefile.am Sun Sep 5 22:25:49 2010
@@ -115,7 +115,9 @@
LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs \
UIM_DISABLE_NOTIFY=1
-installed-modules.scm loader.scm: $(SCM_FILES)
+loader.scm: installed-modules.scm
+
+installed-modules.scm: $(SCM_FILES)
$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/uim uim-module-manager && \
$(UIM_MODULE_MANAGER_ENV) $(UIM_MODULE_MANAGER) \
--path $(top_builddir)/scm --register $(module_names)
=======================================
--- /branches/1.6/scm/tutcode.scm Sun Aug 1 17:30:14 2010
+++ /branches/1.6/scm/tutcode.scm Sun Sep 5 22:25:49 2010
@@ -32,33 +32,58 @@
;;;
;;; TUT-Code<http://www.crew.sfc.keio.ac.jp/~chk/>ÆþÎÏ¥¹¥¯¥ê¥×¥È¡£
;;; TUT-CodeÇÛÎó¤ÇÆüËܸì¤ÎÆþÎϤò¹Ô¤¦¡£
+;;; TUT-Code°Ê³°¤ÎT-Code¤äTry-Code¤ÎÆþÎϤ⡢¥³¡¼¥Éɽ¤ÎÀßÄê¤Ë¤è¤ê²Äǽ¡£
;;;
-;;; ¥Ç¥Õ¥©¥ë¥È¤Î¥³¡¼¥Éɽ(¥¡¼¥¹¥È¥í¡¼¥¯¤ÈÆþÎϤµ¤ì¤ëʸ»ú¤È¤ÎÂбþ)
-;;; ¤Ç¤¢¤ëtutcode-rule¤ÏQWERTY¥¡¼¥Ü¡¼¥ÉÍÑ¡£
-;;;
-;;; ¡ÚÉô¼ó¹çÀ®ÊÑ´¹¡Û
+;;; ¡ÚÉô¼ó¹çÀ®ÊÑ´¹¡Û(ala)
;;; Á°ÃÖ·¿¤Î¤ß¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£
;;; ºÆµ¢Åª¤ÊÉô¼ó¹çÀ®ÊÑ´¹¤â²Äǽ¤Ç¤¹¡£
;;; Éô¼ó¹çÀ®¤Î¥¢¥ë¥´¥ê¥º¥à¤Ïtc-2.1¤Î¤â¤Î¤Ç¤¹¡£
;;;
-;;; ¡Ú¸ò¤¼½ñ¤ÊÑ´¹¡Û
+;;; ¡Ú¸ò¤¼½ñ¤ÊÑ´¹¡Û(alj)
;;; ñ½ã¤ÊÁ°ÃÖ·¿¸ò¤¼½ñ¤ÊÑ´¹¤¬¤Ç¤¤Þ¤¹¡£
;;; ¸ò¤¼½ñ¤ÊÑ´¹¼½ñ¤Ïtc2¤ÈƱ¤¸·Á¼°(SKK¼½ñ¤ÈƱÍͤηÁ¼°)¤Ç¤¹¡£
;;;
;;; * ¸ò¤¼½ñ¤ÊÑ´¹¼½ñ(Îã:/usr/local/share/tc/mazegaki.dic)¤Ø¤Î¥¢¥¯¥»¥¹¤Ï
;;; libuim-skk.so¤Îµ¡Ç½¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£
;;; ¤½¤Î¤¿¤á¡¢³Ø½¬µ¡Ç½¤âSKK¤ÈƱÍͤÎÆ°ºî¤Ë¤Ê¤ê¤Þ¤¹:
-;;; ³ÎÄꤷ¤¿¸õÊä¤Ï¼¡²ó¤ÎÊÑ´¹¤«¤éÀèƬ¤ËÍè¤Þ¤¹¡£
-;;; ³ÎÄꤷ¤¿¸õÊä¤Ï¸Ä¿Í¼½ñ(~/.mazegaki.dic)¤ËÊݸ¤µ¤ì¤Þ¤¹¡£
+;;; + ³ÎÄꤷ¤¿¸õÊä¤Ï¼¡²ó¤ÎÊÑ´¹¤«¤éÀèƬ¤ËÍè¤Þ¤¹¡£
+;;; + ³ÎÄꤷ¤¿¸õÊä¤Ï¸Ä¿Í¼½ñ(~/.mazegaki.dic)¤ËÊݸ¤µ¤ì¤Þ¤¹¡£
;;; ¤³¤ì¤é¤Î³Ø½¬µ¡Ç½¤ò¥ª¥Õ¤Ë¤¹¤ë¤Ë¤Ï¡¢
;;; tutcode-enable-mazegaki-learning?ÊÑ¿ô¤ò#f¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+;;; ** ¸ò¤¼½ñ¤ÊÑ´¹¼½ñ¤Ø¤ÎÅÐÏ¿¡¦ºï½ü¤âSKK¤ÈƱÍͤÎÆ°ºî¤Ë¤Ê¤ê¤Þ¤¹:
+;;; + ~/.mazegaki.dic¤Ø¤ÎÅÐÏ¿¡¦ºï½ü¡£
+;;; + ÅÐÏ¿: ÊÑ´¹¸õÊä¤ÎºÇ¸å¤Þ¤Ç¹Ô¤Ã¤¿¤éºÆµ¢ÅªÅÐÏ¿¥â¡¼¥É¤Ë°Ü¹Ô¡£
+;;; ¤¢¤ë¤¤¤Ï¡¢ÆɤߤòÆþÎϸ塢|¤ò²¡¤¹¡£
+;;; + ºï½ü: ¼½ñ¤«¤é¤Îºï½ü¤Ï¡¢ºï½ü¤·¤¿¤¤¸õÊä¤òÁª¤ó¤Ç!¤ò²¡¤¹¡£
;;;
;;; * ³èÍѤ¹¤ë¸ì¤ÎÊÑ´¹¤Ï¼«Æ°Åª¤Ë¤Ï¹Ô¤¤¤Þ¤»¤ó¡£
;;; ÆɤߤËÌÀ¼¨Åª¤Ë"¡½"¤òÉղä·¤ÆÊÑ´¹¤·¤Æ¤¯¤À¤µ¤¤¡£
-;;;
-;;; * ¸ò¤¼½ñ¤ÊÑ´¹´Ø·¸¤Ç̤¼ÂÁõ¤Îµ¡Ç½
-;;; - ¸åÃÖ·¿¸ò¤¼½ñ¤ÊÑ´¹
-;;; - Æɤߤò¿¤Ð¤·¤¿¤ê½Ì¤á¤¿¤ê¤¹¤ëµ¡Ç½¡¢ÆɤߤÎÊä´°µ¡Ç½
+;;;
+;;; * ±Ñ»úÊÑ´¹(SKK abbrev)¥â¡¼¥É¤òÄɲ䷤Ƥ¤¤Þ¤¹(al/)¡£
+;;; Î㤨¤Ð¡¢¡Öfile¡×¤òÆþÎϤ·¤Æ¡Ö¥Õ¥¡¥¤¥ë¡×¤ËÊÑ´¹¤¹¤ëµ¡Ç½¤Ç¤¹¡£
+;;;
+;;; ¡Ú¥Ø¥ë¥×µ¡Ç½¡Û
+;;; * ²¾ÁÛ¸°È×ɽ¼¨(ɽ·Á¼°¤Î¸õÊ䥦¥£¥ó¥É¥¦¤òήÍÑ)
+;;; uim-pref-gtk¤Ç¤Îɽ¼¨¡¦Èóɽ¼¨ÀßÄê¤Î¾¤Ë¡¢
+;;; Ctrl+/¤Ç°ì»þŪ¤Ëɽ¼¨¡¦Èóɽ¼¨¤ÎÀÚ¤êÂؤ¨¤â²Äǽ¤Ç¤¹¡£
+;;; (ÂǤÁÊý¤¬¤¢¤ä¤Õ¤ä¤Êʸ»ú¤òÆþÎϤ¹¤ë¤È¤¤À¤±É½¼¨¤·¤¿¤¤¾ì¹ç¤¬¤¢¤ë¤Î¤Ç)
+;;; * ¼«Æ°¥Ø¥ë¥×ɽ¼¨µ¡Ç½(ɽ·Á¼°¤Î¸õÊ䥦¥£¥ó¥É¥¦¤òήÍÑ)
+;;; ¸ò¤¼½ñ¤ÊÑ´¹¤äÉô¼ó¹çÀ®ÊÑ´¹¤ÇÆþÎϤ·¤¿Ê¸»ú¤ÎÂǤÁÊý¤òɽ¼¨¤·¤Þ¤¹¡£
+;;; Éô¼ó¹çÀ®ÊýË¡¤â¡¢´Êñ¤Ê¹çÀ®¤Ë´Ø¤·¤Æ¤Ïɽ¼¨²Äǽ¤Ç¤¹¡£
+;;; Îã:¸ò¤¼½ñ¤ÊÑ´¹¤Ç¡Öͫݵ¡×¤ò³ÎÄꤷ¤¿¾ì¹ç
+;;; ¨£¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¡¨¡¨¡¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¤
+;;; ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢
+;;; ¨§¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨© ¨§¨¡¨¡¨¡¨¡¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨©
+;;; ¨¢ ¨¢ ¨¢ ¨¢ ¨¢b ¨¢ ¨¢ ¨¢ ¨¢ ¨¢f ¨¢ ¨¢
+;;; ¨§¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨© ¨§¨¡¨¡¨¡¨¡¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨©
+;;; ¨¢ ¨¢3 ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢1 ¨¢ ¨¢
+;;; ¨§¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨© ¨§¨¡¨¡¨¡¨¡¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨©
+;;; ¨¢ ¨¢ ¨¢d ¨¢ ¨¢e ¨¢ ¨¢2a(¢¥ÎÓ´Ì)¨¢ ¨¢ ¨¢ ¨¢ ¨¢
+;;; ¨¦¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨¡¨¡¨¡¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨¥
+;;;
+;;; ¡Úµ¹æÆþÎϥ⡼¥É¡Û
+;;; Ctrl+_¤Çµ¹æÆþÎϥ⡼¥É¤Î¥È¥°¥ë¡£
+;;; Á´³Ñ±Ñ¿ôÆþÎϥ⡼¥É¤È¤·¤Æ¤â»È¤¨¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
;;;
;;; ¡ÚÀßÄêÎã¡Û
;;; *
¥³¡¼¥Éɽ¤Î°ìÉô¤òÊѹ¹¤·¤¿¤¤¾ì¹ç¤Ï¡¢Î㤨¤Ð~/.uim¤Ç°Ê²¼¤Î¤è¤¦¤Ëµ½Ò¤¹¤ë¡£
@@ -860,11 +885,11 @@
;;; ¨£¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¡¨¡¨¡¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¨¨¡¨¤
;;; ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢
;;; ¨§¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨© ¨§¨¡¨¡¨¡¨¡¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨©
-;;; ¨¢ ¨¢ ¨¢ ¨¢ ¨¢b ¨¢ ¨¢ ¨¢ ¨¢ ¨¢g ¨¢ ¨¢
+;;; ¨¢ ¨¢ ¨¢ ¨¢ ¨¢b ¨¢ ¨¢ ¨¢ ¨¢ ¨¢f ¨¢ ¨¢
;;; ¨§¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨© ¨§¨¡¨¡¨¡¨¡¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨©
;;; ¨¢ ¨¢3 ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢ ¨¢1 ¨¢ ¨¢
;;; ¨§¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨© ¨§¨¡¨¡¨¡¨¡¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨©
-;;; ¨¢ ¨¢ ¨¢e ¨¢ ¨¢f ¨¢ ¨¢2a(¢¥ÎÓ´Ì)¨¢ ¨¢ ¨¢ ¨¢ ¨¢
+;;; ¨¢ ¨¢ ¨¢d ¨¢ ¨¢e ¨¢ ¨¢2a(¢¥ÎÓ´Ì)¨¢ ¨¢ ¨¢ ¨¢ ¨¢
;;; ¨¦¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨¡¨¡¨¡¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨¥
;;;
;;; Ä̾ï¤Î¸õÊ䥦¥£¥ó¥É¥¦¤Î¾ì¹ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ëɽ¼¨¤¹¤ë¡£
