2 new revisions:
Revision: f801ec470573
Author: Muneyuki Noguchi <[email protected]>
Date: Thu Mar 15 03:32:58 2012
Log: Make some variables in m17nlib.scm configurable....
http://code.google.com/p/uim/source/detail?r=f801ec470573
Revision: 9b7abae5a49c
Author: Muneyuki Noguchi <[email protected]>
Date: Thu Mar 15 03:55:22 2012
Log: Don't try to run `make' in qt4/chardict/po....
http://code.google.com/p/uim/source/detail?r=9b7abae5a49c
==============================================================================
Revision: f801ec470573
Author: Muneyuki Noguchi <[email protected]>
Date: Thu Mar 15 03:32:58 2012
Log: Make some variables in m17nlib.scm configurable.
* scm/m17nlib-custom.scm
- New file.
* scm/m17nlib.scm
- Don't define m17nlib-widgets, default-widget_m17nlib_input_mode
and m17nlib-input-mode-actions here.
http://code.google.com/p/uim/source/detail?r=f801ec470573
Added:
/scm/m17nlib-custom.scm
Modified:
/scm/m17nlib.scm
=======================================
--- /dev/null
+++ /scm/m17nlib-custom.scm Thu Mar 15 03:32:58 2012
@@ -0,0 +1,126 @@
+;;;
+;;; Copyright (c) 2012 uim Project http://code.google.com/p/uim/
+;;;
+;;; All rights reserved.
+;;;
+;;; Redistribution and use in source and binary forms, with or without
+;;; modification, are permitted provided that the following conditions
+;;; are met:
+;;; 1. Redistributions of source code must retain the above copyright
+;;; notice, this list of conditions and the following disclaimer.
+;;; 2. Redistributions in binary form must reproduce the above copyright
+;;; notice, this list of conditions and the following disclaimer in the
+;;; documentation and/or other materials provided with the distribution.
+;;; 3. Neither the name of authors nor the names of its contributors
+;;; may be used to endorse or promote products derived from this
software
+;;; without specific prior written permission.
+;;;
+;;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND
+;;; ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+;;; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE
+;;; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
CONTRIBUTORS BE LIABLE
+;;; FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL
+;;; DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+;;; OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+;;; HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT
+;;; LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
WAY
+;;; OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+;;; SUCH DAMAGE.
+;;;;
+
+(require "i18n.scm")
+
+(define-custom-group 'm17nlib
+ (N_ "m17nlib")
+ (N_ "A multilingual text processing library engine"))
+
+;;
+;; toolbar
+;;
+
+;; Can't be unified with action definitions in skk.scm until uim
+;; 0.4.6.
+(define m17nlib-input-mode-indication-alist
+ (list
+ (list 'action_m17nlib_off
+ 'off
+ "-"
+ (N_ "off")
+ (N_ "Direct input mode"))
+ (list 'action_m17nlib_on
+ 'on
+ "O"
+ (N_ "on")
+ (N_ "m17nlib mode"))))
+
+;;; Buttons
+
+(define-custom 'm17nlib-widgets '(widget_m17nlib_input_mode)
+ '(m17nlib toolbar-widget)
+ (list 'ordered-list
+ (list 'widget_m17nlib_input_mode
+ (N_ "Input mode")
+ (N_ "Input mode")))
+ (N_ "Enabled toolbar buttons")
+ (N_ "long description will be here."))
+
+;; dynamic reconfiguration
+;; m17nlib-configure-widgets is not defined at this point. So wrapping
+;; into lambda.
+(custom-add-hook 'm17nlib-widgets
+ 'custom-set-hooks
+ (lambda ()
+ (m17nlib-configure-widgets)))
+
+;;; Input mode
+
+(define-custom 'default-widget_m17nlib_input_mode 'action_m17nlib_off
+ '(m17nlib toolbar-widget)
+ (cons 'choice
+ (map indication-alist-entry-extract-choice
+ m17nlib-input-mode-indication-alist))
+ (N_ "Default input mode")
+ (N_ "long description will be here."))
+
+(define-custom 'm17nlib-input-mode-actions
+ (map car m17nlib-input-mode-indication-alist)
+ '(m17nlib toolbar-widget)
+ (cons 'ordered-list
+ (map indication-alist-entry-extract-choice
+ m17nlib-input-mode-indication-alist))
+ (N_ "Input mode menu items")
+ (N_ "long description will be here."))
+
+;; value dependency
+(if custom-full-featured?
+ (custom-add-hook 'm17nlib-input-mode-actions
+ 'custom-set-hooks
+ (lambda ()
+ (custom-choice-range-reflect-olist-val
+ 'default-widget_m17nlib_input_mode
+ 'm17nlib-input-mode-actions
+ m17nlib-input-mode-indication-alist))))
+
+;; activity dependency
+(custom-add-hook 'default-widget_m17nlib_input_mode
+ 'custom-activity-hooks
+ (lambda ()
+ (memq 'widget_m17nlib_input_mode m17nlib-widgets)))
+
+(custom-add-hook 'm17nlib-input-mode-actions
+ 'custom-activity-hooks
+ (lambda ()
+ (memq 'widget_m17nlib_input_mode m17nlib-widgets)))
+
+;; dynamic reconfiguration
+;; m17nlib-configure-widgets is not defined at this point. So wrapping
+;; into lambda.
+(custom-add-hook 'default-widget_m17n_input_mode
+ 'custom-set-hooks
+ (lambda ()
+ (m17nlib-configure-widgets)))
+
+(custom-add-hook 'm17nlib-input-mode-actions
+ 'custom-set-hooks
+ (lambda ()
+ (m17nlib-configure-widgets)))
=======================================
--- /scm/m17nlib.scm Tue Feb 7 17:24:19 2012
+++ /scm/m17nlib.scm Thu Mar 15 03:32:58 2012
@@ -29,6 +29,7 @@
;;;;
(require-custom "generic-key-custom.scm")
+(require-custom "m17nlib-custom.scm")
;;; user configs
@@ -38,20 +39,6 @@
(define-key m17nlib-on-key? 'generic-on-key?)
(define-key m17nlib-off-key? 'generic-off-key?)
-;; widgets and actions
-
-;; widgets
-(define m17nlib-widgets '(widget_m17nlib_input_mode))
-
-;; default activity for each widgets
-(define default-widget_m17nlib_input_mode 'action_m17nlib_off)
-
-;; actions of widget_m17nlib_input_mode
-(define m17nlib-input-mode-actions
- '(action_m17nlib_off
- action_m17nlib_on))
-
-
;;; implementations
(register-action 'action_m17nlib_off
==============================================================================
Revision: 9b7abae5a49c
Author: Muneyuki Noguchi <[email protected]>
Date: Thu Mar 15 03:55:22 2012
Log: Don't try to run `make' in qt4/chardict/po.
* qt4/chardict/Makefile.am
- Don't try to run `make' in po
because qt4/chardict/po was removed.
http://code.google.com/p/uim/source/detail?r=9b7abae5a49c
Modified:
/qt4/chardict/Makefile.am
=======================================
--- /qt4/chardict/Makefile.am Sat Mar 3 03:36:50 2012
+++ /qt4/chardict/Makefile.am Thu Mar 15 03:55:22 2012
@@ -16,7 +16,6 @@
$(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
$(MAKE) $(AM_MAKEFLAGS) distclean-am
endif
- $(MAKE) $@ -C po
-rm -f Makefile uim-chardict-qt4.pro
FORCE:
