Revision: 7301
Author: deton.kih
Date: Sun Sep 11 15:12:28 2011
Log: * scm/tutcode-custom.scm
- (tutcode-use-table-style-candidate-window?):
Remove.
Change set-hooks for tutcode-nr-candidate-max{-for-XXX}
to candidate-window-style.
- (tutcode-candidate-window-table-layout):
Change hook to candidate-window-style.
* scm/tutcode.scm
- Apply obsolete setting of tutcode-use-table-style-candidate-window?
to candidate-window-style for seamless upgrade.
- (uim-candwin-prog): Remove.
- (tutcode-context-new): Change to check candidate-window-style
instead of tutcode-use-table-style-candidate-window?.
http://code.google.com/p/uim/source/detail?r=7301
Modified:
/trunk/scm/tutcode-custom.scm
/trunk/scm/tutcode.scm
=======================================
--- /trunk/scm/tutcode-custom.scm Tue Aug 30 03:41:50 2011
+++ /trunk/scm/tutcode-custom.scm Sun Sep 11 15:12:28 2011
@@ -193,12 +193,6 @@
(N_ "Use candidate window")
(N_ "long description will be here."))
-(define-custom 'tutcode-use-table-style-candidate-window? #f
- '(tutcode candwin)
- '(boolean)
- (N_ "Use table style candidate window")
- (N_ "long description will be here."))
-
(define-custom 'tutcode-candidate-window-table-layout 'qwerty-jis
'(tutcode candwin)
(list 'choice
@@ -356,10 +350,10 @@
(lambda ()
tutcode-use-auto-help-window?))
-(custom-add-hook 'tutcode-use-table-style-candidate-window?
+(custom-add-hook 'candidate-window-style
'custom-set-hooks
(lambda ()
- (if tutcode-use-table-style-candidate-window?
+ (if (eq? candidate-window-style 'table)
(begin
(custom-set-value! 'tutcode-nr-candidate-max
(length tutcode-table-heading-label-char-list))
@@ -382,7 +376,7 @@
(custom-add-hook 'tutcode-candidate-window-table-layout
'custom-activity-hooks
(lambda ()
- tutcode-use-table-style-candidate-window?))
+ (eq? candidate-window-style 'table)))
(custom-add-hook 'tutcode-bushu-index2-filename
'custom-activity-hooks
=======================================
--- /trunk/scm/tutcode.scm Tue Aug 30 03:41:50 2011
+++ /trunk/scm/tutcode.scm Sun Sep 11 15:12:28 2011
@@ -340,16 +340,10 @@
;;; tutcode-context-new»þ¤ËÈ¿±Ç¤¹¤ë¡£
(define tutcode-rule-userconfig ())
-;;; ¸õÊ䥦¥£¥ó¥É¥¦¤Î¥×¥í¥°¥é¥à̾¡£
-;;; uim-xim¤¬¡¢UIM_LIBEXECDIR/uim-candwin-prog¤ò¸õÊ䥦¥£¥ó¥É¥¦¤È¤·¤Æ»ÈÍÑ¡£
-;;; gtk-immoduleÅù¤¬¡¢É½·Á¼°¸õÊ䥦¥£¥ó¥É¥¦¤ò»ÈÍѤ¹¤ë¤«È½ÃǤ¹¤ë¤¿¤á¡¢
-;;; "uim-candwin-tbl"¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¤¤ë¡£
-;;; ɽ·Á¼°¸õÊ䥦¥£¥ó¥É¥¦¤òcustom¤ÇÀßÄê¤Ç¤¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¡¢
-;;; ¤¢¤é¤«¤¸¤ádefine¡£
-;;; XXX:tutcode°Ê³°¤Ë¤â±Æ¶Á¤¹¤ë¤Î¤Ç¡¢Â¾¤Î¾ì½ê¤ÎÊý¤¬¤¤¤¤¤«¤â¡£
-(define uim-candwin-prog "")
-(if tutcode-use-table-style-candidate-window?
- (set! uim-candwin-prog "uim-candwin-tbl-gtk"))
+;;; µìÈǤÎÀßÄê¤òÈ¿±Ç
+(if (and (symbol-bound? 'tutcode-use-table-style-candidate-window?)
+ tutcode-use-table-style-candidate-window?)
+ (set! candidate-window-style 'table))
;;; ɽ·Á¼°¤Î¸õÊ䥦¥£¥ó¥É¥¦¾å¤Î³Æ¥Ü¥¿¥ó¤È¥¡¼¤ÎÂбþɽ(13Îó8¹Ô)¡£
;;; ɽ·Á¼°¸õÊ䥦¥£¥ó¥É¥¦¤¬»²¾È¤·¤Æ»ÈÍѤ¹¤ë¡£
@@ -805,7 +799,7 @@
(tutcode-rule-commit-sequences! tutcode-rule-userconfig)))
;; ɽ·Á¼°¸õÊ䥦¥£¥ó¥É¥¦ÍÑÀßÄê
(if (null? tutcode-heading-label-char-list)
- (if tutcode-use-table-style-candidate-window?
+ (if (eq? candidate-window-style 'table)
(set! tutcode-heading-label-char-list
(case tutcode-candidate-window-table-layout
((qwerty-jis) tutcode-table-heading-label-char-list-qwerty-jis)
@@ -818,7 +812,7 @@
(set! tutcode-heading-label-char-list-for-history
tutcode-heading-label-char-list))
(if (null? tutcode-heading-label-char-list-for-kigou-mode)
- (if tutcode-use-table-style-candidate-window?
+ (if (eq? candidate-window-style 'table)
(begin
(set! tutcode-heading-label-char-list-for-kigou-mode
tutcode-table-heading-label-char-list-for-kigou-mode)
