[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [E-devel] taskbar 0.1.3



Sthithaprajna Garapaty wrote:
I merged your diff and stuck everything in cvs.
Other than that, please let me know if I left out anything important.

You left out some autofoo changes, mostly related to translation.. but also some fixes to the theme build process..

See the attached diff.

I'll churn out some more diffs once I get everything sorted out.

--
Morten
:wq
Index: Makefile.am
===================================================================
RCS file: /var/cvs/e/e_modules/taskbar/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- Makefile.am	22 Jun 2006 05:30:18 -0000	1.2
+++ Makefile.am	24 Jun 2006 12:11:09 -0000
@@ -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)
 
@@ -19,7 +17,7 @@
 pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
 			e_mod_main.h \
-		        e_mod_config.c	
+			e_mod_config.c	
 			
 module_la_LIBADD       = @e_libs@
 module_la_LDFLAGS      = -module -avoid-version
@@ -27,4 +25,3 @@
 
 clean-local:
 	 rm -rf *~
-
Index: autogen.sh
===================================================================
RCS file: /var/cvs/e/e_modules/taskbar/autogen.sh,v
retrieving revision 1.1
diff -u -r1.1 autogen.sh
--- autogen.sh	13 Jun 2006 23:54:41 -0000	1.1
+++ autogen.sh	24 Jun 2006 12:11:09 -0000
@@ -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 "$@"
Index: configure.in
===================================================================
RCS file: /var/cvs/e/e_modules/taskbar/configure.in,v
retrieving revision 1.2
diff -u -r1.2 configure.in
--- configure.in	22 Jun 2006 05:30:18 -0000	1.2
+++ configure.in	24 Jun 2006 12:11:09 -0000
@@ -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
 ],[
 ])
 
Index: e_mod_config.c
===================================================================
RCS file: /var/cvs/e/e_modules/taskbar/e_mod_config.c,v
retrieving revision 1.2
diff -u -r1.2 e_mod_config.c
--- e_mod_config.c	22 Jun 2006 22:21:17 -0000	1.2
+++ e_mod_config.c	24 Jun 2006 12:11:09 -0000
@@ -23,20 +23,21 @@
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
-   v->free_cfdata = _free_data;
-   v->basic.apply_cfdata = _basic_apply_data;
+   v->free_cfdata   = _free_data;
+
+   v->basic.apply_cfdata   = _basic_apply_data;
    v->basic.create_widgets = _basic_create_widgets;
 
    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
 _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
 {
    cfdata->show_label = ci->show_label;
-   cfdata->show_all = ci->show_all;
+   cfdata->show_all   = ci->show_all;
 }
 
 static void *
@@ -55,29 +56,26 @@
 static void
 _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-   if (!taskbar_config)
-      return;
-   taskbar_config->config_dialog = NULL;
+   if (!taskbar_config) return;
+   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);
-   e_widget_framelist_object_append(of, ob);  
+   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);
    e_widget_framelist_object_append(of, ob);
+
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
    return o;
Index: e_mod_main.h
===================================================================
RCS file: /var/cvs/e/e_modules/taskbar/e_mod_main.h,v
retrieving revision 1.4
diff -u -r1.4 e_mod_main.h
--- e_mod_main.h	22 Jun 2006 22:21:18 -0000	1.4
+++ e_mod_main.h	24 Jun 2006 12:11:09 -0000
@@ -4,6 +4,8 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
+#define _(str) dgettext(PACKAGE, str)
+
 typedef struct _Config Config;
 typedef struct _Config_Item Config_Item;
 
@@ -13,9 +15,9 @@
    E_Module *module;
    Evas_List *instances;
    Evas_List *items;
-   E_Menu *menu;
    Evas_List *handlers;
-   E_Config_Dialog *config_dialog;
+   Evas_List *config_dialog;
+   E_Menu *menu;
 };
 
 struct _Config_Item
@@ -28,10 +30,10 @@
 EAPI extern E_Module_Api e_modapi;
 
 EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-EAPI int e_modapi_info(E_Module *m);
-EAPI int e_modapi_about(E_Module *m);
+EAPI int   e_modapi_shutdown(E_Module *m);
+EAPI int   e_modapi_save(E_Module *m);
+EAPI int   e_modapi_info(E_Module *m);
+EAPI int   e_modapi_about(E_Module *m);
 
 void _config_taskbar_module(Config_Item *ci);
 void _taskbar_config_updated(const char *id);
Index: data/themes/Makefile.am
===================================================================
RCS file: /var/cvs/e/e_modules/taskbar/data/themes/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- data/themes/Makefile.am	22 Jun 2006 05:30:18 -0000	1.2
+++ data/themes/Makefile.am	24 Jun 2006 12:11:09 -0000
@@ -4,18 +4,14 @@
 EDJE_FLAGS = -v -id images -fd fonts
 
 filesdir = $(datadir)
-files_DATA = \
-fonts/VeraBd.ttf \
-$(wildcard taskbar.ed?) \
-$(wildcard taskbar2.ed?)
-
+files_DATA = fonts/VeraBd.ttf tarkbar.edj
 
 EXTRA_DIST = $(files_DATA) $(wildcard images/*.png)
 
-%.edj:  %.edc
-	$(EDJE_CC) $(EDJE_FLAGS) $< $@
+taskbar.edj: Makefile taskbar.edc
+	$(EDJE_CC) $(EDJE_FLAGS) \
+	taskbar.edc \
+	taskbar.edj
 
 clean-local:
 	rm -f *.edj
-
-