Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto_browsing.c
Log Message:
More combo work - Also added removal of images from slideshow by clicking.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ephoto.c 5 Apr 2006 14:58:40 -0000 1.31
+++ ephoto.c 5 Apr 2006 23:46:36 -0000 1.32
@@ -585,8 +585,14 @@
ewl_text_font_size_set(EWL_TEXT(m->hsize), 10);
ewl_widget_show(m->hsize);
+ m->hboxv = ewl_hbox_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(m->hboxv),
EWL_FLAG_FILL_SHRINK);
+ ewl_container_child_append(EWL_CONTAINER(m->settings),
m->hboxv);
+ ewl_object_alignment_set(EWL_OBJECT(m->settings),
EWL_FLAG_ALIGN_CENTER);
+ ewl_widget_show(m->hboxv);
+
m->text = ewl_text_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings), m->text);
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->text);
ewl_object_alignment_set(EWL_OBJECT(m->text),
EWL_FLAG_ALIGN_CENTER);
ewl_text_font_size_set(EWL_TEXT(m->text), 12);
ewl_text_styles_set(EWL_TEXT(m->text),
EWL_TEXT_STYLE_UNDERLINE);
@@ -594,10 +600,8 @@
ewl_text_text_set(EWL_TEXT(m->text), "Audio");
ewl_widget_show(m->text);
- m->data = _data_setup();
-
m->atext = ewl_combo_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings),
m->atext);
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->atext);
ewl_object_alignment_set(EWL_OBJECT(m->atext),
EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(m->atext);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_browsing.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ephoto_browsing.c 5 Apr 2006 17:22:27 -0000 1.20
+++ ephoto_browsing.c 5 Apr 2006 23:46:36 -0000 1.21
@@ -226,7 +226,9 @@
m->row = ewl_tree_row_add(EWL_TREE(m->imagetree), NULL,
m->children);
ewl_callback_append(m->hbox, EWL_CALLBACK_CLICKED,
images_cb, NULL);
free(itemp);
- }
+ }
+ m->data = NULL;
+ ewl_combo_dirty_set(EWL_COMBO(m->atext), 1);
/***********************************************************************/
ecore_list_destroy(files);
ecore_list_destroy(imagefiles);
@@ -267,7 +269,9 @@
name = ewl_widget_name_get(w);
- ewl_container_child_remove(EWL_CONTAINER(m->ib), w);
+ ewl_widget_destroy(w);
+
+ ewl_freebox_resort(EWL_FREEBOX(m->ib));
/*********Lets remove the image from the list*********/
name2 = ecore_dlist_goto_first(m->imagelist);
@@ -312,12 +316,14 @@
/**********Add the images to the iconbox and list**********/
if ( page == m->vbox2 || w == m->vbutton ) {
m->i = ewl_image_thumbnail_new();
- ewl_image_constrain_set(EWL_IMAGE(m->i), 64);
+ ewl_widget_name_set(m->i, pathi);
+ ewl_image_constrain_set(EWL_IMAGE(m->i), 64);
ewl_image_proportional_set(EWL_IMAGE(m->i), TRUE);
ewl_image_thumbnail_request(EWL_IMAGE(m->i), pathi);
ewl_image_file_set(EWL_IMAGE(m->i), PACKAGE_DATA_DIR
"images/camera.png", NULL);
ewl_container_child_append(EWL_CONTAINER(m->ib), m->i);
- ewl_widget_show(m->i);
+ ewl_callback_append(m->i, EWL_CALLBACK_CLICKED, iremove_cb,
NULL);
+ ewl_widget_show(m->i);
ecore_dlist_append(m->imagelist, strdup(pathi));
slidenum++;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
