Enlightenment CVS committal
Author : titansoccer15
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_presentation.c
Log Message:
Set up the black background for slideshows.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/ephoto/src/ephoto_presentation.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ephoto_presentation.c 22 Feb 2006 05:55:20 -0000 1.3
+++ ephoto_presentation.c 22 Feb 2006 06:29:35 -0000 1.4
@@ -36,15 +36,14 @@
s->text = NULL;
}
s->screen = ewl_image_new();
- /* ewl_theme_data_str_set(s->screen, "/image/file", PACKAGE_DATA_DIR
"/images/images.edc");
- ewl_theme_data_str_set(s->screen, "/image/group", "entry"); */
+ ewl_theme_data_str_set(s->screen, "/image/group", "entry");
ewl_image_file_set(EWL_IMAGE(s->screen), picture1, NULL);
ewl_object_alignment_set(EWL_OBJECT(s->screen), EWL_FLAG_ALIGN_CENTER);
if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) == 0 ) {
ewl_object_maximum_size_set(EWL_OBJECT(s->screen), w, h);
}
ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(s->wins), s->screen);
+ ewl_container_child_append(EWL_CONTAINER(s->cell), s->screen);
ewl_widget_show(s->screen);
if (!picture1 &&
ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->loopcheck)) == 1 ) {
@@ -57,15 +56,14 @@
hsize = ewl_text_text_get(EWL_TEXT(m->hsize));
h = atoi(hsize);
s->screen = ewl_image_new();
- /* ewl_theme_data_str_set(s->screen, "/image/file",
PACKAGE_DATA_DIR "/images/images.edc");
- ewl_theme_data_str_set(s->screen, "/image/group", "entry"); */
+ ewl_theme_data_str_set(s->screen, "/image/group", "entry");
ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
EWL_FLAG_FILL_SHRINK);
ewl_image_file_set(EWL_IMAGE(s->screen), picture2, NULL);
ewl_object_alignment_set(EWL_OBJECT(s->screen),
EWL_FLAG_ALIGN_CENTER);
if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) ==
0 ) {
ewl_object_maximum_size_set(EWL_OBJECT(s->screen), w,
h);
}
- ewl_container_child_append(EWL_CONTAINER(s->wins), s->screen);
+ ewl_container_child_append(EWL_CONTAINER(s->cell), s->screen);
ewl_widget_show(s->screen);
}
if (!picture1 &&
ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->loopcheck)) == 0 ) {
@@ -106,10 +104,10 @@
char *picture1;
char *wsize;
char *hsize;
- char *pic1;
int ws;
int h;
int time;
+ char *pic1;
/**************/
/****Make sure s->wins isn't open****/
@@ -139,6 +137,17 @@
ewl_callback_append(s->wins, EWL_CALLBACK_DELETE_WINDOW, destroys_cb,
NULL);
ewl_callback_append(s->wins, EWL_CALLBACK_CLICKED, destroys_cb, NULL);
ewl_widget_show(s->wins);
+
+ s->screen = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(s->screen), PACKAGE_DATA_DIR
"/images/black.png", NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_ALL);
+ ewl_container_child_append(EWL_CONTAINER(s->wins), s->screen);
+ ewl_widget_show(s->screen);
+
+ s->cell = ewl_cell_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(s->cell), EWL_FLAG_FILL_ALL);
+ ewl_container_child_append(EWL_CONTAINER(s->wins), s->cell);
+ ewl_widget_show(s->cell);
#ifdef EWL_MEDIA_H
if (audio != 0) {
@@ -154,9 +163,7 @@
/*******************************************************************/
/*******Start the slideshow*******/
-#ifdef EWL_MEDIA_H
ewl_callback_append(s->audio1, EWL_CALLBACK_REALIZE, play_cb, NULL);
-#endif
if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->audiolen)) == 1 ) {
time = audiolen / slidenum;
@@ -165,20 +172,18 @@
time = ewl_spinner_value_get(EWL_SPINNER(m->slidetime));
}
s->timer = ecore_timer_add(time, _change_picture_cb, NULL);
+ /*******************************************************************/
pic1 = ecore_dlist_goto_first(m->imagelist);
-
s->screen = ewl_image_new();
- /* ewl_theme_data_str_set(s->screen, "/image/file", PACKAGE_DATA_DIR
"/images/images.edc");
- ewl_theme_data_str_set(s->screen, "/image/group", "entry"); */
+ ewl_theme_data_str_set(s->screen, "/image/group", "entry");
ewl_image_file_set(EWL_IMAGE(s->screen), pic1, NULL);
ewl_object_alignment_set(EWL_OBJECT(s->screen), EWL_FLAG_ALIGN_CENTER);
if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) == 0 ) {
ewl_object_maximum_size_set(EWL_OBJECT(s->screen), ws, h);
}
ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(s->wins), s->screen);
+ ewl_container_child_append(EWL_CONTAINER(s->cell), s->screen);
ewl_widget_show(s->screen);
- /*******************************************************************/
}
void
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
