Revision: 6700
Author: ek.kato
Date: Mon Aug 9 18:14:10 2010
Log: * scm/im-custom.scm (toolbar-widget)
- New subgroup to prevent saving duplicate items in 'toolbar'
main group.
* scm/ajax-ime-custom.scm
* scm/mana-custom.scm
* scm/anthy-custom.scm
* scm/canna-custom.scm
* scm/prime-custom.scm
* scm/skk-custom.scm
* scm/wnn-custom.scm
* scm/yahoo-jp-custom.scm
* scm/sj3-custom.scm
* scm/social-ime-custom.scm
* scm/anthy-utf8-custom.scm
- Use 'toolbar-widget' subgroup.
http://code.google.com/p/uim/source/detail?r=6700
Modified:
/trunk/scm/ajax-ime-custom.scm
/trunk/scm/anthy-custom.scm
/trunk/scm/anthy-utf8-custom.scm
/trunk/scm/canna-custom.scm
/trunk/scm/im-custom.scm
/trunk/scm/mana-custom.scm
/trunk/scm/prime-custom.scm
/trunk/scm/sj3-custom.scm
/trunk/scm/skk-custom.scm
/trunk/scm/social-ime-custom.scm
/trunk/scm/wnn-custom.scm
/trunk/scm/yahoo-jp-custom.scm
=======================================
--- /trunk/scm/ajax-ime-custom.scm Tue Jul 20 01:20:45 2010
+++ /trunk/scm/ajax-ime-custom.scm Mon Aug 9 18:14:10 2010
@@ -188,7 +188,7 @@
(define-custom 'ajax-ime-widgets '(widget_ajax-ime_input_mode
widget_ajax-ime_kana_input_method)
- '(ajax-ime toolbar)
+ '(ajax-ime toolbar-widget)
(list 'ordered-list
(list 'widget_ajax-ime_input_mode
(N_ "Input mode")
@@ -211,7 +211,7 @@
;;; Input mode
(define-custom 'default-widget_ajax-ime_input_mode 'action_ajax-ime_direct
- '(ajax-ime toolbar)
+ '(ajax-ime toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
ajax-ime-input-mode-indication-alist))
@@ -220,7 +220,7 @@
(define-custom 'ajax-ime-input-mode-actions
(map car ajax-ime-input-mode-indication-alist)
- '(ajax-ime toolbar)
+ '(ajax-ime toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
ajax-ime-input-mode-indication-alist))
@@ -262,7 +262,7 @@
;;; Kana input method
(define-custom 'default-widget_ajax-ime_kana_input_method 'action_ajax-ime_roma
- '(ajax-ime toolbar)
+ '(ajax-ime toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
ajax-ime-kana-input-method-indication-alist))
@@ -271,7 +271,7 @@
(define-custom 'ajax-ime-kana-input-method-actions
(map car ajax-ime-kana-input-method-indication-alist)
- '(ajax-ime toolbar)
+ '(ajax-ime toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
ajax-ime-kana-input-method-indication-alist))
=======================================
--- /trunk/scm/anthy-custom.scm Tue Jul 20 01:20:45 2010
+++ /trunk/scm/anthy-custom.scm Mon Aug 9 18:14:10 2010
@@ -183,7 +183,7 @@
(define-custom 'anthy-widgets '(widget_anthy_input_mode
widget_anthy_kana_input_method)
- '(anthy toolbar)
+ '(anthy toolbar-widget)
(list 'ordered-list
(list 'widget_anthy_input_mode
(N_ "Input mode")
@@ -206,7 +206,7 @@
;;; Input mode
(define-custom 'default-widget_anthy_input_mode 'action_anthy_direct
- '(anthy toolbar)
+ '(anthy toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
anthy-input-mode-indication-alist))
@@ -215,7 +215,7 @@
(define-custom 'anthy-input-mode-actions
(map car anthy-input-mode-indication-alist)
- '(anthy toolbar)
+ '(anthy toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
anthy-input-mode-indication-alist))
@@ -257,7 +257,7 @@
;;; Kana input method
(define-custom 'default-widget_anthy_kana_input_method 'action_anthy_roma
- '(anthy toolbar)
+ '(anthy toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
anthy-kana-input-method-indication-alist))
@@ -266,7 +266,7 @@
(define-custom 'anthy-kana-input-method-actions
(map car anthy-kana-input-method-indication-alist)
- '(anthy toolbar)
+ '(anthy toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
anthy-kana-input-method-indication-alist))
=======================================
--- /trunk/scm/anthy-utf8-custom.scm Tue Jul 20 01:20:45 2010
+++ /trunk/scm/anthy-utf8-custom.scm Mon Aug 9 18:14:10 2010
@@ -190,7 +190,7 @@
(define-custom 'anthy-utf8-widgets '(widget_anthy_utf8_input_mode
widget_anthy_utf8_kana_input_method)
- '(anthy-utf8 toolbar)
+ '(anthy-utf8 toolbar-widget)
(list 'ordered-list
(list 'widget_anthy_utf8_input_mode
(N_ "Input mode")
@@ -213,7 +213,7 @@
;;; Input mode
(define-custom 'default-widget_anthy_utf8_input_mode 'action_anthy_utf8_direct
- '(anthy-utf8 toolbar)
+ '(anthy-utf8 toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
anthy-utf8-input-mode-indication-alist))
@@ -222,7 +222,7 @@
(define-custom 'anthy-utf8-input-mode-actions
(map car anthy-utf8-input-mode-indication-alist)
- '(anthy-utf8 toolbar)
+ '(anthy-utf8 toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
anthy-utf8-input-mode-indication-alist))
@@ -264,7 +264,7 @@
;;; Kana input method
(define-custom 'default-widget_anthy_utf8_kana_input_method 'action_anthy_utf8_roma
- '(anthy-utf8 toolbar)
+ '(anthy-utf8 toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
anthy-utf8-kana-input-method-indication-alist))
@@ -273,7 +273,7 @@
(define-custom 'anthy-utf8-kana-input-method-actions
(map car anthy-utf8-kana-input-method-indication-alist)
- '(anthy-utf8 toolbar)
+ '(anthy-utf8 toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
anthy-utf8-kana-input-method-indication-alist))
=======================================
--- /trunk/scm/canna-custom.scm Tue Jul 20 01:20:45 2010
+++ /trunk/scm/canna-custom.scm Mon Aug 9 18:14:10 2010
@@ -188,7 +188,7 @@
(define-custom 'canna-widgets '(widget_canna_input_mode
widget_canna_kana_input_method)
- '(canna toolbar)
+ '(canna toolbar-widget)
(list 'ordered-list
(list 'widget_canna_input_mode
(N_ "Input mode")
@@ -211,7 +211,7 @@
;;; Input mode
(define-custom 'default-widget_canna_input_mode 'action_canna_direct
- '(canna toolbar)
+ '(canna toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
canna-input-mode-indication-alist))
@@ -220,7 +220,7 @@
(define-custom 'canna-input-mode-actions
(map car canna-input-mode-indication-alist)
- '(canna toolbar)
+ '(canna toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
canna-input-mode-indication-alist))
@@ -262,7 +262,7 @@
;;; Kana input method
(define-custom 'default-widget_canna_kana_input_method 'action_canna_roma
- '(canna toolbar)
+ '(canna toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
canna-kana-input-method-indication-alist))
@@ -271,7 +271,7 @@
(define-custom 'canna-kana-input-method-actions
(map car canna-kana-input-method-indication-alist)
- '(canna toolbar)
+ '(canna toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
canna-kana-input-method-indication-alist))
=======================================
--- /trunk/scm/im-custom.scm Mon Aug 2 22:24:42 2010
+++ /trunk/scm/im-custom.scm Mon Aug 9 18:14:10 2010
@@ -49,10 +49,6 @@
(N_ "Toolbar")
(N_ "long description will be here."))
-(define-custom-group 'toolbar-help
- (N_ "Help")
- (N_ "long description will be here."))
-
(define-custom-group 'annotation
(N_ "Annotation")
(N_ "long description will be here."))
@@ -129,6 +125,17 @@
(N_ "Preedit settings of XIM")
(N_ "long description will be here."))
+;; subgroup
+(define-custom-group 'toolbar-help
+ (N_ "Help")
+ (N_ "long description will be here."))
+
+;; subgroup
+(define-custom-group 'toolbar-widget
+ (N_ "Toolbar")
+ (N_ "long description will be here."))
+
+
;;
;; default-im-name
;;
=======================================
--- /trunk/scm/mana-custom.scm Tue Jul 20 01:20:45 2010
+++ /trunk/scm/mana-custom.scm Mon Aug 9 18:14:10 2010
@@ -179,7 +179,7 @@
(define-custom 'mana-widgets '(widget_mana_input_mode
widget_mana_kana_input_method)
- '(mana toolbar)
+ '(mana toolbar-widget)
(list 'ordered-list
(list 'widget_mana_input_mode
(N_ "Input mode")
@@ -202,7 +202,7 @@
;;; Input mode
(define-custom 'default-widget_mana_input_mode 'action_mana_direct
- '(mana toolbar)
+ '(mana toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
mana-input-mode-indication-alist))
@@ -211,7 +211,7 @@
(define-custom 'mana-input-mode-actions
(map car mana-input-mode-indication-alist)
- '(mana toolbar)
+ '(mana toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
mana-input-mode-indication-alist))
@@ -253,7 +253,7 @@
;;; Kana input method
(define-custom 'default-widget_mana_kana_input_method 'action_mana_roma
- '(mana toolbar)
+ '(mana toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
mana-kana-input-method-indication-alist))
@@ -262,7 +262,7 @@
(define-custom 'mana-kana-input-method-actions
(map car mana-kana-input-method-indication-alist)
- '(mana toolbar)
+ '(mana toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
mana-kana-input-method-indication-alist))
=======================================
--- /trunk/scm/prime-custom.scm Mon Aug 2 23:04:13 2010
+++ /trunk/scm/prime-custom.scm Mon Aug 9 18:14:10 2010
@@ -266,7 +266,7 @@
;; Users don't care this option.
;; (2005-03-03) <Hiroyuki Komatsu>
;(define-custom 'default-widget_prime_input_mode 'action_prime_mode_latin
-; '(prime-advanced toolbar)
+; '(prime-advanced toolbar-widget)
; (cons 'choice
; (map indication-alist-entry-extract-choice
; prime-input-mode-indication-alist))
@@ -278,7 +278,7 @@
;; (2005-03-03) <Hiroyuki Komatsu>
;(define-custom 'prime-input-mode-actions
; (map car prime-input-mode-indication-alist)
-; '(prime-advanced toolbar)
+; '(prime-advanced toolbar-widget)
; (cons 'ordered-list
; (map indication-alist-entry-extract-choice
; prime-input-mode-indication-alist))
=======================================
--- /trunk/scm/sj3-custom.scm Wed Aug 4 18:58:53 2010
+++ /trunk/scm/sj3-custom.scm Mon Aug 9 18:14:10 2010
@@ -188,7 +188,7 @@
(define-custom 'sj3-widgets '(widget_sj3_input_mode
widget_sj3_kana_input_method)
- '(sj3 toolbar)
+ '(sj3 toolbar-widget)
(list 'ordered-list
(list 'widget_sj3_input_mode
(N_ "Input mode")
@@ -211,7 +211,7 @@
;;; Input mode
(define-custom 'default-widget_sj3_input_mode 'action_sj3_direct
- '(sj3 toolbar)
+ '(sj3 toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
sj3-input-mode-indication-alist))
@@ -220,7 +220,7 @@
(define-custom 'sj3-input-mode-actions
(map car sj3-input-mode-indication-alist)
- '(sj3 toolbar)
+ '(sj3 toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
sj3-input-mode-indication-alist))
@@ -262,7 +262,7 @@
;;; Kana input method
(define-custom 'default-widget_sj3_kana_input_method 'action_sj3_roma
- '(sj3 toolbar)
+ '(sj3 toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
sj3-kana-input-method-indication-alist))
@@ -271,7 +271,7 @@
(define-custom 'sj3-kana-input-method-actions
(map car sj3-kana-input-method-indication-alist)
- '(sj3 toolbar)
+ '(sj3 toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
sj3-kana-input-method-indication-alist))
=======================================
--- /trunk/scm/skk-custom.scm Tue Aug 3 05:25:55 2010
+++ /trunk/scm/skk-custom.scm Mon Aug 9 18:14:10 2010
@@ -228,7 +228,7 @@
(define-custom 'skk-widgets '(widget_skk_input_mode
widget_skk_kana_input_method)
- '(skk toolbar)
+ '(skk toolbar-widget)
(list 'ordered-list
(list 'widget_skk_input_mode
(N_ "Input mode")
@@ -251,7 +251,7 @@
;;; Input mode
(define-custom 'default-widget_skk_input_mode 'action_skk_latin
- '(skk toolbar)
+ '(skk toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
skk-input-mode-indication-alist))
@@ -260,7 +260,7 @@
(define-custom 'skk-input-mode-actions
(map car skk-input-mode-indication-alist)
- '(skk toolbar)
+ '(skk toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
skk-input-mode-indication-alist))
@@ -291,7 +291,7 @@
;;; Kana input method
(define-custom 'default-widget_skk_kana_input_method 'action_skk_roma
- '(skk toolbar)
+ '(skk toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
skk-kana-input-method-indication-alist))
@@ -300,7 +300,7 @@
(define-custom 'skk-kana-input-method-actions
(map car skk-kana-input-method-indication-alist)
- '(skk toolbar)
+ '(skk toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
skk-kana-input-method-indication-alist))
=======================================
--- /trunk/scm/social-ime-custom.scm Tue Jul 20 01:20:45 2010
+++ /trunk/scm/social-ime-custom.scm Mon Aug 9 18:14:10 2010
@@ -187,7 +187,7 @@
(define-custom 'social-ime-widgets '(widget_social-ime_input_mode
widget_social-ime_kana_input_method)
- '(social-ime toolbar)
+ '(social-ime toolbar-widget)
(list 'ordered-list
(list 'widget_social-ime_input_mode
(N_ "Input mode")
@@ -210,7 +210,7 @@
;;; Input mode
(define-custom 'default-widget_social-ime_input_mode 'action_social-ime_direct
- '(social-ime toolbar)
+ '(social-ime toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
social-ime-input-mode-indication-alist))
@@ -219,7 +219,7 @@
(define-custom 'social-ime-input-mode-actions
(map car social-ime-input-mode-indication-alist)
- '(social-ime toolbar)
+ '(social-ime toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
social-ime-input-mode-indication-alist))
@@ -261,7 +261,7 @@
;;; Kana input method
(define-custom 'default-widget_social-ime_kana_input_method 'action_social-ime_roma
- '(social-ime toolbar)
+ '(social-ime toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
social-ime-kana-input-method-indication-alist))
@@ -270,7 +270,7 @@
(define-custom 'social-ime-kana-input-method-actions
(map car social-ime-kana-input-method-indication-alist)
- '(social-ime toolbar)
+ '(social-ime toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
social-ime-kana-input-method-indication-alist))
=======================================
--- /trunk/scm/wnn-custom.scm Wed Aug 4 18:58:53 2010
+++ /trunk/scm/wnn-custom.scm Mon Aug 9 18:14:10 2010
@@ -188,7 +188,7 @@
(define-custom 'wnn-widgets '(widget_wnn_input_mode
widget_wnn_kana_input_method)
- '(wnn toolbar)
+ '(wnn toolbar-widget)
(list 'ordered-list
(list 'widget_wnn_input_mode
(N_ "Input mode")
@@ -211,7 +211,7 @@
;;; Input mode
(define-custom 'default-widget_wnn_input_mode 'action_wnn_direct
- '(wnn toolbar)
+ '(wnn toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
wnn-input-mode-indication-alist))
@@ -220,7 +220,7 @@
(define-custom 'wnn-input-mode-actions
(map car wnn-input-mode-indication-alist)
- '(wnn toolbar)
+ '(wnn toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
wnn-input-mode-indication-alist))
@@ -262,7 +262,7 @@
;;; Kana input method
(define-custom 'default-widget_wnn_kana_input_method 'action_wnn_roma
- '(wnn toolbar)
+ '(wnn toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
wnn-kana-input-method-indication-alist))
@@ -271,7 +271,7 @@
(define-custom 'wnn-kana-input-method-actions
(map car wnn-kana-input-method-indication-alist)
- '(wnn toolbar)
+ '(wnn toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
wnn-kana-input-method-indication-alist))
=======================================
--- /trunk/scm/yahoo-jp-custom.scm Tue Jul 20 01:20:45 2010
+++ /trunk/scm/yahoo-jp-custom.scm Mon Aug 9 18:14:10 2010
@@ -188,7 +188,7 @@
(define-custom 'yahoo-jp-widgets '(widget_yahoo-jp_input_mode
widget_yahoo-jp_kana_input_method)
- '(yahoo-jp toolbar)
+ '(yahoo-jp toolbar-widget)
(list 'ordered-list
(list 'widget_yahoo-jp_input_mode
(N_ "Input mode")
@@ -211,7 +211,7 @@
;;; Input mode
(define-custom 'default-widget_yahoo-jp_input_mode 'action_yahoo-jp_direct
- '(yahoo-jp toolbar)
+ '(yahoo-jp toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
yahoo-jp-input-mode-indication-alist))
@@ -220,7 +220,7 @@
(define-custom 'yahoo-jp-input-mode-actions
(map car yahoo-jp-input-mode-indication-alist)
- '(yahoo-jp toolbar)
+ '(yahoo-jp toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
yahoo-jp-input-mode-indication-alist))
@@ -262,7 +262,7 @@
;;; Kana input method
(define-custom 'default-widget_yahoo-jp_kana_input_method 'action_yahoo-jp_roma
- '(yahoo-jp toolbar)
+ '(yahoo-jp toolbar-widget)
(cons 'choice
(map indication-alist-entry-extract-choice
yahoo-jp-kana-input-method-indication-alist))
@@ -271,7 +271,7 @@
(define-custom 'yahoo-jp-kana-input-method-actions
(map car yahoo-jp-kana-input-method-indication-alist)
- '(yahoo-jp toolbar)
+ '(yahoo-jp toolbar-widget)
(cons 'ordered-list
(map indication-alist-entry-extract-choice
yahoo-jp-kana-input-method-indication-alist))
