[uim-commit] r431 - in trunk: doc scm

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-01-31 10:26:05 -0800 (Mon, 31 Jan 2005)
New Revision: 431

Modified:
   trunk/doc/CUSTOM
   trunk/scm/custom.scm
   trunk/scm/im-custom.scm
Log:
* scm/im-custom.scm
  - Add a set-hook for enabled-im-list to reflect the value to
    custom-preserved-default-im-name
  - (custom-hook-set-default-im-name): Simplify
  - (custom-group im-switching, custom enable-im-switch, custom
    switch-im-key): Comment out to avoid confusion of users since I
    think that current "im-switching by hotkey" feature is not useful.

* scm/custom.scm
  - (custom-group hidden): New custom group for future use

* doc/CUSTOM
  - Fix a typo


Modified: trunk/doc/CUSTOM
===================================================================
--- trunk/doc/CUSTOM	2005-01-31 17:08:34 UTC (rev 430)
+++ trunk/doc/CUSTOM	2005-01-31 18:26:05 UTC (rev 431)
@@ -20,7 +20,7 @@
   management, but ordinary 'require' does not.
 
   "-custom" suffix of the filename is only a convention and not
-  required. But we recomment the naming convention to manage the files
+  required. But we recommend the naming convention to manage the files
   easily.
 
 * Control activity of a custom variable

Modified: trunk/scm/custom.scm
===================================================================
--- trunk/scm/custom.scm	2005-01-31 17:08:34 UTC (rev 430)
+++ trunk/scm/custom.scm	2005-01-31 18:26:05 UTC (rev 431)
@@ -694,4 +694,8 @@
 		     (_ "")
 		     (_ "Main settings of this group"))
 
+(define-custom-group 'hidden
+		     (_ "Hidden settings")
+		     (_ "Hidden settings of this group. This group is invisible from uim_custom clients. Exists for internal variable management."))
+
 (custom-reload-customs)

Modified: trunk/scm/im-custom.scm
===================================================================
--- trunk/scm/im-custom.scm	2005-01-31 17:08:34 UTC (rev 430)
+++ trunk/scm/im-custom.scm	2005-01-31 18:26:05 UTC (rev 431)
@@ -102,9 +102,8 @@
 (define custom-hook-set-default-im-name
   (lambda ()
     (set! default-im-name
-	  (if custom-activate-default-im-name?
-	      custom-preserved-default-im-name
-	      #f))))
+	  (and custom-activate-default-im-name?
+	       custom-preserved-default-im-name))))
 
 ;; encode #f into default-im-name
 (custom-add-hook 'custom-activate-default-im-name?
@@ -161,6 +160,18 @@
 							'direct))
 						 enabled-im-list))))
 
+;; value dependency
+(if custom-full-featured?
+    (custom-add-hook 'enabled-im-list
+		     'custom-set-hooks
+		     (lambda ()
+		       (custom-set-type-info!
+			'custom-preserved-default-im-name
+			(cons 'choice
+			      (custom-im-list-as-choice-rec
+			       (map retrieve-im
+				    enabled-im-list)))))))
+
 (define-custom 'enable-lazy-loading? #t
   '(global advanced)
   '(boolean)
@@ -170,28 +181,32 @@
 ;;
 ;; im-switching
 ;;
-(define-custom-group 'im-switching
-		     (_ "Input method switching")
-		     (_ "long description will be here."))
 
-(define-custom 'enable-im-switch #f
-  '(global im-switching advanced)
-  '(boolean)
-  (_ "Enable IM switching by hotkey")
-  (_ "long description will be here."))
+;; I think that current 'im-switching' feature is not useful. So
+;; commented out them to avoid confusion of users.  -- YamaKen 2005-02-01
 
-(define-custom 'switch-im-key '("<Control>Shift_key" "<Shift>Control_key")
-  '(global im-switching advanced)
-  '(key)
-  (_ "IM switching key")
-  (_ "long description will be here."))
+;;(define-custom-group 'im-switching
+;;		     (_ "Input method switching")
+;;		     (_ "long description will be here."))
+;;
+;;(define-custom 'enable-im-switch #f
+;;  '(global im-switching advanced)
+;;  '(boolean)
+;;  (_ "Enable IM switching by hotkey")
+;;  (_ "long description will be here."))
+;;
+;;(define-custom 'switch-im-key '("<Control>Shift_key" "<Shift>Control_key")
+;;  '(global im-switching advanced)
+;;  '(key)
+;;  (_ "IM switching key")
+;;  (_ "long description will be here."))
+;;
+;;;; activity dependency
+;;(custom-add-hook 'switch-im-key?
+;;		 'custom-activity-hooks
+;;		 (lambda ()
+;;		   enable-im-switch))
 
-;; activity dependency
-(custom-add-hook 'switch-im-key?
-		 'custom-activity-hooks
-		 (lambda ()
-		   enable-im-switch))
-
 (define-custom 'uim-color 'uim-color-uim
   '(global)
   (list 'choice