From 08b9455b5fa1a6d4b9a3ae54bb5705b6bb79405b Mon Sep 17 00:00:00 2001 From: codewarrior Date: Mon, 31 Oct 2005 09:46:27 +0000 Subject: [PATCH] -bug fixes SVN revision: 18165 --- src/bin/e_eap_editor.c | 8 ++------ src/bin/e_widget_iconsel.c | 7 +++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c index 54a907641..1e9d4fdcf 100644 --- a/src/bin/e_eap_editor.c +++ b/src/bin/e_eap_editor.c @@ -108,6 +108,7 @@ _e_eap_edit_create_data(E_Config_Dialog *cfd) cfdata = E_NEW(E_App_Edit_CFData, 1); if (!cfdata) return NULL; cfdata->editor = cfd->data; + cfdata->image = NULL; _e_eap_edit_fill_data(cfdata); return cfdata; } @@ -214,17 +215,12 @@ _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data) o = e_widget_frametable_add(evas, _("Icon"), 0); + editor->img = e_icon_add(evas); if(eap->path) { - editor->img = e_icon_add(evas); e_icon_file_key_set(editor->img, eap->path, "images/0"); e_icon_fill_inside_set(editor->img, 1); } - else - { - editor->img = edje_object_add(evas); - e_theme_edje_object_set(editor->img, "base/theme/icons/enlightenment/e", "icons/enlightenment/e"); - } editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48, &(cfdata->image)); diff --git a/src/bin/e_widget_iconsel.c b/src/bin/e_widget_iconsel.c index 441e632f0..66eefe6eb 100644 --- a/src/bin/e_widget_iconsel.c +++ b/src/bin/e_widget_iconsel.c @@ -3,6 +3,13 @@ */ #include "e.h" +/*- DESCRIPTION -*/ +/* Adds a pushable button with an icon preview which serves as an icon + * selector (could be extended to select certain file tyes. + * NOTE: The Evas_Object *icon object in the *_add functions is expected to + * be an e_icon. + */ + typedef struct _E_Widget_Data E_Widget_Data; struct _E_Widget_Data {