[uim-commit] r439 - trunk/scm

yamaken at freedesktop.org yamaken at freedesktop.org
Mon Jan 31 12:40:01 PST 2005


Author: yamaken
Date: 2005-01-31 12:39:57 -0800 (Mon, 31 Jan 2005)
New Revision: 439

Modified:
   trunk/scm/anthy-custom.scm
   trunk/scm/canna-custom.scm
   trunk/scm/generic-custom.scm
   trunk/scm/im-custom.scm
   trunk/scm/prime-custom.scm
   trunk/scm/skk-custom.scm
Log:
* scm/im-custom.scm
  - (custom-group candwin): New custom group

* scm/generic-custom.scm
  - (custom 'generic-use-candidate-window?, custom
    'generic-candidate-op-count, custom 'generic-nr-candidate-max,
    custom 'generic-commit-candidate-by-numeral-key?): Add subgroup
    candwin
  - Add an activity-hook for candidate window custom variables

* scm/anthy-custom.scm
  - (custom 'anthy-use-candidate-window?, custom
    'anthy-candidate-op-count, custom 'anthy-nr-candidate-max, custom
    'anthy-select-candidate-by-numeral-key?): Add subgroup candwin
  - Add an activity-hook for candidate window custom variables

* scm/canna-custom.scm
  - (custom 'canna-use-candidate-window?, custom
    'canna-candidate-op-count, custom 'canna-nr-candidate-max): Add
    subgroup candwin
  - Add an activity-hook for candidate window custom variables

* scm/prime-custom.scm
  - (prime-nr-candidate-max, prime-always-show-window?): Add subgroup
    candwin

* scm/skk-custom.scm
  - (custom 'skk-use-candidate-window?, custom
    'skk-candidate-op-count, custom 'skk-nr-candidate-max, custom
    'skk-commit-candidate-by-label-key?): Add subgroup candwin
  - Add an activity-hook for candidate window custom variables


Modified: trunk/scm/anthy-custom.scm
===================================================================
--- trunk/scm/anthy-custom.scm	2005-01-31 19:55:37 UTC (rev 438)
+++ trunk/scm/anthy-custom.scm	2005-01-31 20:39:57 UTC (rev 439)
@@ -40,29 +40,45 @@
                      (ugettext anthy-im-short-desc))
 
 (define-custom 'anthy-use-candidate-window? #t
-  '(anthy)
+  '(anthy candwin)
   '(boolean)
   (_ "Use candidate window")
   (_ "long description will be here."))
 
 (define-custom 'anthy-candidate-op-count 1
-  '(anthy)
+  '(anthy candwin)
   '(integer 0 99)
   (_ "Conversion key press count to show candidate window")
   (_ "long description will be here."))
 
 (define-custom 'anthy-nr-candidate-max 10
-  '(anthy)
+  '(anthy candwin)
   '(integer 1 20)
   (_ "Number of candidates in candidate window at a time")
   (_ "long description will be here."))
 
 (define-custom 'anthy-select-candidate-by-numeral-key? #f
-  '(anthy)
+  '(anthy candwin)
   '(boolean)
   (_ "Select candidate by numeral keys")
   (_ "long description will be here."))
 
+;; activity dependency
+(custom-add-hook 'anthy-candidate-op-count
+		 'custom-activity-hooks
+		 (lambda ()
+		   anthy-use-candidate-window?))
+
+(custom-add-hook 'anthy-nr-candidate-max
+		 'custom-activity-hooks
+		 (lambda ()
+		   anthy-use-candidate-window?))
+
+(custom-add-hook 'anthy-select-candidate-by-numeral-key?
+		 'custom-activity-hooks
+		 (lambda ()
+		   anthy-use-candidate-window?))
+
 (define-custom 'anthy-show-segment-separator? #f
   '(anthy advanced)
   '(boolean)

Modified: trunk/scm/canna-custom.scm
===================================================================
--- trunk/scm/canna-custom.scm	2005-01-31 19:55:37 UTC (rev 438)
+++ trunk/scm/canna-custom.scm	2005-01-31 20:39:57 UTC (rev 439)
@@ -40,23 +40,34 @@
                      (ugettext canna-im-short-desc))
 
 (define-custom 'canna-use-candidate-window? #t
-  '(canna)
+  '(canna candwin)
   '(boolean)
   (_ "Use candidate window")
   (_ "long description will be here."))
 
 (define-custom 'canna-candidate-op-count 1
-  '(canna)
+  '(canna candwin)
   '(integer 0 99)
   (_ "Conversion key press count to show candidate window")
   (_ "long description will be here."))
 
 (define-custom 'canna-nr-candidate-max 10
-  '(canna)
+  '(canna candwin)
   '(integer 1 20)
   (_ "Number of candidates in candidate window at a time")
   (_ "long description will be here."))
 
+;; activity dependency
+(custom-add-hook 'canna-candidate-op-count
+		 'custom-activity-hooks
+		 (lambda ()
+		   canna-use-candidate-window?))
+
+(custom-add-hook 'canna-nr-candidate-max
+		 'custom-activity-hooks
+		 (lambda ()
+		   canna-use-candidate-window?))
+
 (define-custom 'canna-show-segment-separator? #f
   '(canna advanced)
   '(boolean)

Modified: trunk/scm/generic-custom.scm
===================================================================
--- trunk/scm/generic-custom.scm	2005-01-31 19:55:37 UTC (rev 438)
+++ trunk/scm/generic-custom.scm	2005-01-31 20:39:57 UTC (rev 439)
@@ -37,25 +37,41 @@
 		     (_ "long description will be here."))
 
 (define-custom 'generic-use-candidate-window? #t
-  '(other-ims)
+  '(other-ims candwin)
   '(boolean)
   (_ "Use candidate window")
   (_ "long description will be here."))
 
 (define-custom 'generic-candidate-op-count 1
-  '(other-ims)
+  '(other-ims candwin)
   '(integer 0 99)
   (_ "Conversion key press count to show candidate window")
   (_ "long description will be here."))
 
 (define-custom 'generic-nr-candidate-max 10
-  '(other-ims)
+  '(other-ims candwin)
   '(integer 1 20)
   (_ "Number of candidates in candidate window at a time")
   (_ "long description will be here."))
 
 (define-custom 'generic-commit-candidate-by-numeral-key? #t
-  '(other-ims)
+  '(other-ims candwin)
   '(boolean)
   (_ "Select candidate by numeral keys")
   (_ "long description will be here."))
+
+;; activity dependency
+(custom-add-hook 'generic-candidate-op-count
+		 'custom-activity-hooks
+		 (lambda ()
+		   generic-use-candidate-window?))
+
+(custom-add-hook 'generic-nr-candidate-max
+		 'custom-activity-hooks
+		 (lambda ()
+		   generic-use-candidate-window?))
+
+(custom-add-hook 'generic-commit-candidate-by-numeral-key?
+		 'custom-activity-hooks
+		 (lambda ()
+		   generic-use-candidate-window?))

Modified: trunk/scm/im-custom.scm
===================================================================
--- trunk/scm/im-custom.scm	2005-01-31 19:55:37 UTC (rev 438)
+++ trunk/scm/im-custom.scm	2005-01-31 20:39:57 UTC (rev 439)
@@ -55,6 +55,11 @@
 		     (_ "Toolbar")
 		     (_ "long description will be here."))
 
+;; subgroup
+(define-custom-group 'candwin
+		     (_ "Candidate window")
+		     (_ "long description will be here."))
+
 ;; 
 ;; default-im-name
 ;;

Modified: trunk/scm/prime-custom.scm
===================================================================
--- trunk/scm/prime-custom.scm	2005-01-31 19:55:37 UTC (rev 438)
+++ trunk/scm/prime-custom.scm	2005-01-31 20:39:57 UTC (rev 439)
@@ -40,25 +40,25 @@
                      (ugettext prime-im-short-desc))
 
 ;(define-custom 'prime-use-candidate-window? #t
-;  '(prime)
+;  '(prime candwin)
 ;  '(boolean)
 ;  "Use candidate window"
 ;  "long description will be here.")
 
 ;(define-custom 'prime-candidate-op-count 1
-;  '(prime)
+;  '(prime candwin)
 ;  '(integer 0 99)
 ;  "Conversion key press count to show candidate window"
 ;  "long description will be here.")
 
 (define-custom 'prime-nr-candidate-max 10
-  '(prime)
+  '(prime candwin)
   '(integer 1 20)
   (_ "Number of candidates in candidate window at a time")
   (_ "long description will be here."))
 
 (define-custom 'prime-always-show-window? #t
-  '(prime)
+  '(prime candwin)
   '(boolean)
   (_ "Always showing candidate window")
   (_ "long description will be here."))

Modified: trunk/scm/skk-custom.scm
===================================================================
--- trunk/scm/skk-custom.scm	2005-01-31 19:55:37 UTC (rev 438)
+++ trunk/scm/skk-custom.scm	2005-01-31 20:39:57 UTC (rev 439)
@@ -40,23 +40,45 @@
                      (ugettext skk-im-short-desc))
 
 (define-custom 'skk-use-candidate-window? #t
-  '(skk)
+  '(skk candwin)
   '(boolean)
   (_ "Use candidate window")
   (_ "long description will be here."))
 
 (define-custom 'skk-candidate-op-count 2
-  '(skk)
+  '(skk candwin)
   '(integer 0 99)
   (_ "Conversion key press count to show candidate window")
   (_ "long description will be here."))
 
 (define-custom 'skk-nr-candidate-max 10
-  '(skk)
+  '(skk candwin)
   '(integer 1 20)
   (_ "Number of candidates in candidate window at a time")
   (_ "long description will be here."))
 
+(define-custom 'skk-commit-candidate-by-label-key? #t
+  '(skk candwin advanced)
+  '(boolean)
+  (_ "Commit candidate by heading label keys")
+  (_ "long description will be here."))
+
+;; activity dependency
+(custom-add-hook 'skk-candidate-op-count
+		 'custom-activity-hooks
+		 (lambda ()
+		   skk-use-candidate-window?))
+
+(custom-add-hook 'skk-nr-candidate-max
+		 'custom-activity-hooks
+		 (lambda ()
+		   skk-use-candidate-window?))
+
+(custom-add-hook 'skk-commit-candidate-by-label-key?
+		 'custom-activity-hooks
+		 (lambda ()
+		   skk-use-candidate-window?))
+
 (define-custom 'skk-style 'skk-style-ddskk-like
   '(skk advanced)
   (list 'choice
@@ -96,12 +118,6 @@
   (_ "Friendly for vi user")
   (_ "long description will be here."))
 
-(define-custom 'skk-commit-candidate-by-label-key? #t
-  '(skk advanced)
-  '(boolean)
-  (_ "Commit candidate by heading label keys")
-  (_ "long description will be here."))
-
 (define-custom 'skk-auto-start-henkan? #t
   '(skk advanced)
   '(boolean)



More information about the Uim-commit mailing list