Enlightenment CVS committal
Author : ningerso
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
config.h.in ephoto.c ephoto.h ephoto_slideshow.c
ephoto_viewer.c
Log Message:
Adding gettext setup and swedish translation patch from nils.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- config.h.in 17 Jul 2006 00:28:46 -0000 1.2
+++ config.h.in 6 Oct 2006 02:22:53 -0000 1.3
@@ -1,7 +1,21 @@
/* src/config.h.in. Generated from configure.in by autoheader. */
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+#undef ENABLE_NLS
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+#undef HAVE_DCGETTEXT
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define if you have the iconv() function. */
+#undef HAVE_ICONV
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- ephoto.c 30 Sep 2006 21:26:29 -0000 1.84
+++ ephoto.c 6 Oct 2006 02:22:53 -0000 1.85
@@ -15,7 +15,12 @@
printf("Unable to init ewl\n");
return 1;
}
-
+
+ /* NLS */
+ setlocale( LC_ALL, "" );
+ bindtextdomain( "ephoto", "/usr/share/locale" );
+ textdomain( "ephoto" );
+
m = NULL;
current_thumbs = ecore_dlist_new();
current_directory = strdup(getenv("HOME"));
@@ -40,7 +45,7 @@
ewl_widget_show(menubar);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), "File");
+ ewl_button_label_set(EWL_BUTTON(menu), gettext("File"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -48,7 +53,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/exit.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Exit");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Exit"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, destroy_cb, NULL);
@@ -56,7 +61,7 @@
ewl_widget_show(menu_item);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), "Albums");
+ ewl_button_label_set(EWL_BUTTON(menu), gettext("Albums"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -64,7 +69,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/add.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Add Album");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Add Album"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
@@ -73,14 +78,14 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/remove.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Remove Album");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Remove Album"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
ewl_widget_show(menu_item);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), "Viewer");
+ ewl_button_label_set(EWL_BUTTON(menu), gettext("Viewer"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -88,7 +93,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/emblem-photos.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Image Viewer");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Image Viewer"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, view_images, NULL);
@@ -96,7 +101,7 @@
ewl_widget_show(menu_item);
menu = ewl_menu_new();
- ewl_button_label_set(EWL_BUTTON(menu), "Slideshow");
+ ewl_button_label_set(EWL_BUTTON(menu), gettext("Slideshow"));
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
ewl_widget_show(menu);
@@ -104,7 +109,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/preferences-system.png", NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Configure Slideshow");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Configure Slideshow"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, create_slideshow_config,
NULL);
@@ -114,7 +119,7 @@
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/x-office-presentation.png",
NULL);
- ewl_button_label_set(EWL_BUTTON(menu_item), "Start Slideshow");
+ ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Start Slideshow"));
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, start_slideshow, NULL);
@@ -155,7 +160,7 @@
ewl_widget_show(image);
text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), " Location:");
+ ewl_text_text_set(EWL_TEXT(text), gettext(" Location:"));
ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
ewl_object_maximum_size_set(EWL_OBJECT(text), 66, 15);
ewl_container_child_append(EWL_CONTAINER(hbox), text);
@@ -202,7 +207,7 @@
ewl_widget_show(hseparator);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), "Albums");
+ ewl_border_text_set(EWL_BORDER(border), gettext("Albums"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(vbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
@@ -244,4 +249,3 @@
ewl_main();
return 0;
}
-
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ephoto.h 23 Sep 2006 14:19:02 -0000 1.41
+++ ephoto.h 6 Oct 2006 02:22:53 -0000 1.42
@@ -12,6 +12,10 @@
#include <string.h>
#include "config.h"
+/* NLS */
+#include <libintl.h>
+#include <locale.h>
+
void destroy_cb(Ewl_Widget *w, void *event, void *data);
void populate_browser(Ewl_Widget *w, void *event, void *data);
void populate_albums(Ewl_Widget *w, void *event, void *data);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ephoto_slideshow.c 5 Oct 2006 23:08:45 -0000 1.17
+++ ephoto_slideshow.c 6 Oct 2006 02:22:53 -0000 1.18
@@ -112,7 +112,7 @@
srand((unsigned int)time((time_t *)NULL));
window = ewl_window_new();
- ewl_window_title_set(EWL_WINDOW(window), "Ephoto Slideshow");
+ ewl_window_title_set(EWL_WINDOW(window), gettext("Ephoto Slideshow"));
ewl_window_name_set(EWL_WINDOW(window), "Ephoto Slideshow");
if (sc->full_size)
ewl_window_fullscreen_set(EWL_WINDOW(window), 1);
@@ -326,7 +326,7 @@
sc = parse_slideshow_config();
sc->win = ewl_window_new();
- ewl_window_title_set(EWL_WINDOW(sc->win), "Slideshow Configuration");
+ ewl_window_title_set(EWL_WINDOW(sc->win), gettext("Slideshow Configuration"));
ewl_window_name_set(EWL_WINDOW(sc->win), "Slideshow Configuration");
ewl_window_dialog_set(EWL_WINDOW(sc->win), 1);
ewl_object_size_request(EWL_OBJECT(sc->win), 400, 200);
@@ -345,7 +345,7 @@
ewl_widget_show(main_hbox);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), "Window Size");
+ ewl_border_text_set(EWL_BORDER(border), gettext("Window Size"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(main_hbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
@@ -358,7 +358,7 @@
ewl_widget_show(hbox);
sc->fullscreen = ewl_radiobutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->fullscreen), "Fullscreen");
+ ewl_button_label_set(EWL_BUTTON(sc->fullscreen), gettext("Fullscreen"));
ewl_container_child_append(EWL_CONTAINER(hbox), sc->fullscreen);
ewl_radiobutton_checked_set(EWL_RADIOBUTTON(sc->fullscreen), sc->full_size);
ewl_object_alignment_set(EWL_OBJECT(sc->fullscreen), EWL_FLAG_ALIGN_LEFT);
@@ -366,7 +366,7 @@
ewl_widget_show(sc->fullscreen);
sc->custom = ewl_radiobutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->custom), "Custom");
+ ewl_button_label_set(EWL_BUTTON(sc->custom), gettext("Custom"));
ewl_container_child_append(EWL_CONTAINER(hbox), sc->custom);
ewl_radiobutton_checked_set(EWL_RADIOBUTTON(sc->custom), sc->custom_size);
ewl_radiobutton_chain_set(EWL_RADIOBUTTON(sc->fullscreen),
@@ -381,7 +381,7 @@
ewl_widget_show(hbox);
text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), "Width");
+ ewl_text_text_set(EWL_TEXT(text), gettext("Width"));
ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), text);
@@ -395,7 +395,7 @@
ewl_widget_show(sc->wentry);
text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), "Height");
+ ewl_text_text_set(EWL_TEXT(text), gettext("Height"));
ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), text);
@@ -409,21 +409,21 @@
ewl_widget_show(sc->hentry);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), "Order");
+ ewl_border_text_set(EWL_BORDER(border), gettext("Order"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(main_hbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(border);
sc->loop = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->loop), "Loop Slideshow");
+ ewl_button_label_set(EWL_BUTTON(sc->loop), gettext("Loop Slideshow"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->loop), sc->loop_slide);
ewl_container_child_append(EWL_CONTAINER(border), sc->loop);
ewl_object_alignment_set(EWL_OBJECT(sc->loop), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(sc->loop);
sc->random = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->random), "Random Order");
+ ewl_button_label_set(EWL_BUTTON(sc->random), gettext("Random Order"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->random), sc->random_order);
ewl_container_child_append(EWL_CONTAINER(border), sc->random);
ewl_object_alignment_set(EWL_OBJECT(sc->random), EWL_FLAG_ALIGN_CENTER);
@@ -436,28 +436,28 @@
ewl_widget_show(hbox);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), "Image Size");
+ ewl_border_text_set(EWL_BORDER(border), gettext("Image Size"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(border);
sc->zoom_image = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->zoom_image), "Zoom Images to Fill
Window");
+ ewl_button_label_set(EWL_BUTTON(sc->zoom_image), gettext("Zoom Images to Fill
Window"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->zoom_image), sc->zoom);
ewl_container_child_append(EWL_CONTAINER(border), sc->zoom_image);
ewl_object_alignment_set(EWL_OBJECT(sc->zoom_image), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(sc->zoom_image);
sc->aspect_image = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->aspect_image), "Keep Aspect");
+ ewl_button_label_set(EWL_BUTTON(sc->aspect_image), gettext("Keep Aspect"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->aspect_image),
sc->keep_aspect);
ewl_container_child_append(EWL_CONTAINER(border), sc->aspect_image);
ewl_object_alignment_set(EWL_OBJECT(sc->aspect_image), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(sc->aspect_image);
border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(border), "Transitions");
+ ewl_border_text_set(EWL_BORDER(border), gettext("Transitions"));
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), border);
ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_CENTER);
@@ -475,7 +475,7 @@
ewl_widget_show(sc->spinner);
sc->show_name = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(sc->show_name), "Show File Name On Change");
+ ewl_button_label_set(EWL_BUTTON(sc->show_name), gettext("Show File Name On
Change"));
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(sc->show_name), sc->name_show);
ewl_container_child_append(EWL_CONTAINER(border), sc->show_name);
ewl_object_alignment_set(EWL_OBJECT(sc->show_name), EWL_FLAG_ALIGN_CENTER);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto_viewer.c 5 Oct 2006 03:36:35 -0000 1.14
+++ ephoto_viewer.c 6 Oct 2006 02:22:53 -0000 1.15
@@ -161,7 +161,7 @@
}
}
vwin = ewl_window_new();
- ewl_window_title_set(EWL_WINDOW(vwin), "Ephoto Image Viewer");
+ ewl_window_title_set(EWL_WINDOW(vwin), gettext("Ephoto Image Viewer"));
ewl_window_name_set(EWL_WINDOW(vwin), "Ephoto Image Viewer");
ewl_object_size_request(EWL_OBJECT(vwin), 480, 480);
ewl_callback_append(vwin, EWL_CALLBACK_DELETE_WINDOW, destroy_vwin, NULL);
@@ -208,7 +208,7 @@
button = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(button),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(button), "In");
+ ewl_button_label_set(EWL_BUTTON(button), gettext("In"));
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
@@ -218,7 +218,7 @@
button = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(button),
PACKAGE_DATA_DIR "/images/search.png", NULL);
- ewl_button_label_set(EWL_BUTTON(button), "Out");
+ ewl_button_label_set(EWL_BUTTON(button), gettext("Out"));
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
@@ -238,7 +238,7 @@
button = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(button),
PACKAGE_DATA_DIR "/images/undo.png", NULL);
- ewl_button_label_set(EWL_BUTTON(button), "Left");
+ ewl_button_label_set(EWL_BUTTON(button), gettext("Left"));
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
@@ -248,7 +248,7 @@
button = ewl_button_new();
ewl_button_image_set(EWL_BUTTON(button),
PACKAGE_DATA_DIR "/images/redo.png", NULL);
- ewl_button_label_set(EWL_BUTTON(button), "Right");
+ ewl_button_label_set(EWL_BUTTON(button), gettext("Right"));
ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(hbox), button);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
