-bug fixes

SVN revision: 18165
This commit is contained in:
codewarrior 2005-10-31 09:46:27 +00:00 committed by codewarrior
parent 7261913daa
commit 08b9455b5f
2 changed files with 9 additions and 6 deletions

View File

@ -108,6 +108,7 @@ _e_eap_edit_create_data(E_Config_Dialog *cfd)
cfdata = E_NEW(E_App_Edit_CFData, 1); cfdata = E_NEW(E_App_Edit_CFData, 1);
if (!cfdata) return NULL; if (!cfdata) return NULL;
cfdata->editor = cfd->data; cfdata->editor = cfd->data;
cfdata->image = NULL;
_e_eap_edit_fill_data(cfdata); _e_eap_edit_fill_data(cfdata);
return 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); o = e_widget_frametable_add(evas, _("Icon"), 0);
editor->img = e_icon_add(evas);
if(eap->path) if(eap->path)
{ {
editor->img = e_icon_add(evas);
e_icon_file_key_set(editor->img, eap->path, "images/0"); e_icon_file_key_set(editor->img, eap->path, "images/0");
e_icon_fill_inside_set(editor->img, 1); 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, editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48,
&(cfdata->image)); &(cfdata->image));

View File

@ -3,6 +3,13 @@
*/ */
#include "e.h" #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; typedef struct _E_Widget_Data E_Widget_Data;
struct _E_Widget_Data struct _E_Widget_Data
{ {