Enlightenment CVS committal
Author : iamsthitha
Project : e_modules
Module : taskbar
Dir : e_modules/taskbar
Modified Files:
Makefile.am autogen.sh configure.in e_mod_config.c
e_mod_main.c
Log Message:
-Internationalization support (maybe)
-Minor code cleanup
===================================================================
RCS file: /cvs/e/e_modules/taskbar/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 22 Jun 2006 05:30:18 -0000 1.2
+++ Makefile.am 6 Jul 2006 05:15:45 -0000 1.3
@@ -1,12 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = data
+SUBDIRS = data po
# data files for the module
filesdir = $(datadir)
-files_DATA = \
-module_icon.png \
-module.eap
+files_DATA = module.eap
EXTRA_DIST = $(files_DATA)
===================================================================
RCS file: /cvs/e/e_modules/taskbar/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 13 Jun 2006 23:54:41 -0000 1.1
+++ autogen.sh 6 Jul 2006 05:15:45 -0000 1.2
@@ -10,6 +10,19 @@
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 taskbar.pot.template";\
+xgettext \
+-n \
+-C \
+-d taskbar \
+-p po \
+--copyright-holder="Enlightenment development team" \
+--foreign-user \
+--msgid-bugs-address="enlightenment-devel@lists.sourceforge.net" \
+-k -k_ -kd_ -kN_ -kD_ \
+--from-code=UTF-8 \
+-o taskbar.pot \
+`find . -name "*.[ch]" -print` || exit 1
if [ -z "$NOCONFIGURE" ]; then
./configure "$@"
===================================================================
RCS file: /cvs/e/e_modules/taskbar/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- configure.in 22 Jun 2006 05:30:18 -0000 1.2
+++ configure.in 6 Jul 2006 05:15:45 -0000 1.3
@@ -17,6 +17,9 @@
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
+ALL_LINGUAS=""
+AC_SUBST(ALL_LINGUAS)
+
MODULE_ARCH="$host_os-$host_cpu"
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
@@ -155,6 +158,7 @@
Makefile
data/Makefile
data/themes/Makefile
+po/Makefile
],[
])
===================================================================
RCS file: /cvs/e/e_modules/taskbar/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 22 Jun 2006 22:21:17 -0000 1.2
+++ e_mod_config.c 6 Jul 2006 05:15:45 -0000 1.3
@@ -29,7 +29,7 @@
con = e_container_current_get(e_manager_current_get());
cfd = e_config_dialog_new(con, _("Taskbar Configuration"), NULL, 0, v, ci);
- taskbar_config->config_dialog = cfd;
+ taskbar_config->config_dialog =
evas_list_append(taskbar_config->config_dialog, cfd);
}
static void
@@ -57,27 +57,29 @@
{
if (!taskbar_config)
return;
- taskbar_config->config_dialog = NULL;
+ taskbar_config->config_dialog =
evas_list_remove(taskbar_config->config_dialog, cfd);
free(cfdata);
}
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
- Evas_Object *o, *of, *ob, *label, *time_entry, *time_check, *date_entry,
*date_check;
- E_Radio_Group *rg;
+ Evas_Object *o, *of, *ob;
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Display"), 0);
+
ob = e_widget_check_add(evas, _("Show Labels"), &(cfdata->show_label));
- if (cfdata->show_label)
- e_widget_check_checked_set(ob, 1);
+ //if (cfdata->show_label)
+ // e_widget_check_checked_set(ob, 1);
e_widget_framelist_object_append(of, ob);
+
ob = e_widget_check_add(evas, _("Show windows from all desktops"),
&(cfdata->show_all));
- if (cfdata->show_all)
- e_widget_check_checked_set(ob, 1);
+ //if (cfdata->show_all)
+ // e_widget_check_checked_set(ob, 1);
e_widget_framelist_object_append(of, ob);
+
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
===================================================================
RCS file: /cvs/e/e_modules/taskbar/e_mod_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.c 2 Jul 2006 19:06:10 -0000 1.5
+++ e_mod_main.c 6 Jul 2006 05:15:45 -0000 1.6
@@ -1261,7 +1261,7 @@
{
e_gadcon_provider_unregister(&_gadcon_class);
- if (taskbar_config->config_dialog)
+ while (taskbar_config->config_dialog)
e_object_del(E_OBJECT(taskbar_config->config_dialog));
while (taskbar_config->handlers)
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
