Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : screenshot
Dir : e_modules/screenshot
Modified Files:
Makefile.am autogen.sh configure.in e_mod_config.c
e_mod_main.c e_mod_main.h
Log Message:
Add start of intl support for config dialogs.
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 25 Jan 2006 04:23:27 -0000 1.5
+++ Makefile.am 30 Jan 2006 01:10:07 -0000 1.6
@@ -1,4 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = po
+
+MAINTAINERCLEANFILES = Makefile.in mkinstalldirs
EDJE_CC = @edje_cc@
EDJE_FLAGS = -v
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 16 Dec 2005 01:07:33 -0000 1.1
+++ autogen.sh 30 Jan 2006 01:10:07 -0000 1.2
@@ -10,6 +10,18 @@
echo "Running autoconf..." ; autoconf || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize
--automake) || exit 1
echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
+echo "Generating gettext screenshot.pot template"; \
+xgettext \
+--output screenshot.pot \
+--output-dir=po \
+--language=C \
+--add-location \
+--keyword=D_ \
+--indent \
+--sort-by-file \
+--copyright-holder="TODO" \
+--foreign-user \
+`find . -name "*.[ch]" -print` || exit 1
if [ -z "$NOCONFIGURE" ]; then
./configure "$@"
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.in 21 Jan 2006 00:36:02 -0000 1.4
+++ configure.in 30 Jan 2006 01:10:07 -0000 1.5
@@ -20,6 +20,12 @@
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
+ALL_LINGUAS="ja"
+AC_SUBST(ALL_LINGUAS)
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.14)
+
MODULE_ARCH="$host_os-$host_cpu"
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
@@ -209,9 +215,19 @@
AM_CONDITIONAL(WANT_OSIRIS, false)
fi
+AC_PREFIX_DEFAULT(${HOME}/.e/e)
+if test "x$prefix" = "xNONE"; then
+ datarootdir=${ac_default_prefix}
+else
+ datarootdir=${ac_default_prefix}/share
+fi
+localedir=${datarootdir}/locale
+AC_SUBST(LOCALEDIR, "${localedir}")
+AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory])
AC_OUTPUT([
Makefile
e_modules-screenshot.spec
+po/Makefile
],[
])
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_config.c 22 Jan 2006 14:16:44 -0000 1.10
+++ e_mod_config.c 30 Jan 2006 01:10:07 -0000 1.11
@@ -75,7 +75,7 @@
v->advanced.create_widgets = _advanced_create_widgets;
/* create config diaolg */
- cfd = e_config_dialog_new(con, _("Screenshot Configuration"), NULL, 0, v,
s);
+ cfd = e_config_dialog_new(con, D_("Screenshot Configuration"), NULL, 0, v,
s);
s->config_dialog = cfd;
}
@@ -166,16 +166,16 @@
#ifdef HAVE_IMPORT
# ifdef HAVE_SCROT
rg = e_widget_radio_group_new(&(cfdata->method));
- ob = e_widget_radio_add(evas, _("Use Import"), S_METHOD_IMPORT, rg);
+ ob = e_widget_radio_add(evas, D_("Use Import"), S_METHOD_IMPORT, rg);
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_radio_add(evas, _("Use Scrot"), S_METHOD_SCROT, rg);
+ ob = e_widget_radio_add(evas, D_("Use Scrot"), S_METHOD_SCROT, rg);
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
# endif
#else
/* Dont need to add an option as we only have one to use */
#endif
- ob = e_widget_label_add(evas, _("Delay Time:"));
+ ob = e_widget_label_add(evas, D_("Delay Time:"));
e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 0, 0, 1, 0);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 0.0, 60.0, 1.0, 0,
&(cfdata->delay_time), NULL, 200);
@@ -184,22 +184,22 @@
e_widget_framelist_object_append(of, ot);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("File Settings"), 0);
+ of = e_widget_framelist_add(evas, D_("File Settings"), 0);
ot = e_widget_table_add(evas, 1);
- ob = e_widget_label_add(evas, _("Save Directory:"));
+ ob = e_widget_label_add(evas, D_("Save Directory:"));
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 0, 0, 1, 0);
ob = e_widget_entry_add(evas, &cfdata->location);
e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, _("Filename (minus extension):"));
+ ob = e_widget_label_add(evas, D_("Filename (minus extension):"));
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 0, 0, 1, 0);
ob = e_widget_entry_add(evas, &cfdata->filename);
e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, _("Example: screenshot%d = screenshot1,
screenshot2, etc..."));
+ ob = e_widget_label_add(evas, D_("Example: screenshot%d = screenshot1,
screenshot2, etc..."));
e_widget_table_object_append(ot, ob, 0, 2, 2, 1, 0, 0, 1, 0);
e_widget_framelist_object_append(of, ot);
@@ -286,9 +286,9 @@
#ifdef HAVE_IMPORT
# ifdef HAVE_SCROT
rg = e_widget_radio_group_new(&(cfdata->method));
- ob = e_widget_radio_add(evas, _("Use Import"), S_METHOD_IMPORT, rg);
+ ob = e_widget_radio_add(evas, D_("Use Import"), S_METHOD_IMPORT, rg);
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_radio_add(evas, _("Use Scrot"), S_METHOD_SCROT, rg);
+ ob = e_widget_radio_add(evas, D_("Use Scrot"), S_METHOD_SCROT, rg);
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
# endif
@@ -296,7 +296,7 @@
/* Dont need to add an option as we only have one to use */
#endif
- ob = e_widget_label_add(evas, _("Delay Time:"));
+ ob = e_widget_label_add(evas, D_("Delay Time:"));
e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 0, 0, 1, 0);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 0.0, 60.0, 1.0, 0,
&(cfdata->delay_time), NULL, 200);
@@ -305,48 +305,48 @@
e_widget_framelist_object_append(of, ot);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("File Settings"), 0);
+ of = e_widget_framelist_add(evas, D_("File Settings"), 0);
ot = e_widget_table_add(evas, 1);
- ob = e_widget_label_add(evas, _("Save Directory:"));
+ ob = e_widget_label_add(evas, D_("Save Directory:"));
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 0, 0, 1, 0);
ob = e_widget_entry_add(evas, &cfdata->location);
e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, _("Filename (minus extension):"));
+ ob = e_widget_label_add(evas, D_("Filename (minus extension):"));
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 0, 0, 1, 0);
ob = e_widget_entry_add(evas, &cfdata->filename);
e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, _("Example: screenshot%d = screenshot1,
screenshot2, etc..."));
+ ob = e_widget_label_add(evas, D_("Example: screenshot%d = screenshot1,
screenshot2, etc..."));
e_widget_table_object_append(ot, ob, 0, 2, 2, 1, 0, 0, 1, 0);
e_widget_framelist_object_append(of, ot);
e_widget_list_object_append(o, of, 1, 1, 0.5);
#ifdef HAVE_IMPORT
- of = e_widget_framelist_add(evas, _("Import Options"), 0);
- ob = e_widget_check_add(evas, _("Include Image Border"),
&(cfdata->import.use_img_border));
+ of = e_widget_framelist_add(evas, D_("Import Options"), 0);
+ ob = e_widget_check_add(evas, D_("Include Image Border"),
&(cfdata->import.use_img_border));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Use Image Dithering"),
&(cfdata->import.use_dither));
+ ob = e_widget_check_add(evas, D_("Use Image Dithering"),
&(cfdata->import.use_dither));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Include Window Manager Frame"),
&(cfdata->import.use_frame));
+ ob = e_widget_check_add(evas, D_("Include Window Manager Frame"),
&(cfdata->import.use_frame));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Choose Window To Grab"),
&(cfdata->import.use_window));
+ ob = e_widget_check_add(evas, D_("Choose Window To Grab"),
&(cfdata->import.use_window));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Silent"), &(cfdata->import.use_silent));
+ ob = e_widget_check_add(evas, D_("Silent"), &(cfdata->import.use_silent));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Trim Edges"), &(cfdata->import.use_trim));
+ ob = e_widget_check_add(evas, D_("Trim Edges"), &(cfdata->import.use_trim));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
#endif
#ifdef HAVE_SCROT
- of = e_widget_framelist_add(evas, _("Scrot Options"), 0);
- ob = e_widget_check_add(evas, _("Include Image Border"),
&(cfdata->scrot.use_img_border));
+ of = e_widget_framelist_add(evas, D_("Scrot Options"), 0);
+ ob = e_widget_check_add(evas, D_("Include Image Border"),
&(cfdata->scrot.use_img_border));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Generate Thumbnail"),
&(cfdata->scrot.use_thumb));
+ ob = e_widget_check_add(evas, D_("Generate Thumbnail"),
&(cfdata->scrot.use_thumb));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_main.c 15 Jan 2006 11:26:39 -0000 1.17
+++ e_mod_main.c 30 Jan 2006 01:10:07 -0000 1.18
@@ -46,6 +46,10 @@
{
Screen *e;
+ /* Set up module's message catalogue */
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
+
/* actually init screen */
e = _screen_init(m);
m->config_menu = e->config_menu;
@@ -99,8 +103,8 @@
EAPI int
e_modapi_about(E_Module *m)
{
- e_module_dialog_show(_("Enlightenment Screenshot Module"),
- ("This module is used to take screenshots"));
+ e_module_dialog_show(D_("Enlightenment Screenshot Module"),
+ D_("This module is used to take screenshots"));
return 1;
}
@@ -486,8 +490,8 @@
}
else
{
- e_module_dialog_show(_("Enlightenment Screenshot Module"),
- _("Please Choose A Program To Use For Taking
Screenshots."));
+ e_module_dialog_show(D_("Enlightenment Screenshot Module"),
+ D_("Please Choose A Program To Use For Taking
Screenshots."));
return;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.h 6 Jan 2006 21:10:37 -0000 1.5
+++ e_mod_main.h 30 Jan 2006 01:10:07 -0000 1.6
@@ -1,3 +1,5 @@
+#define D_(str) dgettext(PACKAGE, str)
+
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
