[uim-commit] r863 - trunk/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-06-05 01:50:15 -0700 (Sun, 05 Jun 2005)
New Revision: 863

Modified:
   trunk/scm/skk-custom.scm
   trunk/scm/skk.scm
Log:
* scm/skk.scm (skk-ddskk-like-heading-lable-char-list) : Move into
  skk-custom.scm.
(skk-uim-heading-label-char-list) : Ditto.
* scm/skk-custom.scm : Add custom-set-hooks for
  skk-candidate-selection-style. 
(skk-ddskk-like-heading-label-char-list ) : Moved from skk.scm.
(skk-uim-heading-label-char-list) : Ditto.


Modified: trunk/scm/skk-custom.scm
===================================================================
--- trunk/scm/skk-custom.scm	2005-06-04 12:24:02 UTC (rev 862)
+++ trunk/scm/skk-custom.scm	2005-06-05 08:50:15 UTC (rev 863)
@@ -35,6 +35,9 @@
 (define skk-im-name-label (N_ "SKK"))
 (define skk-im-short-desc (N_ "uim version of SKK input method"))
 
+(define skk-ddskk-like-heading-label-char-list '("a" "s" "d" "f" "j" "k" "l"))
+(define skk-uim-heading-label-char-list '("1" "2" "3" "4" "5" "6" "7" "8" "9" "0"))
+
 (define-custom-group 'skk
                      (ugettext skk-im-name-label)
                      (ugettext skk-im-short-desc))
@@ -84,6 +87,21 @@
   (_ "Candidate selection style")
   (_ "long description will be here."))
 
+(custom-add-hook 'skk-candidate-selection-style
+		 'custom-set-hooks
+		 (lambda ()
+		   (if (= skk-candidate-selection-style 'ddskk-like)
+		       (begin
+			 (custom-set-value! 'skk-candidate-op-count 4)
+			 (custom-set-value!
+			  'skk-nr-candidate-max
+			  (length skk-ddskk-like-heading-label-char-list)))
+		       (begin	
+			 (custom-set-value! 'skk-candidate-op-count 2)
+			 (custom-set-value!
+			  'skk-nr-candidate-max
+			  (length skk-uim-heading-label-char-list))))))
+
 ;; activity dependency
 (custom-add-hook 'skk-candidate-op-count
 		 'custom-activity-hooks

Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-06-04 12:24:02 UTC (rev 862)
+++ trunk/scm/skk.scm	2005-06-05 08:50:15 UTC (rev 863)
@@ -55,9 +55,6 @@
 ;; encoding conversion problem.  -- YamaKen 2005-02-02
 (define skk-auto-start-henkan-keyword-list '("¤ò" "¡¢" "¡£" "¡¥" "¡¤" "¡©" "¡×" "¡ª" "¡¨" "¡§" ")" ";" ":" "¡Ë" "¡É" "¡Û" "¡Ù" "¡Õ" "¡Ó" "¡Ñ" "¡Ï" "¡Í" "}" "]" "?" "." "," "!"))
 
-(define skk-ddskk-like-heading-label-char-list '("a" "s" "d" "f" "j" "k" "l"))
-(define skk-uim-heading-label-char-list '("1" "2" "3" "4" "5" "6" "7" "8" "9" "0"))
-
 ;; style specification
 (define skk-style-spec
   '(;; (style-element-name . validator)