[uim-commit] r392 - trunk/scm
yamaken at freedesktop.org
yamaken at freedesktop.org
Sat Jan 29 14:30:21 PST 2005
Author: yamaken
Date: 2005-01-29 14:30:19 -0800 (Sat, 29 Jan 2005)
New Revision: 392
Modified:
trunk/scm/anthy-custom.scm
trunk/scm/anthy.scm
trunk/scm/canna-custom.scm
trunk/scm/canna.scm
trunk/scm/generic.scm
trunk/scm/hangul.scm
trunk/scm/im-custom.scm
trunk/scm/im.scm
trunk/scm/lazy-load.scm
trunk/scm/prime-custom.scm
trunk/scm/prime.scm
trunk/scm/skk-custom.scm
trunk/scm/skk.scm
trunk/scm/spellcheck-custom.scm
trunk/scm/spellcheck.scm
Log:
* This commmit replaces a Scheme API im-label-name with im-name-label
in accordance with following discussion
http://lists.freedesktop.org/archives/uim/2005-January/000921.html
http://lists.freedesktop.org/archives/uim/2005-January/000973.html
* scm/im.scm
- (record im, register-im): s/label-name/name-label/g
* scm/generic.scm
- (generic-register-im): Ditto
* scm/im-custom.scm
- (custom-im-list-as-choice-rec): Ditto
* scm/lazy-load.scm
- (register-stub-im): Ditto
* scm/prime.scm
* scm/spellcheck.scm
* scm/canna.scm
* scm/anthy.scm
* scm/skk.scm
- s/label-name/name-label/g in register-im
* scm/hangul.scm
- s/label-name/name-label/g in hangul-register-im
* scm/skk-custom.scm
- (skk-im-label-name): Rename to skk-im-name-label
- (skk-im-name-label): Renamed from skk-im-label-name
- (custom-group skk): s/label-name/name-label/g
* scm/prime-custom.scm
- (prime-im-label-name): Rename to prime-im-name-label
- (prime-im-name-label): Renamed from prime-im-label-name
- (custom-group prime): s/label-name/name-label/g
* scm/anthy-custom.scm
- (anthy-im-label-name): Rename to anthy-im-name-label
- (anthy-im-name-label): Renamed from anthy-im-label-name
- (custom-group anthy): s/label-name/name-label/g
* scm/spellcheck-custom.scm
- (spell-im-label-name): Rename to spell-im-name-label
- (spell-im-name-label): Renamed from spell-im-label-name
- (custom-group spellcheck): s/label-name/name-label/g
* scm/canna-custom.scm
- (canna-im-label-name): Rename to canna-im-name-label
- (canna-im-name-label): Renamed from canna-im-label-name
- (custom-group canna): s/label-name/name-label/g
Modified: trunk/scm/anthy-custom.scm
===================================================================
--- trunk/scm/anthy-custom.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/anthy-custom.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -32,11 +32,11 @@
(require "i18n.scm")
-(define anthy-im-label-name (N_ "Anthy"))
+(define anthy-im-name-label (N_ "Anthy"))
(define anthy-im-short-desc (N_ "Japanese Kana Kanji Conversion Engine, Anthy"))
(define-custom-group 'anthy
- (ugettext anthy-im-label-name)
+ (ugettext anthy-im-name-label)
(ugettext anthy-im-short-desc))
(define-custom 'anthy-use-candidate-window? #t
Modified: trunk/scm/anthy.scm
===================================================================
--- trunk/scm/anthy.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/anthy.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -979,7 +979,7 @@
'anthy
"ja"
"EUC-JP"
- anthy-im-label-name
+ anthy-im-name-label
anthy-im-short-desc
#f
anthy-init-handler
Modified: trunk/scm/canna-custom.scm
===================================================================
--- trunk/scm/canna-custom.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/canna-custom.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -32,11 +32,11 @@
(require "i18n.scm")
-(define canna-im-label-name (N_ "Canna"))
+(define canna-im-name-label (N_ "Canna"))
(define canna-im-short-desc (N_ "Japanese Kana Kanji Conversion Engine, Canna"))
(define-custom-group 'canna
- (ugettext canna-im-label-name)
+ (ugettext canna-im-name-label)
(ugettext canna-im-short-desc))
(define-custom 'canna-use-candidate-window? #t
Modified: trunk/scm/canna.scm
===================================================================
--- trunk/scm/canna.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/canna.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -816,7 +816,7 @@
'canna
"ja"
"EUC-JP"
- canna-im-label-name
+ canna-im-name-label
canna-im-short-desc
#f
canna-init-handler
Modified: trunk/scm/generic.scm
===================================================================
--- trunk/scm/generic.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/generic.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -421,12 +421,12 @@
(init-handler id im #f)))
(define generic-register-im
- (lambda (name lang code label-name short-desc init-arg)
+ (lambda (name lang code name-label short-desc init-arg)
(register-im
name
lang
code
- label-name
+ name-label
short-desc
init-arg
generic-init-handler
Modified: trunk/scm/hangul.scm
===================================================================
--- trunk/scm/hangul.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/hangul.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -53,12 +53,12 @@
(generic-key-press-handler-with-this-env gc key state))))
(define hangul-register-im
- (lambda (name lang code label-name short-desc init-arg)
+ (lambda (name lang code name-label short-desc init-arg)
(register-im
name
lang
code
- label-name
+ name-label
short-desc
init-arg
generic-init-handler
Modified: trunk/scm/im-custom.scm
===================================================================
--- trunk/scm/im-custom.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/im-custom.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -35,9 +35,9 @@
(lambda (lst)
(map (lambda (im)
(let ((sym (im-name im))
- (label-name (im-label-name im))
+ (name-label (im-name-label im))
(desc (im-short-desc im)))
- (custom-choice-rec-new sym label-name desc)))
+ (custom-choice-rec-new sym name-label desc)))
lst)))
(define-custom-group 'global
Modified: trunk/scm/im.scm
===================================================================
--- trunk/scm/im.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/im.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -68,7 +68,7 @@
(list 'name #f) ;; must be first member
(list 'lang "")
(list 'encoding "")
- (list 'label-name "") ;; under discussion
+ (list 'name-label "") ;; under discussion
(list 'short-desc "")
(list 'init-arg #f)
(list 'init-handler list)
@@ -106,12 +106,12 @@
;; accepts overwrite register
;; returns initial register or not
(define register-im
- (lambda (name lang encoding label-name short-desc init-arg init release
+ (lambda (name lang encoding name-label short-desc init-arg init release
mode key-press key-release reset
get-candidate set-candidate-index prop)
(and (or (null? enabled-im-list) ;; bootstrap
(memq name enabled-im-list))
- (let ((im (im-new name lang encoding label-name short-desc
+ (let ((im (im-new name lang encoding name-label short-desc
init-arg init release
mode key-press key-release reset
get-candidate set-candidate-index prop
Modified: trunk/scm/lazy-load.scm
===================================================================
--- trunk/scm/lazy-load.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/lazy-load.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -42,7 +42,7 @@
context)))))
(define register-stub-im
- (lambda (name lang encoding label-name short-desc module-name)
+ (lambda (name lang encoding name-label short-desc module-name)
(if (or (not (retrieve-im name))
(not (im-key-press-handler (retrieve-im name))))
(let ((init-handler (stub-im-generate-init-handler name module-name)))
@@ -50,7 +50,7 @@
name
lang
encoding
- label-name
+ name-label
short-desc
#f ;; arg
init-handler
@@ -82,7 +82,7 @@
" '" name-str "\n"
" \"" (im-lang im) "\"\n"
" \"" (im-encoding im) "\"\n"
- " \"" (im-label-name im) "\"\n"
+ " \"" (im-name-label im) "\"\n"
" \"" (im-short-desc im) "\"\n"
" \"" (im-module-name im) "\"))\n")))
im-names)))
Modified: trunk/scm/prime-custom.scm
===================================================================
--- trunk/scm/prime-custom.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/prime-custom.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -32,11 +32,11 @@
(require "i18n.scm")
-(define prime-im-label-name (N_ "PRIME"))
+(define prime-im-name-label (N_ "PRIME"))
(define prime-im-short-desc (N_ "Japanese predictable input method"))
(define-custom-group 'prime
- (ugettext prime-im-label-name)
+ (ugettext prime-im-name-label)
(ugettext prime-im-short-desc))
;(define-custom 'prime-use-candidate-window? #t
Modified: trunk/scm/prime.scm
===================================================================
--- trunk/scm/prime.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/prime.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -1596,7 +1596,7 @@
'prime
"ja"
"EUC-JP"
- prime-im-label-name
+ prime-im-name-label
prime-im-short-desc
#f
prime-init-handler
Modified: trunk/scm/skk-custom.scm
===================================================================
--- trunk/scm/skk-custom.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/skk-custom.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -32,11 +32,11 @@
(require "i18n.scm")
-(define skk-im-label-name (N_ "SKK"))
+(define skk-im-name-label (N_ "SKK"))
(define skk-im-short-desc (N_ "Uim's SKK like input method"))
(define-custom-group 'skk
- (ugettext skk-im-label-name)
+ (ugettext skk-im-name-label)
(ugettext skk-im-short-desc))
(define-custom 'skk-use-candidate-window? #t
Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/skk.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -1630,7 +1630,7 @@
'skk
"ja"
"EUC-JP"
- skk-im-label-name
+ skk-im-name-label
skk-im-short-desc
#f
skk-init-handler
Modified: trunk/scm/spellcheck-custom.scm
===================================================================
--- trunk/scm/spellcheck-custom.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/spellcheck-custom.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -34,11 +34,11 @@
;; spellcheck IM is not available yet
-(define spell-im-label-name (N_ "Spellcheck"))
+(define spell-im-name-label (N_ "Spellcheck"))
(define spell-im-short-desc (N_ "Spellcheck"))
(define-custom-group 'spellcheck
- (ugettext spell-im-label-name)
+ (ugettext spell-im-name-label)
(ugettext spell-im-short-desc))
(define-custom 'spell-use-candidate-window? #t
Modified: trunk/scm/spellcheck.scm
===================================================================
--- trunk/scm/spellcheck.scm 2005-01-29 22:10:30 UTC (rev 391)
+++ trunk/scm/spellcheck.scm 2005-01-29 22:30:19 UTC (rev 392)
@@ -547,7 +547,7 @@
'spell
"ja"
"EUC-JP"
- spell-im-label-name
+ spell-im-name-label
spell-im-short-desc
#f
spell-init-handler
More information about the Uim-commit
mailing list