Menu
▾
▴
tomoe-commits — Automated diffs from our revision control system
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(58) |
May
(28) |
Jun
(308) |
Jul
(11) |
Aug
(1) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(4) |
Feb
(8) |
Mar
(3) |
Apr
(3) |
May
(8) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2009 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ma...@us...> - 2007-05-08 03:02:28
|
Revision: 1237
http://tomoe.svn.sourceforge.net/tomoe/?rev=1237&view=rev
Author: makeinu
Date: 2007-05-07 20:02:29 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Replace WITH_HOGE with USE_HOGE. Sorry, I forgot to commit it.
Fix some handwriting entries which has multiple characters.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/data/handwriting.xml
tomoe/trunk/test/Makefile.am
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-05-08 02:40:46 UTC (rev 1236)
+++ tomoe/trunk/ChangeLog 2007-05-08 03:02:29 UTC (rev 1237)
@@ -1,3 +1,9 @@
+2007-05-08 Takuro Ashie <as...@ho...>
+
+ * test/Makefile.am: Replace WITH_HOGE with USE_HOGE.
+ Sorry, I forgot to commit it.
+ * data/handwriting.xml: Fix some entries which has multiple characters.
+
2007-05-07 Takuro Ashie <as...@ho...>
* configure.ac: Don't use "--disable-*" and "--without-*" for help
Modified: tomoe/trunk/data/handwriting.xml
===================================================================
--- tomoe/trunk/data/handwriting.xml 2007-05-08 02:40:46 UTC (rev 1236)
+++ tomoe/trunk/data/handwriting.xml 2007-05-08 03:02:29 UTC (rev 1237)
@@ -461,7 +461,7 @@
</strokes>
</character>
<character>
- <utf8>旧「ね」</utf8>
+ <utf8>ね</utf8>
<strokes>
<stroke>
<point x="280" y="173"/>
@@ -894,7 +894,7 @@
</strokes>
</character>
<character>
- <utf8>0</utf8>
+ <utf8>0</utf8>
<strokes>
<stroke>
<point x="536" y="170"/>
@@ -909,7 +909,7 @@
</strokes>
</character>
<character>
- <utf8>1</utf8>
+ <utf8>1</utf8>
<strokes>
<stroke>
<point x="536" y="150"/>
@@ -918,7 +918,7 @@
</strokes>
</character>
<character>
- <utf8>2</utf8>
+ <utf8>2</utf8>
<strokes>
<stroke>
<point x="286" y="300"/>
@@ -931,7 +931,7 @@
</strokes>
</character>
<character>
- <utf8>3</utf8>
+ <utf8>3</utf8>
<strokes>
<stroke>
<point x="333" y="206"/>
@@ -946,7 +946,7 @@
</strokes>
</character>
<character>
- <utf8>4</utf8>
+ <utf8>4</utf8>
<strokes>
<stroke>
<point x="520" y="146"/>
@@ -960,7 +960,7 @@
</strokes>
</character>
<character>
- <utf8>5</utf8>
+ <utf8>5</utf8>
<strokes>
<stroke>
<point x="353" y="130"/>
@@ -977,7 +977,7 @@
</strokes>
</character>
<character>
- <utf8>6</utf8>
+ <utf8>6</utf8>
<strokes>
<stroke>
<point x="723" y="173"/>
@@ -991,7 +991,7 @@
</strokes>
</character>
<character>
- <utf8>7</utf8>
+ <utf8>7</utf8>
<strokes>
<stroke>
<point x="276" y="213"/>
@@ -1002,7 +1002,7 @@
</strokes>
</character>
<character>
- <utf8>8</utf8>
+ <utf8>8</utf8>
<strokes>
<stroke>
<point x="676" y="313"/>
@@ -1018,7 +1018,7 @@
</strokes>
</character>
<character>
- <utf8>9</utf8>
+ <utf8>9</utf8>
<strokes>
<stroke>
<point x="650" y="236"/>
@@ -1653,7 +1653,7 @@
</strokes>
</character>
<character>
- <utf8>旧「化」</utf8>
+ <utf8>化</utf8>
<strokes>
<stroke>
<point x="460" y="123"/>
@@ -1677,7 +1677,7 @@
</strokes>
</character>
<character>
- <utf8>(^^)</utf8>
+ <utf8>(^^)</utf8>
<strokes>
<stroke>
<point x="200" y="190"/>
Modified: tomoe/trunk/test/Makefile.am
===================================================================
--- tomoe/trunk/test/Makefile.am 2007-05-08 02:40:46 UTC (rev 1236)
+++ tomoe/trunk/test/Makefile.am 2007-05-08 03:02:29 UTC (rev 1237)
@@ -33,19 +33,19 @@
writing_spec.rb
dict_modules = xml
-if WITH_EST
+if USE_EST
dict_modules += est
endif
-# if ENABLE_DICT_RUBY
+# if USE_DICT_RUBY
# dict_modules += ruby
# endif
-if WITH_UNIHAN
+if USE_UNIHAN
dict_modules += unihan
endif
-# if WITH_SVN
+# if USE_SVN
# dict_modules += svn
# endif
-if WITH_MYSQL
+if USE_MYSQL
dict_modules += mysql
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-08 02:40:45
|
Revision: 1236
http://tomoe.svn.sourceforge.net/tomoe/?rev=1236&view=rev
Author: makeinu
Date: 2007-05-07 19:40:46 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Take care about entries which has multiple characters.
Modified Paths:
--------------
tomoe-gtk/trunk/ChangeLog
tomoe-gtk/trunk/src/tomoe-char-table.c
Modified: tomoe-gtk/trunk/ChangeLog
===================================================================
--- tomoe-gtk/trunk/ChangeLog 2007-05-07 09:02:54 UTC (rev 1235)
+++ tomoe-gtk/trunk/ChangeLog 2007-05-08 02:40:46 UTC (rev 1236)
@@ -1,5 +1,10 @@
2007-05-07 Takuro Ashie <as...@ho...>
+ * src/tomoe-char-table.c: Take care about entries which has multiple
+ characters.
+
+2007-05-07 Takuro Ashie <as...@ho...>
+
* configure.ac, tomoe-pc.in: Remove gucharmap from requirements
on --without-gucharmap.
Modified: tomoe-gtk/trunk/src/tomoe-char-table.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-char-table.c 2007-05-07 09:02:54 UTC (rev 1235)
+++ tomoe-gtk/trunk/src/tomoe-char-table.c 2007-05-08 02:40:46 UTC (rev 1236)
@@ -856,6 +856,7 @@
PangoFontMetrics *metrics;
gint char_width, digit_width, ascent, descent;
gint max_char_width, max_char_height;
+ GList *node;
context = gtk_widget_get_pango_context (GTK_WIDGET (view));
metrics = pango_context_get_metrics (context,
@@ -871,6 +872,15 @@
descent = pango_font_metrics_get_descent (metrics);
max_char_height = PANGO_PIXELS (ascent + descent);
+ /* Get max width for entries which has multiple characters */
+ for (node = priv->layout_list; node; node = g_list_next (node)) {
+ PangoLayout *layout = PANGO_LAYOUT (node->data);
+ gint w = max_char_width, h = max_char_height;
+
+ pango_layout_get_pixel_size (layout, &w, &h);
+ max_char_width = w > max_char_width ? w : max_char_width;
+ }
+
if (inner_width)
*inner_width = max_char_width;
if (inner_height)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 09:02:52
|
Revision: 1235
http://tomoe.svn.sourceforge.net/tomoe/?rev=1235&view=rev
Author: makeinu
Date: 2007-05-07 02:02:54 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Don't use "--disable-*" and "--without-*" for help string to avoid confusion.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/configure.ac
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-05-07 08:50:40 UTC (rev 1234)
+++ tomoe/trunk/ChangeLog 2007-05-07 09:02:54 UTC (rev 1235)
@@ -1,5 +1,15 @@
2007-05-07 Takuro Ashie <as...@ho...>
+ * configure.ac: Don't use "--disable-*" and "--without-*" for help
+ string to avoid confusion.
+
+2007-05-07 Takuro Ashie <as...@ho...>
+
+ * configure.ac, macros/svn.m4, module/dict/Makefile.am,
+ - Replace WITH_HOGE conditional with USE_HOGE.
+
+2007-05-07 Takuro Ashie <as...@ho...>
+
* configure.ac:
- Enable Unihan and disable ruby-dict by default.
- Unify names of variables as "use_hoge" for enabling/disabling
Modified: tomoe/trunk/configure.ac
===================================================================
--- tomoe/trunk/configure.ac 2007-05-07 08:50:40 UTC (rev 1234)
+++ tomoe/trunk/configure.ac 2007-05-07 09:02:54 UTC (rev 1235)
@@ -206,8 +206,8 @@
dnl **************************************************************
AC_ARG_ENABLE(unihan,
- AS_HELP_STRING([--disable-unihan],
- [disable Unihan detabase]),
+ AS_HELP_STRING([--enable-unihan],
+ [Enable Unihan detabase (default: yes)]),
[use_unihan=$enableval],
[use_unihan=yes])
AM_CONDITIONAL([USE_UNIHAN], [test x"$use_unihan" = "xyes"])
@@ -244,7 +244,7 @@
dnl **************************************************************
AC_ARG_ENABLE(dict_ruby,
AS_HELP_STRING([--enable-dict-ruby],
- [Enable Ruby based dictionary module]),
+ [Enable Ruby based dictionary module (default: no)]),
[use_dict_ruby=$enableval],
[use_dict_ruby=no])
if test x"$ruby_available" != "xyes"; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 08:50:39
|
Revision: 1234
http://tomoe.svn.sourceforge.net/tomoe/?rev=1234&view=rev
Author: makeinu
Date: 2007-05-07 01:50:40 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Show enable_gtk_doc.
Modified Paths:
--------------
tomoe-gtk/trunk/configure.ac
Modified: tomoe-gtk/trunk/configure.ac
===================================================================
--- tomoe-gtk/trunk/configure.ac 2007-05-07 08:10:56 UTC (rev 1233)
+++ tomoe-gtk/trunk/configure.ac 2007-05-07 08:50:40 UTC (rev 1234)
@@ -193,4 +193,5 @@
echo "Configure Result:"
echo
echo " Use gucharmap : ${use_gucharmap}"
+echo " Use gtk-doc : ${enable_gtk_doc}"
echo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 08:10:55
|
Revision: 1233
http://tomoe.svn.sourceforge.net/tomoe/?rev=1233&view=rev
Author: makeinu
Date: 2007-05-07 01:10:56 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Remove gucharmap from requirements on --without-gucharmap.
Modified Paths:
--------------
tomoe-gtk/trunk/ChangeLog
tomoe-gtk/trunk/configure.ac
tomoe-gtk/trunk/tomoe-gtk.pc.in
Modified: tomoe-gtk/trunk/ChangeLog
===================================================================
--- tomoe-gtk/trunk/ChangeLog 2007-05-07 07:52:41 UTC (rev 1232)
+++ tomoe-gtk/trunk/ChangeLog 2007-05-07 08:10:56 UTC (rev 1233)
@@ -1,5 +1,10 @@
2007-05-07 Takuro Ashie <as...@ho...>
+ * configure.ac, tomoe-pc.in: Remove gucharmap from requirements
+ on --without-gucharmap.
+
+2007-05-07 Takuro Ashie <as...@ho...>
+
* configure.ac, src/Makefile.am, src/tomoe-gtk.h,
src/tomoe-window.[ch]:
Don't build & install gucharmap related code on --without-gucharmap.
Modified: tomoe-gtk/trunk/configure.ac
===================================================================
--- tomoe-gtk/trunk/configure.ac 2007-05-07 07:52:41 UTC (rev 1232)
+++ tomoe-gtk/trunk/configure.ac 2007-05-07 08:10:56 UTC (rev 1233)
@@ -101,9 +101,13 @@
if test x"$use_gucharmap" = "xyes"; then
# Checks for gucharmap
PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0])
- AC_SUBST(GUCHARMAP_CFLAGS)
- AC_SUBST(GUCHARMAP_LIBS)
+ TOMOE_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0 gucharmap >= 1.4.0"
+else
+ TOMOE_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0"
fi
+AC_SUBST(GUCHARMAP_CFLAGS)
+AC_SUBST(GUCHARMAP_LIBS)
+AC_SUBST(TOMOE_REQUIRED_LIBS)
AM_CONDITIONAL([USE_GUCHARMAP], [test x"$use_gucharmap" = "xyes"])
# Checks for gtk-doc
Modified: tomoe-gtk/trunk/tomoe-gtk.pc.in
===================================================================
--- tomoe-gtk/trunk/tomoe-gtk.pc.in 2007-05-07 07:52:41 UTC (rev 1232)
+++ tomoe-gtk/trunk/tomoe-gtk.pc.in 2007-05-07 08:10:56 UTC (rev 1233)
@@ -6,6 +6,6 @@
Name: tomoe-gtk
Description: TOMOE GTK+ library
Version: @VERSION@
-Requires: tomoe >= 0.4.0 gucharmap >= 1.4.0 gtk+-2.0 >= 2.4.0
+Requires: @TOMOE_REQUIRED_LIBS@
Libs: -L${libdir} -ltomoe-gtk
Cflags: -I${includedir}/tomoe/gtk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 07:52:39
|
Revision: 1232
http://tomoe.svn.sourceforge.net/tomoe/?rev=1232&view=rev
Author: makeinu
Date: 2007-05-07 00:52:41 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Check TOMOE_GTK_HAS_GUCHARMAP flag.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/src/scim_tomoe_prefs_widget.cpp
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-05-07 07:41:14 UTC (rev 1231)
+++ scim-tomoe/trunk/ChangeLog 2007-05-07 07:52:41 UTC (rev 1232)
@@ -1,3 +1,7 @@
+2007-05-07 Takuro Ashie <as...@ho...>
+
+ * src/scim_tomoe_prefs_widget.cpp: Check TOMOE_GTK_HAS_GUCHARMAP flag.
+
2007-04-27 Takuro Ashie <as...@ho...>
* src/scim_tomoe.cpp: I don't know why but previous code causes
Modified: scim-tomoe/trunk/src/scim_tomoe_prefs_widget.cpp
===================================================================
--- scim-tomoe/trunk/src/scim_tomoe_prefs_widget.cpp 2007-05-07 07:41:14 UTC (rev 1231)
+++ scim-tomoe/trunk/src/scim_tomoe_prefs_widget.cpp 2007-05-07 07:52:41 UTC (rev 1232)
@@ -43,7 +43,9 @@
static GtkWidget *create_window_page (ScimTomoePrefsWidget *prefs_widget);
static GtkWidget *create_handwriting_page (ScimTomoePrefsWidget *prefs_widget);
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
static GtkWidget *create_unicode_table_page (ScimTomoePrefsWidget *prefs_widget);
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
static void load_config (ScimTomoePrefsWidget *prefs_widget);
static void apply_config (ScimTomoePrefsWidget *prefs_widget);
@@ -92,12 +94,14 @@
gtk_widget_show (label);
gtk_widget_show (widget);
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
/* "Unicode table" page */
label = gtk_label_new (_("Unicode table"));
widget = create_unicode_table_page (prefs);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
gtk_widget_show (label);
gtk_widget_show (widget);
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
}
static void
@@ -324,6 +328,7 @@
return vbox;
}
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
static GtkWidget *
create_unicode_table_page (ScimTomoePrefsWidget *prefs)
{
@@ -339,6 +344,7 @@
return vbox;
}
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
static void
load_config (ScimTomoePrefsWidget *prefs)
@@ -457,6 +463,7 @@
set_default_font (prefs, SCIM_TOMOE_CONFIG_CAND_FONT, view);
}
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
// Unicode table font
TomoeGucharmap *gucharmap = TOMOE_GUCHARMAP (tomoe_window_get_gucharmap_page (parent));
GucharmapCharmap *charmap = tomoe_gucharmap_get_charmap (gucharmap);
@@ -471,6 +478,7 @@
set_default_font (prefs, SCIM_TOMOE_CONFIG_CAND_FONT,
GTK_WIDGET (charmap));
}
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
}
static void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 07:41:13
|
Revision: 1231
http://tomoe.svn.sourceforge.net/tomoe/?rev=1231&view=rev
Author: makeinu
Date: 2007-05-07 00:41:14 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Fix indent.
Modified Paths:
--------------
tomoe-gtk/trunk/src/tomoe-window.h
Modified: tomoe-gtk/trunk/src/tomoe-window.h
===================================================================
--- tomoe-gtk/trunk/src/tomoe-window.h 2007-05-07 07:40:19 UTC (rev 1230)
+++ tomoe-gtk/trunk/src/tomoe-window.h 2007-05-07 07:41:14 UTC (rev 1231)
@@ -60,7 +60,6 @@
GtkWidget *tomoe_window_get_handwriting_page (TomoeWindow *window);
GtkWidget *tomoe_window_get_reading_search_page (TomoeWindow *window);
-
/*
* It will be renamed to "tomoe_window_get_charmap_page".
* Please use "#ifdef TOMOE_GTK_HAS_*" and TOMOE_IS_* to detect widget type.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 07:40:22
|
Revision: 1230
http://tomoe.svn.sourceforge.net/tomoe/?rev=1230&view=rev
Author: makeinu
Date: 2007-05-07 00:40:19 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Update comment.
Modified Paths:
--------------
tomoe-gtk/trunk/src/tomoe-window.h
Modified: tomoe-gtk/trunk/src/tomoe-window.h
===================================================================
--- tomoe-gtk/trunk/src/tomoe-window.h 2007-05-07 07:24:19 UTC (rev 1229)
+++ tomoe-gtk/trunk/src/tomoe-window.h 2007-05-07 07:40:19 UTC (rev 1230)
@@ -63,8 +63,8 @@
/*
* It will be renamed to "tomoe_window_get_charmap_page".
- * Please use "#ifdef TOMOE_GTK_HAS_*" and TOMOE_IS_* to detect widget type,
- * or whether the charmap page exists or not.
+ * Please use "#ifdef TOMOE_GTK_HAS_*" and TOMOE_IS_* to detect widget type.
+ * If the charmap page doesn't exist, this function will return NULL.
*/
GtkWidget *tomoe_window_get_gucharmap_page (TomoeWindow *window);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 07:24:19
|
Revision: 1229
http://tomoe.svn.sourceforge.net/tomoe/?rev=1229&view=rev
Author: makeinu
Date: 2007-05-07 00:24:19 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Don't build & install gucharmap related code on --without-gucharmap.
Modified Paths:
--------------
tomoe-gtk/trunk/ChangeLog
tomoe-gtk/trunk/configure.ac
tomoe-gtk/trunk/po/ja.po
tomoe-gtk/trunk/src/Makefile.am
tomoe-gtk/trunk/src/tomoe-gtk.h
tomoe-gtk/trunk/src/tomoe-window.c
tomoe-gtk/trunk/src/tomoe-window.h
Modified: tomoe-gtk/trunk/ChangeLog
===================================================================
--- tomoe-gtk/trunk/ChangeLog 2007-05-07 06:38:17 UTC (rev 1228)
+++ tomoe-gtk/trunk/ChangeLog 2007-05-07 07:24:19 UTC (rev 1229)
@@ -1,5 +1,11 @@
2007-05-07 Takuro Ashie <as...@ho...>
+ * configure.ac, src/Makefile.am, src/tomoe-gtk.h,
+ src/tomoe-window.[ch]:
+ Don't build & install gucharmap related code on --without-gucharmap.
+
+2007-05-07 Takuro Ashie <as...@ho...>
+
* configure.ac, src/Makefile.am: Genearate tomoe-gtk-config.h to know
whether the gucharmap is buitin or not. But the header file is not
used yet.
Modified: tomoe-gtk/trunk/configure.ac
===================================================================
--- tomoe-gtk/trunk/configure.ac 2007-05-07 06:38:17 UTC (rev 1228)
+++ tomoe-gtk/trunk/configure.ac 2007-05-07 07:24:19 UTC (rev 1229)
@@ -104,6 +104,7 @@
AC_SUBST(GUCHARMAP_CFLAGS)
AC_SUBST(GUCHARMAP_LIBS)
fi
+AM_CONDITIONAL([USE_GUCHARMAP], [test x"$use_gucharmap" = "xyes"])
# Checks for gtk-doc
GTK_DOC_CHECK([1.4])
Modified: tomoe-gtk/trunk/po/ja.po
===================================================================
--- tomoe-gtk/trunk/po/ja.po 2007-05-07 06:38:17 UTC (rev 1228)
+++ tomoe-gtk/trunk/po/ja.po 2007-05-07 07:24:19 UTC (rev 1229)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: libtomoe-gtk 0.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-22 11:26+0900\n"
+"POT-Creation-Date: 2007-05-07 16:14+0900\n"
"PO-Revision-Date: 2005-10-11 18:15+0900\n"
"Last-Translator: HIGUCHI Daisuke <da...@us...>\n"
"Language-Team: Japanese <ja...@li...>\n"
@@ -229,35 +229,35 @@
msgid "Reading"
msgstr "\xC6ɤ\xDF"
-#: src/tomoe-window.c:115
+#: src/tomoe-window.c:121
msgid "TomoeHandwriting"
msgstr ""
-#: src/tomoe-window.c:116
+#: src/tomoe-window.c:122
msgid "The TomoeHandwriting widget inside of the TomoeWindow."
msgstr ""
-#: src/tomoe-window.c:123
+#: src/tomoe-window.c:129
msgid "TomoeReadingSearch"
msgstr ""
-#: src/tomoe-window.c:124
+#: src/tomoe-window.c:130
msgid "The TomoeReadingSearch widget inside of the TomoeWindow."
msgstr ""
-#: src/tomoe-window.c:131
+#: src/tomoe-window.c:137
msgid "TomoeGucharmap"
msgstr ""
-#: src/tomoe-window.c:132
+#: src/tomoe-window.c:138
msgid "The TomoeGucharmap widget inside of the TomoeWindow."
msgstr ""
-#: src/tomoe-window.c:164 src/tomoe-window.c:196
+#: src/tomoe-window.c:163 src/tomoe-window.c:195
msgid "Handwriting recognition"
msgstr "\xBC\xEA\xBD\xF1\xA4\xADǧ\xBC\xB1"
-#: src/tomoe-window.c:207
+#: src/tomoe-window.c:206
msgid "Search with reading"
msgstr "\xC6ɤߤǸ\xA1\xBA\xF7"
@@ -265,7 +265,7 @@
msgid "Unicode table"
msgstr "Unicodeɽ"
-#: src/tomoe-window.c:410
+#: src/tomoe-window.c:417
msgid "Tomoe"
msgstr ""
Modified: tomoe-gtk/trunk/src/Makefile.am
===================================================================
--- tomoe-gtk/trunk/src/Makefile.am 2007-05-07 06:38:17 UTC (rev 1228)
+++ tomoe-gtk/trunk/src/Makefile.am 2007-05-07 07:24:19 UTC (rev 1229)
@@ -8,18 +8,17 @@
lib_LTLIBRARIES = libtomoe-gtk.la
libtomoe_gtk_la_SOURCES = \
- tomoe-canvas.c tomoe-canvas.h \
- tomoe-char-table.c tomoe-char-table.h \
- tomoe-details.c tomoe-details.h \
- tomoe-edit-char.c tomoe-edit-char.h \
- tomoe-edit-meta.c tomoe-edit-meta.h \
- tomoe-edit-strokes.c tomoe-edit-strokes.h \
- tomoe-gtk.c tomoe-gtk.h \
- tomoe-gucharmap.c tomoe-gucharmap.h \
- tomoe-handwriting.c tomoe-handwriting.h \
- tomoe-reading-search.c tomoe-reading-search.h \
- tomoe-scrollable.c tomoe-scrollable.h \
- tomoe-window.c tomoe-window.h
+ tomoe-canvas.c \
+ tomoe-char-table.c \
+ tomoe-details.c \
+ tomoe-edit-char.c \
+ tomoe-edit-meta.c \
+ tomoe-edit-strokes.c \
+ tomoe-gtk.c \
+ tomoe-handwriting.c \
+ tomoe-reading-search.c \
+ tomoe-scrollable.c \
+ tomoe-window.c
libtomoe_gtk_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \
@@ -34,12 +33,16 @@
tomoe-edit-meta.h \
tomoe-edit-strokes.h \
tomoe-gtk.h \
- tomoe-gucharmap.h \
tomoe-handwriting.h \
tomoe-reading-search.h \
tomoe-scrollable.h \
tomoe-window.h
+if USE_GUCHARMAP
+libtomoe_gtk_la_SOURCES += tomoe-gucharmap.c
+pkginclude_HEADERS += tomoe-gucharmap.h
+endif
+
#
# Rule to install tomoe-gtk-config.h header file
#
Modified: tomoe-gtk/trunk/src/tomoe-gtk.h
===================================================================
--- tomoe-gtk/trunk/src/tomoe-gtk.h 2007-05-07 06:38:17 UTC (rev 1228)
+++ tomoe-gtk/trunk/src/tomoe-gtk.h 2007-05-07 07:24:19 UTC (rev 1229)
@@ -21,12 +21,17 @@
#ifndef __TOMOE_GTK_H_INCLUDED__
#define __TOMOE_GTK_H_INCLUDED__
+#include <tomoe-gtk-config.h>
+
#include <tomoe-canvas.h>
#include <tomoe-char-table.h>
#include <tomoe-window.h>
#include <tomoe-handwriting.h>
#include <tomoe-reading-search.h>
+
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
#include <tomoe-gucharmap.h>
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
/* editors */
#include <tomoe-details.h>
Modified: tomoe-gtk/trunk/src/tomoe-window.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-window.c 2007-05-07 06:38:17 UTC (rev 1228)
+++ tomoe-gtk/trunk/src/tomoe-window.c 2007-05-07 07:24:19 UTC (rev 1229)
@@ -25,13 +25,17 @@
#include <glib/gi18n-lib.h>
#include <tomoe.h>
+#include "tomoe-gtk.h"
#include "tomoe-window.h"
#include "tomoe-canvas.h"
#include "tomoe-handwriting.h"
#include "tomoe-char-table.h"
#include "tomoe-reading-search.h"
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
#include "tomoe-gucharmap.h"
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
+
#define TOMOE_DATA_VIEW_ICON TOMOEGTKDATADIR"/tomoe-data-view.png"
#define TOMOE_DICTIONARY_ICON TOMOEGTKDATADIR"/tomoe-dictionary.png"
#define TOMOE_HANDWRITING_ICON TOMOEGTKDATADIR"/tomoe-handwriting.png"
@@ -86,8 +90,10 @@
gpointer user_data);
static void on_reading_search_selected (TomoeReadingSearch *search,
gpointer user_data);
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
static void on_gucharmap_selected (TomoeGucharmap *gucharmap,
gpointer data);
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
static guint window_signals[LAST_SIGNAL] = { 0 };
@@ -199,6 +205,7 @@
gtk_image_new_from_file (TOMOE_SEARCHING_ICON),
_("Search with reading"));
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
/* gucharmap page */
widget = tomoe_gucharmap_new ();
priv->gucharmap = widget;
@@ -209,6 +216,9 @@
tomoe_window_append_page (window, widget,
gtk_image_new_from_file (TOMOE_GUCHARMAP_ICON),
_("Unicode table"));
+#else /* TOMOE_GTK_HAS_GUCHARMAP */
+ priv->gucharmap = NULL;
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
}
static void
@@ -361,8 +371,10 @@
return tomoe_handwriting_get_selected_char (widget);
else if (TOMOE_IS_READING_SEARCH (widget))
return tomoe_reading_search_get_selected_char (widget);
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
else if (TOMOE_IS_GUCHARMAP (widget))
return tomoe_gucharmap_get_selected_char (widget);
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
return NULL;
}
@@ -383,8 +395,10 @@
return tomoe_handwriting_get_selected_tomoe_char (widget);
else if (TOMOE_IS_READING_SEARCH (widget))
return tomoe_reading_search_get_selected_tomoe_char (widget);
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
else if (TOMOE_IS_GUCHARMAP (widget))
return tomoe_gucharmap_get_selected_tomoe_char (widget);
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
return NULL;
}
@@ -425,6 +439,7 @@
window_signals[SELECTED_SIGNAL], 0);
}
+#ifdef TOMOE_GTK_HAS_GUCHARMAP
static void
on_gucharmap_selected (TomoeGucharmap *gucharmap, gpointer user_data)
{
@@ -435,6 +450,7 @@
g_signal_emit (G_OBJECT (window),
window_signals[SELECTED_SIGNAL], 0);
}
+#endif /* TOMOE_GTK_HAS_GUCHARMAP */
/*
* vi:ts=4:nowrap:ai:expandtab
Modified: tomoe-gtk/trunk/src/tomoe-window.h
===================================================================
--- tomoe-gtk/trunk/src/tomoe-window.h 2007-05-07 06:38:17 UTC (rev 1228)
+++ tomoe-gtk/trunk/src/tomoe-window.h 2007-05-07 07:24:19 UTC (rev 1229)
@@ -60,6 +60,12 @@
GtkWidget *tomoe_window_get_handwriting_page (TomoeWindow *window);
GtkWidget *tomoe_window_get_reading_search_page (TomoeWindow *window);
+
+/*
+ * It will be renamed to "tomoe_window_get_charmap_page".
+ * Please use "#ifdef TOMOE_GTK_HAS_*" and TOMOE_IS_* to detect widget type,
+ * or whether the charmap page exists or not.
+ */
GtkWidget *tomoe_window_get_gucharmap_page (TomoeWindow *window);
const gchar *tomoe_window_get_selected_char (TomoeWindow *window);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 06:38:22
|
Revision: 1228
http://tomoe.svn.sourceforge.net/tomoe/?rev=1228&view=rev
Author: makeinu
Date: 2007-05-06 23:38:17 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Genearate tomoe-gtk-config.h to know whether the gucharmap is buitin or not. But the header file is not used yet.
Modified Paths:
--------------
tomoe-gtk/trunk/ChangeLog
tomoe-gtk/trunk/configure.ac
tomoe-gtk/trunk/src/Makefile.am
Modified: tomoe-gtk/trunk/ChangeLog
===================================================================
--- tomoe-gtk/trunk/ChangeLog 2007-05-07 04:23:00 UTC (rev 1227)
+++ tomoe-gtk/trunk/ChangeLog 2007-05-07 06:38:17 UTC (rev 1228)
@@ -1,3 +1,9 @@
+2007-05-07 Takuro Ashie <as...@ho...>
+
+ * configure.ac, src/Makefile.am: Genearate tomoe-gtk-config.h to know
+ whether the gucharmap is buitin or not. But the header file is not
+ used yet.
+
2007-04-27 Takuro Ashie <as...@ho...>
* src/tomoe-window.c: I don't why but previous code breaks scim-tomoe.
Modified: tomoe-gtk/trunk/configure.ac
===================================================================
--- tomoe-gtk/trunk/configure.ac 2007-05-07 04:23:00 UTC (rev 1227)
+++ tomoe-gtk/trunk/configure.ac 2007-05-07 06:38:17 UTC (rev 1228)
@@ -93,9 +93,17 @@
AC_SUBST(TOMOE_LIBS)
# Checks for gucharmap
-PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0])
-AC_SUBST(GUCHARMAP_CFLAGS)
-AC_SUBST(GUCHARMAP_LIBS)
+AC_ARG_WITH(gucharmap,
+ AS_HELP_STRING([--with-gucharmap],
+ [Compile with gucharmap]),
+ [use_gucharmap=$withval],
+ [use_gucharmap=yes])
+if test x"$use_gucharmap" = "xyes"; then
+ # Checks for gucharmap
+ PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0])
+ AC_SUBST(GUCHARMAP_CFLAGS)
+ AC_SUBST(GUCHARMAP_LIBS)
+fi
# Checks for gtk-doc
GTK_DOC_CHECK([1.4])
@@ -109,6 +117,55 @@
AM_GLIB_GNU_GETTEXT
AM_GLIB_DEFINE_LOCALEDIR(TOMOE_GTK_LOCALEDIR)
+
+dnl **************************************************************
+dnl Generate tomoe-gtk-config.h
+dnl **************************************************************
+
+AC_CONFIG_COMMANDS([src/tomoe-gtk-config.h], [
+ outfile=tomoe-gtk-config.h-tmp
+ cat > $outfile <<\_______EOF
+/* tomoe-gtk-config.h
+ *
+ * This is a generated file. Please modify `configure.ac'
+ */
+
+#ifndef TOMOE_GTK_CONFIG_H
+#define TOMOE_GTK_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+_______EOF
+
+ cat >>$outfile <<_______EOF
+$tomoe_gtk_has_gucharmap
+_______EOF
+
+ cat >>$outfile <<_______EOF
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* TOMOE_GTK_CONFIG_H */
+_______EOF
+
+
+ if cmp -s $outfile src/tomoe-gtk-config.h; then
+ AC_MSG_NOTICE([src/tomoe-gtk-config.h is unchanged])
+ rm -f $outfile
+ else
+ mv $outfile src/tomoe-gtk-config.h
+ fi
+],[
+if test "x$use_gucharmap" = "xyes" ; then
+ tomoe_gtk_has_gucharmap='
+#define TOMOE_GTK_HAS_GUCHARMAP'
+fi
+])
+
AC_CONFIG_FILES([
Makefile
po/Makefile.in
@@ -122,3 +179,13 @@
])
AC_OUTPUT
+
+dnl **************************************************************
+dnl Show configure result
+dnl **************************************************************
+
+echo
+echo "Configure Result:"
+echo
+echo " Use gucharmap : ${use_gucharmap}"
+echo
Modified: tomoe-gtk/trunk/src/Makefile.am
===================================================================
--- tomoe-gtk/trunk/src/Makefile.am 2007-05-07 04:23:00 UTC (rev 1227)
+++ tomoe-gtk/trunk/src/Makefile.am 2007-05-07 06:38:17 UTC (rev 1228)
@@ -39,3 +39,14 @@
tomoe-reading-search.h \
tomoe-scrollable.h \
tomoe-window.h
+
+#
+# Rule to install tomoe-gtk-config.h header file
+#
+configexecincludedir = $(includedir)/tomoe/gtk
+
+install-exec-local: tomoe-gtk-config.h
+ $(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
+ file=$(DESTDIR)$(configexecincludedir)/tomoe-gtk-config.h; \
+ if test -r $$file && cmp -s tomoe-gtk-config.h $$file; then :; \
+ else $(INSTALL_DATA) tomoe-gtk-config.h $$file; fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 04:23:00
|
Revision: 1227
http://tomoe.svn.sourceforge.net/tomoe/?rev=1227&view=rev
Author: makeinu
Date: 2007-05-06 21:23:00 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Replace WITH_HOGE conditional with USE_HOGE.
Modified Paths:
--------------
tomoe/trunk/configure.ac
tomoe/trunk/macros/svn.m4
tomoe/trunk/module/dict/Makefile.am
Modified: tomoe/trunk/configure.ac
===================================================================
--- tomoe/trunk/configure.ac 2007-05-07 02:16:43 UTC (rev 1226)
+++ tomoe/trunk/configure.ac 2007-05-07 04:23:00 UTC (rev 1227)
@@ -155,7 +155,7 @@
use_est=no
PKG_CHECK_MODULES(EST, hyperestraier,
[use_est=yes], [use_est=no])
-AM_CONDITIONAL([WITH_EST], [test x"$use_est" = "xyes"])
+AM_CONDITIONAL([USE_EST], [test x"$use_est" = "xyes"])
dnl **************************************************************
dnl Configure for configuration.
@@ -210,7 +210,7 @@
[disable Unihan detabase]),
[use_unihan=$enableval],
[use_unihan=yes])
-AM_CONDITIONAL([WITH_UNIHAN], [test x"$use_unihan" = "xyes"])
+AM_CONDITIONAL([USE_UNIHAN], [test x"$use_unihan" = "xyes"])
AC_PATH_PROG(UNZIP, unzip, unzip-not-found)
@@ -237,7 +237,7 @@
AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_LIBS)
-AM_CONDITIONAL([WITH_MYSQL], [test "x$use_mysql" = "xyes"])
+AM_CONDITIONAL([USE_MYSQL], [test "x$use_mysql" = "xyes"])
dnl **************************************************************
dnl Configure for Ruby dictionary.
@@ -250,7 +250,7 @@
if test x"$ruby_available" != "xyes"; then
use_dict_ruby=no
fi
-AM_CONDITIONAL(ENABLE_DICT_RUBY, [test x"$use_dict_ruby" = "xyes"])
+AM_CONDITIONAL(USE_DICT_RUBY, [test x"$use_dict_ruby" = "xyes"])
dnl **************************************************************
Modified: tomoe/trunk/macros/svn.m4
===================================================================
--- tomoe/trunk/macros/svn.m4 2007-05-07 02:16:43 UTC (rev 1226)
+++ tomoe/trunk/macros/svn.m4 2007-05-07 04:23:00 UTC (rev 1227)
@@ -52,5 +52,5 @@
AC_SUBST(SVN_CFLAGS)
AC_SUBST(SVN_LIBS)
-AM_CONDITIONAL([WITH_SVN], [test "$use_svn" = "yes"])
+AM_CONDITIONAL([USE_SVN], [test "$use_svn" = "yes"])
])
Modified: tomoe/trunk/module/dict/Makefile.am
===================================================================
--- tomoe/trunk/module/dict/Makefile.am 2007-05-07 02:16:43 UTC (rev 1226)
+++ tomoe/trunk/module/dict/Makefile.am 2007-05-07 04:23:00 UTC (rev 1227)
@@ -46,7 +46,7 @@
xml_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:XML\" $(AM_CPPFLAGS)
xml_la_SOURCES = tomoe-dict-xml.c $(ptr_array_based_dict_sources)
-if WITH_EST
+if USE_EST
dict_module_LTLIBRARIES += est.la
est_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:Est\" $(AM_CPPFLAGS)
@@ -54,7 +54,7 @@
est_la_LIBADD = $(EST_LIBS)
endif
-if ENABLE_DICT_RUBY
+if USE_DICT_RUBY
dict_module_LTLIBRARIES += ruby.la
ruby_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:Ruby\" $(AM_CPPFLAGS)
@@ -62,7 +62,7 @@
ruby_la_LIBADD = $(RUBY_LIBS)
endif
-if WITH_UNIHAN
+if USE_UNIHAN
dict_module_LTLIBRARIES += unihan.la
unihan_built_sources = tomoe-unihan-data.h
@@ -102,7 +102,7 @@
touch $@
endif
-if WITH_SVN
+if USE_SVN
dict_module_LTLIBRARIES += svn.la
svn_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:Svn\" $(AM_CPPFLAGS)
@@ -110,7 +110,7 @@
svn_la_LIBADD = $(SVN_LIBS)
endif
-if WITH_MYSQL
+if USE_MYSQL
dict_module_LTLIBRARIES += mysql.la
mysql_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:MySQL\" $(AM_CPPFLAGS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 02:16:41
|
Revision: 1226
http://tomoe.svn.sourceforge.net/tomoe/?rev=1226&view=rev
Author: makeinu
Date: 2007-05-06 19:16:43 -0700 (Sun, 06 May 2007)
Log Message:
-----------
- Add "x" when test variables for detecting empty string.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/configure.ac
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-05-07 02:05:01 UTC (rev 1225)
+++ tomoe/trunk/ChangeLog 2007-05-07 02:16:43 UTC (rev 1226)
@@ -4,6 +4,7 @@
- Enable Unihan and disable ruby-dict by default.
- Unify names of variables as "use_hoge" for enabling/disabling
dictionaries.
+ - Add "x" when test variables for detecting empty string.
2007-05-07 Kouhei Sutou <ko...@co...>
Modified: tomoe/trunk/configure.ac
===================================================================
--- tomoe/trunk/configure.ac 2007-05-07 02:05:01 UTC (rev 1225)
+++ tomoe/trunk/configure.ac 2007-05-07 02:16:43 UTC (rev 1226)
@@ -155,7 +155,7 @@
use_est=no
PKG_CHECK_MODULES(EST, hyperestraier,
[use_est=yes], [use_est=no])
-AM_CONDITIONAL([WITH_EST], [test "$use_est" = "yes"])
+AM_CONDITIONAL([WITH_EST], [test x"$use_est" = "xyes"])
dnl **************************************************************
dnl Configure for configuration.
@@ -210,7 +210,7 @@
[disable Unihan detabase]),
[use_unihan=$enableval],
[use_unihan=yes])
-AM_CONDITIONAL([WITH_UNIHAN], [test "$use_unihan" = "yes"])
+AM_CONDITIONAL([WITH_UNIHAN], [test x"$use_unihan" = "xyes"])
AC_PATH_PROG(UNZIP, unzip, unzip-not-found)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-05-07 02:04:59
|
Revision: 1225
http://tomoe.svn.sourceforge.net/tomoe/?rev=1225&view=rev
Author: makeinu
Date: 2007-05-06 19:05:01 -0700 (Sun, 06 May 2007)
Log Message:
-----------
- Enable Unihan and disable ruby-dict by default.
- Unify names of variables as "use_hoge" for enabling/disabling
dictionaries.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/configure.ac
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-05-07 01:53:51 UTC (rev 1224)
+++ tomoe/trunk/ChangeLog 2007-05-07 02:05:01 UTC (rev 1225)
@@ -1,3 +1,10 @@
+2007-05-07 Takuro Ashie <as...@ho...>
+
+ * configure.ac:
+ - Enable Unihan and disable ruby-dict by default.
+ - Unify names of variables as "use_hoge" for enabling/disabling
+ dictionaries.
+
2007-05-07 Kouhei Sutou <ko...@co...>
* module/dict/Makefile.am, module/dict/download.rb: used passive
Modified: tomoe/trunk/configure.ac
===================================================================
--- tomoe/trunk/configure.ac 2007-05-07 01:53:51 UTC (rev 1224)
+++ tomoe/trunk/configure.ac 2007-05-07 02:05:01 UTC (rev 1225)
@@ -152,10 +152,10 @@
dnl Check for Hyper Estraier.
dnl **************************************************************
-est_exists=no
+use_est=no
PKG_CHECK_MODULES(EST, hyperestraier,
- [est_exists=yes], [est_exists=no])
-AM_CONDITIONAL([WITH_EST], [test "$est_exists" = "yes"])
+ [use_est=yes], [use_est=no])
+AM_CONDITIONAL([WITH_EST], [test "$use_est" = "yes"])
dnl **************************************************************
dnl Configure for configuration.
@@ -205,12 +205,11 @@
dnl Configure for Unihan dictionary.
dnl **************************************************************
-use_unihan=yes
AC_ARG_ENABLE(unihan,
AS_HELP_STRING([--disable-unihan],
[disable Unihan detabase]),
[use_unihan=$enableval],
- [use_unihan=$enableval])
+ [use_unihan=yes])
AM_CONDITIONAL([WITH_UNIHAN], [test "$use_unihan" = "yes"])
AC_PATH_PROG(UNZIP, unzip, unzip-not-found)
@@ -225,12 +224,12 @@
dnl Configure for MySQL dictionary.
dnl **************************************************************
-enable_mysql=no
+use_mysql=no
AC_PATH_PROG(MYSQL_CONFIG, mysql_config, mysql_config-not-found)
if test "x$MYSQL_CONFIG" != "xmysql_config-not-found"; then
- enable_mysql=yes
+ use_mysql=yes
MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
MYSQL_LIBS=`$MYSQL_CONFIG --libs`
fi
@@ -238,7 +237,7 @@
AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_LIBS)
-AM_CONDITIONAL([WITH_MYSQL], [test "x$enable_mysql" = "xyes"])
+AM_CONDITIONAL([WITH_MYSQL], [test "x$use_mysql" = "xyes"])
dnl **************************************************************
dnl Configure for Ruby dictionary.
@@ -246,13 +245,12 @@
AC_ARG_ENABLE(dict_ruby,
AS_HELP_STRING([--enable-dict-ruby],
[Enable Ruby based dictionary module]),
- [enable_dict_ruby=$enableval],
- [enable_dict_ruby=$enableval])
+ [use_dict_ruby=$enableval],
+ [use_dict_ruby=no])
if test x"$ruby_available" != "xyes"; then
- enable_dict_ruby=no
+ use_dict_ruby=no
fi
-AM_CONDITIONAL(ENABLE_DICT_RUBY,
- [test x"$enable_dict_ruby" = "xyes"])
+AM_CONDITIONAL(ENABLE_DICT_RUBY, [test x"$use_dict_ruby" = "xyes"])
dnl **************************************************************
@@ -315,10 +313,10 @@
echo " * Dictionary Backends"
echo
echo " Unihan Database : ${use_unihan}"
-echo " Hyper Estraier : ${est_exists}"
+echo " Hyper Estraier : ${use_est}"
echo " Subversion : ${use_svn}"
-echo " MySQL : ${enable_mysql}"
-echo " Ruby : ${enable_dict_ruby}"
+echo " MySQL : ${use_mysql}"
+echo " Ruby : ${use_dict_ruby}"
echo
echo " * Other Features"
echo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-05-07 01:53:52
|
Revision: 1224
http://tomoe.svn.sourceforge.net/tomoe/?rev=1224&view=rev
Author: ktou
Date: 2007-05-06 18:53:51 -0700 (Sun, 06 May 2007)
Log Message:
-----------
* module/dict/Makefile.am, module/dict/download.rb: used passive
mode for downloading Unihan.zip.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/module/dict/Makefile.am
Added Paths:
-----------
tomoe/trunk/module/dict/download.rb
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-27 09:51:29 UTC (rev 1223)
+++ tomoe/trunk/ChangeLog 2007-05-07 01:53:51 UTC (rev 1224)
@@ -1,3 +1,8 @@
+2007-05-07 Kouhei Sutou <ko...@co...>
+
+ * module/dict/Makefile.am, module/dict/download.rb: used passive
+ mode for downloading Unihan.zip.
+
2007-04-27 Kouhei Sutou <ko...@co...>
* macros/: ignored auto-generated files.
Modified: tomoe/trunk/module/dict/Makefile.am
===================================================================
--- tomoe/trunk/module/dict/Makefile.am 2007-04-27 09:51:29 UTC (rev 1223)
+++ tomoe/trunk/module/dict/Makefile.am 2007-05-07 01:53:51 UTC (rev 1224)
@@ -72,7 +72,7 @@
DISTCLEANFILES = Unihan.zip
BUILT_SOURCES = $(unihan_built_sources)
-EXTRA_DIST = unihan-compiler.rb $(BUILT_SOURCES) Unihan.stamp
+EXTRA_DIST = unihan-compiler.rb download.rb $(BUILT_SOURCES) Unihan.stamp
unihan_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:Unihan\" $(AM_CPPFLAGS)
unihan_la_SOURCES = \
@@ -96,8 +96,7 @@
Unihan_URL = ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
Unihan.stamp:
if test ! -f Unihan.txt; then \
- $(RUBY) -r open-uri -e "print open('$(Unihan_URL)').read" \
- > Unihan.zip || exit 1; \
+ $(RUBY) $(srcdir)/download.rb $(Unihan_URL) || exit 1; \
$(UNZIP) -o Unihan.zip || exit 1; \
fi
touch $@
Added: tomoe/trunk/module/dict/download.rb
===================================================================
--- tomoe/trunk/module/dict/download.rb (rev 0)
+++ tomoe/trunk/module/dict/download.rb 2007-05-07 01:53:51 UTC (rev 1224)
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'uri'
+
+if ARGV.size < 1
+ puts "Usage: #{$0} URI"
+ exit 1
+end
+
+uri = URI.parse(ARGV.first)
+
+if uri.is_a?(URI::FTP)
+ require 'net/ftp'
+ Net::FTP.open(uri.host) do |ftp|
+ ftp.passive = true
+ ftp.login
+ ftp.passive
+ dir, file = File.split(uri.path)
+ ftp.chdir(dir)
+ ftp.getbinaryfile(file)
+ end
+else
+ require 'open-uri'
+ File.open(File.basename(uri.path), "wb") do |output|
+ output.print uri.read
+ end
+end
Property changes on: tomoe/trunk/module/dict/download.rb
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-04-27 09:51:30
|
Revision: 1223
http://tomoe.svn.sourceforge.net/tomoe/?rev=1223&view=rev
Author: huzheng
Date: 2007-04-27 02:51:29 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
stroke-editor version 1.2
Modified Paths:
--------------
tools/stroke-editor/ChangeLog
tools/stroke-editor/src/canvas.py
tools/stroke-editor/src/importutf.py
tools/stroke-editor/src/main.py
tools/stroke-editor/src/net/db.py
tools/stroke-editor/src/openxml.py
tools/stroke-editor/src/savexml.py
tools/stroke-editor/src/workview.py
tools/stroke-editor/utils/utf2sql.py
Added Paths:
-----------
tools/stroke-editor/data/test.list
tools/stroke-editor/src/importlist.py
Modified: tools/stroke-editor/ChangeLog
===================================================================
--- tools/stroke-editor/ChangeLog 2007-04-27 07:09:38 UTC (rev 1222)
+++ tools/stroke-editor/ChangeLog 2007-04-27 09:51:29 UTC (rev 1223)
@@ -1,3 +1,7 @@
+2007.4.27 Hu Zheng <zh...@re...>
+- Multiple characters support.
+* Version 1.2 released.
+
2007.4.19 Mathieu Blondel <mbl...@ru...>
- remove the "select all" stock and put a normal label instead
- put the options related to the strokes in a "stroke" submenu
@@ -2,7 +6,8 @@
- make the options sensitive only if they are available
+* Version 1.1 released.
-2007.4.12
-Get the 1.0 version. Add into tomoe project.
+2007.4.12 Hu Zheng <zh...@re...>
+* Get the 1.0 version. Add into tomoe project.
-2007.3.26
-Start the development.
+2007.3.26 Hu Zheng <zh...@re...>
+* Start the development.
Added: tools/stroke-editor/data/test.list
===================================================================
--- tools/stroke-editor/data/test.list (rev 0)
+++ tools/stroke-editor/data/test.list 2007-04-27 09:51:29 UTC (rev 1223)
@@ -0,0 +1,6 @@
+*
+(^^)
+
+:_)
+:)
+:-)
Modified: tools/stroke-editor/src/canvas.py
===================================================================
--- tools/stroke-editor/src/canvas.py 2007-04-27 07:09:38 UTC (rev 1222)
+++ tools/stroke-editor/src/canvas.py 2007-04-27 09:51:29 UTC (rev 1223)
@@ -45,7 +45,7 @@
self.set_font(char_font)
self._font_desc_number = pango.FontDescription (FONT_NUMBER)
self._state = CANVAS_NORMAL
- self._char = u" "
+ self._chars = u" "
self.set_size_request (400, 400)
self._selection = []
self._modified = False
@@ -62,12 +62,12 @@
def get_font (self):
return self._font_desc.to_string ()
- def set_char (self, char, strokes = [], modified = False):
- """set_char (self, char, strokes = [])
- char: integer of unicode
+ def set_chars (self, chars, strokes = [], modified = False):
+ """set_chars (self, chars, strokes = [])
+ chars: is an unicode chars
strokes: a list for stroke, default = [] empty
"""
- self._char = unichr (char)
+ self._chars = chars
self._strokes = strokes
self._modified = False
self.queue_draw ()
@@ -154,7 +154,7 @@
# Draw charater as background
cr.save ()
layout = pango.Layout (pg)
- layout.set_text (self._char)
+ layout.set_text (self._chars)
layout.set_font_description (self._font_desc)
w, h = layout.get_pixel_size ()
cr.scale (float (self._width) / w, float (self._height) / h)
Added: tools/stroke-editor/src/importlist.py
===================================================================
--- tools/stroke-editor/src/importlist.py (rev 0)
+++ tools/stroke-editor/src/importlist.py 2007-04-27 09:51:29 UTC (rev 1223)
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+
+import gobject
+import gtk
+
+class ImportList:
+ def __init__(self, mainwin):
+ self.mainwin = mainwin
+
+ def import_listfile(self, filename):
+ self.mainwin.enable_network = False
+ self.mainwin.char_liststore = gtk.ListStore(gobject.TYPE_STRING, object, gobject.TYPE_BOOLEAN)
+ lines = file(filename).readlines()
+ for line in lines:
+ utf8str = ""
+ for ch in line:
+ if (ch == '\0' or ch == '\n'):
+ break
+ utf8str += ch;
+ if utf8str != "":
+ self.mainwin.char_liststore.append([utf8str, [], False])
+
+ def do_import(self):
+ dialog = gtk.FileChooserDialog ("Select list file",
+ self.mainwin,
+ gtk.FILE_CHOOSER_ACTION_OPEN,
+ (gtk.STOCK_OPEN, gtk.RESPONSE_OK,
+ gtk.STOCK_CANCEL, gtk.RESPONSE_CLOSE))
+ listfilter = gtk.FileFilter()
+ listfilter.set_name("UTF-8 list file")
+ listfilter.add_pattern("*.list*")
+ allfilter = gtk.FileFilter()
+ allfilter.set_name("Any file")
+ allfilter.add_pattern("*")
+ dialog.add_filter(listfilter)
+ dialog.add_filter(allfilter)
+ dialog.set_default_response (gtk.RESPONSE_OK)
+ dialog.set_position (gtk.WIN_POS_CENTER_ON_PARENT)
+ retval = dialog.run ()
+ if retval == gtk.RESPONSE_OK:
+ self.import_listfile(dialog.get_filename())
+ dialog.destroy ()
+
Modified: tools/stroke-editor/src/importutf.py
===================================================================
--- tools/stroke-editor/src/importutf.py 2007-04-27 07:09:38 UTC (rev 1222)
+++ tools/stroke-editor/src/importutf.py 2007-04-27 09:51:29 UTC (rev 1223)
@@ -17,13 +17,13 @@
self.mainwin.char_liststore.append([utf8char, [], False])
def do_import(self):
- dialog = gtk.FileChooserDialog ("Select character list file",
+ dialog = gtk.FileChooserDialog ("Select utf file",
self.mainwin,
gtk.FILE_CHOOSER_ACTION_OPEN,
(gtk.STOCK_OPEN, gtk.RESPONSE_OK,
gtk.STOCK_CANCEL, gtk.RESPONSE_CLOSE))
utffilter = gtk.FileFilter()
- utffilter.set_name("UTF-8 list file")
+ utffilter.set_name("UTF-8 utf file")
utffilter.add_pattern("*.utf*")
allfilter = gtk.FileFilter()
allfilter.set_name("Any file")
Modified: tools/stroke-editor/src/main.py
===================================================================
--- tools/stroke-editor/src/main.py 2007-04-27 07:09:38 UTC (rev 1222)
+++ tools/stroke-editor/src/main.py 2007-04-27 09:51:29 UTC (rev 1223)
@@ -7,6 +7,7 @@
from savexml import SaveXML
from configfile import ConfigFile
from importutf import ImportUtf
+from importlist import ImportList
from net import StrokeClient
@@ -17,7 +18,8 @@
<menu action="FileMenu">
<menuitem action="Open"/>
<menuitem action="Save"/>
- <menuitem action="Import"/>
+ <menuitem action="ImportUtf"/>
+ <menuitem action="ImportList"/>
<menuitem action="ImportToServer"/>
<menuitem action="Connect"/>
<separator/>
@@ -25,8 +27,9 @@
</menu>
<menu action="EditMenu">
<menuitem action="Add"/>
+ <menuitem action="DeleteKey"/>
+ <menuitem action="EditKey"/>
<menuitem action="Search"/>
- <menuitem action="DeleteChar"/>
<separator/>
<menu action="StrokeMenu">
<menuitem action="Cut"/>
@@ -51,8 +54,9 @@
<toolitem action="Connect"/>
<separator/>
<toolitem action="Add"/>
+ <toolitem action="DeleteKey"/>
+ <toolitem action="EditKey"/>
<toolitem action="Search"/>
- <toolitem action="DeleteChar"/>
<separator/>
<toolitem action="About"/>
</toolbar>
@@ -76,8 +80,10 @@
# (action name, stock id, label, accelerator, tooltip, callback)
( "Open", gtk.STOCK_OPEN,
None, None, None, self.do_open),
- ( "Import", gtk.STOCK_CONVERT,
- "Import list file", None, None, self.do_import),
+ ( "ImportUtf", gtk.STOCK_CONVERT,
+ "Import utf file", None, None, self.do_importUtf),
+ ( "ImportList", gtk.STOCK_CONVERT,
+ "Import list file", None, None, self.do_importList),
( "ImportToServer", gtk.STOCK_CONVERT,
"Import To Server", None, None, self.do_import_to_server),
( "Save", gtk.STOCK_SAVE,
@@ -97,11 +103,13 @@
( "SelectAll", None,
"Select _All", "<Ctrl>A", None, self.do_select_all),
( "Add", gtk.STOCK_ADD,
- None, None, None, self.do_newchar),
+ None, None, None, self.do_newkey),
( "Search", gtk.STOCK_FIND,
None, None, None, self.do_search),
- ( "DeleteChar", gtk.STOCK_DELETE,
- "Delete Char", None, None, self.do_delchar),
+ ( "DeleteKey", gtk.STOCK_DELETE,
+ "Delete Key", None, None, self.do_delkey),
+ ( "EditKey", gtk.STOCK_EDIT,
+ "Edit Key", None, None, self.do_editkey),
( "Font", gtk.STOCK_SELECT_FONT,
None, None, None, self.do_font),
( "Quit", gtk.STOCK_QUIT,
@@ -120,7 +128,8 @@
self.add_accel_group (self._manager.get_accel_group ())
self._manager.add_ui_from_string (_WINDOW_UI)
- self._manager.get_widget("/Toolbar/DeleteChar").set_homogeneous(False)
+ self._manager.get_widget("/Toolbar/DeleteKey").set_homogeneous(False)
+ self._manager.get_widget("/Toolbar/EditKey").set_homogeneous(False)
vbox.pack_start(self._manager.get_widget ("/MenuBar"), False)
vbox.pack_start(self._manager.get_widget ("/Toolbar"), False)
@@ -139,15 +148,16 @@
self.update_statusbar()
self.enable_network = False
- self._current_code = -1
+ self._current_chars = False
self._unit = int(self.config.get("server", "unit", "0"))
self._url = self.config.get("server", "url", "http://10.66.0.143:1980")
def create_charlist(self):
- self._manager.get_action("/Toolbar/DeleteChar").set_sensitive(False)
+ self._manager.get_action("/Toolbar/DeleteKey").set_sensitive(False)
+ self._manager.get_action("/Toolbar/EditKey").set_sensitive(False)
self.char_liststore = gtk.ListStore(gobject.TYPE_STRING, object, gobject.TYPE_BOOLEAN)
self.char_treeview = gtk.TreeView(self.char_liststore)
- charcolumn = gtk.TreeViewColumn("Char")
+ charcolumn = gtk.TreeViewColumn("Key")
self.char_treeview.append_column(charcolumn)
cell = gtk.CellRendererText()
charcolumn.pack_start(cell, True)
@@ -169,19 +179,20 @@
def on_char_treeview_selected(self, treeselection):
(model, iter) = treeselection.get_selected()
- self._manager.get_action("/Toolbar/DeleteChar").set_sensitive(bool(iter))
+ self._manager.get_action("/Toolbar/DeleteKey").set_sensitive(bool(iter))
+ self._manager.get_action("/Toolbar/EditKey").set_sensitive(bool(iter))
if iter:
if self.enable_network:
- if self._current_code != -1:
+ if self._current_chars:
strokes = self.workview.get_strokes()
if self.workview.is_modified ():
- self.client.update_strokes (self._current_code, strokes)
- code = ord (unicode (model.get_value(iter, 0), "UTF-8")[0])
- strokes = self.client.get_strokes (code)
- self.workview.set_char (code, strokes)
- self._current_code = code
+ self.client.update_strokes (self._current_chars, strokes)
+ chars = unicode (model.get_value(iter, 0), "UTF-8")
+ strokes = self.client.get_strokes (chars)
+ self.workview.set_chars (chars, strokes)
+ self._current_chars = chars
else:
- self.workview.set_char(ord(unicode(model.get_value(iter, 0), "UTF-8")[0]), model.get_value(iter, 1))
+ self.workview.set_chars(unicode(model.get_value(iter, 0), "UTF-8"), model.get_value(iter, 1))
def on_workview_strokes_changed(self, workview):
@@ -229,18 +240,25 @@
all = self.client.get_chars_by_range (int( self._unit * 100), 100)
self.char_liststore = gtk.ListStore(gobject.TYPE_STRING, object, gobject.TYPE_BOOLEAN)
for c in all:
- self.char_liststore.append ([unichr(c[0]).encode("utf8"), [], bool(c[1])])
+ self.char_liststore.append ([c[0].encode("UTF-8"), [], bool(c[1])])
self.char_treeview.set_model(self.char_liststore)
self.update_statusbar()
dlg.destroy()
- def do_import(self, widget):
+ def do_importUtf(self, widget):
self.char_treeview.set_model(None)
importutf = ImportUtf(self)
importutf.do_import()
self.char_treeview.set_model(self.char_liststore)
self.update_statusbar()
+ def do_importList(self, widget):
+ self.char_treeview.set_model(None)
+ importlist = ImportList(self)
+ importlist.do_import()
+ self.char_treeview.set_model(self.char_liststore)
+ self.update_statusbar()
+
def do_import_to_server(self, widget):
dlg = gtk.Dialog ("Select Unit",
buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
@@ -257,15 +275,15 @@
model = self.char_treeview.get_model()
for i in model:
if i[2]:
- self.client.update_strokes(ord(unicode(i[0],"utf8")), i[1])
+ self.client.update_strokes(unicode(i[0],"utf8"), i[1])
dlg.destroy()
- def do_newchar(self, widget):
- dialog = NewCharDialog(self, self.char_treeview, self.char_liststore)
- dialog.do_newchar()
+ def do_newkey(self, widget):
+ dialog = NewKeyDialog(self, self.char_treeview, self.char_liststore)
+ dialog.do_newkey()
self.update_statusbar()
- def do_delchar(self, widget):
+ def do_delkey(self, widget):
treeselection = self.char_treeview.get_selection()
(model, iter) = treeselection.get_selected()
if iter:
@@ -276,6 +294,13 @@
dialog.destroy()
self.update_statusbar()
+ def do_editkey(self, widget):
+ treeselection = self.char_treeview.get_selection()
+ (model, iter) = treeselection.get_selected()
+ if iter:
+ dialog = EditKeyDialog(self, self.char_treeview)
+ dialog.do_editkey()
+
def do_font (self, widget):
dialog = gtk.FontSelectionDialog ("Font")
dialog.set_font_name (self.workview.get_font ())
@@ -331,7 +356,7 @@
def do_about(self, widget):
about = gtk.AboutDialog()
about.set_name("Stroke Editor")
- about.set_version("1.0")
+ about.set_version("1.2")
about.set_copyright("Copyright \xc2\xa9 2007 by RedHat Inc.")
about.set_comments("Stroke Editor is a tool for the Tomoe project.")
about.set_website("http://tomoe.sourceforge.net")
@@ -354,7 +379,7 @@
self.statusbar.pop(0)
self.statusbar.push(0, info)
-class NewCharDialog(gtk.Dialog):
+class NewKeyDialog(gtk.Dialog):
def __init__(self, parent, treeview, liststore):
gtk.Dialog.__init__(self, "Input the new character", parent, gtk.DIALOG_MODAL, (gtk.STOCK_OK, gtk.RESPONSE_OK))
self.set_default_response (gtk.RESPONSE_OK)
@@ -363,11 +388,10 @@
self.liststore = liststore
hbox = gtk.HBox(False, 5)
hbox.show()
- label = gtk.Label("New character:")
+ label = gtk.Label("New key:")
label.show()
hbox.pack_start(label, False)
self.entry = gtk.Entry()
- self.entry.set_max_length(1)
self.entry.connect("activate", self.on_entry_activate)
self.entry.show()
hbox.pack_start(self.entry, True)
@@ -376,7 +400,7 @@
def on_entry_activate(self, widget):
self.response(gtk.RESPONSE_OK)
- def do_newchar(self):
+ def do_newkey(self):
retval = self.run()
if retval == gtk.RESPONSE_OK:
utf8char = self.entry.get_text()
@@ -393,6 +417,45 @@
self.treeview.scroll_to_cell(self.liststore.get_path(treeiter))
self.destroy()
+class EditKeyDialog(gtk.Dialog):
+ def __init__(self, parent, treeview):
+ gtk.Dialog.__init__(self, "Edit the key", parent, gtk.DIALOG_MODAL, (gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+ self.set_default_response (gtk.RESPONSE_OK)
+ self.set_position (gtk.WIN_POS_CENTER_ON_PARENT)
+ self.parent_window = parent
+ self.treeview = treeview
+ hbox = gtk.HBox(False, 5)
+ hbox.show()
+ label = gtk.Label("Edit key:")
+ label.show()
+ hbox.pack_start(label, False)
+ self.entry = gtk.Entry()
+ treeselection = treeview.get_selection()
+ (model, iter) = treeselection.get_selected()
+ if iter:
+ utf8str = model.get_value (iter, 0)
+ self.entry.set_text(utf8str)
+ self.entry.select_region(0, -1)
+ self.entry.connect("activate", self.on_entry_activate)
+ self.entry.show()
+ hbox.pack_start(self.entry, True)
+ self.vbox.pack_start(hbox, True, True, 5)
+
+ def on_entry_activate(self, widget):
+ self.response(gtk.RESPONSE_OK)
+
+ def do_editkey(self):
+ retval = self.run()
+ if retval == gtk.RESPONSE_OK:
+ utf8str = self.entry.get_text()
+ if utf8str != "":
+ treeselection = self.treeview.get_selection()
+ (model, iter) = treeselection.get_selected()
+ if iter:
+ model.set_value(iter, 0, utf8str)
+ self.parent_window.on_char_treeview_selected(treeselection)
+ self.destroy()
+
class SearchDialog(gtk.Dialog):
def __init__(self, parent, treeview, liststore):
gtk.Dialog.__init__(self, "Input the search character", parent, gtk.DIALOG_MODAL, (gtk.STOCK_OK, gtk.RESPONSE_OK))
@@ -406,7 +469,6 @@
label.show()
hbox.pack_start(label, False)
self.entry = gtk.Entry()
- self.entry.set_max_length(1)
self.entry.connect("activate", self.on_entry_activate)
self.entry.show()
hbox.pack_start(self.entry, True)
Modified: tools/stroke-editor/src/net/db.py
===================================================================
--- tools/stroke-editor/src/net/db.py 2007-04-27 07:09:38 UTC (rev 1222)
+++ tools/stroke-editor/src/net/db.py 2007-04-27 09:51:29 UTC (rev 1223)
@@ -1,15 +1,7 @@
+# -*- coding: utf-8 -*-
+
from cPickle import dumps, loads
-SQLITE_VERSION = 1
-try:
- import sqlite
- SQLITE_VERSION = 1
-except:
- pass
-try:
- from pysqlite2 import dbapi2 as sqlite
- SQLITE_VERSION = 2
-except:
- pass
+from pysqlite2 import dbapi2 as sqlite
class DB:
@@ -22,18 +14,13 @@
tmp = dumps (strokes)
else:
tmp = None
- sql = {
- 1: "UPDATE data SET strokes = \"%s\" WHERE code = %d",
- 2: "UPDATE data SET strokes = ? WHERE code = ?" }
-
- self._cur.execute (sql[SQLITE_VERSION], (tmp, code))
+ sql = "UPDATE data SET strokes = ? WHERE code = ?"
+ self._cur.execute (sql, (tmp, code))
self._con.commit()
def get_strokes (self, code):
- sql = {
- 1: "SELECT strokes FROM data WHERE code = %d",
- 2: "SELECT strokes FROM data WHERE code = ?" }
- self._cur.execute (sql[SQLITE_VERSION], (code,))
+ sql = "SELECT strokes FROM data WHERE code = ?"
+ self._cur.execute (sql, (code,))
d = self._cur.fetchall ()
tmp = d[0][0]
if tmp:
@@ -41,23 +28,17 @@
else:
return []
def get_all_chars (self):
- sql = {
- 1: "SELECT code, ifnull(strokes != \"\",0) FROM data",
- 2: "SELECT code, ifnull(strokes != \"\",0) FROM data" }
- self._cur.execute (sql[SQLITE_VERSION])
+ sql = "SELECT code, ifnull(strokes != \"\",0) FROM data"
+ self._cur.execute (sql)
d = self._cur.fetchall ()
return d
def get_chars_by_range (self, offset, limit):
- sql = {
- 1: "SELECT code, ifnull(strokes !=\"\", 0) FROM data ORDER BY code LIMIT %d OFFSET %d",
- 2: "SELECT code, ifnull(strokes !=\"\", 0) FROM data ORDER BY code LIMIT ? OFFSET ?"
- }
- self._cur.execute (sql[SQLITE_VERSION], (limit, offset))
+ sql = "SELECT code, ifnull(strokes !=\"\", 0) FROM data ORDER BY code LIMIT ? OFFSET ?"
+ self._cur.execute (sql, (limit, offset))
d = self._cur.fetchall ()
return d
if __name__ == "__main__":
- db = DB("gb2312.db")
- db.update_strokes (22467, [[(0,0),(100,100)]])
- print db.get_strokes (22467)
+ db = DB("../../data/gb2312.db")
+ print db.get_strokes ("我")
Modified: tools/stroke-editor/src/openxml.py
===================================================================
--- tools/stroke-editor/src/openxml.py 2007-04-27 07:09:38 UTC (rev 1222)
+++ tools/stroke-editor/src/openxml.py 2007-04-27 09:51:29 UTC (rev 1223)
@@ -10,7 +10,7 @@
def start_element(self, name, attrs):
if name == "character":
- self.utf8char = ""
+ self.utf8chars = ""
elif name == "utf8":
self.in_utf8 = True
elif name == "strokes":
@@ -22,7 +22,7 @@
def end_element(self, name):
if name == "character":
- self.mainwin.char_liststore.append([self.utf8char, self.strokes, bool(self.strokes)])
+ self.mainwin.char_liststore.append([self.utf8chars, self.strokes, bool(self.strokes)])
elif name == "utf8":
self.in_utf8 = False
elif name == "strokes":
@@ -32,7 +32,7 @@
def char_data(self, data):
if self.in_utf8:
- self.utf8char = data
+ self.utf8chars = self.utf8chars + data
def open_xmlfile(self, filename):
# When the column is sorted, it will become very slow, so create a new one.
Modified: tools/stroke-editor/src/savexml.py
===================================================================
--- tools/stroke-editor/src/savexml.py 2007-04-27 07:09:38 UTC (rev 1222)
+++ tools/stroke-editor/src/savexml.py 2007-04-27 09:51:29 UTC (rev 1223)
@@ -9,9 +9,11 @@
def write_strokes(self, model, path, iter, xmlfile):
utf8str = model.get_value(iter, 0)
strokes = model.get_value(iter, 1)
- xmlfile.write(" <character>\n <utf8>&#x")
- xmlfile.write("%X"%(ord(unicode(utf8str, "UTF-8")[0])))
- xmlfile.write(";</utf8>\n <strokes>\n")
+ xmlfile.write(" <character>\n <utf8>")
+ unichars = unicode(utf8str, "UTF-8")
+ for unichar in unichars:
+ xmlfile.write("&#x%X;"%(ord(unichar)))
+ xmlfile.write("</utf8>\n <strokes>\n")
for stroke in strokes:
xmlfile.write(" <stroke>\n")
for points in stroke:
Modified: tools/stroke-editor/src/workview.py
===================================================================
--- tools/stroke-editor/src/workview.py 2007-04-27 07:09:38 UTC (rev 1222)
+++ tools/stroke-editor/src/workview.py 2007-04-27 09:51:29 UTC (rev 1223)
@@ -31,7 +31,7 @@
self._workview.reparent (self)
self._xml.signal_autoconnect (self)
self._canvas = Canvas (config)
- self.set_char (ord (u" "))
+ self.set_chars (u" ")
self._canvas.set_flags (gtk.HAS_DEFAULT)
self._canvas.connect ("strokes-changed", self.strokes_changed_cb)
self._canvas.show ()
@@ -74,13 +74,13 @@
def get_selection(self):
return self._treeview.get_selection()
- def set_char (self, char, strokes = [], modified = False):
- """set_char (self, char, strokes = [])
- char: unicode char index
+ def set_chars (self, chars, strokes = [], modified = False):
+ """set_chars (self, chars, strokes = [])
+ chars: unicode string
strokes: strokes data
"""
- self._char = char
- self._canvas.set_char (self._char, strokes, modified)
+ self._chars = chars
+ self._canvas.set_chars (self._chars, strokes, modified)
def set_font (self, font):
"""set_font (sefl, font)
Modified: tools/stroke-editor/utils/utf2sql.py
===================================================================
--- tools/stroke-editor/utils/utf2sql.py 2007-04-27 07:09:38 UTC (rev 1222)
+++ tools/stroke-editor/utils/utf2sql.py 2007-04-27 09:51:29 UTC (rev 1223)
@@ -26,14 +26,14 @@
else:
o = sys.stdout
o.write ("BEGIN TRANSACTION;\n")
- o.write ("CREATE TABLE data (code INTEGER PRIMARY KEY, strokes TEXT);\n")
+ o.write ("CREATE TABLE data (code TEXT PRIMARY KEY, strokes TEXT);\n")
o.write ("COMMIT;\n")
o.write ("BEGIN TRANSACTION;\n")
for l in i:
ul = unicode(l, "utf8")
for z in ul:
if z != u"\n":
- o.write("INSERT INTO data (code) VALUES(" + str(ord(z)) + ");\n")
+ o.write((u"INSERT INTO data (code) VALUES( '%s' );\n" % z).encode ("utf-8"))
o.write("COMMIT;\n")
print >> sys.stderr, "SQL have been generated."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-27 07:21:14
|
Revision: 1221
http://tomoe.svn.sourceforge.net/tomoe/?rev=1221&view=rev
Author: makeinu
Date: 2007-04-27 00:07:58 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
I don't why but previous code breaks scim-tomoe. I call tomoe_gtk_init() from tomow_window_init() until I fix it.
Modified Paths:
--------------
tomoe-gtk/trunk/ChangeLog
tomoe-gtk/trunk/src/tomoe-window.c
Modified: tomoe-gtk/trunk/ChangeLog
===================================================================
--- tomoe-gtk/trunk/ChangeLog 2007-04-27 06:30:53 UTC (rev 1220)
+++ tomoe-gtk/trunk/ChangeLog 2007-04-27 07:07:58 UTC (rev 1221)
@@ -1,5 +1,10 @@
2007-04-27 Takuro Ashie <as...@ho...>
+ * src/tomoe-window.c: I don't why but previous code breaks scim-tomoe.
+ I call tomoe_gtk_init() from tomow_window_init() until I fix it.
+
+2007-04-27 Takuro Ashie <as...@ho...>
+
* src/Makefile.am, src/tomoe-window.c, src/tomoe-gtk.[ch]:
Add tomoe_gtk_init() and tomoe_gtk_quit() and move initializing
procedures into it.
Modified: tomoe-gtk/trunk/src/tomoe-window.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-window.c 2007-04-27 06:30:53 UTC (rev 1220)
+++ tomoe-gtk/trunk/src/tomoe-window.c 2007-04-27 07:07:58 UTC (rev 1221)
@@ -143,6 +143,8 @@
TomoeHandwriting *handwriting_page;
GtkWidget *widget, *notebook, *vbox;
TomoeWindowPrivate *priv = TOMOE_WINDOW_GET_PRIVATE (window);
+
+ tomoe_gtk_init ();
priv->context = tomoe_context_new ();
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-27 07:21:06
|
Revision: 1222
http://tomoe.svn.sourceforge.net/tomoe/?rev=1222&view=rev
Author: makeinu
Date: 2007-04-27 00:09:38 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
I don't know why but previous code causes segmentation fault. I comment out it until I fix it.
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/src/scim_tomoe.cpp
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-27 07:07:58 UTC (rev 1221)
+++ scim-tomoe/trunk/ChangeLog 2007-04-27 07:09:38 UTC (rev 1222)
@@ -1,5 +1,10 @@
2007-04-27 Takuro Ashie <as...@ho...>
+ * src/scim_tomoe.cpp: I don't know why but previous code causes
+ segmentation fault. I comment out it until I fix it.
+
+2007-04-27 Takuro Ashie <as...@ho...>
+
* src/scim_tomoe.cpp: Add tomoe_gtk_init() and tomoe_gtk_quit().
2007-04-20 Takuro Ashie <as...@ho...>
Modified: scim-tomoe/trunk/src/scim_tomoe.cpp
===================================================================
--- scim-tomoe/trunk/src/scim_tomoe.cpp 2007-04-27 07:07:58 UTC (rev 1221)
+++ scim-tomoe/trunk/src/scim_tomoe.cpp 2007-04-27 07:09:38 UTC (rev 1222)
@@ -205,7 +205,7 @@
setenv ("DISPLAY", display.c_str (), 1);
gtk_init (&argc, &argv);
- tomoe_gtk_init ();
+ //tomoe_gtk_init ();
helper_agent.signal_connect_exit (slot (slot_exit));
helper_agent.signal_connect_update_screen (slot (slot_update_screen));
@@ -307,7 +307,7 @@
// run
gtk_main ();
- tomoe_gtk_quit ();
+ //tomoe_gtk_quit ();
}
static void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-27 06:30:51
|
Revision: 1220
http://tomoe.svn.sourceforge.net/tomoe/?rev=1220&view=rev
Author: makeinu
Date: 2007-04-26 23:30:53 -0700 (Thu, 26 Apr 2007)
Log Message:
-----------
Add tomoe_gtk_init() and tomoe_gtk_quit().
Modified Paths:
--------------
scim-tomoe/trunk/ChangeLog
scim-tomoe/trunk/src/scim_tomoe.cpp
Modified: scim-tomoe/trunk/ChangeLog
===================================================================
--- scim-tomoe/trunk/ChangeLog 2007-04-27 06:28:07 UTC (rev 1219)
+++ scim-tomoe/trunk/ChangeLog 2007-04-27 06:30:53 UTC (rev 1220)
@@ -1,3 +1,7 @@
+2007-04-27 Takuro Ashie <as...@ho...>
+
+ * src/scim_tomoe.cpp: Add tomoe_gtk_init() and tomoe_gtk_quit().
+
2007-04-20 Takuro Ashie <as...@ho...>
* configure.ac: Fix search path of scim-helper-launcher again.
Modified: scim-tomoe/trunk/src/scim_tomoe.cpp
===================================================================
--- scim-tomoe/trunk/src/scim_tomoe.cpp 2007-04-27 06:28:07 UTC (rev 1219)
+++ scim-tomoe/trunk/src/scim_tomoe.cpp 2007-04-27 06:30:53 UTC (rev 1220)
@@ -205,7 +205,8 @@
setenv ("DISPLAY", display.c_str (), 1);
gtk_init (&argc, &argv);
-
+ tomoe_gtk_init ();
+
helper_agent.signal_connect_exit (slot (slot_exit));
helper_agent.signal_connect_update_screen (slot (slot_update_screen));
helper_agent.signal_connect_trigger_property (slot (slot_trigger_property));
@@ -305,6 +306,8 @@
// run
gtk_main ();
+
+ tomoe_gtk_quit ();
}
static void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-27 06:28:06
|
Revision: 1219
http://tomoe.svn.sourceforge.net/tomoe/?rev=1219&view=rev
Author: makeinu
Date: 2007-04-26 23:28:07 -0700 (Thu, 26 Apr 2007)
Log Message:
-----------
Add tomoe_gtk_init() and tomoe_gtk_quit().
Modified Paths:
--------------
uim-tomoe-gtk/trunk/ChangeLog
uim-tomoe-gtk/trunk/src/uim-tomoe-gtk.c
Modified: uim-tomoe-gtk/trunk/ChangeLog
===================================================================
--- uim-tomoe-gtk/trunk/ChangeLog 2007-04-27 06:25:29 UTC (rev 1218)
+++ uim-tomoe-gtk/trunk/ChangeLog 2007-04-27 06:28:07 UTC (rev 1219)
@@ -1,3 +1,7 @@
+2007-04-27 Takuro Ashie <as...@ho...>
+
+ * src/uim-tomoe-gtk.c: Add tomoe_gtk_init() and tomoe_gtk_quit().
+
2007-04-16 Kouhei Sutou <ko...@co...>
* ./: used glib-gettextize and intltoolize.
Modified: uim-tomoe-gtk/trunk/src/uim-tomoe-gtk.c
===================================================================
--- uim-tomoe-gtk/trunk/src/uim-tomoe-gtk.c 2007-04-27 06:25:29 UTC (rev 1218)
+++ uim-tomoe-gtk/trunk/src/uim-tomoe-gtk.c 2007-04-27 06:28:07 UTC (rev 1219)
@@ -48,6 +48,7 @@
str = tomoe_char_get_utf8 (ch);
if (!str) return;
+ g_string_append (tmp, "charset=UTF-8\n");
g_string_append (tmp, str);
g_string_append (tmp, "\n");
@@ -96,6 +97,7 @@
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
gtk_init (&argc, &argv);
+ tomoe_gtk_init ();
/* confirm helper connection */
check_helper_connection ();
@@ -118,5 +120,7 @@
/* run */
gtk_main ();
+ tomoe_gtk_quit ();
+
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-27 06:25:28
|
Revision: 1218
http://tomoe.svn.sourceforge.net/tomoe/?rev=1218&view=rev
Author: makeinu
Date: 2007-04-26 23:25:29 -0700 (Thu, 26 Apr 2007)
Log Message:
-----------
Add tomoe_gtk_init() and tomoe_gtk_quit() and move initializing procedures into it.
Modified Paths:
--------------
tomoe-gtk/trunk/ChangeLog
tomoe-gtk/trunk/src/Makefile.am
tomoe-gtk/trunk/src/tomoe-gtk.h
tomoe-gtk/trunk/src/tomoe-window.c
tomoe-gtk/trunk/test/testtomoegtk.c
tomoe-gtk/trunk/test/testtomoegtkedit.c
Added Paths:
-----------
tomoe-gtk/trunk/src/tomoe-gtk.c
Modified: tomoe-gtk/trunk/ChangeLog
===================================================================
--- tomoe-gtk/trunk/ChangeLog 2007-04-27 03:13:08 UTC (rev 1217)
+++ tomoe-gtk/trunk/ChangeLog 2007-04-27 06:25:29 UTC (rev 1218)
@@ -1,3 +1,10 @@
+2007-04-27 Takuro Ashie <as...@ho...>
+
+ * src/Makefile.am, src/tomoe-window.c, src/tomoe-gtk.[ch]:
+ Add tomoe_gtk_init() and tomoe_gtk_quit() and move initializing
+ procedures into it.
+ * test/testtomoegtk.c, test/testtomoegtkedit.c: Follow the change.
+
2007-04-20 Takuro Ashie <as...@ho...>
* src/tomoe-edit-strokes.c, src/tomoe-handwriting.c,
Modified: tomoe-gtk/trunk/src/Makefile.am
===================================================================
--- tomoe-gtk/trunk/src/Makefile.am 2007-04-27 03:13:08 UTC (rev 1217)
+++ tomoe-gtk/trunk/src/Makefile.am 2007-04-27 06:25:29 UTC (rev 1218)
@@ -14,6 +14,7 @@
tomoe-edit-char.c tomoe-edit-char.h \
tomoe-edit-meta.c tomoe-edit-meta.h \
tomoe-edit-strokes.c tomoe-edit-strokes.h \
+ tomoe-gtk.c tomoe-gtk.h \
tomoe-gucharmap.c tomoe-gucharmap.h \
tomoe-handwriting.c tomoe-handwriting.h \
tomoe-reading-search.c tomoe-reading-search.h \
Added: tomoe-gtk/trunk/src/tomoe-gtk.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-gtk.c (rev 0)
+++ tomoe-gtk/trunk/src/tomoe-gtk.c 2007-04-27 06:25:29 UTC (rev 1218)
@@ -0,0 +1,43 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright (C) 2007 Takuro Ashie
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+#include <tomoe.h>
+
+void
+tomoe_gtk_init (void)
+{
+#ifdef ENABLE_NLS
+ bindtextdomain (GETTEXT_PACKAGE, TOMOE_GTK_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+
+ /* load libtomoe */
+ tomoe_init ();
+}
+
+void
+tomoe_gtk_quit (void)
+{
+ tomoe_quit ();
+}
Modified: tomoe-gtk/trunk/src/tomoe-gtk.h
===================================================================
--- tomoe-gtk/trunk/src/tomoe-gtk.h 2007-04-27 03:13:08 UTC (rev 1217)
+++ tomoe-gtk/trunk/src/tomoe-gtk.h 2007-04-27 06:25:29 UTC (rev 1218)
@@ -34,6 +34,9 @@
#include <tomoe-edit-meta.h>
#include <tomoe-edit-strokes.h>
+void tomoe_gtk_init (void);
+void tomoe_gtk_quit (void);
+
#endif /* __TOMOE_GTK_H_INCLUDED__ */
/*
Modified: tomoe-gtk/trunk/src/tomoe-window.c
===================================================================
--- tomoe-gtk/trunk/src/tomoe-window.c 2007-04-27 03:13:08 UTC (rev 1217)
+++ tomoe-gtk/trunk/src/tomoe-window.c 2007-04-27 06:25:29 UTC (rev 1218)
@@ -143,14 +143,6 @@
TomoeHandwriting *handwriting_page;
GtkWidget *widget, *notebook, *vbox;
TomoeWindowPrivate *priv = TOMOE_WINDOW_GET_PRIVATE (window);
-
-#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, TOMOE_GTK_LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif
-
- /* load libtomoe */
- tomoe_init ();
priv->context = tomoe_context_new ();
/*
Modified: tomoe-gtk/trunk/test/testtomoegtk.c
===================================================================
--- tomoe-gtk/trunk/test/testtomoegtk.c 2007-04-27 03:13:08 UTC (rev 1217)
+++ tomoe-gtk/trunk/test/testtomoegtk.c 2007-04-27 06:25:29 UTC (rev 1218)
@@ -8,10 +8,12 @@
/*g_setenv ("TOMOE_CONFIG_FILE", "./test-config.xml", FALSE);*/
gtk_init (&argc, &argv);
+ tomoe_gtk_init ();
win = tomoe_window_new ();
g_signal_connect (G_OBJECT (win), "destroy",
G_CALLBACK (gtk_main_quit), NULL);
gtk_widget_show (win);
gtk_main ();
+ tomoe_gtk_quit ();
return 0;
}
Modified: tomoe-gtk/trunk/test/testtomoegtkedit.c
===================================================================
--- tomoe-gtk/trunk/test/testtomoegtkedit.c 2007-04-27 03:13:08 UTC (rev 1217)
+++ tomoe-gtk/trunk/test/testtomoegtkedit.c 2007-04-27 06:25:29 UTC (rev 1218)
@@ -7,11 +7,13 @@
GtkWidget *win;
gtk_init (&argc, &argv);
+ tomoe_gtk_init ();
/* will be replaced to TomoeDetails or something */
win = tomoe_window_new ();
g_signal_connect (G_OBJECT (win), "destroy",
G_CALLBACK (gtk_main_quit), NULL);
gtk_widget_show (win);
gtk_main ();
+ tomoe_gtk_quit ();
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-27 03:13:07
|
Revision: 1217
http://tomoe.svn.sourceforge.net/tomoe/?rev=1217&view=rev
Author: ktou
Date: 2007-04-26 20:13:08 -0700 (Thu, 26 Apr 2007)
Log Message:
-----------
reverted the following changes:
* autogen.sh, configure.ac, po/LINGUAS: removed dependency on intltool.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/autogen.sh
tomoe/trunk/configure.ac
Added Paths:
-----------
tomoe/trunk/po/LINGUAS
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-27 01:06:18 UTC (rev 1216)
+++ tomoe/trunk/ChangeLog 2007-04-27 03:13:08 UTC (rev 1217)
@@ -2,9 +2,6 @@
* macros/: ignored auto-generated files.
- * autogen.sh, configure.ac, po/LINGUAS: removed dependency on
- intltool.
-
2007-04-26 Takuro Ashie <as...@ho...>
* configure.ac: Show configure result.
Modified: tomoe/trunk/autogen.sh
===================================================================
--- tomoe/trunk/autogen.sh 2007-04-27 01:06:18 UTC (rev 1216)
+++ tomoe/trunk/autogen.sh 2007-04-27 03:13:08 UTC (rev 1217)
@@ -14,6 +14,7 @@
run libtoolize --copy --force
run glib-gettextize --force --copy
+run intltoolize --force --copy --automake
run gtkdocize --copy
run aclocal -I macros
run autoheader
Modified: tomoe/trunk/configure.ac
===================================================================
--- tomoe/trunk/configure.ac 2007-04-27 01:06:18 UTC (rev 1216)
+++ tomoe/trunk/configure.ac 2007-04-27 03:13:08 UTC (rev 1217)
@@ -90,8 +90,16 @@
dnl Check for gettext.
dnl **************************************************************
-ALL_LINGUAS="ja"
+IT_PROG_INTLTOOL([0.35.0])
+
AM_GLIB_GNU_GETTEXT
+dnl should run after AM_GLIB_GNU_GETTEXT
+AC_CONFIG_COMMANDS([modify-itlocaledir], [
+sed \
+ -i'' \
+ -e "s/^itlocaledir = /itlocaledir = \$(datadir)\/locale\n#itlocaledir = /" \
+ po/Makefile
+])
GETTEXT_PACKAGE=tomoe
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package])
Copied: tomoe/trunk/po/LINGUAS (from rev 1214, tomoe/trunk/po/LINGUAS)
===================================================================
--- tomoe/trunk/po/LINGUAS (rev 0)
+++ tomoe/trunk/po/LINGUAS 2007-04-27 03:13:08 UTC (rev 1217)
@@ -0,0 +1,2 @@
+# please keep this list sorted alphabetically
+ja
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-27 01:06:17
|
Revision: 1216
http://tomoe.svn.sourceforge.net/tomoe/?rev=1216&view=rev
Author: ktou
Date: 2007-04-26 18:06:18 -0700 (Thu, 26 Apr 2007)
Log Message:
-----------
* macros/: ignored auto-generated files.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
Property Changed:
----------------
tomoe/trunk/macros/
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-27 01:05:15 UTC (rev 1215)
+++ tomoe/trunk/ChangeLog 2007-04-27 01:06:18 UTC (rev 1216)
@@ -1,5 +1,7 @@
2007-04-27 Kouhei Sutou <ko...@co...>
+ * macros/: ignored auto-generated files.
+
* autogen.sh, configure.ac, po/LINGUAS: removed dependency on
intltool.
Property changes on: tomoe/trunk/macros
___________________________________________________________________
Name: svn:ignore
+ argz.m4
libtool.m4
ltoptions.m4
ltsugar.m4
ltversion.m4
lt~obsolete.m4
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kt...@us...> - 2007-04-27 01:05:26
|
Revision: 1215
http://tomoe.svn.sourceforge.net/tomoe/?rev=1215&view=rev
Author: ktou
Date: 2007-04-26 18:05:15 -0700 (Thu, 26 Apr 2007)
Log Message:
-----------
* autogen.sh, configure.ac, po/LINGUAS: removed dependency on intltool.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/autogen.sh
tomoe/trunk/configure.ac
Removed Paths:
-------------
tomoe/trunk/po/LINGUAS
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-26 05:11:34 UTC (rev 1214)
+++ tomoe/trunk/ChangeLog 2007-04-27 01:05:15 UTC (rev 1215)
@@ -1,3 +1,8 @@
+2007-04-27 Kouhei Sutou <ko...@co...>
+
+ * autogen.sh, configure.ac, po/LINGUAS: removed dependency on
+ intltool.
+
2007-04-26 Takuro Ashie <as...@ho...>
* configure.ac: Show configure result.
Modified: tomoe/trunk/autogen.sh
===================================================================
--- tomoe/trunk/autogen.sh 2007-04-26 05:11:34 UTC (rev 1214)
+++ tomoe/trunk/autogen.sh 2007-04-27 01:05:15 UTC (rev 1215)
@@ -14,7 +14,6 @@
run libtoolize --copy --force
run glib-gettextize --force --copy
-run intltoolize --force --copy --automake
run gtkdocize --copy
run aclocal -I macros
run autoheader
Modified: tomoe/trunk/configure.ac
===================================================================
--- tomoe/trunk/configure.ac 2007-04-26 05:11:34 UTC (rev 1214)
+++ tomoe/trunk/configure.ac 2007-04-27 01:05:15 UTC (rev 1215)
@@ -90,16 +90,8 @@
dnl Check for gettext.
dnl **************************************************************
-IT_PROG_INTLTOOL([0.35.0])
-
+ALL_LINGUAS="ja"
AM_GLIB_GNU_GETTEXT
-dnl should run after AM_GLIB_GNU_GETTEXT
-AC_CONFIG_COMMANDS([modify-itlocaledir], [
-sed \
- -i'' \
- -e "s/^itlocaledir = /itlocaledir = \$(datadir)\/locale\n#itlocaledir = /" \
- po/Makefile
-])
GETTEXT_PACKAGE=tomoe
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package])
Deleted: tomoe/trunk/po/LINGUAS
===================================================================
--- tomoe/trunk/po/LINGUAS 2007-04-26 05:11:34 UTC (rev 1214)
+++ tomoe/trunk/po/LINGUAS 2007-04-27 01:05:15 UTC (rev 1215)
@@ -1,2 +0,0 @@
-# please keep this list sorted alphabetically
-ja
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-26 05:12:34
|
Revision: 1214
http://tomoe.svn.sourceforge.net/tomoe/?rev=1214&view=rev
Author: makeinu
Date: 2007-04-25 22:11:34 -0700 (Wed, 25 Apr 2007)
Log Message:
-----------
Fix capitalization.
Modified Paths:
--------------
tomoe/trunk/configure.ac
Modified: tomoe/trunk/configure.ac
===================================================================
--- tomoe/trunk/configure.ac 2007-04-26 05:06:33 UTC (rev 1213)
+++ tomoe/trunk/configure.ac 2007-04-26 05:11:34 UTC (rev 1214)
@@ -314,7 +314,7 @@
echo
echo " * Dictionary Backends"
echo
-echo " Unihan database : ${use_unihan}"
+echo " Unihan Database : ${use_unihan}"
echo " Hyper Estraier : ${est_exists}"
echo " Subversion : ${use_svn}"
echo " MySQL : ${enable_mysql}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-04-26 05:06:33
|
Revision: 1213
http://tomoe.svn.sourceforge.net/tomoe/?rev=1213&view=rev
Author: makeinu
Date: 2007-04-25 22:06:33 -0700 (Wed, 25 Apr 2007)
Log Message:
-----------
Show configure result.
Modified Paths:
--------------
tomoe/trunk/ChangeLog
tomoe/trunk/configure.ac
Modified: tomoe/trunk/ChangeLog
===================================================================
--- tomoe/trunk/ChangeLog 2007-04-25 07:35:56 UTC (rev 1212)
+++ tomoe/trunk/ChangeLog 2007-04-26 05:06:33 UTC (rev 1213)
@@ -1,11 +1,15 @@
+2007-04-26 Takuro Ashie <as...@ho...>
+
+ * configure.ac: Show configure result.
+
2007-04-25 Takuro Ashie <as...@ho...>
- * module/dict/tomoe-dict-xml.c, module/dict/tomoe-dict-ruby.c,
- module/dict/tomoe-dict-unihan.c, module/dict/tomoe-dict-mysql.c,
- module/dict/tomoe-dict-svn.c, module/dict/tomoe-dict-est.c,
- module/recognizer/tomoe-recognizer-simple.c, configure.ac,
- lib/tomoe-char.c, lib/tomoe-query.c, lib/tomoe-config.c,
- lib/tomoe-recognizer.c, lib/glib-utils.h, lib/tomoe-reading.c:
+ * module/dict/tomoe-dict-xml.c, module/dict/tomoe-dict-ruby.c,
+ module/dict/tomoe-dict-unihan.c, module/dict/tomoe-dict-mysql.c,
+ module/dict/tomoe-dict-svn.c, module/dict/tomoe-dict-est.c,
+ module/recognizer/tomoe-recognizer-simple.c, configure.ac,
+ lib/tomoe-char.c, lib/tomoe-query.c, lib/tomoe-config.c,
+ lib/tomoe-recognizer.c, lib/glib-utils.h, lib/tomoe-reading.c:
Use gi18n-lib.h instead of gi18n.h.
2007-04-20 Kouhei Sutou <ko...@co...>
Modified: tomoe/trunk/configure.ac
===================================================================
--- tomoe/trunk/configure.ac 2007-04-25 07:35:56 UTC (rev 1212)
+++ tomoe/trunk/configure.ac 2007-04-26 05:06:33 UTC (rev 1213)
@@ -210,7 +210,7 @@
AS_HELP_STRING([--disable-unihan],
[disable Unihan detabase]),
[use_unihan=$enableval],
- [use_unihan=$enableval])
+ [use_unihan=$enableval])
AM_CONDITIONAL([WITH_UNIHAN], [test "$use_unihan" = "yes"])
AC_PATH_PROG(UNZIP, unzip, unzip-not-found)
@@ -225,6 +225,8 @@
dnl Configure for MySQL dictionary.
dnl **************************************************************
+enable_mysql=no
+
AC_PATH_PROG(MYSQL_CONFIG, mysql_config, mysql_config-not-found)
if test "x$MYSQL_CONFIG" != "xmysql_config-not-found"; then
@@ -243,10 +245,14 @@
dnl **************************************************************
AC_ARG_ENABLE(dict_ruby,
AS_HELP_STRING([--enable-dict-ruby],
- [Enable Ruby based dictionary module]))
+ [Enable Ruby based dictionary module]),
+ [enable_dict_ruby=$enableval],
+ [enable_dict_ruby=$enableval])
+if test x"$ruby_available" != "xyes"; then
+ enable_dict_ruby=no
+fi
AM_CONDITIONAL(ENABLE_DICT_RUBY,
- [test x"$enable_dict_ruby" = "xyes" -a \
- x"$ruby_available" = "xyes"])
+ [test x"$enable_dict_ruby" = "xyes"])
dnl **************************************************************
@@ -294,3 +300,27 @@
])
AC_OUTPUT
+
+dnl **************************************************************
+dnl Show configure result
+dnl **************************************************************
+
+echo
+echo "Configure Result:"
+echo
+echo " * Language Bindings"
+echo
+echo " Ruby : ${ruby_available}"
+echo
+echo " * Dictionary Backends"
+echo
+echo " Unihan database : ${use_unihan}"
+echo " Hyper Estraier : ${est_exists}"
+echo " Subversion : ${use_svn}"
+echo " MySQL : ${enable_mysql}"
+echo " Ruby : ${enable_dict_ruby}"
+echo
+echo " * Other Features"
+echo
+echo " gtk-doc : ${enable_gtk_doc}"
+echo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|