Convert configuration dialog to the new api

SVN revision: 32480
This commit is contained in:
Davide Andreoli 2007-11-08 04:18:22 +00:00
parent d49fabd0b5
commit 38a4f93b18
6 changed files with 72 additions and 81 deletions

View File

@ -6,7 +6,7 @@ rm -f aclocal.m4 ltmain.sh
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

View File

@ -20,26 +20,30 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
}
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;
}

View File

@ -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

View File

@ -37,17 +37,27 @@ EAPI E_Module_Api e_modapi = {
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;
}

View File

@ -79,6 +79,8 @@ struct _Penguin
Population *pop;
};
extern E_Module *penguins_mod;
EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init(E_Module *m);

View File

@ -5,57 +5,41 @@
msgid ""
msgstr ""
"Project-Id-Version: Penguins\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-10-20 12:44+0200\n"
"PO-Revision-Date: 2007-10-20 13:50+0200\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2007-11-08 04:08+0100\n"
"PO-Revision-Date: 2007-11-08 03:50+0200\n"
"Last-Translator: DaveMDS <dave@gurumeditation.it>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: e_mod_config.c:40
msgid "Penguins Module"
msgstr "Modulo dei pinguini"
#: e_mod_config.c:88
#: e_mod_config.c:42
msgid "Population Settings"
msgstr "Impostazioni della popolazione"
#: e_mod_config.c:90
msgid "Number of penguins:"
msgstr "Numero di pinguini"
#: e_mod_config.c:92 e_mod_config.c:102
#, c-format
msgid "%1.0f"
msgstr "%1.0f"
#: e_mod_config.c:95
msgid "Zoom factor:"
msgstr "Ingrandimento:"
#: e_mod_config.c:97
#, c-format
msgid "%1.1f X"
msgstr "%1.1f X"
#: e_mod_config.c:100
msgid "Transparency:"
msgstr "Trasparenza:"
#: e_mod_config.c:110
msgid "Select population:"
msgstr "Seleziona il tipo di popolazione:"
#: e_mod_main.c:84
msgid "Enlightenment Penguins Module"
msgstr "Modulo dei pinguini per Enlightenment"
#: e_mod_main.c:86
msgid ""
"This is a module to display fancy penguins on your desktop.<br>and you can "
"choose the population you like"
msgstr ""
"Questo modulo riempie il vostro desktop di simpatici pinguini.<br>"
"Se preferite potete anche scegliere popolazioni diverse dai pinguini."
#: e_mod_main.c:55
msgid "Appearance"
msgstr ""
#: e_mod_main.c:56
msgid "Penguins"
msgstr ""
#~ msgid "Number of penguins:"
#~ msgstr "Numero di pinguini"
#~ msgid "%1.0f"
#~ msgstr "%1.0f"
#~ msgid "Zoom factor:"
#~ msgstr "Ingrandimento:"
#~ msgid "%1.1f X"
#~ msgstr "%1.1f X"
#~ msgid "Transparency:"
#~ msgstr "Trasparenza:"
#~ msgid "Select population:"
#~ msgstr "Seleziona il tipo di popolazione:"