[uim-commit] r2291 - in trunk: . doc gtk gtk/test qt qt/test
ekato at freedesktop.org
ekato at freedesktop.org
Wed Nov 30 00:15:44 PST 2005
Author: ekato
Date: 2005-11-30 00:15:20 -0800 (Wed, 30 Nov 2005)
New Revision: 2291
Added:
trunk/gtk/test/
trunk/gtk/test/Makefile.am
trunk/gtk/test/entry.c
trunk/gtk/test/test.sh.in
trunk/qt/test/
trunk/qt/test/Makefile.am
trunk/qt/test/qedittest.cpp
Removed:
trunk/entry.c
trunk/qedittest.cpp
trunk/test.sh.in
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/doc/Makefile.am
trunk/gtk/Makefile.am
trunk/qt/Makefile.am
Log:
* configure.ac : Modify AC_CONFIG_FILES.
* Makefile.am
- Remove gtk_entry and qedittest and put them into test
directories of each toolkit.
- Update EXTRA_DIST.
* entry.c : Move to gtk/test.
* test.sh.in : Ditto.
* qedittest.cpp : Move to qt/test.
* gtk/Makefile.am : Add SUBDIRS test.
* gtk/test/ : New.
* gtk/test/Makefile.am : New
* gtk/test/entry.c : Moved from topdir.
* gtk/test/test.sh.in : Moved and update.
* qt/Makefile.am : Add SUBDIRS test.
* qt/test/ : New.
* qt/test/Makefile.am : New.
* doc/Makefile.am : Update EXTRA_DIST.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/Makefile.am 2005-11-30 08:15:20 UTC (rev 2291)
@@ -1,9 +1,9 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = m4 doc replace uim scm gtk qt xim helper po test fep emacs \
examples pixmaps
-EXTRA_DIST = README.ja INSTALL.ja test.sh.in uim.spec.in \
+EXTRA_DIST = uim.spec.in \
intltool-extract.in intltool-merge.in intltool-update.in \
- uim.pc.in ChangeLog.old uim.desktop autogen.sh RELEASING
+ uim.pc.in ChangeLog.old uim.desktop autogen.sh
DISTCLEANFILES = uim.pc intltool-extract intltool-merge intltool-update po/.intltool-merge-cache
@@ -13,23 +13,6 @@
desktopdir = $(datadir)/applications
desktop_DATA = uim.desktop
-noinst_PROGRAMS = $(gtk_entry) $(qedittest)
-
-if GTK2
-gtk_entry = gtk-entry
-gtk_entry_SOURCES = entry.c
-gtk_entry_LDADD = @GTK2_LIBS@
-gtk_entry_CFLAGS = @GTK2_CFLAGS@
-else
-endif
-
-if QT
-qedittest = qedittest
-qedittest_SOURCES = qedittest.cpp
-qedittest_CXXFLAGS = $(UIM_QT_CXXFLAGS)
-qedittest_LDFLAGS = $(UIM_QT_LDFLAGS)
-endif
-
ACLOCAL_AMFLAGS = -I m4
ChangeLog:
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/configure.ac 2005-11-30 08:15:20 UTC (rev 2291)
@@ -799,8 +799,7 @@
AC_SUBST(SRCDIR)
-AC_CONFIG_FILES([test.sh
- Makefile
+AC_CONFIG_FILES([Makefile
po/Makefile.in
m4/Makefile
helper/Makefile
@@ -808,7 +807,10 @@
uim/Makefile
scm/Makefile
gtk/Makefile
+ gtk/test/Makefile
+ gtk/test/test.sh
qt/Makefile
+ qt/test/Makefile
xim/Makefile
fep/Makefile
emacs/Makefile
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/doc/Makefile.am 2005-11-30 08:15:20 UTC (rev 2291)
@@ -1,2 +1,2 @@
EXTRA_DIST = 00INDEX COMPATIBILITY CUSTOM DOT-UIM HELPER-CANDWIN \
- HELPER-PROTOCOL KEY PLUGIN UIM-SCM UIM-SH UNIT-TEST
+ HELPER-PROTOCOL KEY PLUGIN RELEASING UIM-SCM UIM-SH UNIT-TEST
Deleted: trunk/entry.c
===================================================================
--- trunk/entry.c 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/entry.c 2005-11-30 08:15:20 UTC (rev 2291)
@@ -1,102 +0,0 @@
-/* example-start entry entry.c */
-
-#include <stdio.h>
-#include <gtk/gtk.h>
-
-void enter_callback( GtkWidget *widget,
- GtkWidget *entry )
-{
- gchar *entry_text;
- entry_text = (gchar*)gtk_entry_get_text(GTK_ENTRY(entry));
- printf("Entry contents: %s\n", entry_text);
-}
-
-void entry_toggle_editable( GtkWidget *checkbutton,
- GtkWidget *entry )
-{
- gtk_entry_set_editable(GTK_ENTRY(entry),
- GTK_TOGGLE_BUTTON(checkbutton)->active);
-}
-
-void entry_toggle_visibility( GtkWidget *checkbutton,
- GtkWidget *entry )
-{
- gtk_entry_set_visibility(GTK_ENTRY(entry),
- GTK_TOGGLE_BUTTON(checkbutton)->active);
-}
-
-int main( int argc,
- char *argv[] )
-{
-
- GtkWidget *window;
- GtkWidget *vbox, *hbox;
- GtkWidget *entry;
- GtkWidget *button;
- GtkWidget *check;
-
- GTimer *tim = g_timer_new();
-
- gtk_set_locale();
- gtk_init (&argc, &argv);
-
- g_timer_start(tim);
-
- /* create a new window */
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_usize( GTK_WIDGET (window), 200, 100);
- gtk_window_set_title(GTK_WINDOW (window), "GTK Entry");
- gtk_signal_connect(GTK_OBJECT (window), "delete_event",
- (GtkSignalFunc) gtk_exit, NULL);
-
- vbox = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (window), vbox);
- gtk_widget_show (vbox);
-
- entry = gtk_entry_new_with_max_length (50);
- gtk_signal_connect(GTK_OBJECT(entry), "activate",
- GTK_SIGNAL_FUNC(enter_callback),
- entry);
- gtk_entry_set_text (GTK_ENTRY (entry), "hello");
- gtk_entry_append_text (GTK_ENTRY (entry), " world");
- gtk_entry_select_region (GTK_ENTRY (entry),
- 0, GTK_ENTRY(entry)->text_length);
- gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 0);
- gtk_widget_show (entry);
-
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (vbox), hbox);
- gtk_widget_show (hbox);
-
- check = gtk_check_button_new_with_label("Editable");
- gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT(check), "toggled",
- GTK_SIGNAL_FUNC(entry_toggle_editable), entry);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), TRUE);
- gtk_widget_show (check);
-
- check = gtk_check_button_new_with_label("Visible");
- gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT(check), "toggled",
- GTK_SIGNAL_FUNC(entry_toggle_visibility), entry);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), TRUE);
- gtk_widget_show (check);
-
- button = gtk_button_new_with_label ("Close");
- gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC(gtk_exit),
- GTK_OBJECT (window));
- gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
- gtk_widget_grab_default (button);
- gtk_widget_show (button);
-
- gtk_widget_show(window);
-
- g_print("elapsed time: %f\n",g_timer_elapsed(tim,NULL));
- g_timer_destroy(tim);
-
- gtk_main();
- return(0);
-}
-/* example-end */
Modified: trunk/gtk/Makefile.am
===================================================================
--- trunk/gtk/Makefile.am 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/gtk/Makefile.am 2005-11-30 08:15:20 UTC (rev 2291)
@@ -1,3 +1,4 @@
+SUBDIRS = test
moduledir = $(libdir)/gtk-2.0/@GTK_BINARY_VERSION@/immodules
GTK_IMMODULES= $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
Added: trunk/gtk/test/Makefile.am
===================================================================
--- trunk/gtk/test/Makefile.am 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/gtk/test/Makefile.am 2005-11-30 08:15:20 UTC (rev 2291)
@@ -0,0 +1,9 @@
+EXTRA_DIST = test.sh.in
+
+if GTK2
+noinst_PROGRAMS = $(gtk_entry)
+gtk_entry = gtk-entry
+gtk_entry_SOURCES = entry.c
+gtk_entry_LDADD = @GTK2_LIBS@
+gtk_entry_CFLAGS = @GTK2_CFLAGS@
+endif
Copied: trunk/gtk/test/entry.c (from rev 2290, trunk/entry.c)
Copied: trunk/gtk/test/test.sh.in (from rev 2290, trunk/test.sh.in)
===================================================================
--- trunk/test.sh.in 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/gtk/test/test.sh.in 2005-11-30 08:15:20 UTC (rev 2291)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+
+LIBUIM_VERBOSE=4; export LIBUIM_VERBOSE
+LD_LIBRARY_PATH=@top_builddir@/uim/.libs/:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
+# disable reading ~/.uim
+LIBUIM_VANILLA=2; export LIBUIM_VANILLA
+# scheme files will be read from scm/
+LIBUIM_SCM_FILES=@top_srcdir@/scm/; export LIBUIM_SCM_FILES
+LIBUIM_PLUGIN_LIB_DIR=@top_builddir@/uim/.libs/; export LIBUIM_PLUGIN_LIB_DIR
+gtk-query-immodules-2.0 @top_builddir@/gtk/.libs/im*.so > immodules
+GTK_IM_MODULE_PATH=@top_builddir@/gtk/.libs/; export GTK_IM_MODULE_PATH
+GTK_IM_MODULE_FILE=./immodules; export GTK_IM_MODULE_FILE
+#LANG= gnome-character-map
+#LANG= gedit
+#gtk-demo
+LANG= ./gtk-entry
Deleted: trunk/qedittest.cpp
===================================================================
--- trunk/qedittest.cpp 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/qedittest.cpp 2005-11-30 08:15:20 UTC (rev 2291)
@@ -1,31 +0,0 @@
-#include <qapplication.h>
-#include <qlineedit.h>
-#include <qtextedit.h>
-#include <qsplitter.h>
-#include <qvbox.h>
-#include <qlabel.h>
-
-int main(int argc, char *argv[])
-{
- QApplication app(argc, argv);
-
- QVBox page;
-
- QLabel *l = new QLabel("Edit Test", &page);
- l->setAlignment(Qt::AlignCenter);
-
- new QLabel(&page);
-
- QVBox *linev = new QVBox(&page);
- new QLabel("lineedit", linev);
- new QLineEdit(linev);
-
- QVBox *textv = new QVBox(&page);
- new QLabel("textedit", textv);
- new QTextEdit(textv);
-
- app.setMainWidget(&page);
- page.show();
-
- return app.exec();
-}
Modified: trunk/qt/Makefile.am
===================================================================
--- trunk/qt/Makefile.am 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/qt/Makefile.am 2005-11-30 08:15:20 UTC (rev 2291)
@@ -1,3 +1,4 @@
+SUBDIRS = test
EXTRA_DIST = pref-keyeditformbase.ui pref-olisteditformbase.ui bushu.t
if QT
Added: trunk/qt/test/Makefile.am
===================================================================
--- trunk/qt/test/Makefile.am 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/qt/test/Makefile.am 2005-11-30 08:15:20 UTC (rev 2291)
@@ -0,0 +1,8 @@
+if QT
+noinst_PROGRAMS = $(qedittest)
+qedittest = qedittest
+qedittest_SOURCES = qedittest.cpp
+qedittest_CXXFLAGS = $(UIM_QT_CXXFLAGS)
+qedittest_LDFLAGS = $(UIM_QT_LDFLAGS)
+endif
+
Copied: trunk/qt/test/qedittest.cpp (from rev 2290, trunk/qedittest.cpp)
Deleted: trunk/test.sh.in
===================================================================
--- trunk/test.sh.in 2005-11-30 07:02:10 UTC (rev 2290)
+++ trunk/test.sh.in 2005-11-30 08:15:20 UTC (rev 2291)
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-
-LIBUIM_VERBOSE=4; export LIBUIM_VERBOSE
-LD_LIBRARY_PATH=uim/.libs/:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
-# disable reading ~/.uim
-LIBUIM_VANILLA=2; export LIBUIM_VANILLA
-# scheme files will be read from scm/
-LIBUIM_SCM_FILES=@SRCDIR@/scm/; export LIBUIM_SCM_FILES
-LIBUIM_PLUGIN_LIB_DIR=@SRCDIR@/uim/.libs/; export LIBUIM_PLUGIN_LIB_DIR
-gtk-query-immodules-2.0 gtk/.libs/im*.so > immodules
-GTK_IM_MODULE_PATH=gtk/.libs/; export GTK_IM_MODULE_PATH
-GTK_IM_MODULE_FILE=./immodules; export GTK_IM_MODULE_FILE
-#LANG= gnome-character-map
-#LANG= gedit
-#gtk-demo
-LANG= ./gtk-entry
More information about the uim-commit
mailing list