Enlightenment CVS committal
Author : titansoccer15
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto.h ephoto_presentation.c ephoto_misc.c
Log Message:
Please ignore these changes for now.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ephoto.c 16 Mar 2006 05:34:08 -0000 1.6
+++ ephoto.c 17 Mar 2006 22:05:16 -0000 1.7
@@ -11,6 +11,7 @@
int audio = 0;
int wino = 0;
+int mainwin;
int audiolen;
int slidenum;
char *audios;
@@ -36,320 +37,332 @@
/*****************************************/
/****Get db directory****/
char *home;
- if ( argv[1] != NULL && ecore_file_is_dir(argv[1]) ) {
- home = argv[1];
+ if ( argc > 2 && !strcmp(argv[1], "--slideshow") ) {
+ int imageint;
+ for ( imageint = 2; imageint < argc; imageint++ ) {
+ ecore_dlist_append(m->imagelist,
strdup(argv[imageint]));
+ }
+ mainwin = 0;
+ slideshow_cb(NULL, NULL, NULL);
+ ewl_main();
}
- else {
- home = getenv("HOME");
- }
- //snprintf(tempdb, PATH_MAX, "%s/ephoto_images", home);
- //if ( !ecore_file_is_dir(tempdb) ) {
- // ecore_file_mkdir(tempdb);
- //}
- //snprintf(db, PATH_MAX, "%s", tempdb);
- /**************************/
- /****Setup the layout****/
- m->win = ewl_window_new();
- ewl_window_title_set(EWL_WINDOW(m->win), "ephoto");
- ewl_window_name_set(EWL_WINDOW(m->win), "ephoto");
- ewl_object_size_request(EWL_OBJECT(m->win), 550, 480);
- ewl_callback_append(m->win, EWL_CALLBACK_DELETE_WINDOW, destroy_cb,
NULL);
- ewl_widget_show(m->win);
-
- m->hbox = ewl_hpaned_new();
- ewl_object_alignment_set(EWL_OBJECT(m->hbox), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->win), m->hbox);
- ewl_widget_show(m->hbox);
-
- m->vbox = ewl_vbox_new();
- ewl_container_child_append(EWL_CONTAINER(m->hbox), m->vbox);
- ewl_object_alignment_set(EWL_OBJECT(m->vbox), EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->vbox), 10);
- ewl_object_size_request(EWL_OBJECT(m->vbox), 20, 400);
- ewl_widget_show(m->vbox);
-
- m->images = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(m->images), "Select Images For
Slideshow");
- ewl_border_label_alignment_set(EWL_BORDER(m->images),
EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->vbox), m->images);
- ewl_object_alignment_set(EWL_OBJECT(m->images), EWL_FLAG_ALIGN_CENTER);
- ewl_object_size_request(EWL_OBJECT(m->images), 250, 210);
- ewl_widget_show(m->images);
-
- m->directory = ewl_entry_new();
- ewl_text_text_set(EWL_TEXT(m->directory), home);
- ewl_object_alignment_set(EWL_OBJECT(m->directory),
EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->images), m->directory);
- ewl_callback_append(m->directory, EWL_CALLBACK_VALUE_CHANGED,
populatei_cb, NULL);
- ewl_widget_show(m->directory);
-
- m->imagetree = ewl_tree_new(1);
- ewl_container_child_append(EWL_CONTAINER(m->images), m->imagetree);
- ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 160);
- ewl_widget_show(m->imagetree);
-
- m->songs = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(m->songs), "Select Audio For Slideshow");
- ewl_border_label_alignment_set(EWL_BORDER(m->songs),
EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->vbox), m->songs);
- ewl_object_alignment_set(EWL_OBJECT(m->songs), EWL_FLAG_ALIGN_CENTER);
- ewl_object_size_request(EWL_OBJECT(m->songs), 250, 210);
- ewl_widget_show(m->songs);
-
- m->directorya = ewl_entry_new();
- ewl_text_text_set(EWL_TEXT(m->directorya), home);
- ewl_object_alignment_set(EWL_OBJECT(m->directorya),
EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->songs), m->directorya);
- ewl_callback_append(m->directorya, EWL_CALLBACK_VALUE_CHANGED,
populatea_cb, NULL);
- ewl_widget_show(m->directorya);
-
- m->audiotree = ewl_tree_new(1);
- ewl_container_child_append(EWL_CONTAINER(m->songs), m->audiotree);
- ewl_object_maximum_size_set(EWL_OBJECT(m->audiotree), 200, 160);
- ewl_widget_show(m->audiotree);
-
- m->notebook = ewl_notebook_new();
- ewl_notebook_tabbar_position_set(EWL_NOTEBOOK(m->notebook),
EWL_POSITION_TOP);
- ewl_container_child_append(EWL_CONTAINER(m->hbox), m->notebook);
- ewl_object_alignment_set(EWL_OBJECT(m->notebook),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(m->notebook), EWL_FLAG_FILL_ALL);
- ewl_widget_show(m->notebook);
-
- m->viewbox = ewl_vbox_new();
- ewl_container_child_append(EWL_CONTAINER(m->notebook), m->viewbox);
- ewl_object_alignment_set(EWL_OBJECT(m->viewbox), EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->viewbox), 10);
- ewl_object_fill_policy_set(EWL_OBJECT(m->viewbox), EWL_FLAG_FILL_ALL);
- ewl_widget_show(m->viewbox);
-
- m->vimage = ewl_image_new();
- ewl_object_fill_policy_set(EWL_OBJECT(m->vimage), EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE(m->vimage), TRUE);
- ewl_container_child_append(EWL_CONTAINER(m->viewbox), m->vimage);
- ewl_widget_show(m->vimage);
-
- m->vbutton = ewl_button_new();
- ewl_button_label_set(EWL_BUTTON(m->vbutton), "Add image to slideshow");
- ewl_container_child_append(EWL_CONTAINER(m->viewbox), m->vbutton);
- ewl_object_maximum_size_set(EWL_OBJECT(m->vbutton), 150 , 25);
- ewl_object_alignment_set(EWL_OBJECT(m->vbutton), EWL_FLAG_ALIGN_CENTER);
- ewl_callback_append(m->vbutton, EWL_CALLBACK_CLICKED, images_cb, NULL);
- ewl_widget_disable(m->vbutton);
- ewl_widget_state_set(m->vbutton, "disabled");
- ewl_widget_show(m->vbutton);
-
- ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(m->notebook), m->viewbox,
"View Image");
-
- m->vbox2 = ewl_vbox_new();
- ewl_container_child_append(EWL_CONTAINER(m->notebook), m->vbox2);
- ewl_object_alignment_set(EWL_OBJECT(m->vbox2), EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->vbox2), 10);
- ewl_object_size_request(EWL_OBJECT(m->vbox2), 20, 400);
- ewl_widget_show(m->vbox2);
+ else {
+ if ( argv[1] != NULL && ecore_file_is_dir(argv[1]) ) {
+ home = argv[1];
+ }
+ else {
+ home = getenv("HOME");
+ }
+ //snprintf(tempdb, PATH_MAX, "%s/ephoto_images", home);
+ //if ( !ecore_file_is_dir(tempdb) ) {
+ // ecore_file_mkdir(tempdb);
+ //}
+ //snprintf(db, PATH_MAX, "%s", tempdb);
+ /**************************/
+ /****Setup the layout****/
+ m->win = ewl_window_new();
+ ewl_window_title_set(EWL_WINDOW(m->win), "ephoto");
+ ewl_window_name_set(EWL_WINDOW(m->win), "ephoto");
+ ewl_object_size_request(EWL_OBJECT(m->win), 550, 480);
+ ewl_callback_append(m->win, EWL_CALLBACK_DELETE_WINDOW,
destroy_cb, NULL);
+ ewl_widget_show(m->win);
+ mainwin = 1;
+
+ m->hbox = ewl_hpaned_new();
+ ewl_object_alignment_set(EWL_OBJECT(m->hbox),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->win), m->hbox);
+ ewl_widget_show(m->hbox);
+
+ m->vbox = ewl_vbox_new();
+ ewl_container_child_append(EWL_CONTAINER(m->hbox), m->vbox);
+ ewl_object_alignment_set(EWL_OBJECT(m->vbox),
EWL_FLAG_ALIGN_CENTER);
+ ewl_box_spacing_set(EWL_BOX(m->vbox), 10);
+ ewl_object_size_request(EWL_OBJECT(m->vbox), 20, 400);
+ ewl_widget_show(m->vbox);
+
+ m->images = ewl_border_new();
+ ewl_border_text_set(EWL_BORDER(m->images), "Select Images For
Slideshow");
+ ewl_border_label_alignment_set(EWL_BORDER(m->images),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->vbox), m->images);
+ ewl_object_alignment_set(EWL_OBJECT(m->images),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_size_request(EWL_OBJECT(m->images), 250, 210);
+ ewl_widget_show(m->images);
+
+ m->directory = ewl_entry_new();
+ ewl_text_text_set(EWL_TEXT(m->directory), home);
+ ewl_object_alignment_set(EWL_OBJECT(m->directory),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->images),
m->directory);
+ ewl_callback_append(m->directory, EWL_CALLBACK_VALUE_CHANGED,
populatei_cb, NULL);
+ ewl_widget_show(m->directory);
+
+ m->imagetree = ewl_tree_new(1);
+ ewl_container_child_append(EWL_CONTAINER(m->images),
m->imagetree);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 160);
+ ewl_widget_show(m->imagetree);
+
+ m->songs = ewl_border_new();
+ ewl_border_text_set(EWL_BORDER(m->songs), "Select Audio For
Slideshow");
+ ewl_border_label_alignment_set(EWL_BORDER(m->songs),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->vbox), m->songs);
+ ewl_object_alignment_set(EWL_OBJECT(m->songs),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_size_request(EWL_OBJECT(m->songs), 250, 210);
+ ewl_widget_show(m->songs);
+
+ m->directorya = ewl_entry_new();
+ ewl_text_text_set(EWL_TEXT(m->directorya), home);
+ ewl_object_alignment_set(EWL_OBJECT(m->directorya),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->songs),
m->directorya);
+ ewl_callback_append(m->directorya, EWL_CALLBACK_VALUE_CHANGED,
populatea_cb, NULL);
+ ewl_widget_show(m->directorya);
+
+ m->audiotree = ewl_tree_new(1);
+ ewl_container_child_append(EWL_CONTAINER(m->songs),
m->audiotree);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->audiotree), 200, 160);
+ ewl_widget_show(m->audiotree);
+
+ m->notebook = ewl_notebook_new();
+ ewl_notebook_tabbar_position_set(EWL_NOTEBOOK(m->notebook),
EWL_POSITION_TOP);
+ ewl_container_child_append(EWL_CONTAINER(m->hbox), m->notebook);
+ ewl_object_alignment_set(EWL_OBJECT(m->notebook),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->notebook),
EWL_FLAG_FILL_ALL);
+ ewl_widget_show(m->notebook);
+
+ m->viewbox = ewl_vbox_new();
+ ewl_container_child_append(EWL_CONTAINER(m->notebook),
m->viewbox);
+ ewl_object_alignment_set(EWL_OBJECT(m->viewbox),
EWL_FLAG_ALIGN_CENTER);
+ ewl_box_spacing_set(EWL_BOX(m->viewbox), 10);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->viewbox),
EWL_FLAG_FILL_ALL);
+ ewl_widget_show(m->viewbox);
+
+ m->vimage = ewl_image_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(m->vimage),
EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(m->vimage), TRUE);
+ ewl_container_child_append(EWL_CONTAINER(m->viewbox),
m->vimage);
+ ewl_widget_show(m->vimage);
+
+ m->vbutton = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(m->vbutton), "Add image to
slideshow");
+ ewl_container_child_append(EWL_CONTAINER(m->viewbox),
m->vbutton);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->vbutton), 150 , 25);
+ ewl_object_alignment_set(EWL_OBJECT(m->vbutton),
EWL_FLAG_ALIGN_CENTER);
+ ewl_callback_append(m->vbutton, EWL_CALLBACK_CLICKED,
images_cb, NULL);
+ ewl_widget_disable(m->vbutton);
+ ewl_widget_state_set(m->vbutton, "disabled");
+ ewl_widget_show(m->vbutton);
+
+ ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(m->notebook),
m->viewbox, "View Image");
+
+ m->vbox2 = ewl_vbox_new();
+ ewl_container_child_append(EWL_CONTAINER(m->notebook),
m->vbox2);
+ ewl_object_alignment_set(EWL_OBJECT(m->vbox2),
EWL_FLAG_ALIGN_CENTER);
+ ewl_box_spacing_set(EWL_BOX(m->vbox2), 10);
+ ewl_object_size_request(EWL_OBJECT(m->vbox2), 20, 400);
+ ewl_widget_show(m->vbox2);
+
+ ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(m->notebook),
m->vbox2, "Slideshow/Presentation");
- ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(m->notebook), m->vbox2,
"Slideshow/Presentation");
-
- m->content = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(m->content), "Content");
- ewl_border_label_alignment_set(EWL_BORDER(m->content),
EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->vbox2), m->content);
- ewl_object_alignment_set(EWL_OBJECT(m->content), EWL_FLAG_ALIGN_CENTER);
- ewl_widget_show(m->content);
-
- m->ib = ewl_iconbox_new();
- ewl_iconbox_editable_set(EWL_ICONBOX(m->ib), 1);
- ewl_object_size_request(EWL_OBJECT(m->ib), 520, 400);
- ewl_container_child_append(EWL_CONTAINER(m->content), m->ib);
- ewl_widget_show(m->ib);
-
- m->settings = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(m->settings), "Settings");
- ewl_border_label_alignment_set(EWL_BORDER(m->settings),
EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->vbox2), m->settings);
- ewl_object_alignment_set(EWL_OBJECT(m->settings),
EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->settings), 5);
- ewl_object_maximum_size_set(EWL_OBJECT(m->settings), 99999, 200);
- ewl_widget_show(m->settings);
-
- m->hboxv = ewl_hbox_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings), m->hboxv);
- ewl_object_alignment_set(EWL_OBJECT(m->hboxv), EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
- ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
- ewl_widget_show(m->hboxv);
-
- m->text = ewl_text_new();
- 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_text_set(EWL_TEXT(m->text), "Length of Slide(secs)");
- ewl_widget_show(m->text);
-
- m->slidetime = ewl_spinner_new();
- ewl_spinner_value_set(EWL_SPINNER(m->slidetime), 3);
- ewl_spinner_min_val_set(EWL_SPINNER(m->slidetime), 1);
- ewl_spinner_max_val_set(EWL_SPINNER(m->slidetime), 1000);
- ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->slidetime);
- ewl_spinner_step_set(EWL_SPINNER(m->slidetime), 1);
- ewl_spinner_digits_set(EWL_SPINNER(m->slidetime), 0);
- ewl_object_alignment_set(EWL_OBJECT(m->slidetime),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_maximum_size_set(EWL_OBJECT(m->slidetime), 55, 20);
- ewl_object_minimum_size_set(EWL_OBJECT(m->slidetime), 55, 20);
- ewl_callback_append(m->slidetime, EWL_CALLBACK_CLICKED, rad_cb, NULL);
- ewl_widget_show(m->slidetime);
-
- m->hboxv = ewl_hbox_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings), m->hboxv);
- ewl_object_alignment_set(EWL_OBJECT(m->hboxv), EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
- ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
- ewl_widget_show(m->hboxv);
-
- m->loopcheck = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(m->loopcheck), "Loop Slideshow");
- ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->loopcheck);
- ewl_object_maximum_size_set(EWL_OBJECT(m->loopcheck), 130, 50);
- ewl_object_size_request(EWL_OBJECT(m->loopcheck), 130, 50);
- ewl_object_alignment_set(EWL_OBJECT(m->loopcheck),
EWL_FLAG_ALIGN_CENTER);
- ewl_widget_show(m->loopcheck);
-
- m->audiolen = ewl_checkbutton_new();
- ewl_button_label_set(EWL_BUTTON(m->audiolen), "Fit to Audio");
- ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->audiolen);
- ewl_object_maximum_size_set(EWL_OBJECT(m->audiolen), 150, 50);
- ewl_object_size_request(EWL_OBJECT(m->audiolen), 150, 50);
- ewl_object_alignment_set(EWL_OBJECT(m->audiolen),
EWL_FLAG_ALIGN_CENTER);
- ewl_callback_append(m->audiolen, EWL_CALLBACK_CLICKED, rad_cb, NULL);
- ewl_widget_show(m->audiolen);
- ewl_widget_disable(m->audiolen);
-
- m->text = ewl_text_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings), 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_text_set(EWL_TEXT(m->text), "Size of
Slideshow/Presentation(pixels)");
- ewl_widget_show(m->text);
-
- m->hboxv = ewl_hbox_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings), m->hboxv);
- ewl_object_alignment_set(EWL_OBJECT(m->hboxv), EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
- ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
- ewl_object_fill_policy_set(EWL_OBJECT(m->hboxv), EWL_FLAG_FILL_SHRINK);
- ewl_widget_show(m->hboxv);
-
- m->rad4 = ewl_radiobutton_new();
- ewl_button_label_set(EWL_BUTTON(m->rad4), "Custom");
- ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->rad4);
- ewl_radiobutton_checked_set(EWL_RADIOBUTTON(m->rad4), TRUE);
- ewl_object_maximum_size_set(EWL_OBJECT(m->rad4), 130, 50);
- ewl_object_size_request(EWL_OBJECT(m->rad4), 130, 50);
- ewl_object_alignment_set(EWL_OBJECT(m->rad4), EWL_FLAG_ALIGN_LEFT);
- ewl_callback_append(m->rad4, EWL_CALLBACK_CLICKED, rad_cb, NULL);
- ewl_callback_append(m->rad4, EWL_CALLBACK_REALIZE, rad_cb, NULL);
- ewl_widget_show(m->rad4);
-
- m->fullrad = ewl_radiobutton_new();
- ewl_button_label_set(EWL_BUTTON(m->fullrad), "Fullscreen");
- ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->fullrad);
- ewl_object_maximum_size_set(EWL_OBJECT(m->fullrad), 130, 50);
- ewl_object_size_request(EWL_OBJECT(m->fullrad), 130, 50);
- ewl_object_alignment_set(EWL_OBJECT(m->fullrad), EWL_FLAG_ALIGN_LEFT);
- ewl_callback_append(m->fullrad, EWL_CALLBACK_CLICKED, rad_cb, NULL);
- ewl_widget_show(m->fullrad);
-
- ewl_radiobutton_chain_set(EWL_RADIOBUTTON(m->rad4),
EWL_RADIOBUTTON(m->fullrad));
-
- m->hboxv = ewl_hbox_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings), m->hboxv);
- ewl_object_alignment_set(EWL_OBJECT(m->hboxv), EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
- ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
- ewl_object_fill_policy_set(EWL_OBJECT(m->hboxv), EWL_FLAG_FILL_SHRINK);
- ewl_widget_show(m->hboxv);
-
- m->text = ewl_text_new();
- 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_text_set(EWL_TEXT(m->text), "Width");
- ewl_widget_show(m->text);
-
- m->wsize = ewl_entry_new();
- ewl_entry_editable_set(EWL_ENTRY(m->wsize), 0);
- ewl_text_text_set(EWL_TEXT(m->wsize), "640");
- ewl_object_maximum_size_set(EWL_OBJECT(m->wsize), 50, 10);
- ewl_object_alignment_set(EWL_OBJECT(m->wsize), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->wsize);
- ewl_text_font_size_set(EWL_TEXT(m->wsize), 12);
- ewl_widget_show(m->wsize);
-
- m->text = ewl_text_new();
- 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_text_set(EWL_TEXT(m->text), "Height");
- ewl_widget_show(m->text);
-
- m->hsize = ewl_entry_new();
- ewl_entry_editable_set(EWL_ENTRY(m->hsize), 0);
- ewl_text_text_set(EWL_TEXT(m->hsize), "480");
- ewl_object_maximum_size_set(EWL_OBJECT(m->hsize), 50, 10);
- ewl_object_alignment_set(EWL_OBJECT(m->hsize), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->hsize);
- ewl_text_font_size_set(EWL_TEXT(m->hsize), 12);
- ewl_widget_show(m->hsize);
-
- m->text = ewl_text_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings), 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_text_set(EWL_TEXT(m->text), "Audio");
- ewl_widget_show(m->text);
-
- m->atext = ewl_text_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings), m->atext);
- ewl_object_alignment_set(EWL_OBJECT(m->atext), EWL_FLAG_ALIGN_CENTER);
- ewl_text_font_size_set(EWL_TEXT(m->atext), 12);
- ewl_widget_show(m->atext);
-
- m->hboxv = ewl_hbox_new();
- ewl_container_child_append(EWL_CONTAINER(m->settings), m->hboxv);
- ewl_object_alignment_set(EWL_OBJECT(m->hboxv), EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
- ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
- ewl_widget_show(m->hboxv);
-
- m->slideshow = ewl_button_new();
- ewl_button_label_set(EWL_BUTTON(m->slideshow), "Slideshow");
- ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->slideshow);
- ewl_object_alignment_set(EWL_OBJECT(m->slideshow),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_maximum_size_set(EWL_OBJECT(m->slideshow), 80, 15);
- ewl_callback_append(m->slideshow, EWL_CALLBACK_CLICKED, slideshow_cb,
NULL);
- ewl_widget_show(m->slideshow);
- ewl_widget_disable(m->slideshow);
-
- m->presentation = ewl_button_new();
- ewl_button_label_set(EWL_BUTTON(m->presentation), "Presentation");
- ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->presentation);
- ewl_object_alignment_set(EWL_OBJECT(m->presentation),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_maximum_size_set(EWL_OBJECT(m->presentation), 80, 15);
- ewl_callback_append(m->presentation, EWL_CALLBACK_CLICKED,
presentation_cb, NULL);
- ewl_widget_show(m->presentation);
- ewl_widget_disable(m->presentation);
-
- ewl_object_fill_policy_set(EWL_OBJECT(m->win), EWL_FLAG_FILL_ALL);
- ewl_object_fill_policy_set(EWL_OBJECT(m->vbox), EWL_FLAG_FILL_ALL);
- ewl_object_fill_policy_set(EWL_OBJECT(m->vbox2), EWL_FLAG_FILL_ALL);
- ewl_object_fill_policy_set(EWL_OBJECT(m->hbox), EWL_FLAG_FILL_ALL);
- /**********************************************************/
- /************LETS POPULATE THEM TREES******************/
- ewl_callback_call(m->directory, EWL_CALLBACK_VALUE_CHANGED);
- ewl_callback_call(m->directorya, EWL_CALLBACK_VALUE_CHANGED);
- /******************************************************/
+ m->content = ewl_border_new();
+ ewl_border_text_set(EWL_BORDER(m->content), "Content");
+ ewl_border_label_alignment_set(EWL_BORDER(m->content),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->vbox2), m->content);
+ ewl_object_alignment_set(EWL_OBJECT(m->content),
EWL_FLAG_ALIGN_CENTER);
+ ewl_widget_show(m->content);
+
+ m->ib = ewl_iconbox_new();
+ ewl_iconbox_editable_set(EWL_ICONBOX(m->ib), 1);
+ ewl_object_size_request(EWL_OBJECT(m->ib), 520, 400);
+ ewl_container_child_append(EWL_CONTAINER(m->content), m->ib);
+ ewl_widget_show(m->ib);
+
+ m->settings = ewl_border_new();
+ ewl_border_text_set(EWL_BORDER(m->settings), "Settings");
+ ewl_border_label_alignment_set(EWL_BORDER(m->settings),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->vbox2),
m->settings);
+ ewl_object_alignment_set(EWL_OBJECT(m->settings),
EWL_FLAG_ALIGN_CENTER);
+ ewl_box_spacing_set(EWL_BOX(m->settings), 5);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->settings), 99999,
200);
+ ewl_widget_show(m->settings);
+
+ m->hboxv = ewl_hbox_new();
+ ewl_container_child_append(EWL_CONTAINER(m->settings),
m->hboxv);
+ ewl_object_alignment_set(EWL_OBJECT(m->hboxv),
EWL_FLAG_ALIGN_CENTER);
+ ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
+ ewl_widget_show(m->hboxv);
+
+ m->text = ewl_text_new();
+ 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_text_set(EWL_TEXT(m->text), "Length of Slide(secs)");
+ ewl_widget_show(m->text);
+
+ m->slidetime = ewl_spinner_new();
+ ewl_spinner_value_set(EWL_SPINNER(m->slidetime), 3);
+ ewl_spinner_min_val_set(EWL_SPINNER(m->slidetime), 1);
+ ewl_spinner_max_val_set(EWL_SPINNER(m->slidetime), 1000);
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv),
m->slidetime);
+ ewl_spinner_step_set(EWL_SPINNER(m->slidetime), 1);
+ ewl_spinner_digits_set(EWL_SPINNER(m->slidetime), 0);
+ ewl_object_alignment_set(EWL_OBJECT(m->slidetime),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->slidetime), 55, 20);
+ ewl_object_minimum_size_set(EWL_OBJECT(m->slidetime), 55, 20);
+ ewl_callback_append(m->slidetime, EWL_CALLBACK_CLICKED, rad_cb,
NULL);
+ ewl_widget_show(m->slidetime);
+
+ m->hboxv = ewl_hbox_new();
+ ewl_container_child_append(EWL_CONTAINER(m->settings),
m->hboxv);
+ ewl_object_alignment_set(EWL_OBJECT(m->hboxv),
EWL_FLAG_ALIGN_CENTER);
+ ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
+ ewl_widget_show(m->hboxv);
+
+ m->loopcheck = ewl_checkbutton_new();
+ ewl_button_label_set(EWL_BUTTON(m->loopcheck), "Loop
Slideshow");
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv),
m->loopcheck);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->loopcheck), 130, 50);
+ ewl_object_size_request(EWL_OBJECT(m->loopcheck), 130, 50);
+ ewl_object_alignment_set(EWL_OBJECT(m->loopcheck),
EWL_FLAG_ALIGN_CENTER);
+ ewl_widget_show(m->loopcheck);
+
+ m->audiolen = ewl_checkbutton_new();
+ ewl_button_label_set(EWL_BUTTON(m->audiolen), "Fit to Audio");
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv),
m->audiolen);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->audiolen), 150, 50);
+ ewl_object_size_request(EWL_OBJECT(m->audiolen), 150, 50);
+ ewl_object_alignment_set(EWL_OBJECT(m->audiolen),
EWL_FLAG_ALIGN_CENTER);
+ ewl_callback_append(m->audiolen, EWL_CALLBACK_CLICKED, rad_cb,
NULL);
+ ewl_widget_show(m->audiolen);
+ ewl_widget_disable(m->audiolen);
+
+ m->text = ewl_text_new();
+ ewl_container_child_append(EWL_CONTAINER(m->settings), 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_text_set(EWL_TEXT(m->text), "Size of
Slideshow/Presentation(pixels)");
+ ewl_widget_show(m->text);
+
+ m->hboxv = ewl_hbox_new();
+ ewl_container_child_append(EWL_CONTAINER(m->settings),
m->hboxv);
+ ewl_object_alignment_set(EWL_OBJECT(m->hboxv),
EWL_FLAG_ALIGN_CENTER);
+ ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->hboxv),
EWL_FLAG_FILL_SHRINK);
+ ewl_widget_show(m->hboxv);
+
+ m->rad4 = ewl_radiobutton_new();
+ ewl_button_label_set(EWL_BUTTON(m->rad4), "Custom");
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->rad4);
+ ewl_radiobutton_checked_set(EWL_RADIOBUTTON(m->rad4), TRUE);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->rad4), 130, 50);
+ ewl_object_size_request(EWL_OBJECT(m->rad4), 130, 50);
+ ewl_object_alignment_set(EWL_OBJECT(m->rad4),
EWL_FLAG_ALIGN_LEFT);
+ ewl_callback_append(m->rad4, EWL_CALLBACK_CLICKED, rad_cb,
NULL);
+ ewl_callback_append(m->rad4, EWL_CALLBACK_REALIZE, rad_cb,
NULL);
+ ewl_widget_show(m->rad4);
+
+ m->fullrad = ewl_radiobutton_new();
+ ewl_button_label_set(EWL_BUTTON(m->fullrad), "Fullscreen");
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->fullrad);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->fullrad), 130, 50);
+ ewl_object_size_request(EWL_OBJECT(m->fullrad), 130, 50);
+ ewl_object_alignment_set(EWL_OBJECT(m->fullrad),
EWL_FLAG_ALIGN_LEFT);
+ ewl_callback_append(m->fullrad, EWL_CALLBACK_CLICKED, rad_cb,
NULL);
+ ewl_widget_show(m->fullrad);
+
+ ewl_radiobutton_chain_set(EWL_RADIOBUTTON(m->rad4),
EWL_RADIOBUTTON(m->fullrad));
+
+ m->hboxv = ewl_hbox_new();
+ ewl_container_child_append(EWL_CONTAINER(m->settings),
m->hboxv);
+ ewl_object_alignment_set(EWL_OBJECT(m->hboxv),
EWL_FLAG_ALIGN_CENTER);
+ ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->hboxv),
EWL_FLAG_FILL_SHRINK);
+ ewl_widget_show(m->hboxv);
+
+ m->text = ewl_text_new();
+ 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_text_set(EWL_TEXT(m->text), "Width");
+ ewl_widget_show(m->text);
+
+ m->wsize = ewl_entry_new();
+ ewl_entry_editable_set(EWL_ENTRY(m->wsize), 0);
+ ewl_text_text_set(EWL_TEXT(m->wsize), "640");
+ ewl_object_maximum_size_set(EWL_OBJECT(m->wsize), 50, 10);
+ ewl_object_alignment_set(EWL_OBJECT(m->wsize),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->wsize);
+ ewl_text_font_size_set(EWL_TEXT(m->wsize), 12);
+ ewl_widget_show(m->wsize);
+
+ m->text = ewl_text_new();
+ 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_text_set(EWL_TEXT(m->text), "Height");
+ ewl_widget_show(m->text);
+
+ m->hsize = ewl_entry_new();
+ ewl_entry_editable_set(EWL_ENTRY(m->hsize), 0);
+ ewl_text_text_set(EWL_TEXT(m->hsize), "480");
+ ewl_object_maximum_size_set(EWL_OBJECT(m->hsize), 50, 10);
+ ewl_object_alignment_set(EWL_OBJECT(m->hsize),
EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->hsize);
+ ewl_text_font_size_set(EWL_TEXT(m->hsize), 12);
+ ewl_widget_show(m->hsize);
+
+ m->text = ewl_text_new();
+ ewl_container_child_append(EWL_CONTAINER(m->settings), 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_text_set(EWL_TEXT(m->text), "Audio");
+ ewl_widget_show(m->text);
+
+ m->atext = ewl_text_new();
+ ewl_container_child_append(EWL_CONTAINER(m->settings),
m->atext);
+ ewl_object_alignment_set(EWL_OBJECT(m->atext),
EWL_FLAG_ALIGN_CENTER);
+ ewl_text_font_size_set(EWL_TEXT(m->atext), 12);
+ ewl_widget_show(m->atext);
+
+ m->hboxv = ewl_hbox_new();
+ ewl_container_child_append(EWL_CONTAINER(m->settings),
m->hboxv);
+ ewl_object_alignment_set(EWL_OBJECT(m->hboxv),
EWL_FLAG_ALIGN_CENTER);
+ ewl_box_spacing_set(EWL_BOX(m->hboxv), 5);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->hboxv), 220, 100);
+ ewl_widget_show(m->hboxv);
+
+ m->slideshow = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(m->slideshow), "Slideshow");
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv),
m->slideshow);
+ ewl_object_alignment_set(EWL_OBJECT(m->slideshow),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->slideshow), 80, 15);
+ ewl_callback_append(m->slideshow, EWL_CALLBACK_CLICKED,
slideshow_cb, NULL);
+ ewl_widget_show(m->slideshow);
+ ewl_widget_disable(m->slideshow);
+
+ m->presentation = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(m->presentation),
"Presentation");
+ ewl_container_child_append(EWL_CONTAINER(m->hboxv),
m->presentation);
+ ewl_object_alignment_set(EWL_OBJECT(m->presentation),
EWL_FLAG_ALIGN_CENTER);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->presentation), 80,
15);
+ ewl_callback_append(m->presentation, EWL_CALLBACK_CLICKED,
presentation_cb, NULL);
+ ewl_widget_show(m->presentation);
+ ewl_widget_disable(m->presentation);
+
+ ewl_object_fill_policy_set(EWL_OBJECT(m->win),
EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->vbox),
EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->vbox2),
EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->hbox),
EWL_FLAG_FILL_ALL);
+ /**********************************************************/
+ /************LETS POPULATE THEM TREES******************/
+ ewl_callback_call(m->directory, EWL_CALLBACK_VALUE_CHANGED);
+ ewl_callback_call(m->directorya, EWL_CALLBACK_VALUE_CHANGED);
+ /******************************************************/
ewl_main();
return 0;
+ }
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/ephoto/src/ephoto.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto.h 15 Mar 2006 04:22:37 -0000 1.5
+++ ephoto.h 17 Mar 2006 22:05:16 -0000 1.6
@@ -124,6 +124,7 @@
extern int audio;
extern int wino ;
extern int audiolen;
+extern int mainwin;
extern int slidenum;
extern char *audios;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/ephoto/src/ephoto_presentation.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto_presentation.c 17 Mar 2006 04:56:46 -0000 1.8
+++ ephoto_presentation.c 17 Mar 2006 22:05:16 -0000 1.9
@@ -26,51 +26,58 @@
picture1 = ecore_dlist_current(m->imagelist);
ewl_widget_destroy(s->screen);
-
- wsize = ewl_text_text_get(EWL_TEXT(m->wsize));
- w = atoi(wsize);
- hsize = ewl_text_text_get(EWL_TEXT(m->hsize));
- h = atoi(hsize);
-
- if (s->text != NULL) {
- ewl_widget_destroy(s->text);
- s->text = NULL;
+ if ( mainwin == 1 ) {
+ wsize = ewl_text_text_get(EWL_TEXT(m->wsize));
+ w = atoi(wsize);
+ hsize = ewl_text_text_get(EWL_TEXT(m->hsize));
+ h = atoi(hsize);
+ }
+ if ( mainwin == 0 ) {
+ w = 800;
+ h = 600;
}
s->screen = ewl_image_new();
ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE);
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 ) {
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) ==
0 ) {
+ ewl_object_maximum_size_set(EWL_OBJECT(s->screen), w,
h);
+ }
+ }
+ if ( mainwin == 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->cell), s->screen);
ewl_widget_show(s->screen);
- if (!picture1 &&
ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->loopcheck)) == 1 ) {
- picture2 = ecore_dlist_goto_first(m->imagelist);
-
- ewl_widget_destroy(s->screen);
-
- wsize = ewl_text_text_get(EWL_TEXT(m->wsize));
- w = atoi(wsize);
- hsize = ewl_text_text_get(EWL_TEXT(m->hsize));
- h = atoi(hsize);
- s->screen = ewl_image_new();
- ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE);
- 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);
+ if ( mainwin == 1 ) {
+ if (!picture1 &&
ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->loopcheck)) == 1 ) {
+ picture2 = ecore_dlist_goto_first(m->imagelist);
+
+ ewl_widget_destroy(s->screen);
+
+ wsize = ewl_text_text_get(EWL_TEXT(m->wsize));
+ w = atoi(wsize);
+ hsize = ewl_text_text_get(EWL_TEXT(m->hsize));
+ h = atoi(hsize);
+ s->screen = ewl_image_new();
+ ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE);
+ 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->cell),
s->screen);
+ ewl_widget_show(s->screen);
+ }
+ if (!picture1 &&
ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->loopcheck)) == 0 ) {
+ ewl_callback_call(s->wins, EWL_CALLBACK_CLICKED);
}
- 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 ) {
- ewl_callback_call(s->wins, EWL_CALLBACK_CLICKED);
}
/******************************************************************/
data = NULL;
@@ -121,22 +128,36 @@
/************************************/
/*****Setup slideshow layout*****/
- wsize = ewl_text_text_get(EWL_TEXT(m->wsize));
- ws = atoi(wsize);
- hsize = ewl_text_text_get(EWL_TEXT(m->hsize));
- h = atoi(hsize);
+ if ( mainwin == 1 ) {
+ wsize = ewl_text_text_get(EWL_TEXT(m->wsize));
+ ws = atoi(wsize);
+ hsize = ewl_text_text_get(EWL_TEXT(m->hsize));
+ h = atoi(hsize);
+ }
+
+ if ( mainwin == 0 ) {
+ ws = 800;
+ h= 600;
+ }
s->wins = ewl_window_new();
wino = 1;
ewl_window_title_set(EWL_WINDOW(s->wins), "Slideshow");
ewl_window_name_set(EWL_WINDOW(s->wins), "Slideshow");
ewl_window_class_set(EWL_WINDOW(s->wins), "Slideshow");
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) == 0 ) {
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) ==
0 ) {
+ ewl_object_size_request(EWL_OBJECT(s->wins), ws, h);
+ }
+ }
+ if ( mainwin == 0 ) {
ewl_object_size_request(EWL_OBJECT(s->wins), ws, h);
}
ewl_object_fill_policy_set(EWL_OBJECT(s->wins), EWL_FLAG_FILL_ALL);
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) == 1 ) {
- ewl_callback_append(s->wins, EWL_CALLBACK_REALIZE, realize_cb,
NULL);
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) ==
1 ) {
+ ewl_callback_append(s->wins, EWL_CALLBACK_REALIZE,
realize_cb, NULL);
+ }
}
ewl_callback_append(s->wins, EWL_CALLBACK_DELETE_WINDOW, destroys_cb,
NULL);
ewl_callback_append(s->wins, EWL_CALLBACK_CLICKED, destroys_cb, NULL);
@@ -170,11 +191,16 @@
/*******Start the slideshow*******/
ewl_callback_append(s->audio1, EWL_CALLBACK_REALIZE, play_cb, NULL);
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->audiolen)) == 1 ) {
- time = audiolen / slidenum;
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->audiolen))
== 1 ) {
+ time = audiolen / slidenum;
+ }
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->audiolen))
== 0 ) {
+ time = ewl_spinner_value_get(EWL_SPINNER(m->slidetime));
+ }
}
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->audiolen)) == 0 ) {
- time = ewl_spinner_value_get(EWL_SPINNER(m->slidetime));
+ else {
+ time = 3;
}
s->timer = ecore_timer_add(time, _change_picture_cb, NULL);
/*******************************************************************/
@@ -184,7 +210,12 @@
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 ) {
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) ==
0 ) {
+ ewl_object_maximum_size_set(EWL_OBJECT(s->screen), ws,
h);
+ }
+ }
+ if ( mainwin == 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);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/ephoto/src/ephoto_misc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_misc.c 20 Feb 2006 19:41:30 -0000 1.1
+++ ephoto_misc.c 17 Mar 2006 22:05:16 -0000 1.2
@@ -20,6 +20,9 @@
ewl_widget_destroy(w);
ecore_timer_del(s->timer);
wino = 0;
+ if ( mainwin == 0 ) {
+ ewl_main_quit();
+ }
return;
data = NULL;
/*****************************/
-------------------------------------------------------
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
