Hello community,
here is the log from the commit of package scim-tomoe
checked in at Fri Dec 15 18:52:05 CET 2006.
--------
--- GNOME/scim-tomoe/scim-tomoe.changes 2006-10-29 10:34:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/scim-tomoe/scim-tomoe.changes 2006-12-14 18:27:02.000000000 +0100
@@ -2 +2 @@
-Sun Oct 29 10:34:24 CET 2006 - meissner@suse.de
+Thu Dec 14 18:15:38 CET 2006 - mfabian@suse.de
@@ -4 +4,3 @@
-- correct use of RPM_OPT_FLAGS
+- update to 0.4.0.
+ • Adaptation to libtomoegtk-0.3.0.
+- remove scim-tomoe-no-focus.diff (included upstream).
Old:
----
scim-tomoe-0.2.0.tar.bz2
scim-tomoe-no-focus.diff
New:
----
scim-tomoe-0.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scim-tomoe.spec ++++++
--- /var/tmp/diff_new_pack.BjEiht/_old 2006-12-15 18:51:21.000000000 +0100
+++ /var/tmp/diff_new_pack.BjEiht/_new 2006-12-15 18:51:21.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package scim-tomoe (Version 0.2.0)
+# spec file for package scim-tomoe (Version 0.4.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,15 @@
Name: scim-tomoe
BuildRequires: gcc-c++ gtk2-devel libtomoe-gtk-devel scim-devel tomoe-devel update-desktop-files
-Version: 0.2.0
-Release: 35
-License: GNU General Public License (GPL) - all versions
+Version: 0.4.0
+Release: 1
+License: GNU General Public License (GPL)
Group: System/I18n/Japanese
Autoreqprov: on
Provides: locale(scim:ja)
URL: http://sourceforge.jp/projects/scim-imengine/
-Source0: http://osdn.dl.sourceforge.jp/scim-imengine/17173/scim-tomoe-0.2.0.tar.bz2
+Source0: http://osdn.dl.sourceforge.jp/scim-imengine/22896/scim-tomoe-0.4.0.tar.bz2
Patch0: libtool-autoconf.patch
-Patch1: scim-tomoe-no-focus.diff
Patch2: fix-to-build-with-scim-1.4.5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Tomoe Input Method Engine for SCIM
@@ -41,13 +40,12 @@
%define build_setup 1
%setup -q -n %{name}-%{version}
%patch0 -p1
-%patch1 -p0
%patch2 -p1
%build
libtoolize --force
autoreconf -I /opt/gnome/share/aclocal --force --install --verbose
-CXXFLAGS="$RPM_OPT_FLAGS" \
+CXXFLAGS="$RPM_OPT_FLAGS"
./configure --prefix=/usr \
--sysconfdir=%{_sysconfdir} \
--libdir=%{_libdir} \
@@ -73,8 +71,10 @@
%{_datadir}/scim/icons/scim-tomoe.png
%changelog -n scim-tomoe
-* Sun Oct 29 2006 - meissner@suse.de
-- correct use of RPM_OPT_FLAGS
+* Thu Dec 14 2006 - mfabian@suse.de
+- update to 0.4.0.
+ • Adaptation to libtomoegtk-0.3.0.
+- remove scim-tomoe-no-focus.diff (included upstream).
* Thu Oct 12 2006 - mfabian@suse.de
- fix to build with scim 1.4.5.
* Fri Feb 24 2006 - zsu@suse.de
++++++ fix-to-build-with-scim-1.4.5.patch ++++++
--- /var/tmp/diff_new_pack.BjEiht/_old 2006-12-15 18:51:21.000000000 +0100
+++ /var/tmp/diff_new_pack.BjEiht/_new 2006-12-15 18:51:21.000000000 +0100
@@ -3,7 +3,7 @@
+++ scim-tomoe-0.2.0/src/Makefile.am 2006-10-12 12:44:00.000000000 +0200
@@ -12,7 +12,7 @@
scim_tomoe_prefs.h \
- scim_tomoe_prefs_win.h
+ scim_tomoe_prefs_widget.h
-moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper
+moduledir = @SCIM_MODULEDIR@/Helper
++++++ scim-tomoe-0.2.0.tar.bz2 -> scim-tomoe-0.4.0.tar.bz2 ++++++
++++ 11024 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/ChangeLog new/scim-tomoe-0.4.0/ChangeLog
--- old/scim-tomoe-0.2.0/ChangeLog 2005-10-27 05:14:19.000000000 +0200
+++ new/scim-tomoe-0.4.0/ChangeLog 2006-11-29 04:40:08.000000000 +0100
@@ -1,3 +1,94 @@
+2006-11-29 Takuro Ashie
+
+ * Version-0.4.0.
+
+2006-11-28 Takuro Ashie
+
+ * configure.ac, README: Update.
+
+2006-11-28 Hiroyuki Ikezoe
+
+ * src/scim-tomoe.cpp: Follow new TOMOE APIs.
+ * configure.ac: preparation for next version.
+
+2006-11-16 Hiroyuki Ikezoe
+
+ * src/scim-tomoe.cpp: Chase the TOMOE API!.
+
+2006-11-14 Takuro Ashie
+
+ * data/scim-tomoe.png: Chagned.
+
+2006-11-13 Takuro Ashie
+
+ * README: Added. This file is contributed by UTUMI Hirosi. Thanks!
+
+2006-10-20 Takuro Ashie
+
+ * configure.ac: Version-0.3.0.
+
+2006-10-24 Hiroyuki Ikezoe
+
+ * src/scim_tomoe.cpp, src/scim_tomoe_prefs_widget.[cpp|h]: Added "show
+ on top of other windows" options.
+
+2006-10-24 Hiroyuki Ikezoe
+
+ * po/POTFILES.in: scim_tomoe_prefs_win.cpp ->
+ scim_tomoe_prefs_widget.cpp.
+
+2006-10-20 Hiroyuki Ikezoe
+
+ * configure.ac: libtomoe-gtk-0.3.0 is required.
+
+2006-10-18 Hiroyuki Ikezoe
+
+ * src/scim_tomoe.cpp: Fixed a crash.
+
+2006-10-18 Hiroyuki Ikezoe
+
+ * src/scim_tomoe.cpp: Check the return value of
+ tomoe_char_table_get_selected().
+
+2006-10-18 Takuro Ashie
+
+ * src/scim_tomoe.cpp: API of libtomoe-gtk has been changed.
+ (TomoeCandidatesView -> TomoeCharTable).
+
+2006-10-16 Hiroyuki Ikezoe
+
+ * src/scim_tomoe.cpp: Set tooltips on tab label.
+
+2006-10-13 Hiroyuki Ikezoe
+
+ * src/scim_tomoe.cpp: Obtain focus in entry widget on reading page.
+ It's adhoc.
+
+2006-10-13 Hiroyuki Ikezoe
+
+ * src/scim_tomoe.cpp: Use some icons for tab label.
+
+2006-10-13 Hiroyuki Ikezoe
+
+ * src/scim_tomoe_prefs_widget.[cpp|h]: New files.
+ * src/scim_tomoe_prefs_win.[cpp|h]: Removed.
+ * src/scim_tomoe.cpp: Use ScimTomoePrefsWidget instead of
+ ScimTomoePrefsWin. Now preferences widget is in tomoe window itself.
+
+2006-10-12 Hiroyuki Ikezoe
+
+ * src/scim_tomoe.cpp: quick hack for adapting to TOMOE-0.3.0.
+ * configure.ac: libtomoe-gtk-0.2.0 is required.
+
+2006-04-25 Takuro Ashie
+
+ * configure.ac: export LIBTOOL_EXPORT_OPTIONS.
+
+2005-12-12 Zhe Su
+
+ * src/scim_tomoe.cpp:
+ prevent main window from getting focus.
+
2005-10-29 HIGUCHI Daisuke
* version 0.2.0.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/NEWS new/scim-tomoe-0.4.0/NEWS
--- old/scim-tomoe-0.2.0/NEWS 2005-08-24 04:10:34.000000000 +0200
+++ new/scim-tomoe-0.4.0/NEWS 2006-10-20 04:25:26.000000000 +0200
@@ -1,3 +1,7 @@
+Overview of Changes from scim-tomoe-0.2.0 to scim-tomoe-0.3.0
+==============================================================
+* Adaptation to libtomoegtk-0.3.0.
+
scim-tomoe-0.1.0
=============================================================
* Initial release.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/README new/scim-tomoe-0.4.0/README
--- old/scim-tomoe-0.2.0/README 2005-07-29 11:42:29.000000000 +0200
+++ new/scim-tomoe-0.4.0/README 2006-11-28 06:34:44.000000000 +0100
@@ -1 +1,24 @@
-tomoe moe.
+1. What's this?
+===============
+
+scim-tomoe is an SCIM helper for Tomoe.
+http://sourceforge.jp/projects/scim-imengine/
+
+Tomoe is a handwriting recognizer which
+currently supports Japanese.
+http://tomoe.sourceforge.jp/cgi-bin/en/blog/index.rb
+
+
+2. Requirements
+===============
+
+tomoe-0.4.0 or later.
+libtomoe-gtk-0.4.0 or later.
+
+
+3. Usage
+========
+
+Right-click on the SCIM toolbar and
+choose "Handwriting recognition".
+(It will take a few seconds to load Tomoe data.)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/config.rpath new/scim-tomoe-0.4.0/config.rpath
--- old/scim-tomoe-0.2.0/config.rpath 2005-07-06 18:34:08.000000000 +0200
+++ new/scim-tomoe-0.4.0/config.rpath 2005-08-24 04:04:26.000000000 +0200
@@ -2,13 +2,28 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
-# Copyright 1996-2005 Free Software Foundation, Inc.
+# Copyright 1996-2003 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit , 1996
#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
#
# The first argument passed to this file is the canonical host specification,
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
@@ -35,8 +50,6 @@
host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
-
# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
wl=
@@ -47,13 +60,6 @@
aix*)
wl='-Wl,'
;;
- darwin*)
- case "$cc_basename" in
- xlc*)
- wl='-Wl,'
- ;;
- esac
- ;;
mingw* | pw32* | os2*)
;;
hpux9* | hpux10* | hpux11*)
@@ -65,19 +71,13 @@
newsos6)
;;
linux*)
- case $cc_basename in
- icc* | ecc*)
- wl='-Wl,'
- ;;
- pgcc | pgf77 | pgf90)
+ case $CC in
+ icc|ecc)
wl='-Wl,'
;;
- ccc*)
+ ccc)
wl='-Wl,'
;;
- como)
- wl='-lopt='
- ;;
esac
;;
osf3* | osf4* | osf5*)
@@ -96,9 +96,6 @@
;;
sysv4*MP*)
;;
- unicos*)
- wl='-Wl,'
- ;;
uts4*)
;;
esac
@@ -141,7 +138,7 @@
# that the semantics of dynamic libraries on AmigaOS, at least up
# to version 4, is to share data among multiple programs linked
# with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we cannot use
+ # behavior of shared libraries on other platforms, we can use
# them.
ld_shlibs=no
;;
@@ -176,13 +173,6 @@
sunos4*)
hardcode_direct=yes
;;
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- :
- else
- ld_shlibs=no
- fi
- ;;
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
@@ -276,7 +266,7 @@
# see comment about different semantics on the GNU ld section
ld_shlibs=no
;;
- bsdi[45]*)
+ bsdi4*)
;;
cygwin* | mingw* | pw32*)
# When not using gcc, we currently assume that we are using
@@ -287,17 +277,8 @@
libext=lib
;;
darwin* | rhapsody*)
- hardcode_direct=no
- if test "$GCC" = yes ; then
- :
- else
- case "$cc_basename" in
- xlc*)
- ;;
- *)
- ld_shlibs=no
- ;;
- esac
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+ hardcode_direct=no
fi
;;
dgux*)
@@ -314,7 +295,7 @@
hardcode_direct=yes
hardcode_minus_L=yes
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
@@ -457,7 +438,7 @@
;;
beos*)
;;
- bsdi[45]*)
+ bsdi4*)
;;
cygwin* | mingw* | pw32*)
shrext=.dll
@@ -469,8 +450,6 @@
;;
freebsd1*)
;;
- kfreebsd*-gnu)
- ;;
freebsd*)
;;
gnu*)
@@ -507,13 +486,11 @@
;;
linux*)
;;
- knetbsd*-gnu)
- ;;
netbsd*)
;;
newsos6)
;;
- nto-qnx*)
+ nto-qnx)
;;
openbsd*)
;;
@@ -542,7 +519,7 @@
shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <= 2.4.0])
# Check libtomoe-gtk
-PKG_CHECK_MODULES(LIBTOMOE_GTK, [libtomoe-gtk >= 0.0.0])
+PKG_CHECK_MODULES(LIBTOMOE_GTK, [libtomoe-gtk >= 0.4.0])
# Check tomoe
-PKG_CHECK_MODULES(TOMOE, [tomoe >= 0.2.0])
+PKG_CHECK_MODULES(TOMOE, [tomoe >= 0.4.0])
AC_SUBST(SCIM_VERSION)
@@ -78,6 +78,7 @@
# libtool option to control which symbols are exported
# right now, symbols starting with _ are not exported
LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
+AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
# Extra args.
AC_ARG_ENABLE(debug,
Binary files old/scim-tomoe-0.2.0/data/scim-tomoe.png and new/scim-tomoe-0.4.0/data/scim-tomoe.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/po/POTFILES.in new/scim-tomoe-0.4.0/po/POTFILES.in
--- old/scim-tomoe-0.2.0/po/POTFILES.in 2005-10-07 04:39:51.000000000 +0200
+++ new/scim-tomoe-0.4.0/po/POTFILES.in 2006-10-24 04:53:03.000000000 +0200
@@ -1,2 +1,2 @@
src/scim_tomoe.cpp
-src/scim_tomoe_prefs_win.cpp
+src/scim_tomoe_prefs_widget.cpp
Binary files old/scim-tomoe-0.2.0/po/ja.gmo and new/scim-tomoe-0.4.0/po/ja.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/po/ja.po new/scim-tomoe-0.4.0/po/ja.po
--- old/scim-tomoe-0.2.0/po/ja.po 2005-10-27 05:15:39.000000000 +0200
+++ new/scim-tomoe-0.4.0/po/ja.po 2006-11-28 06:37:32.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: scim-tomoe\n"
"Report-Msgid-Bugs-To: ashie@homa.ne.jp\n"
-"POT-Creation-Date: 2005-10-27 12:15+0900\n"
+"POT-Creation-Date: 2006-11-28 14:37+0900\n"
"PO-Revision-Date: 2005-08-05 19:16+0900\n"
"Last-Translator: Hiroyuki Ikezoe \n"
"Language-Team: Japanese \n"
@@ -15,50 +15,57 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/scim_tomoe.cpp:106
+#: src/scim_tomoe.cpp:108
msgid "Handwriting recognition"
msgstr "手書き認識"
-#: src/scim_tomoe.cpp:108
+#: src/scim_tomoe.cpp:110
msgid "An front-end for handwriting recognition engine"
msgstr "手書き認識エンジン用のフロントエンド"
-#: src/scim_tomoe.cpp:217
+#: src/scim_tomoe.cpp:219
msgid "TOMOE"
msgstr "TOMOE"
-#: src/scim_tomoe.cpp:219
+#: src/scim_tomoe.cpp:221
msgid "Show/Hide TOMOE."
msgstr "TOMOEを表示/非表示"
-#: src/scim_tomoe.cpp:253
+#: src/scim_tomoe.cpp:263
msgid "Space"
msgstr "Space"
-#: src/scim_tomoe.cpp:261
+#: src/scim_tomoe.cpp:271
msgid "BackSpace"
msgstr "BackSpace"
-#: src/scim_tomoe.cpp:269
+#: src/scim_tomoe.cpp:279
msgid "Enter"
msgstr "Enter"
-#: src/scim_tomoe_prefs_win.cpp:95
-msgid "Preferences for handwriting pad"
-msgstr "手書き認識パッドの設定"
+#: src/scim_tomoe.cpp:310
+msgid "Preferences for SCIM-TOMOE"
+msgstr "SCIM-TOMOEの設定"
-#: src/scim_tomoe_prefs_win.cpp:115
+#: src/scim_tomoe_prefs_widget.cpp:100
msgid "Common"
msgstr "一般"
-#: src/scim_tomoe_prefs_win.cpp:122
+#: src/scim_tomoe_prefs_widget.cpp:107
msgid "Use auto _find"
msgstr "自動検索を使用する(_F)"
-#: src/scim_tomoe_prefs_win.cpp:144
+#: src/scim_tomoe_prefs_widget.cpp:129
msgid "_Interval time until start auto find:"
msgstr "自動検索を開始するまでの時間(_I):"
-#: src/scim_tomoe_prefs_win.cpp:186
+#: src/scim_tomoe_prefs_widget.cpp:171
msgid "_Clear the canvas when select a candidate"
msgstr "候補選択時にクリアする(_C)"
+
+#: src/scim_tomoe_prefs_widget.cpp:189
+msgid "Show on _top of other windows"
+msgstr "常に他のウインドウより前に表示する(_T)"
+
+#~ msgid "Preferences for handwriting pad"
+#~ msgstr "手書き認識パッドの設定"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/src/Makefile.am new/scim-tomoe-0.4.0/src/Makefile.am
--- old/scim-tomoe-0.2.0/src/Makefile.am 2005-10-21 11:20:41.000000000 +0200
+++ new/scim-tomoe-0.4.0/src/Makefile.am 2006-10-13 08:37:02.000000000 +0200
@@ -10,24 +10,30 @@
noinst_HEADERS = \
intl.h \
scim_tomoe_prefs.h \
- scim_tomoe_prefs_win.h
+ scim_tomoe_prefs_widget.h
moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper
module_LTLIBRARIES = tomoe.la
tomoe_la_SOURCES = \
scim_tomoe.cpp \
- scim_tomoe_prefs_win.cpp
+ scim_tomoe_prefs_widget.cpp
-tomoe_la_CFLAGS = @GTK2_CFLAGS@ @LIBTOMOE_GTK_CFLAGS@ @SCIM_CFLAGS@ @SCIM_DEBUG_FLAGS@ @TOMOE_CFLAGS@
-tomoe_la_CXXFLAGS = @GTK2_CFLAGS@ @LIBTOMOE_GTK_CFLAGS@ @SCIM_CFLAGS@ @SCIM_DEBUG_FLAGS@ @TOMOE_CFLAGS@
-
-tomoe_la_LDFLAGS = \
- -avoid-version \
- -rpath $(moduledir) \
- -module \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @SCIM_LIBS@ \
- @GTK2_LIBS@ \
- @LIBTOMOE_GTK_LIBS@ \
- @TOMOE_LIBS@
+tomoe_la_CFLAGS = @GTK2_CFLAGS@ \
+ @LIBTOMOE_GTK_CFLAGS@ \
+ @SCIM_CFLAGS@ \
+ @SCIM_DEBUG_FLAGS@ \
+ @TOMOE_CFLAGS@
+tomoe_la_CXXFLAGS = @GTK2_CFLAGS@ \
+ @LIBTOMOE_GTK_CFLAGS@ \
+ @SCIM_CFLAGS@ \
+ @SCIM_DEBUG_FLAGS@ \
+ @TOMOE_CFLAGS@
+tomoe_la_LDFLAGS = -avoid-version \
+ -rpath $(moduledir) \
+ -module \
+ @LIBTOOL_EXPORT_OPTIONS@ \
+ @SCIM_LIBS@ \
+ @GTK2_LIBS@ \
+ @LIBTOMOE_GTK_LIBS@ \
+ @TOMOE_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/src/scim_tomoe.cpp new/scim-tomoe-0.4.0/src/scim_tomoe.cpp
--- old/scim-tomoe-0.2.0/src/scim_tomoe.cpp 2005-10-05 10:23:53.000000000 +0200
+++ new/scim-tomoe-0.4.0/src/scim_tomoe.cpp 2006-11-28 03:58:48.000000000 +0100
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: scim_tomoe.cpp,v 1.13 2005/10/05 08:23:53 daih Exp $
+ * $Id: scim_tomoe.cpp,v 1.27 2006/11/28 01:42:05 ikezoe Exp $
*
*/
@@ -45,7 +45,7 @@
#include "intl.h"
#include "scim_tomoe_prefs.h"
-#include "scim_tomoe_prefs_win.h"
+#include "scim_tomoe_prefs_widget.h"
#include
#define scim_module_init tomoe_LTX_scim_module_init
@@ -70,7 +70,7 @@
static void run (const String &display,
const ConfigPointer &config);
-static void on_candidates_view_selected (TomoeCandidatesView *view,
+static void on_char_table_selected (TomoeCharTable *table,
gpointer user_data);
static void on_space_button_clicked (GtkButton *button,
gpointer user_data);
@@ -78,7 +78,9 @@
gpointer user_data);
static void on_enter_button_clicked (GtkButton *button,
gpointer user_data);
-static void on_prefs_button_clicked (GtkButton *button,
+static void on_notebook_switch_page (GtkNotebook *notebook,
+ GtkNotebookPage *page,
+ guint page_num,
gpointer user_data);
static HelperAgent helper_agent;
@@ -101,7 +103,7 @@
void scim_module_init (void)
{
bindtextdomain (GETTEXT_PACKAGE, SCIM_TOMOE_LOCALEDIR);
- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
helper_info.name = String (_("Handwriting recognition"));
helper_info.description = String (
@@ -204,7 +206,7 @@
setenv ("DISPLAY", display.c_str (), 1);
- gtk_init(&argc, &argv);
+ gtk_init (&argc, &argv);
helper_agent.signal_connect_exit (slot (slot_exit));
helper_agent.signal_connect_update_screen (slot (slot_update_screen));
@@ -236,22 +238,30 @@
GtkWidget *window = tomoe_window_new ();
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+ gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
+ GdkPixbuf *icon = gdk_pixbuf_new_from_file (SCIM_TOMOE_ICON, NULL);
+ if (icon) {
+ gtk_window_set_icon (GTK_WINDOW (window), icon);
+ g_object_unref (icon);
+ }
gtk_widget_show (window);
g_signal_connect (G_OBJECT (window), "response",
G_CALLBACK (gtk_main_quit), NULL);
main_window = window;
- // add software keyboard button
+ // add software keyboard buttons
TomoeWindow *tomoe = TOMOE_WINDOW (window);
GtkWidget *separator, *button;
separator = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (tomoe->button_area), separator,
+ GtkWidget *hw_page = tomoe_window_get_handwriting_page (TOMOE_WINDOW (tomoe));
+ GtkWidget *button_area = tomoe_stroke_search_get_button_area (TOMOE_STROKE_SEARCH (hw_page));
+ gtk_box_pack_start (GTK_BOX (button_area), separator,
FALSE, FALSE, 4);
gtk_widget_show (separator);
button = gtk_button_new_with_mnemonic (_("Space"));
- gtk_box_pack_start (GTK_BOX (tomoe->button_area), button,
+ gtk_box_pack_start (GTK_BOX (button_area), button,
FALSE, FALSE, 4);
g_signal_connect (G_OBJECT (button), "pressed",
G_CALLBACK (on_space_button_clicked),
@@ -259,7 +269,7 @@
gtk_widget_show (button);
button = gtk_button_new_with_mnemonic (_("BackSpace"));
- gtk_box_pack_start (GTK_BOX (tomoe->button_area), button,
+ gtk_box_pack_start (GTK_BOX (button_area), button,
FALSE, FALSE, 4);
g_signal_connect (G_OBJECT (button), "pressed",
G_CALLBACK (on_backspace_button_clicked),
@@ -267,38 +277,37 @@
gtk_widget_show (button);
button = gtk_button_new_with_mnemonic (_("Enter"));
- gtk_box_pack_start (GTK_BOX (tomoe->button_area), button,
+ gtk_box_pack_start (GTK_BOX (button_area), button,
FALSE, FALSE, 4);
g_signal_connect (G_OBJECT (button), "pressed",
G_CALLBACK (on_enter_button_clicked),
(gpointer) tomoe);
gtk_widget_show (button);
- // add preference button
- separator = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (tomoe->button_area), separator,
- FALSE, FALSE, 4);
- gtk_widget_show (separator);
-
- button = gtk_button_new_from_stock (GTK_STOCK_PREFERENCES);
- gtk_box_pack_start (GTK_BOX (tomoe->button_area), button,
- FALSE, FALSE, 4);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (on_prefs_button_clicked),
- (gpointer) tomoe);
- gtk_widget_show (button);
-
+ // for getting focus
+ GtkWidget *notebook = tomoe_window_get_notebook (TOMOE_WINDOW (tomoe));;
+ g_signal_connect (G_OBJECT (notebook), "switch-page",
+ G_CALLBACK (on_notebook_switch_page), window);
// add hooks
- g_signal_connect (G_OBJECT (tomoe->candidates_view), "selected",
- G_CALLBACK (on_candidates_view_selected),
+ GtkWidget *candidates_view = tomoe_stroke_search_get_candidates_view (TOMOE_STROKE_SEARCH (hw_page));
+ g_signal_connect (G_OBJECT (candidates_view), "selected",
+ G_CALLBACK (on_char_table_selected),
(gpointer) tomoe);
- // create preferences window
- GtkWidget *prefs_win = scim_tomoe_prefs_win_new (tomoe, config);
- gtk_window_set_transient_for (GTK_WINDOW (prefs_win),
- GTK_WINDOW (window));
+ // create preferences widget
+ GtkWidget *prefs_widget = scim_tomoe_prefs_widget_new (tomoe, config);
g_object_set_data (G_OBJECT (window),
- OBJECT_DATA_PREFS_WIN, prefs_win);
+ OBJECT_DATA_PREFS_WIN, prefs_widget);
+ gtk_widget_show (prefs_widget);
+ bool always_top = SCIM_TOMOE_PREFS_WIDGET (prefs_widget)->config->read (
+ SCIM_TOMOE_CONFIG_WINDOW_ALWAYS_TOP,
+ SCIM_TOMOE_CONFIG_WINDOW_ALWAYS_TOP_DEFAULT);
+ gtk_window_set_keep_above (GTK_WINDOW (window), always_top ? TRUE: FALSE);
+
+ // add preference page
+ tomoe_window_append_page (tomoe, prefs_widget,
+ gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU),
+ _("Preferences for SCIM-TOMOE"));
// run
gtk_main ();
@@ -308,21 +317,24 @@
}
static void
-on_candidates_view_selected (TomoeCandidatesView *view, gpointer user_data)
+on_char_table_selected (TomoeCharTable *table, gpointer user_data)
{
TomoeWindow *window = TOMOE_WINDOW (user_data);
gpointer object_data = g_object_get_data (G_OBJECT (window),
OBJECT_DATA_PREFS_WIN);
- ScimTomoePrefsWin *prefs_win = SCIM_TOMOE_PREFS_WIN (object_data);
+ ScimTomoePrefsWidget *prefs_widget = SCIM_TOMOE_PREFS_WIDGET (object_data);
if (helper_agent.get_connection_number () < 0) return;
- gchar *str = tomoe_candidates_view_get_selected_letter (view);
+ TomoeChar *t_char = tomoe_char_table_get_selected (table);
+ if (!t_char) return;
+
+ const gchar *str = tomoe_char_get_utf8 (t_char);
if (str && *str) {
helper_agent.commit_string (-1, "", scim::utf8_mbstowcs (str));
bool value;
- value = prefs_win->config->read (
+ value = prefs_widget->config->read (
String (SCIM_TOMOE_CONFIG_CLEAR_ON_SELECT),
SCIM_TOMOE_CONFIG_CLEAR_ON_SELECT_DEFAULT);
if (value) {
@@ -367,16 +379,17 @@
}
static void
-on_prefs_button_clicked (GtkButton *button, gpointer user_data)
+on_notebook_switch_page (GtkNotebook *notebook, GtkNotebookPage *page,
+ guint page_num, gpointer user_data)
{
- GtkWidget *window = GTK_WIDGET (user_data);
- gpointer object_data = g_object_get_data (G_OBJECT (window),
- OBJECT_DATA_PREFS_WIN);
- GtkWidget *prefs_win = GTK_WIDGET (object_data);
+ g_return_if_fail (GTK_WINDOW (user_data));
- gtk_widget_show (prefs_win);
- gtk_dialog_run (GTK_DIALOG (prefs_win));
- gtk_widget_hide (prefs_win);
+ if (page_num == 1) {
+ gtk_window_set_accept_focus (GTK_WINDOW (user_data), TRUE);
+ } else {
+ gtk_window_set_accept_focus (GTK_WINDOW (user_data), FALSE);
+ gtk_window_set_focus (GTK_WINDOW (user_data), NULL);
+ }
}
/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/src/scim_tomoe_prefs.h new/scim-tomoe-0.4.0/src/scim_tomoe_prefs.h
--- old/scim-tomoe-0.2.0/src/scim_tomoe_prefs.h 2005-08-23 10:19:21.000000000 +0200
+++ new/scim-tomoe-0.4.0/src/scim_tomoe_prefs.h 2006-10-26 06:34:35.000000000 +0200
@@ -23,9 +23,11 @@
#define SCIM_TOMOE_CONFIG_USE_AUTO_FIND "/Helper/Tomoe/UseAutoFind"
#define SCIM_TOMOE_CONFIG_AUTO_FIND_TIME "/Helper/Tomoe/AutoFindTime"
#define SCIM_TOMOE_CONFIG_CLEAR_ON_SELECT "/Helper/Tomoe/ClearOnSelect"
+#define SCIM_TOMOE_CONFIG_WINDOW_ALWAYS_TOP "/Helper/Tomoe/AlwaysTop"
-#define SCIM_TOMOE_CONFIG_USE_AUTO_FIND_DEFAULT true
-#define SCIM_TOMOE_CONFIG_AUTO_FIND_TIME_DEFAULT 0
-#define SCIM_TOMOE_CONFIG_CLEAR_ON_SELECT_DEFAULT false
+#define SCIM_TOMOE_CONFIG_USE_AUTO_FIND_DEFAULT true
+#define SCIM_TOMOE_CONFIG_AUTO_FIND_TIME_DEFAULT 0
+#define SCIM_TOMOE_CONFIG_CLEAR_ON_SELECT_DEFAULT false
+#define SCIM_TOMOE_CONFIG_WINDOW_ALWAYS_TOP_DEFAULT false
#endif /* __SCIM_TOMOE_PREFS_H__ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/src/scim_tomoe_prefs_widget.cpp new/scim-tomoe-0.4.0/src/scim_tomoe_prefs_widget.cpp
--- old/scim-tomoe-0.2.0/src/scim_tomoe_prefs_widget.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/scim-tomoe-0.4.0/src/scim_tomoe_prefs_widget.cpp 2006-10-26 06:34:35.000000000 +0200
@@ -0,0 +1,357 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright (C) 2005 Takuro Ashie
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+ #include
+#endif
+
+#include "intl.h"
+#include "scim_tomoe_prefs_widget.h"
+#include "scim_tomoe_prefs.h"
+#include
+
+enum {
+ HOGE_SIGNAL,
+ LAST_SIGNAL,
+};
+
+#define OBJECT_DATA_CONFIG_KEY "ScimTomoePrefsWidget::ConfigKey"
+#define OBJECT_DATA_CONFIG_VALUE "ScimTomoePrefsWidget::ConfigValue"
+
+static void scim_tomoe_prefs_widget_class_init (ScimTomoePrefsWidgetClass *klass);
+static void scim_tomoe_prefs_widget_init (ScimTomoePrefsWidget *prefs_widget);
+static void scim_tomoe_prefs_widget_dispose (GObject *object);
+
+static void load_config (ScimTomoePrefsWidget *prefs_widget);
+static void apply_config (ScimTomoePrefsWidget *prefs_widget);
+
+static void on_default_toggle_button_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+static void on_default_toggle_button_set_sensitive
+ (GtkToggleButton *togglebutton,
+ gpointer user_data);
+static void on_default_spin_button_changed (GtkSpinButton *spinbutton,
+ gpointer user_data);
+
+//static guint prefs_widget_signals[LAST_SIGNAL] = { 0 };
+static GtkVBoxClass *parent_class = NULL;
+
+GType
+scim_tomoe_prefs_widget_get_type (void)
+{
+ static GType type = 0;
+
+ if (!type) {
+ static const GTypeInfo info = {
+ sizeof (ScimTomoePrefsWidgetClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) scim_tomoe_prefs_widget_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (ScimTomoePrefsWidget),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) scim_tomoe_prefs_widget_init,
+ };
+
+ type = g_type_register_static (GTK_TYPE_VBOX,
+ "ScimTomoePrefsWidget",
+ &info, (GTypeFlags) 0);
+ }
+
+ return type;
+}
+
+static void
+scim_tomoe_prefs_widget_class_init (ScimTomoePrefsWidgetClass *klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+ parent_class = (GtkVBoxClass *) g_type_class_peek_parent (klass);
+
+ gobject_class->dispose = scim_tomoe_prefs_widget_dispose;
+}
+
+static void
+scim_tomoe_prefs_widget_init (ScimTomoePrefsWidget *prefs_widget)
+{
+ GtkWidget *main_vbox = GTK_WIDGET (prefs_widget);
+
+ GtkWidget *notebook = gtk_notebook_new ();
+ gtk_box_pack_start (GTK_BOX (main_vbox), notebook, TRUE, TRUE, 0);
+ gtk_widget_show (notebook);
+
+ GtkWidget *label = gtk_label_new (_("Common"));
+ GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+ gtk_widget_show (label);
+ gtk_widget_show (vbox);
+
+ // use auto find
+ GtkWidget *check = gtk_check_button_new_with_mnemonic (_("Use auto _find"));
+ gtk_container_set_border_width (GTK_CONTAINER (check), 4);
+ gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+ g_object_set_data (G_OBJECT (check),
+ OBJECT_DATA_CONFIG_KEY,
+ (gpointer) SCIM_TOMOE_CONFIG_USE_AUTO_FIND);
+ g_object_set_data (G_OBJECT (check),
+ OBJECT_DATA_CONFIG_VALUE,
+ GINT_TO_POINTER (SCIM_TOMOE_CONFIG_USE_AUTO_FIND_DEFAULT));
+ g_signal_connect (G_OBJECT (check), "toggled",
+ G_CALLBACK (on_default_toggle_button_toggled),
+ prefs_widget);
+ gtk_widget_show (check);
+
+ prefs_widget->widget_list = g_list_append (prefs_widget->widget_list, check);
+
+ // table
+ GtkWidget *table = gtk_table_new (4, 4, FALSE);
+ gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+ gtk_widget_show (table);
+
+ // auto find time
+ label = gtk_label_new_with_mnemonic (_("_Interval time until start auto find:"));
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL),
+ 4, 4);
+ gtk_widget_show (label);
+
+ GtkObject *adj = gtk_adjustment_new (0, 0.0, 99999.0, 50.0, 200.0, 200.0);
+ GtkWidget *spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0);
+ g_object_set_data (G_OBJECT (spin),
+ OBJECT_DATA_CONFIG_KEY,
+ (gpointer) SCIM_TOMOE_CONFIG_AUTO_FIND_TIME);
+ g_object_set_data (G_OBJECT (spin),
+ OBJECT_DATA_CONFIG_VALUE,
+ GINT_TO_POINTER (SCIM_TOMOE_CONFIG_AUTO_FIND_TIME_DEFAULT));
+ gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL),
+ 4, 4);
+ g_signal_connect (G_OBJECT (spin), "value-changed",
+ G_CALLBACK (on_default_spin_button_changed),
+ prefs_widget);
+ gtk_widget_show (spin);
+
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
+
+ label = gtk_label_new ("[msec]");
+ gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL),
+ 4, 4);
+ gtk_widget_show (label);
+
+ g_signal_connect (G_OBJECT (check), "toggled",
+ G_CALLBACK (on_default_toggle_button_set_sensitive),
+ table);
+ gtk_widget_set_sensitive (table, FALSE);
+
+ prefs_widget->widget_list = g_list_append (prefs_widget->widget_list, spin);
+
+ // clear the canvas
+ check = gtk_check_button_new_with_mnemonic (
+ _("_Clear the canvas when select a candidate"));
+ gtk_container_set_border_width (GTK_CONTAINER (check), 4);
+ gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+ g_object_set_data (G_OBJECT (check),
+ OBJECT_DATA_CONFIG_KEY,
+ (gpointer) SCIM_TOMOE_CONFIG_CLEAR_ON_SELECT);
+ g_object_set_data (G_OBJECT (check),
+ OBJECT_DATA_CONFIG_VALUE,
+ GINT_TO_POINTER (SCIM_TOMOE_CONFIG_CLEAR_ON_SELECT_DEFAULT));
+ g_signal_connect (G_OBJECT (check), "toggled",
+ G_CALLBACK (on_default_toggle_button_toggled),
+ prefs_widget);
+ gtk_widget_show (check);
+
+ prefs_widget->widget_list = g_list_append (prefs_widget->widget_list, check);
+
+ // show on top of other windows.
+ check = gtk_check_button_new_with_mnemonic (
+ _("Show on _top of other windows"));
+ gtk_container_set_border_width (GTK_CONTAINER (check), 4);
+ gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
+ g_object_set_data (G_OBJECT (check),
+ OBJECT_DATA_CONFIG_KEY,
+ (gpointer) SCIM_TOMOE_CONFIG_WINDOW_ALWAYS_TOP);
+ g_object_set_data (G_OBJECT (check),
+ OBJECT_DATA_CONFIG_VALUE,
+ GINT_TO_POINTER (SCIM_TOMOE_CONFIG_WINDOW_ALWAYS_TOP_DEFAULT));
+ g_signal_connect (G_OBJECT (check), "toggled",
+ G_CALLBACK (on_default_toggle_button_toggled),
+ prefs_widget);
+ gtk_widget_show (check);
+
+ prefs_widget->widget_list = g_list_append (prefs_widget->widget_list, check);
+}
+
+static void
+scim_tomoe_prefs_widget_dispose (GObject *object)
+{
+ ScimTomoePrefsWidget *prefs_widget = SCIM_TOMOE_PREFS_WIDGET (object);
+
+ prefs_widget->config->flush ();
+ prefs_widget->config = NULL;
+
+ if (G_OBJECT_CLASS(parent_class)->dispose)
+ G_OBJECT_CLASS(parent_class)->dispose(object);
+}
+
+GtkWidget *
+scim_tomoe_prefs_widget_new (TomoeWindow *window, const ConfigPointer &config)
+{
+ GtkWidget *widget = GTK_WIDGET(g_object_new (SCIM_TOMOE_TYPE_PREFS_WIDGET,
+ NULL));
+ ScimTomoePrefsWidget *prefs_widget = SCIM_TOMOE_PREFS_WIDGET (widget);
+
+ prefs_widget->config = config;
+ prefs_widget->parent = GTK_WIDGET (window);
+
+ load_config (SCIM_TOMOE_PREFS_WIDGET(widget));
+
+ return widget;
+}
+
+static void
+load_config (ScimTomoePrefsWidget *prefs_widget)
+{
+ GList *node;
+
+ if (prefs_widget->config.null ())
+ return;
+
+ for (node = prefs_widget->widget_list; node; node = g_list_next (node)) {
+ GtkWidget *widget = GTK_WIDGET (node->data);
+
+ if (GTK_IS_TOGGLE_BUTTON (widget)) {
+ gpointer key_p, value_p;
+ const char *key;
+ bool value;
+
+ key_p = g_object_get_data (G_OBJECT (widget),
+ OBJECT_DATA_CONFIG_KEY);
+ value_p = g_object_get_data (G_OBJECT (widget),
+ OBJECT_DATA_CONFIG_VALUE);
+
+ key = (const char*) key_p;
+ value = GPOINTER_TO_INT (value_p);
+
+ value = prefs_widget->config->read (String (key), value);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
+
+ } else if (GTK_IS_SPIN_BUTTON (widget)) {
+ gpointer key_p, value_p;
+ const char *key;
+ gint value;
+
+ key_p = g_object_get_data (G_OBJECT (widget),
+ OBJECT_DATA_CONFIG_KEY);
+ value_p = g_object_get_data (G_OBJECT (widget),
+ OBJECT_DATA_CONFIG_VALUE);
+
+ key = (const char*) key_p;
+ value = GPOINTER_TO_INT (value_p);
+
+ value = prefs_widget->config->read (String (key), value);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
+
+ } else if (GTK_IS_EDITABLE (widget)) {
+ // FIXME
+ }
+ }
+
+ apply_config (prefs_widget);
+}
+
+static void
+apply_config (ScimTomoePrefsWidget *prefs_widget)
+{
+ TomoeWindow *parent = TOMOE_WINDOW (prefs_widget->parent);
+ TomoeCanvas *canvas = TOMOE_CANVAS (tomoe_window_get_canvas (parent));
+
+ bool use_auto_find;
+ gint time1, time2;
+
+ time1 = tomoe_canvas_get_auto_find_time (canvas);
+
+ use_auto_find = prefs_widget->config->read (
+ SCIM_TOMOE_CONFIG_USE_AUTO_FIND,
+ SCIM_TOMOE_CONFIG_USE_AUTO_FIND_DEFAULT);
+
+ time2 = prefs_widget->config->read (
+ SCIM_TOMOE_CONFIG_AUTO_FIND_TIME,
+ SCIM_TOMOE_CONFIG_AUTO_FIND_TIME_DEFAULT);
+
+ if (!use_auto_find)
+ tomoe_canvas_set_auto_find_time (canvas, -1);
+ else if (time1 != time2)
+ tomoe_canvas_set_auto_find_time (canvas, time2);
+
+ // window z-level option
+ bool always_top;
+ always_top = prefs_widget->config->read (
+ SCIM_TOMOE_CONFIG_WINDOW_ALWAYS_TOP,
+ SCIM_TOMOE_CONFIG_WINDOW_ALWAYS_TOP_DEFAULT);
+ gtk_window_set_keep_above (GTK_WINDOW (parent), always_top ? TRUE : FALSE);
+}
+
+static void
+on_default_toggle_button_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ ScimTomoePrefsWidget *prefs_widget = SCIM_TOMOE_PREFS_WIDGET (user_data);
+
+ gboolean value = gtk_toggle_button_get_active (togglebutton);
+ gpointer key_p = g_object_get_data (G_OBJECT (togglebutton),
+ OBJECT_DATA_CONFIG_KEY);
+ const gchar *key = (const gchar *) key_p;
+ if (key && *key)
+ prefs_widget->config->write (String (key), value);
+
+ apply_config (prefs_widget);
+}
+
+static void
+on_default_toggle_button_set_sensitive (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ GtkWidget *widget = GTK_WIDGET (user_data);
+ gboolean active = gtk_toggle_button_get_active (togglebutton);
+ gtk_widget_set_sensitive (widget, active);
+}
+
+static void
+on_default_spin_button_changed (GtkSpinButton *spinbutton, gpointer user_data)
+{
+ ScimTomoePrefsWidget *prefs_widget = SCIM_TOMOE_PREFS_WIDGET (user_data);
+
+ gint value = (gint) gtk_spin_button_get_value (spinbutton);
+ gpointer key_p = g_object_get_data (G_OBJECT (spinbutton),
+ OBJECT_DATA_CONFIG_KEY);
+ const gchar *key = (const gchar *) key_p;
+ if (key && *key)
+ prefs_widget->config->write (String (key), value);
+
+ apply_config (prefs_widget);
+}
+/*
+vi:ts=4:nowrap:ai:expandtab
+*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/src/scim_tomoe_prefs_widget.h new/scim-tomoe-0.4.0/src/scim_tomoe_prefs_widget.h
--- old/scim-tomoe-0.2.0/src/scim_tomoe_prefs_widget.h 1970-01-01 01:00:00.000000000 +0100
+++ new/scim-tomoe-0.4.0/src/scim_tomoe_prefs_widget.h 2006-10-13 08:20:34.000000000 +0200
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright (C) 2005 Takuro Ashie
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __SCIM_TOMOE_PREFS_WIDGET_H__
+#define __SCIM_TOMOE_PREFS_WIDGET_H__
+
+#define Uses_SCIM_CONFIG_BASE
+#include
+#include
+#include
+
+using namespace scim;
+
+#define SCIM_TOMOE_TYPE_PREFS_WIDGET (scim_tomoe_prefs_widget_get_type ())
+#define SCIM_TOMOE_PREFS_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SCIM_TOMOE_TYPE_PREFS_WIDGET, ScimTomoePrefsWidget))
+#define SCIM_TOMOE_PREFS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SCIM_TOMOE_TYPE_PREFS_WIDGET, ScimTomoePrefsWidgetClass))
+#define SCIM_TOMOE_IS_PREFS_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SCIM_TOMOE_TYPE_PREFS_WIDGET))
+#define SCIM_TOMOE_IS_PREFS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SCIM_TOMOE_TYPE_PREFS_WIDGET))
+#define SCIM_TOMOE_PREFS_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SCIM_TOMOE_TYPE_PREFS_WIDGET, ScimTomoePrefsWidgetClass))
+
+
+typedef struct _ScimTomoePrefsWidgetClass ScimTomoePrefsWidgetClass;
+typedef struct _ScimTomoePrefsWidget ScimTomoePrefsWidget;
+
+struct _ScimTomoePrefsWidget
+{
+ GtkVBox parent_instance;
+ GtkWidget *parent;
+ ConfigPointer config;
+
+ GList *widget_list;
+};
+
+struct _ScimTomoePrefsWidgetClass
+{
+ GtkVBoxClass parent_class;
+};
+
+
+GType scim_tomoe_prefs_widget_get_type (void) G_GNUC_CONST;
+GtkWidget *scim_tomoe_prefs_widget_new (TomoeWindow *window,
+ const ConfigPointer &config);
+
+#endif /* __SCIM_TOMOE_PREFS_WIDGET_H__ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/src/scim_tomoe_prefs_win.cpp new/scim-tomoe-0.4.0/src/scim_tomoe_prefs_win.cpp
--- old/scim-tomoe-0.2.0/src/scim_tomoe_prefs_win.cpp 2005-10-21 11:20:41.000000000 +0200
+++ new/scim-tomoe-0.4.0/src/scim_tomoe_prefs_win.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,344 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Copyright (C) 2005 Takuro Ashie
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
- #include
-#endif
-
-#include "intl.h"
-#include "scim_tomoe_prefs_win.h"
-#include "scim_tomoe_prefs.h"
-#include
-
-enum {
- HOGE_SIGNAL,
- LAST_SIGNAL,
-};
-
-#define OBJECT_DATA_CONFIG_KEY "ScimTomoePrefsWin::ConfigKey"
-#define OBJECT_DATA_CONFIG_VALUE "ScimTomoePrefsWin::ConfigValue"
-
-static void scim_tomoe_prefs_win_class_init (ScimTomoePrefsWinClass *klass);
-static void scim_tomoe_prefs_win_init (ScimTomoePrefsWin *prefs_win);
-static void scim_tomoe_prefs_win_dispose (GObject *object);
-
-static void load_config (ScimTomoePrefsWin *prefs_win);
-static void apply_config (ScimTomoePrefsWin *prefs_win);
-
-static void on_default_toggle_button_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-static void on_default_toggle_button_set_sensitive
- (GtkToggleButton *togglebutton,
- gpointer user_data);
-static void on_default_spin_button_changed (GtkSpinButton *spinbutton,
- gpointer user_data);
-
-//static guint prefs_win_signals[LAST_SIGNAL] = { 0 };
-static GtkDialogClass *parent_class = NULL;
-
-GType
-scim_tomoe_prefs_win_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo info = {
- sizeof (ScimTomoePrefsWinClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) scim_tomoe_prefs_win_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (ScimTomoePrefsWin),
- 0, /* n_preallocs */
- (GInstanceInitFunc) scim_tomoe_prefs_win_init,
- };
-
- type = g_type_register_static (GTK_TYPE_DIALOG,
- "ScimTomoePrefsWin",
- &info, (GTypeFlags) 0);
- }
-
- return type;
-}
-
-static void
-scim_tomoe_prefs_win_class_init (ScimTomoePrefsWinClass *klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
- parent_class = (GtkDialogClass *) g_type_class_peek_parent (klass);
-
- gobject_class->dispose = scim_tomoe_prefs_win_dispose;
-}
-
-static void
-scim_tomoe_prefs_win_init (ScimTomoePrefsWin *prefs_win)
-{
- gtk_window_set_title (GTK_WINDOW (prefs_win),
- _("Preferences for handwriting pad"));
- gtk_window_set_icon_from_file (GTK_WINDOW (prefs_win),
- SCIM_ICONDIR "/scim-tomoe.png",
- NULL);
- gtk_window_set_default_size (GTK_WINDOW (prefs_win), 300, 300);
-
- gtk_dialog_add_buttons (GTK_DIALOG (prefs_win),
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- NULL);
-
- GtkWidget *main_vbox = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (prefs_win)->vbox), main_vbox,
- TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 8);
- gtk_widget_show (main_vbox);
-
- GtkWidget *notebook = gtk_notebook_new ();
- gtk_box_pack_start (GTK_BOX (main_vbox), notebook, TRUE, TRUE, 0);
- gtk_widget_show (notebook);
-
- GtkWidget *label = gtk_label_new (_("Common"));
- GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
- gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
- gtk_widget_show (label);
- gtk_widget_show (vbox);
-
- // use auto find
- GtkWidget *check = gtk_check_button_new_with_mnemonic (_("Use auto _find"));
- gtk_container_set_border_width (GTK_CONTAINER (check), 4);
- gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
- g_object_set_data (G_OBJECT (check),
- OBJECT_DATA_CONFIG_KEY,
- (gpointer) SCIM_TOMOE_CONFIG_USE_AUTO_FIND);
- g_object_set_data (G_OBJECT (check),
- OBJECT_DATA_CONFIG_VALUE,
- GINT_TO_POINTER (SCIM_TOMOE_CONFIG_USE_AUTO_FIND_DEFAULT));
- g_signal_connect (G_OBJECT (check), "toggled",
- G_CALLBACK (on_default_toggle_button_toggled),
- prefs_win);
- gtk_widget_show (check);
-
- prefs_win->widget_list = g_list_append (prefs_win->widget_list, check);
-
- // table
- GtkWidget *table = gtk_table_new (4, 4, FALSE);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
-
- // auto find time
- label = gtk_label_new_with_mnemonic (_("_Interval time until start auto find:"));
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL),
- 4, 4);
- gtk_widget_show (label);
-
- GtkObject *adj = gtk_adjustment_new (0, 0.0, 99999.0, 50.0, 200.0, 200.0);
- GtkWidget *spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0);
- g_object_set_data (G_OBJECT (spin),
- OBJECT_DATA_CONFIG_KEY,
- (gpointer) SCIM_TOMOE_CONFIG_AUTO_FIND_TIME);
- g_object_set_data (G_OBJECT (spin),
- OBJECT_DATA_CONFIG_VALUE,
- GINT_TO_POINTER (SCIM_TOMOE_CONFIG_AUTO_FIND_TIME_DEFAULT));
- gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL),
- 4, 4);
- g_signal_connect (G_OBJECT (spin), "value-changed",
- G_CALLBACK (on_default_spin_button_changed),
- prefs_win);
- gtk_widget_show (spin);
-
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
-
- label = gtk_label_new ("[msec]");
- gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL),
- 4, 4);
- gtk_widget_show (label);
-
- g_signal_connect (G_OBJECT (check), "toggled",
- G_CALLBACK (on_default_toggle_button_set_sensitive),
- table);
- gtk_widget_set_sensitive (table, FALSE);
-
- prefs_win->widget_list = g_list_append (prefs_win->widget_list, spin);
-
- // clear the canvas
- check = gtk_check_button_new_with_mnemonic (
- _("_Clear the canvas when select a candidate"));
- gtk_container_set_border_width (GTK_CONTAINER (check), 4);
- gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
- g_object_set_data (G_OBJECT (check),
- OBJECT_DATA_CONFIG_KEY,
- (gpointer) SCIM_TOMOE_CONFIG_CLEAR_ON_SELECT);
- g_object_set_data (G_OBJECT (check),
- OBJECT_DATA_CONFIG_VALUE,
- GINT_TO_POINTER (SCIM_TOMOE_CONFIG_CLEAR_ON_SELECT_DEFAULT));
- g_signal_connect (G_OBJECT (check), "toggled",
- G_CALLBACK (on_default_toggle_button_toggled),
- prefs_win);
- gtk_widget_show (check);
-
- prefs_win->widget_list = g_list_append (prefs_win->widget_list, check);
-}
-
-static void
-scim_tomoe_prefs_win_dispose (GObject *object)
-{
- ScimTomoePrefsWin *prefs_win = SCIM_TOMOE_PREFS_WIN (object);
-
- prefs_win->config->flush ();
- prefs_win->config = NULL;
-
- if (G_OBJECT_CLASS(parent_class)->dispose)
- G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-GtkWidget *
-scim_tomoe_prefs_win_new (TomoeWindow *window, const ConfigPointer &config)
-{
- GtkWidget *widget = GTK_WIDGET(g_object_new (SCIM_TOMOE_TYPE_PREFS_WIN,
- NULL));
- ScimTomoePrefsWin *prefs_win = SCIM_TOMOE_PREFS_WIN (widget);
-
- prefs_win->config = config;
- prefs_win->parent = GTK_WIDGET (window);
-
- load_config (SCIM_TOMOE_PREFS_WIN(widget));
-
- return widget;
-}
-
-static void
-load_config (ScimTomoePrefsWin *prefs_win)
-{
- GList *node;
-
- if (prefs_win->config.null ())
- return;
-
- for (node = prefs_win->widget_list; node; node = g_list_next (node)) {
- GtkWidget *widget = GTK_WIDGET (node->data);
-
- if (GTK_IS_TOGGLE_BUTTON (widget)) {
- gpointer key_p, value_p;
- const char *key;
- bool value;
-
- key_p = g_object_get_data (G_OBJECT (widget),
- OBJECT_DATA_CONFIG_KEY);
- value_p = g_object_get_data (G_OBJECT (widget),
- OBJECT_DATA_CONFIG_VALUE);
-
- key = (const char*) key_p;
- value = GPOINTER_TO_INT (value_p);
-
- value = prefs_win->config->read (String (key), value);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
-
- } else if (GTK_IS_SPIN_BUTTON (widget)) {
- gpointer key_p, value_p;
- const char *key;
- gint value;
-
- key_p = g_object_get_data (G_OBJECT (widget),
- OBJECT_DATA_CONFIG_KEY);
- value_p = g_object_get_data (G_OBJECT (widget),
- OBJECT_DATA_CONFIG_VALUE);
-
- key = (const char*) key_p;
- value = GPOINTER_TO_INT (value_p);
-
- value = prefs_win->config->read (String (key), value);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
-
- } else if (GTK_IS_EDITABLE (widget)) {
- // FIXME
- }
- }
-
- apply_config (prefs_win);
-}
-
-static void
-apply_config (ScimTomoePrefsWin *prefs_win)
-{
- TomoeWindow *parent = TOMOE_WINDOW (prefs_win->parent);
- TomoeCanvas *canvas = TOMOE_CANVAS (tomoe_window_get_canvas (parent));
-
- bool use_auto_find;
- gint time1, time2;
-
- time1 = tomoe_canvas_get_auto_find_time (canvas);
-
- use_auto_find = prefs_win->config->read (
- SCIM_TOMOE_CONFIG_USE_AUTO_FIND,
- SCIM_TOMOE_CONFIG_USE_AUTO_FIND_DEFAULT);
-
- time2 = prefs_win->config->read (
- SCIM_TOMOE_CONFIG_AUTO_FIND_TIME,
- SCIM_TOMOE_CONFIG_AUTO_FIND_TIME_DEFAULT);
-
- if (!use_auto_find)
- tomoe_canvas_set_auto_find_time (canvas, -1);
- else if (time1 != time2)
- tomoe_canvas_set_auto_find_time (canvas, time2);
-}
-
-static void
-on_default_toggle_button_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- ScimTomoePrefsWin *prefs_win = SCIM_TOMOE_PREFS_WIN (user_data);
-
- gboolean value = gtk_toggle_button_get_active (togglebutton);
- gpointer key_p = g_object_get_data (G_OBJECT (togglebutton),
- OBJECT_DATA_CONFIG_KEY);
- const gchar *key = (const gchar *) key_p;
- if (key && *key)
- prefs_win->config->write (String (key), value);
-
- apply_config (prefs_win);
-}
-
-static void
-on_default_toggle_button_set_sensitive (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- GtkWidget *widget = GTK_WIDGET (user_data);
- gboolean active = gtk_toggle_button_get_active (togglebutton);
- gtk_widget_set_sensitive (widget, active);
-}
-
-static void
-on_default_spin_button_changed (GtkSpinButton *spinbutton, gpointer user_data)
-{
- ScimTomoePrefsWin *prefs_win = SCIM_TOMOE_PREFS_WIN (user_data);
-
- gint value = (gint) gtk_spin_button_get_value (spinbutton);
- gpointer key_p = g_object_get_data (G_OBJECT (spinbutton),
- OBJECT_DATA_CONFIG_KEY);
- const gchar *key = (const gchar *) key_p;
- if (key && *key)
- prefs_win->config->write (String (key), value);
-
- apply_config (prefs_win);
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-tomoe-0.2.0/src/scim_tomoe_prefs_win.h new/scim-tomoe-0.4.0/src/scim_tomoe_prefs_win.h
--- old/scim-tomoe-0.2.0/src/scim_tomoe_prefs_win.h 2005-10-05 10:23:53.000000000 +0200
+++ new/scim-tomoe-0.4.0/src/scim_tomoe_prefs_win.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Copyright (C) 2005 Takuro Ashie
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __SCIM_TOMOE_PREFS_WIN_H__
-#define __SCIM_TOMOE_PREFS_WIN_H__
-
-#define Uses_SCIM_CONFIG_BASE
-#include
-#include
-#include
-
-using namespace scim;
-
-#define SCIM_TOMOE_TYPE_PREFS_WIN (scim_tomoe_prefs_win_get_type ())
-#define SCIM_TOMOE_PREFS_WIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SCIM_TOMOE_TYPE_PREFS_WIN, ScimTomoePrefsWin))
-#define SCIM_TOMOE_PREFS_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SCIM_TOMOE_TYPE_PREFS_WIN, ScimTomoePrefsWinClass))
-#define SCIM_TOMOE_IS_PREFS_WIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SCIM_TOMOE_TYPE_PREFS_WIN))
-#define SCIM_TOMOE_IS_PREFS_WIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SCIM_TOMOE_TYPE_PREFS_WIN))
-#define SCIM_TOMOE_PREFS_WIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SCIM_TOMOE_TYPE_PREFS_WIN, ScimTomoePrefsWinClass))
-
-
-typedef struct _ScimTomoePrefsWinClass ScimTomoePrefsWinClass;
-typedef struct _ScimTomoePrefsWin ScimTomoePrefsWin;
-
-struct _ScimTomoePrefsWin
-{
- GtkDialog parent_instance;
- GtkWidget *parent;
- ConfigPointer config;
-
- GList *widget_list;
-};
-
-struct _ScimTomoePrefsWinClass
-{
- GtkDialogClass parent_class;
-};
-
-
-GType scim_tomoe_prefs_win_get_type (void) G_GNUC_CONST;
-GtkWidget *scim_tomoe_prefs_win_new (TomoeWindow *window,
- const ConfigPointer &config);
-
-#endif /* __SCIM_TOMOE_PREFS_WIN_H__ */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org