enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

- display file icon in properies dialog 

- dont tile image in eap editor (needs better approach to doing it)
- make title setting on icon persistent


SVN revision: 17963
This commit is contained in:
codewarrior 2005-10-26 01:05:56 +00:00 committed by codewarrior
parent 3d4aa3f39c
commit 6313cb25c3
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_eap_editor.c
View File

@ -266,14 +266,14 @@ _e_eap_edit_selector_cb(E_Fileman *fileman, char *file, void *data)
evas_object_del(editor->img);
editor->img = evas_object_image_add(editor->evas);
evas_object_image_file_set(editor->img, file, NULL);
evas_object_image_fill_set(editor->img, 0, 0, 48, 48);
evas_object_resize(editor->img, 48, 48);
evas_object_image_fill_set(editor->img, 0, 0, 48, 48);
evas_object_show(editor->img);
e_widget_resize_object_set(editor->img_widget, editor->img);
e_widget_sub_object_add(editor->img_widget, editor->img);
e_widget_min_size_set(editor->img_widget, 48, 48);
e_widget_change(editor->img_widget);
e_widget_min_size_set(editor->img_widget, 48, 48);
evas_object_resize(editor->img, 48, 48); //temp hack
e_object_del(fileman);
}

14
src/bin/e_fileman_icon.c
View File

@ -13,6 +13,7 @@ struct _E_Smart_Data
Evas_Object *obj;
char *thumb_path;
char *saved_title;
Evas_Object *event_object;
Evas_Object *icon_object;
@ -20,7 +21,7 @@ struct _E_Smart_Data
Evas_Object *entry_object;
E_Fm_File *file;
unsigned char visible : 1;
};
@ -126,6 +127,9 @@ e_fm_icon_title_set(Evas_Object *obj, const char *title)
sd = evas_object_smart_data_get(obj);
if (!sd) return;
E_FREE(sd->saved_title);
sd->saved_title = E_NEW(char *, strlen(title) + 1);
snprintf(sd->saved_title, strlen(title) + 1, "%s", title);
if (sd->icon_object) edje_object_part_text_set(sd->icon_object, "icon_title", title);
}
@ -179,7 +183,7 @@ _e_fm_icon_smart_add(Evas_Object *obj)
sd->evas = evas_object_evas_get(obj);
sd->obj = obj;
sd->saved_title = NULL;
sd->event_object = evas_object_rectangle_add(sd->evas);
evas_object_color_set(sd->event_object, 0, 0, 0, 0);
evas_object_smart_member_add(sd->event_object, obj);
@ -211,6 +215,7 @@ _e_fm_icon_smart_del(Evas_Object *obj)
evas_object_smart_member_del(sd->image_object);
evas_object_del(sd->image_object);
}
E_FREE(sd->saved_title);
if (sd->file) e_object_unref(E_OBJECT(sd->file));
free(sd);
}
@ -355,7 +360,10 @@ _e_fm_icon_smart_show(Evas_Object *obj)
edje_object_part_swallow(sd->icon_object, "icon_swallow", sd->image_object);
evas_object_smart_member_add(sd->image_object, obj);
}
edje_object_part_text_set(sd->icon_object, "icon_title", sd->file->name);
if(sd->saved_title)
edje_object_part_text_set(sd->icon_object, "icon_title", sd->saved_title);
else
edje_object_part_text_set(sd->icon_object, "icon_title", sd->file->name);
evas_object_show(sd->icon_object);

18
src/bin/e_fileman_smart.c
View File

@ -1063,6 +1063,7 @@ _e_fm_icon_prop_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *dat
char text[512];
Evas_Object *o, *ol;
E_Radio_Group *rg;
Evas_Object *img;
cfdata = data;
icon = cfdata->icon;
@ -1094,7 +1095,14 @@ _e_fm_icon_prop_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *dat
ol = e_widget_list_add(evas, 0, 0);
o = e_widget_frametable_add(evas, _("General"), 0);
img = e_fm_icon_add(evas);
e_fm_icon_file_set(img, e_fm_file_new(icon->file->path));
e_fm_icon_title_set(img, "");
e_widget_frametable_object_append(o, e_widget_image_add_from_object(evas, img, 48, 48),
2, 1, 2, 2,
0, 0, 0, 0);
snprintf(text, 512, _("File:"));
e_widget_frametable_object_append(o, e_widget_label_add(evas, text),
0, 0, 1, 1,
@ -1129,19 +1137,19 @@ _e_fm_icon_prop_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *dat
rg = e_widget_radio_group_new(&(cfdata->readwrite));
e_widget_frametable_object_append(o, e_widget_radio_add(evas, _("Let others see this file"), 0, rg),
0, 4, 2, 1,
0, 4, 3, 1,
1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_radio_add(evas, _("Let others modify this file"), 1, rg),
0, 5, 2, 1,
0, 5, 3, 1,
1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_radio_add(evas, _("Dont let others see or modify this file"), 2, rg),
0, 6, 2, 1,
0, 6, 3, 1,
1, 1, 1, 1);
e_widget_frametable_object_append(o, e_widget_radio_add(evas, _("Custom settings"), 3, rg),
0, 7, 2, 1,
0, 7, 3, 1,
1, 1, 1, 1);
e_widget_list_object_append(ol, o, 1, 1, 0.5);