Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
Makefile.am etk_button_test.c etk_canvas_test.c
etk_colorpicker_test.c etk_entry_test.c etk_image_test.c
etk_scale_test.c etk_table_test.c etk_test.c etk_test.h
etk_tree_test.c
Log Message:
etk can speak french and can learn other languages
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 1 Oct 2005 16:29:45 -0000 1.1
+++ Makefile.am 16 Oct 2005 00:05:57 -0000 1.2
@@ -2,6 +2,11 @@
AUTOMAKE_OPTIONS = 1.4 foreign
+# Gettext
+datadir = @datadir@
+localedir = $(datadir)/locale
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+
EXTRA_DIST =
INCLUDES = \
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_button_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_button_test.c 1 Oct 2005 16:29:45 -0000 1.1
+++ etk_button_test.c 16 Oct 2005 00:05:57 -0000 1.2
@@ -25,37 +25,37 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), "Button test");
+ etk_window_title_set(ETK_WINDOW(win), _("Button test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_button_window_deleted_cb), win);
vbox = etk_vbox_new(FALSE, 3);
etk_container_add(ETK_CONTAINER(win), vbox);
- button_normal = etk_button_new_with_label("Normal button");
+ button_normal = etk_button_new_with_label(_("Normal button"));
etk_box_pack_start(ETK_BOX(vbox), button_normal, FALSE, FALSE, 0);
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
- button_normal = etk_button_new_with_label("Button with an image");
+ button_normal = etk_button_new_with_label(_("Button with an image"));
etk_button_image_set(ETK_BUTTON(button_normal), ETK_IMAGE(image));
etk_box_pack_start(ETK_BOX(vbox), button_normal, FALSE, FALSE, 0);
button_normal = etk_button_new();
etk_box_pack_start(ETK_BOX(vbox), button_normal, FALSE, FALSE, 0);
- button_check = etk_check_button_new_with_label("Check button");
+ button_check = etk_check_button_new_with_label(_("Check button"));
etk_box_pack_start(ETK_BOX(vbox), button_check, FALSE, FALSE, 0);
button_check = etk_check_button_new();
etk_box_pack_start(ETK_BOX(vbox), button_check, FALSE, FALSE, 0);
- button_radio = etk_radio_button_new_with_label("Radio button", NULL);
+ button_radio = etk_radio_button_new_with_label(_("Radio button"), NULL);
etk_box_pack_start(ETK_BOX(vbox), button_radio, FALSE, FALSE, 0);
button_radio =
etk_radio_button_new_from_widget(ETK_RADIO_BUTTON(button_radio));
etk_box_pack_start(ETK_BOX(vbox), button_radio, FALSE, FALSE, 0);
- button_toggle = etk_toggle_button_new_with_label("Toggle button");
+ button_toggle = etk_toggle_button_new_with_label(_("Toggle button"));
etk_box_pack_start(ETK_BOX(vbox), button_toggle, FALSE, FALSE, 0);
button_toggle = etk_toggle_button_new();
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_canvas_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_canvas_test.c 1 Oct 2005 16:29:45 -0000 1.1
+++ etk_canvas_test.c 16 Oct 2005 00:05:57 -0000 1.2
@@ -26,7 +26,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), "Etk Canvas Test");
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Canvas Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_canvas_window_deleted_cb), win);
@@ -37,7 +37,7 @@
etk_widget_size_request_set(canvas, 300, 200);
etk_box_pack_start(ETK_BOX(vbox), canvas, TRUE, TRUE, 0);
- button = etk_button_new_with_label("Add object");
+ button = etk_button_new_with_label(_("Add object"));
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_canvas_object_add), canvas);
etk_box_pack_start(ETK_BOX(vbox), button, FALSE, FALSE, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_colorpicker_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_colorpicker_test.c 1 Oct 2005 16:29:45 -0000 1.1
+++ etk_colorpicker_test.c 16 Oct 2005 00:05:57 -0000 1.2
@@ -21,7 +21,7 @@
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), "Etk Color Picker");
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Color Picker"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_canvas_window_deleted_cb), win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_entry_test.c 1 Oct 2005 16:29:45 -0000 1.1
+++ etk_entry_test.c 16 Oct 2005 00:05:57 -0000 1.2
@@ -28,7 +28,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), "Etk Entry test");
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Entry test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_entry_window_deleted_cb), win);
@@ -38,7 +38,7 @@
entry = etk_entry_new();
etk_table_attach(ETK_TABLE(table), entry, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
- button = etk_button_new_with_label("Print the text!!!");
+ button = etk_button_new_with_label(_("Print the text!!!"));
etk_table_attach(ETK_TABLE(table), button, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_print_clicked), NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_image_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_image_test.c 1 Oct 2005 16:29:45 -0000 1.1
+++ etk_image_test.c 16 Oct 2005 00:05:57 -0000 1.2
@@ -22,7 +22,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), "Etk Image Test");
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Image Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_image_window_deleted_cb), win);
@@ -31,8 +31,8 @@
images[1] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
etk_image_keep_aspect_set(ETK_IMAGE(images[1]), FALSE);
- labels[0] = etk_label_new("Keep aspect");
- labels[1] = etk_label_new("Don't keep aspect");
+ labels[0] = etk_label_new(_("Keep aspect"));
+ labels[1] = etk_label_new(_("Don't keep aspect"));
table = etk_table_new(2, 2, FALSE);
etk_table_attach_defaults(ETK_TABLE(table), images[0], 0, 0, 0, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_scale_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_scale_test.c 1 Oct 2005 16:29:45 -0000 1.1
+++ etk_scale_test.c 16 Oct 2005 00:05:57 -0000 1.2
@@ -19,7 +19,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), "Etk Scale test");
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Scale test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_scale_window_deleted_cb), win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_table_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_table_test.c 1 Oct 2005 16:29:45 -0000 1.1
+++ etk_table_test.c 16 Oct 2005 00:05:57 -0000 1.2
@@ -22,47 +22,47 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), "Etk Table Test");
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Table Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_table_window_deleted_cb), win);
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/open.png");
- widget[0] = etk_button_new_with_label("Set Icon");
+ widget[0] = etk_button_new_with_label(_("Set Icon"));
etk_button_image_set(ETK_BUTTON(widget[0]), ETK_IMAGE(image));
widget[20] = etk_alignment_new(0.5, 0.5, 0.0, 0.0);
etk_container_add(ETK_CONTAINER(widget[20]), widget[0]);
- widget[1] = etk_label_new("App name");
+ widget[1] = etk_label_new(_("App name"));
widget[2] = etk_entry_new();
- widget[3] = etk_label_new("Generic Info");
+ widget[3] = etk_label_new(_("Generic Info"));
widget[4] = etk_entry_new();
- widget[5] = etk_label_new("Comments");
+ widget[5] = etk_label_new(_("Comments"));
widget[6] = etk_entry_new();
- widget[7] = etk_label_new("Executable");
+ widget[7] = etk_label_new(_("Executable"));
widget[8] = etk_entry_new();
- widget[9] = etk_label_new("Window name");
+ widget[9] = etk_label_new(_("Window name"));
widget[10] = etk_entry_new();
- widget[11] = etk_label_new("Window class");
+ widget[11] = etk_label_new(_("Window class"));
widget[12] = etk_entry_new();
- widget[13] = etk_label_new("Startup notify");
+ widget[13] = etk_label_new(_("Startup notify"));
widget[14] = etk_check_button_new();
- widget[15] = etk_label_new("Wait exit");
+ widget[15] = etk_label_new(_("Wait exit"));
widget[16] = etk_check_button_new();
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/close.png");
- widget[17] = etk_button_new_with_label("Cancel");
+ widget[17] = etk_button_new_with_label(_("Cancel"));
etk_button_image_set(ETK_BUTTON(widget[17]), ETK_IMAGE(image));
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/save.png");
- widget[18] = etk_button_new_with_label("Save");
+ widget[18] = etk_button_new_with_label(_("Save"));
etk_button_image_set(ETK_BUTTON(widget[18]), ETK_IMAGE(image));
widget[19] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_test.c 1 Oct 2005 16:29:45 -0000 1.1
+++ etk_test.c 16 Oct 2005 00:05:57 -0000 1.2
@@ -52,7 +52,7 @@
int i;
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), "Etk Test Application");
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Test Application"));
etk_signal_connect("destroy", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_main_quit_cb), NULL);
table = etk_table_new((num_tests + 2) / 3, 3, 1);
@@ -60,7 +60,7 @@
for (i = 0; i < num_tests; i++)
{
- button = etk_button_new_with_label(tests[i].name);
+ button = etk_button_new_with_label(_(tests[i].name));
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(tests[i].func), NULL);
etk_table_attach_defaults(ETK_TABLE(table), button, i / 3, i / 3, i % 3,
i % 3);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_test.h 1 Oct 2005 16:29:45 -0000 1.1
+++ etk_test.h 16 Oct 2005 00:05:57 -0000 1.2
@@ -3,6 +3,12 @@
#include "Etk.h"
+/* Gettext */
+#include <libintl.h>
+#define _(String) gettext (String)
+#define gettext_noop(String) String
+#define N_(String) gettext_noop (String)
+
typedef struct _Etk_Test_Set Etk_Test_Set;
struct _Etk_Test_Set
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_tree_test.c 8 Oct 2005 14:43:36 -0000 1.5
+++ etk_tree_test.c 16 Oct 2005 00:05:57 -0000 1.6
@@ -24,16 +24,16 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), "Etk Tree Test");
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Tree Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_tree_window_deleted_cb), win);
table = etk_table_new(2, 2, FALSE);
etk_container_add(ETK_CONTAINER(win), table);
- label = etk_label_new("<h1>Tree:</h1>");
+ label = etk_label_new(_("<h1>Tree:</h1>"));
etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0, 10, 0,
ETK_FILL_POLICY_HFILL);
- label = etk_label_new("<h1>List:</h1>");
+ label = etk_label_new(_("<h1>List:</h1>"));
etk_table_attach(ETK_TABLE(table), label, 1, 1, 0, 0, 10, 0,
ETK_FILL_POLICY_HFILL);
/* The tree: */
@@ -42,19 +42,19 @@
etk_table_attach_defaults(ETK_TABLE(table), tree, 0, 0, 1, 1);
etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_TREE);
- col1 = etk_tree_col_new(ETK_TREE(tree), "Column 1", ETK_TREE_COL_ICON_TEXT);
- col2 = etk_tree_col_new(ETK_TREE(tree), "Column 2", ETK_TREE_COL_INT);
- col3 = etk_tree_col_new(ETK_TREE(tree), "Column 3", ETK_TREE_COL_IMAGE);
+ col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
ETK_TREE_COL_ICON_TEXT);
+ col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT);
+ col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE);
etk_tree_build(ETK_TREE(tree));
etk_tree_freeze(ETK_TREE(tree));
for (i = 0; i < 1000; i++)
{
- row = etk_tree_append(ETK_TREE(tree), col1, PACKAGE_DATA_DIR
"/images/open.png", "Row1",
+ row = etk_tree_append(ETK_TREE(tree), col1, PACKAGE_DATA_DIR
"/images/open.png", _("Row1"),
col2, 1, col3, PACKAGE_DATA_DIR "/images/1star.png", NULL);
- row = etk_tree_append_to_row(row, col1, PACKAGE_DATA_DIR
"/images/open.png", "Row2",
+ row = etk_tree_append_to_row(row, col1, PACKAGE_DATA_DIR
"/images/open.png", _("Row2"),
col2, 2, col3, PACKAGE_DATA_DIR "/images/2stars.png", NULL);
- etk_tree_append_to_row(row, col1, PACKAGE_DATA_DIR "/images/open.png",
"Row3",
+ etk_tree_append_to_row(row, col1, PACKAGE_DATA_DIR "/images/open.png",
_("Row3"),
col2, 3, col3, PACKAGE_DATA_DIR "/images/3stars.png", NULL);
}
etk_tree_thaw(ETK_TREE(tree));
@@ -66,26 +66,26 @@
etk_table_attach_defaults(ETK_TABLE(table), tree, 1, 1, 1, 1);
etk_tree_multiple_select_set(ETK_TREE(tree), TRUE);
- col1 = etk_tree_col_new(ETK_TREE(tree), "Column 1", ETK_TREE_COL_TEXT);
- col2 = etk_tree_col_new(ETK_TREE(tree), "Column 2", ETK_TREE_COL_INT);
- col3 = etk_tree_col_new(ETK_TREE(tree), "Column 3", ETK_TREE_COL_IMAGE);
+ col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"), ETK_TREE_COL_TEXT);
+ col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT);
+ col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE);
etk_tree_build(ETK_TREE(tree));
etk_tree_freeze(ETK_TREE(tree));
for (i = 0; i < 300; i++)
{
- etk_tree_append(ETK_TREE(tree), col1, "Row1", col2, 1, col3,
PACKAGE_DATA_DIR "/images/1star.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row2", col2, 2, col3,
PACKAGE_DATA_DIR "/images/2stars.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row3", col2, 3, col3,
PACKAGE_DATA_DIR "/images/3stars.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row4", col2, 1, col3,
PACKAGE_DATA_DIR "/images/3stars.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row5", col2, 2, col3,
PACKAGE_DATA_DIR "/images/2stars.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row6", col2, 3, col3,
PACKAGE_DATA_DIR "/images/1star.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row7", col2, 1, col3,
PACKAGE_DATA_DIR "/images/1star.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row8", col2, 2, col3,
PACKAGE_DATA_DIR "/images/2stars.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row9", col2, 3, col3,
PACKAGE_DATA_DIR "/images/3stars.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row10", col2, 1, col3,
PACKAGE_DATA_DIR "/images/3stars.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row11", col2, 2, col3,
PACKAGE_DATA_DIR "/images/2stars.png", NULL);
- etk_tree_append(ETK_TREE(tree), col1, "Row12", col2, 3, col3,
PACKAGE_DATA_DIR "/images/1star.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row1"), col2, 1, col3,
PACKAGE_DATA_DIR "/images/1star.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row2"), col2, 2, col3,
PACKAGE_DATA_DIR "/images/2stars.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row3"), col2, 3, col3,
PACKAGE_DATA_DIR "/images/3stars.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row4"), col2, 1, col3,
PACKAGE_DATA_DIR "/images/3stars.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row5"), col2, 2, col3,
PACKAGE_DATA_DIR "/images/2stars.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row6"), col2, 3, col3,
PACKAGE_DATA_DIR "/images/1star.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row7"), col2, 1, col3,
PACKAGE_DATA_DIR "/images/1star.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row8"), col2, 2, col3,
PACKAGE_DATA_DIR "/images/2stars.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row9"), col2, 3, col3,
PACKAGE_DATA_DIR "/images/3stars.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row10"), col2, 1, col3,
PACKAGE_DATA_DIR "/images/3stars.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row11"), col2, 2, col3,
PACKAGE_DATA_DIR "/images/2stars.png", NULL);
+ etk_tree_append(ETK_TREE(tree), col1, _("Row12"), col2, 3, col3,
PACKAGE_DATA_DIR "/images/1star.png", NULL);
}
etk_tree_thaw(ETK_TREE(tree));
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
