Enlightenment CVS committal
Author : davemds
Project : e_modules
Module : penguins
Dir : e_modules/penguins
Modified Files:
autogen.sh e_mod_config.c e_mod_config.h e_mod_main.c
e_mod_main.h
Log Message:
Convert configuration dialog to the new api
===================================================================
RCS file: /cvs/e/e_modules/penguins/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 20 Oct 2007 13:14:50 -0000 1.1
+++ autogen.sh 8 Nov 2007 04:18:22 -0000 1.2
@@ -6,7 +6,7 @@
touch README
echo "Running autopoint..." ; autopoint -f || :
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
+echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1
echo "Running autoheader..." ; autoheader || exit 1
echo "Running autoconf..." ; autoconf || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize
--automake) || exit 1
===================================================================
RCS file: /cvs/e/e_modules/penguins/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 2 Nov 2007 12:48:00 -0000 1.2
+++ e_mod_config.c 8 Nov 2007 04:18:22 -0000 1.3
@@ -20,26 +20,30 @@
static void _fill_data(Population *pop, E_Config_Dialog_Data *cfdata);
static void _ilist_cb_selected(void *data);
-void
-_config_penguin_module(E_Container *con, Population *pop)
+EAPI E_Config_Dialog *
+e_int_config_penguins_module(E_Container *con, const char *params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
char buf[4096];
-
- v = E_NEW(E_Config_Dialog_View, 1);
+ Population *pop;
- if (v)
- {
- v->create_cfdata = _create_data;
- v->free_cfdata = _free_data;
- v->basic.apply_cfdata = _basic_apply_data;
- v->basic.create_widgets = _basic_create_widgets;
-
- snprintf(buf, sizeof(buf), "%s/module.edj",
e_module_dir_get(pop->module));
- cfd = e_config_dialog_new(con, D_("Penguins Module"), "Penguins",
"_e_modules_penguins_config_dialog", buf, 0, v, pop);
- pop->config_dialog = cfd;
- }
+ pop = penguins_mod->data;
+ if (e_config_dialog_find("E", "_e_mod_penguins_config_dialog")) return NULL;
+ 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->basic.create_widgets = _basic_create_widgets;
+
+ snprintf(buf, sizeof(buf), "%s/e-module-penguins.edj",
e_module_dir_get(pop->module));
+ cfd = e_config_dialog_new(con,
+ _("Population Settings"),
+ "E", "_e_mod_penguins_config_dialog",
+ buf, 0, v, pop);
+ pop->config_dialog = cfd;
+ return cfd;
}
static void
@@ -83,35 +87,28 @@
pop = cfd->data;
o = e_widget_list_add(evas, 0, 0);
-
- of = e_widget_framelist_add(evas, D_("Population Settings"), 0);
ob = e_widget_label_add(evas, D_("Number of penguins:"));
- e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f"), 1, 50, 1, 0, NULL,
&(cfdata->penguins_count), 200);
- e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_label_add(evas, D_("Zoom factor:"));
- e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_slider_add(evas, 1, 0, D_("%1.1f X"), 0.2, 3, 0.2, 0,
&(cfdata->zoom), NULL, 200);
- e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_label_add(evas, D_("Transparency:"));
- e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f"), 50, 255, 1, 0, NULL,
&(cfdata->alpha), 200);
- e_widget_framelist_object_append(of, ob);
-
-
-
-
+ e_widget_list_object_append(o, ob, 1, 1, 0.5);
//Lista
ob = e_widget_label_add(evas, D_("Select population:"));
- e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, ob, 1, 1, 0.5);
ol = e_widget_ilist_add(evas, 24, 24, &(cfdata->theme));
e_widget_ilist_clear(ol);
- e_widget_ilist_go(ol);
Evas_List *l;
int count;
@@ -127,9 +124,8 @@
if (name)
{
oi = edje_object_add(evas);
- e_util_edje_icon_set(oi, "enlightenment/shelf_position_left");
edje_object_file_set(oi, theme, "icon");
- printf("TEMA: %s (%s)\n", name, cfdata->theme);
+ //printf("TEMA: %s (%s)\n", name, cfdata->theme);
e_widget_ilist_append(ol, oi, name,
_ilist_cb_selected, theme, theme);
if (strcmp(theme, cfdata->theme) == 0)
@@ -142,8 +138,7 @@
}
e_widget_ilist_go(ol);
e_widget_min_size_set(ol, 155, 250);
- e_widget_framelist_object_append(of, ol);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
+ e_widget_list_object_append(o, ol, 1, 1, 0.5);
return o;
}
===================================================================
RCS file: /cvs/e/e_modules/penguins/e_mod_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.h 20 Oct 2007 13:14:50 -0000 1.1
+++ e_mod_config.h 8 Nov 2007 04:18:22 -0000 1.2
@@ -3,6 +3,6 @@
# ifndef E_MOD_CONFIG_H
# define E_MOD_CONFIG_H
# include "e_mod_main.h"
-void _config_penguin_module(E_Container *con, Population *pop);
+EAPI E_Config_Dialog *e_int_config_penguins_module(E_Container *con, const
char *params __UNUSED__);
# endif
#endif
===================================================================
RCS file: /cvs/e/e_modules/penguins/e_mod_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.c 2 Nov 2007 12:48:00 -0000 1.3
+++ e_mod_main.c 8 Nov 2007 04:18:22 -0000 1.4
@@ -37,17 +37,27 @@
E_MODULE_API_VERSION,
"Penguins"
};
+EAPI E_Module *penguins_mod = NULL;
EAPI void *
e_modapi_init(E_Module *m)
{
Population *pop;
+ char buf[4096];
/* Set up module's message catalogue */
bindtextdomain(PACKAGE, LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
pop = _population_init(m);
+
+ snprintf(buf, sizeof(buf), "%s/e-module-penguins.edj", e_module_dir_get(m));
+ e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL,
"enlightenment/appearance");
+ e_configure_registry_item_add("appearance/penguins", 150, _("Penguins"),
NULL, buf, e_int_config_penguins_module);
+
+ penguins_mod = m;
+
+
return pop;
}
===================================================================
RCS file: /cvs/e/e_modules/penguins/e_mod_main.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.h 2 Nov 2007 12:22:16 -0000 1.2
+++ e_mod_main.h 8 Nov 2007 04:18:22 -0000 1.3
@@ -79,6 +79,8 @@
Population *pop;
};
+extern E_Module *penguins_mod;
+
EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init(E_Module *m);
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
