Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : bling
Dir : e_modules/bling
Modified Files:
compmgr.c configure.in e_mod_config.c e_mod_main.c
Log Message:
build fixes, package isn't localized.
===================================================================
RCS file: /cvs/e/e_modules/bling/compmgr.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- compmgr.c 31 Dec 2006 11:07:18 -0000 1.11
+++ compmgr.c 12 Nov 2007 05:03:36 -0000 1.12
@@ -2042,17 +2042,17 @@
if (!XRenderQueryExtension(dpy, &render_event, &render_error))
{
- e_error_message_show(_("Unable to load Bling module:<br>"
- "Your X server does not have the Render
extension.<br>"));
+ e_error_message_show("Unable to load Bling module:<br>"
+ "Your X server does not have the Render
extension.<br>");
return 0;
}
if (!XQueryExtension
(dpy, COMPOSITE_NAME, &composite_opcode, &composite_event,
&composite_error))
{
- e_error_message_show(_("Unable to load Bling module:<br>"
- "Your X server does not have the Composite
extension.<br>"
- "You may need to enable this manually in your X
configuration.<br>"));
+ e_error_message_show("Unable to load Bling module:<br>"
+ "Your X server does not have the Composite
extension.<br>"
+ "You may need to enable this manually in your X
configuration.<br>");
return 0;
}
XCompositeQueryVersion(dpy, &composite_major, &composite_minor);
===================================================================
RCS file: /cvs/e/e_modules/bling/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in 15 Jul 2007 20:47:04 -0000 1.7
+++ configure.in 12 Nov 2007 05:03:36 -0000 1.8
@@ -3,145 +3,67 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT(configure.in)
+AC_INIT(bling, 0.0.1, [EMAIL PROTECTED])
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
+AC_ISC_POSIX
-AM_INIT_AUTOMAKE(bling, 0.0.1)
+AM_INIT_AUTOMAKE(1.6)
AM_CONFIG_HEADER(config.h)
-AC_ISC_POSIX
+
AC_PROG_CC
AM_PROG_CC_STDC
AC_HEADER_STDC
AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
+
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
MODULE_ARCH="$host_os-$host_cpu"
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
-dnl AC_CHECK_HEADERS(dirent.h,, AC_MSG_ERROR([Cannot find dirent.h])
-
-if test "x${bindir}" = 'x${exec_prefix}/bin'; then
- if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
- else
- bindir="${prefix}/bin";
- fi
- else
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
- else
- bindir="${prefix}/bin";
- fi
- fi
-fi
-
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
- if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
- fi
- else
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
- fi
- fi
-fi
-
-dnl Set PACKAGE_BIN_DIR in config.h.
-if test "x${bindir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", "Package
installed binaries destination")
- else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", "Package installed
binaries destination")
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", "Package installed binaries
destination")
-fi
-
-dnl Set PACKAGE_LIB_DIR in config.h.
-if test "x${libdir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", "Package
installed libraries destination")
- else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", "Package installed
libraries destination")
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", "Package installed
libraries destination")
-fi
-
-dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}",
"Package installed data destination")
- datadir="${HOME}/.e/e/modules/${PACKAGE}"
-else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${libdir}/enlightenment/modules/${PACKAGE}", "Package installed data
destination")
- datadir="${libdir}/enlightenment/modules/${PACKAGE}"
-fi
-
-AC_PREFIX_DEFAULT(${HOME}/.e/e)
-if test "x$prefix" = "xNONE"; then
- datarootdir=${ac_default_prefix}
-else
- datarootdir=${prefix}/share
-fi
-localedir=${datarootdir}/locale
-AC_SUBST(LOCALEDIR, "${localedir}")
-AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory])
-
-#AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
-#AC_SUBST(dlopen_libs)
-
x_cflags="-I/usr/X11R6/include"
x_libs="-L/usr/X11R6/lib -lX11 -lXext -lXrender -lXcomposite"
AC_SUBST(x_cflags)
AC_SUBST(x_libs)
-PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9])
-PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9])
-PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
-
edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc"
AC_ARG_WITH(edje-cc,
-[ --with-edje-cc=PATH specify a specific path to edje_cc],
-[
- v=$withval;
- edje_cc=$v
- echo " Enlightenment edje_cc explicitly set to "$edje_cc;
-],[
- edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc"
-])
+ AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
+ [
+ edje_cc=$withval;
+ echo " Enlightenment edje_cc explicitly set to "$edje_cc;
+ ]
+)
AC_SUBST(edje_cc)
-PKG_CHECK_MODULES(EET, [eet >= 0.9.10])
-
AC_ARG_WITH(enlightenment-config,
-[ --with-enlightenment-config=E_CONFIG use enlightenment-config specified
],
-[
- E_CONFIG=$withval;
- echo "using "$E_CONFIG" for enlightenment-config";
-],[
- PROG="enlightenment-config";
- AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
-])
+ AC_HELP_STRING([--with-enlightenment-config=E_CONFIG], [use
enlightenment-config specified]),
+ [
+ E_CONFIG=$withval;
+ echo "using "$E_CONFIG" for enlightenment-config";
+ ], [
+ PROG="enlightenment-config";
+ AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
+ ]
+)
e_cflags=`$E_CONFIG --cflags`
e_libs=`$E_CONFIG --libs`
e_modules=`$E_CONFIG --module-dir`
AC_SUBST(e_cflags)
AC_SUBST(e_libs)
-AC_SUBST(e_modules)
+
+dnl TODO: Fix better install for homedir
+datadir="${e_modules}/${PACKAGE}"
AC_OUTPUT([
Makefile
module.desktop
e_modules-bling.spec
-],[
+], [
])
===================================================================
RCS file: /cvs/e/e_modules/bling/e_mod_config.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_config.c 12 Nov 2007 04:38:05 -0000 1.7
+++ e_mod_config.c 12 Nov 2007 05:03:36 -0000 1.8
@@ -93,12 +93,12 @@
Evas_Object *o, *of, *ob;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Composite Settings"), 0);
- ob = e_widget_check_add(evas, _("Enable Drop Shadows"),
(&(cfdata->shadow_enable)));
+ of = e_widget_framelist_add(evas, "Composite Settings", 0);
+ ob = e_widget_check_add(evas, "Enable Drop Shadows",
(&(cfdata->shadow_enable)));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Enable Windows In/Out"),
(&(cfdata->fade_enable)));
+ ob = e_widget_check_add(evas, "Enable Windows In/Out",
(&(cfdata->fade_enable)));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Fade On Opacity Changes"),
(&(cfdata->fade_opacity)));
+ ob = e_widget_check_add(evas, "Fade On Opacity Changes",
(&(cfdata->fade_opacity)));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -127,55 +127,55 @@
int i = 0;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Drop Shadow Settings"), 0);
- ob = e_widget_check_add(evas, _("Enable Drop Shadows"),
(&(cfdata->shadow_enable)));
+ of = e_widget_framelist_add(evas, "Drop Shadow Settings", 0);
+ ob = e_widget_check_add(evas, "Enable Drop Shadows",
(&(cfdata->shadow_enable)));
e_widget_framelist_object_append(of, ob);
ot = e_widget_table_add(evas, 0);
- ob = e_widget_label_add(evas, _("Shadow Size"));
+ ob = e_widget_label_add(evas, "Shadow Size");
e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 1, 40, 1, 0, NULL,
&(cfdata->shadow_size), 150);
+ ob = e_widget_slider_add(evas, 1, 0, "%.0f pixels", 1, 40, 1, 0, NULL,
&(cfdata->shadow_size), 150);
e_widget_slider_value_double_set(ob, cfdata->shadow_size);
e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
i++;
- ob = e_widget_label_add(evas, _("Shadow Opacity"));
+ ob = e_widget_label_add(evas, "Shadow Opacity");
e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.00f\%"), 0, 1, 0.05, 0,
&(cfdata->shadow_opacity), NULL, 150);
+ ob = e_widget_slider_add(evas, 1, 0, "%1.00f\%", 0, 1, 0.05, 0,
&(cfdata->shadow_opacity), NULL, 150);
e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
i++;
- ob = e_widget_label_add(evas, _("Horizontal Offset"));
+ ob = e_widget_label_add(evas, "Horizontal Offset");
e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 1, 40, 1, 0, NULL,
&(cfdata->shadow_horz_offset), 150);
+ ob = e_widget_slider_add(evas, 1, 0, "%.0f pixels", 1, 40, 1, 0, NULL,
&(cfdata->shadow_horz_offset), 150);
e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
i++;
- ob = e_widget_label_add(evas, _("Vertical Offset"));
+ ob = e_widget_label_add(evas, "Vertical Offset");
e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 1, 40, 1, 0, NULL,
&(cfdata->shadow_vert_offset), 150);
+ ob = e_widget_slider_add(evas, 1, 0, "%.0f pixels", 1, 40, 1, 0, NULL,
&(cfdata->shadow_vert_offset), 150);
e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
e_widget_framelist_object_append(of, ot);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Fade Settings"), 0);
- ob = e_widget_check_add(evas, _("Fade Windows In/Out"),
(&(cfdata->fade_enable)));
+ of = e_widget_framelist_add(evas, "Fade Settings", 0);
+ ob = e_widget_check_add(evas, "Fade Windows In/Out",
(&(cfdata->fade_enable)));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Fade On Opacity Changes"),
(&(cfdata->fade_opacity)));
+ ob = e_widget_check_add(evas, "Fade On Opacity Changes",
(&(cfdata->fade_opacity)));
e_widget_framelist_object_append(of, ob);
ot = e_widget_table_add(evas, 0);
- ob = e_widget_label_add(evas, _("Fade In Speed"));
+ ob = e_widget_label_add(evas, "Fade In Speed");
e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%.0f"), 1.0, 100.0, 1, 0,
&(cfdata->fade_in_step), NULL, 150);
+ ob = e_widget_slider_add(evas, 1, 0, "%.0f", 1.0, 100.0, 1, 0,
&(cfdata->fade_in_step), NULL, 150);
e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
i++;
- ob = e_widget_label_add(evas, _("Fade Out Speed"));
+ ob = e_widget_label_add(evas, "Fade Out Speed");
e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%.0f"), 1.0, 100.0, 1, 0,
&(cfdata->fade_out_step), NULL, 150);
+ ob = e_widget_slider_add(evas, 1, 0, "%.0f" 1.0, 100.0, 1, 0,
&(cfdata->fade_out_step), NULL, 150);
e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
e_widget_framelist_object_append(of, ot);
===================================================================
RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_main.c 2 Nov 2007 12:22:16 -0000 1.9
+++ e_mod_main.c 12 Nov 2007 05:03:36 -0000 1.10
@@ -82,7 +82,7 @@
menu = e_menu_new();
mi = e_menu_item_new(menu);
- e_menu_item_label_set(mi, _("Configuration"));
+ e_menu_item_label_set(mi, "Configuration");
e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
e_menu_item_callback_set(mi, _bling_menu_cb_configure, b);
b->config_menu = menu;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
