Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto.h ephoto_misc.c ephoto_browsing.c
Log Message:
Switch ephoto to vseparator instead paned for the time being. This makes it
look and run much much better. Also fixed some sizing issues, still have one
or two left.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ephoto.c 17 May 2006 22:49:23 -0000 1.46
+++ ephoto.c 18 May 2006 03:29:52 -0000 1.47
@@ -303,11 +303,13 @@
m->avbox = ewl_vbox_new();
ewl_container_child_append(EWL_CONTAINER(m->win), m->avbox);
ewl_object_fill_policy_set(EWL_OBJECT(m->avbox),
- EWL_FLAG_FILL_ALL | EWL_FLAG_FILL_SHRINK);
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->avbox);
m->menubar = ewl_hmenubar_new();
ewl_container_child_append(EWL_CONTAINER(m->avbox), m->menubar);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menubar),
+ EWL_FLAG_FILL_HFILL);
ewl_widget_show(m->menubar);
m->menu = ewl_menu_new();
@@ -323,6 +325,8 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
slideshow_save_cb, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
m->menu_item = ewl_menu_item_new();
@@ -331,6 +335,8 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
slideshow_load_cb, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
m->menu_item = ewl_menu_item_new();
@@ -339,6 +345,8 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
destroy_cb, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
m->menu = ewl_menu_new();
@@ -355,6 +363,8 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
addi, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
m->menu_item = ewl_menu_item_new();
@@ -363,6 +373,8 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
reseti_cb, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
m->menu_item = ewl_menu_item_new();
@@ -371,6 +383,8 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
reseta_cb, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
m->menu_item = ewl_menu_item_new();
@@ -379,6 +393,8 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
slideshow_cb, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
m->menu_item = ewl_menu_item_new();
@@ -387,6 +403,8 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
presentation_cb, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
m->menu = ewl_menu_new();
@@ -394,6 +412,8 @@
ewl_container_child_append(EWL_CONTAINER(m->menubar), m->menu);
ewl_object_fill_policy_set(EWL_OBJECT(m->menu),
EWL_FLAG_FILL_NONE);
+ ewl_object_alignment_set(EWL_OBJECT(m->menu),
+ EWL_FLAG_ALIGN_RIGHT);
ewl_widget_show(m->menu);
m->menu_item = ewl_menu_item_new();
@@ -402,6 +422,8 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
ephoto_men_cb, "help");
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
m->menu_item = ewl_menu_item_new();
@@ -410,9 +432,11 @@
m->menu_item);
ewl_callback_append(m->menu_item, EWL_CALLBACK_CLICKED,
ephoto_men_cb, "about");
+ ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item),
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
- m->hbox = ewl_hpaned_new();
+ m->hbox = ewl_hbox_new();
ewl_object_alignment_set(EWL_OBJECT(m->hbox),
EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(m->avbox), m->hbox);
@@ -423,9 +447,7 @@
m->vbox = ewl_vbox_new();
ewl_object_alignment_set(EWL_OBJECT(m->vbox),
EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->vbox), 10);
- ewl_object_preferred_inner_size_set(EWL_OBJECT(m->vbox),
- 200, 45);
+ ewl_box_spacing_set(EWL_BOX(m->vbox), 3);
ewl_container_child_append(EWL_CONTAINER(m->hbox), m->vbox);
ewl_object_fill_policy_set(EWL_OBJECT(m->vbox),
EWL_FLAG_FILL_VFILL | EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_HSHRINK);
@@ -464,11 +486,13 @@
EWL_FLAG_FILL_VFILL);
ewl_widget_show(m->imagetree);
+ m->vsep = ewl_vseparator_new();
+ ewl_container_child_append(EWL_CONTAINER(m->hbox), m->vsep);
+ ewl_widget_show(m->vsep);
+
m->notebook = ewl_notebook_new();
ewl_notebook_tabbar_position_set(EWL_NOTEBOOK(m->notebook),
EWL_POSITION_TOP);
- ewl_object_preferred_inner_size_set(EWL_OBJECT(m->notebook),
- 440, 45);
ewl_container_child_append(EWL_CONTAINER(m->hbox), m->notebook);
ewl_object_alignment_set(EWL_OBJECT(m->notebook),
EWL_FLAG_ALIGN_CENTER);
@@ -481,7 +505,7 @@
m->viewbox);
ewl_object_alignment_set(EWL_OBJECT(m->viewbox),
EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->viewbox), 10);
+ ewl_box_spacing_set(EWL_BOX(m->viewbox), 3);
ewl_object_fill_policy_set(EWL_OBJECT(m->viewbox),
EWL_FLAG_FILL_ALL);
ewl_widget_show(m->viewbox);
@@ -528,7 +552,7 @@
m->vbox2);
ewl_object_alignment_set(EWL_OBJECT(m->vbox2),
EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->vbox2), 10);
+ ewl_box_spacing_set(EWL_BOX(m->vbox2), 3);
ewl_widget_show(m->vbox2);
ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(m->notebook),
@@ -539,7 +563,8 @@
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_minimum_size_set(EWL_OBJECT(m->content), 400, 240);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->content),
+ EWL_FLAG_FILL_ALL);
ewl_object_alignment_set(EWL_OBJECT(m->content),
EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(m->content);
@@ -564,9 +589,9 @@
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_minimum_size_set(EWL_OBJECT(m->settings), 400, 240);
- ewl_object_maximum_size_set(EWL_OBJECT(m->settings), 400, 240);
+ ewl_box_spacing_set(EWL_BOX(m->settings), 2);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->settings),
+ 999999, 240);
ewl_widget_show(m->settings);
m->hboxv = ewl_hbox_new();
@@ -607,7 +632,6 @@
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);
@@ -631,7 +655,6 @@
(m->loopcheck), TRUE);
}
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);
@@ -645,7 +668,6 @@
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,
@@ -682,7 +704,6 @@
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,
@@ -701,7 +722,6 @@
}
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,
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ephoto.h 17 May 2006 22:49:23 -0000 1.22
+++ ephoto.h 18 May 2006 03:29:52 -0000 1.23
@@ -106,6 +106,7 @@
Ewl_Widget *menu_item;
Ewl_Widget *avbox;
Ewl_Widget *zoom;
+ Ewl_Widget *vsep;
void *data;
Ecore_List *imagelist;
Ecore_List *presentlist;
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_misc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ephoto_misc.c 13 May 2006 21:06:16 -0000 1.18
+++ ephoto_misc.c 18 May 2006 03:29:52 -0000 1.19
@@ -8,6 +8,7 @@
ewl_widget_destroy(w);
ewl_main_quit();
return;
+ w = NULL;
event = NULL;
data = NULL;
/*************************************************/
@@ -24,6 +25,8 @@
ewl_main_quit();
}
return;
+ w = NULL;
+ event = NULL;
data = NULL;
/*****************************/
}
@@ -38,6 +41,8 @@
ewl_main_quit();
}
return;
+ w = NULL;
+ event = NULL;
data = NULL;
/**********************************/
}
@@ -46,6 +51,8 @@
{
ewl_widget_destroy(data);
return;
+ w = NULL;
+ event = NULL;
data = NULL;
}
@@ -54,7 +61,8 @@
{
/****Setup Callbacks for the radio buttons for size/length****/
if ( w == m->slidetime ) {
- ewl_checkbutton_checked_set(EWL_CHECKBUTTON(m->audiolen),
FALSE);
+ ewl_checkbutton_checked_set(EWL_CHECKBUTTON(m->audiolen),
+ FALSE);
}
if ( w == m->fullrad ) {
ewl_text_text_set(EWL_TEXT(m->wsize), "Full");
@@ -70,6 +78,9 @@
}
/****************************************************/
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void
ephoto_men_cb(Ewl_Widget * w, void *event, void *data)
@@ -78,26 +89,43 @@
Ewl_Widget *vbox;
Ewl_Widget *text;
Ewl_Widget *cancel;
- static char *help_text = "-To view an image, select the simple image
viewer tab, and then click an image from\n"
- "the browser.To add this image to the
slideshow/presentation, click the add to slideshow\n"
- "button. Also, to add images to the
slideshow/presentation, click the slideshow/presentation\n"
- "tab, and then click an image from the
browser. Use the self explanatory settings box to add\n"
- "features. Length of slideshow is the amount
of time each image will be shown in the slideshow.\n"
- "Loop slideshow loops the slideshow. Fit to
audio, fits the length of the slideshow to the\n"
- "length of the audio. You can set the width
and height of the slideshow by manipulating the\n"
- "Custom or Fullscreen settings. Audio thats
added via the combo box, will play during the\n"
- "slideshow. Finally, select whether you want a
slideshow, orpresentation via the button.\n"
- "Command line options can be viewed by doing
ephoto --help from a terminal.\n";
- static char *about_text = "-Ephoto is an advanced image viewer. It is
written in .c and ewl. It allows you to\n"
- "browse images, and view them either in a
simple image viewer form, or in a slideshow or\n"
- "controlled presentation. If emotioned is
compiled, you can have audio play while your\n"
- "images are being shown in the slideshow.
For help see help from the ephoto menu. \n"
- "For options, see ephoto --help from the
terminal.\n";
+ static char *help_text = "-To view an image, select the simple image"
+ " viewer tab, and then click an image from\n"
+ "the browser.To add this image to the"
+ " slideshow/presentation, click the add to"
+ " slideshow\n button. Also, to add images to"
+ " the slideshow/presentation, click the"
+ " slideshow/presentation\n tab, and then"
+ " click an image from the browser. Use"
+ " the self explanatory settings box to add\n"
+ "features. Length of slideshow is the amount"
+ " of time each image will be shown in the"
" slideshow.\n Loop slideshow loops the"
+ " slideshow. Fit to audio, fits the length of"
+ " the slideshow to the\n length of the audio."
+ " You can set the width and height of the"
+ " slideshow by manipulating the\n Custom or"
+ "screen settings. Audio thats added via the"
+ " combo box, will play during the\n"
+ "slideshow. Finally, select whether you want"
+ " a slideshow, orpresentation via the button.\n"
+ "Command line options can be viewed by doing"
+ " ephoto --help from a terminal.\n";
+ static char *about_text = "-Ephoto is an advanced image viewer. It"
+ " is written in .c and ewl. It allows you to\n"
+ "browse images, and view them either in a"
+ " simple image viewer form, or in a slideshow"
+ " or\n controlled presentation. If emotioned"
+ " is compiled, you can have audio play while"
+ " your\n images are being shown in the"
+ " slideshow. For help see help from the ephoto"
+ " menu. \n For options, see ephoto --help"
+ " from the terminal.\n";
hwin = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(hwin), "Help");
ewl_window_name_set(EWL_WINDOW(hwin), "Help");
ewl_object_size_request(EWL_OBJECT(hwin), 400, 300);
- ewl_callback_append(hwin, EWL_CALLBACK_DELETE_WINDOW, destroywin_cb,
hwin);
+ ewl_callback_append(hwin, EWL_CALLBACK_DELETE_WINDOW, destroywin_cb,
+ hwin);
ewl_widget_show(hwin);
vbox = ewl_vbox_new();
@@ -124,8 +152,10 @@
ewl_object_maximum_size_set(EWL_OBJECT(cancel), 80, 15);
ewl_callback_append(cancel, EWL_CALLBACK_CLICKED, destroywin_cb, hwin);
ewl_widget_show(cancel);
-
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void slideshow_save_cb(Ewl_Widget *w, void *event, void *data)
@@ -141,7 +171,8 @@
ewl_window_title_set(EWL_WINDOW(m->save_win), "Save As");
ewl_window_name_set(EWL_WINDOW(m->save_win), "Save As");
ewl_object_size_request(EWL_OBJECT(m->save_win), 200, 100);
- ewl_callback_append(m->save_win, EWL_CALLBACK_DELETE_WINDOW,
destroywin_cb, m->save_win);
+ ewl_callback_append(m->save_win, EWL_CALLBACK_DELETE_WINDOW,
+ destroywin_cb, m->save_win);
ewl_widget_show(m->save_win);
vbox = ewl_vbox_new();
@@ -182,11 +213,14 @@
ewl_container_child_append(EWL_CONTAINER(hbox), cancel);
ewl_object_alignment_set(EWL_OBJECT(cancel), EWL_FLAG_ALIGN_CENTER);
ewl_object_maximum_size_set(EWL_OBJECT(cancel), 80, 15);
- ewl_callback_append(cancel, EWL_CALLBACK_CLICKED, destroywin_cb,
m->save_win);
+ ewl_callback_append(cancel, EWL_CALLBACK_CLICKED, destroywin_cb,
+ m->save_win);
ewl_widget_show(cancel);
return;
-
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void save_cb(Ewl_Widget *w, void *event, void *data)
@@ -226,6 +260,9 @@
ewl_widget_destroy(m->save_win);
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void slideshow_load_cb(Ewl_Widget *w, void *event, void *data)
{
@@ -250,7 +287,8 @@
ewl_window_title_set(EWL_WINDOW(m->load_win), "Load");
ewl_window_name_set(EWL_WINDOW(m->load_win), "Load");
ewl_object_size_request(EWL_OBJECT(m->load_win), 200, 270);
- ewl_callback_append(m->load_win, EWL_CALLBACK_DELETE_WINDOW,
destroywin_cb, m->load_win);
+ ewl_callback_append(m->load_win, EWL_CALLBACK_DELETE_WINDOW,
+ destroywin_cb, m->load_win);
ewl_widget_show(m->load_win);
vbox = ewl_vbox_new();
@@ -278,7 +316,8 @@
ewl_widget_show(hbox);
image = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image), PACKAGE_DATA_DIR
"/images/slide.png", NULL);
+ ewl_image_file_set(EWL_IMAGE(image),
+ PACKAGE_DATA_DIR "/images/slide.png", NULL);
ewl_container_child_append(EWL_CONTAINER(hbox), image);
ewl_widget_show(image);
@@ -286,14 +325,16 @@
ewl_widget_name_set(rtext, tempo);
ewl_text_text_set(EWL_TEXT(rtext), tempo);
ewl_object_minimum_size_set(EWL_OBJECT(rtext), 10, 16);
- ewl_object_fill_policy_set(EWL_OBJECT(rtext),
EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set(EWL_OBJECT(rtext),
+ EWL_FLAG_FILL_ALL);
ewl_container_child_append(EWL_CONTAINER(hbox),
rtext);
ewl_widget_show(rtext);
children[0] = hbox;
children[1] = NULL;
row = ewl_tree_row_add(EWL_TREE(tree), NULL, children);
- ewl_callback_append(rtext, EWL_CALLBACK_CLICKED,
loadclicked_cb, NULL);
+ ewl_callback_append(rtext, EWL_CALLBACK_CLICKED,
+ loadclicked_cb, NULL);
}
}
m->otext = ewl_text_new();
@@ -321,18 +362,25 @@
ewl_container_child_append(EWL_CONTAINER(hbox), cancel);
ewl_object_alignment_set(EWL_OBJECT(cancel), EWL_FLAG_ALIGN_CENTER);
ewl_object_maximum_size_set(EWL_OBJECT(cancel), 80, 15);
- ewl_callback_append(cancel, EWL_CALLBACK_CLICKED, destroywin_cb,
m->load_win);
+ ewl_callback_append(cancel, EWL_CALLBACK_CLICKED, destroywin_cb,
+ m->load_win);
ewl_widget_show(cancel);
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void loadclicked_cb(Ewl_Widget *w, void *event, void *data)
{
- char *rpath;
+ const char *rpath;
rpath = ewl_widget_name_get(w);
ewl_text_text_set(EWL_TEXT(m->otext), rpath);
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void load_cb(Ewl_Widget *w, void *event, void *data)
@@ -360,7 +408,8 @@
m->imagelist = ecore_list_new();
m->ib = ewl_freebox_new();
- ewl_freebox_layout_type_set(EWL_FREEBOX(m->ib),
EWL_FREEBOX_LAYOUT_AUTO);
+ ewl_freebox_layout_type_set(EWL_FREEBOX(m->ib),
+ EWL_FREEBOX_LAYOUT_AUTO);
ewl_container_child_append(EWL_CONTAINER(m->iscroll), m->ib);
ewl_widget_show(m->ib);
@@ -378,10 +427,13 @@
ewl_widget_name_set(m->i, path2);
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),
path2);
- ewl_image_file_set(EWL_IMAGE(m->i),
PACKAGE_DATA_DIR "images/camera.png", NULL);
+
ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(m->i),
+ path2);
+ 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_callback_append(m->i, EWL_CALLBACK_CLICKED,
iremove_cb, NULL);
+ ewl_callback_append(m->i, EWL_CALLBACK_CLICKED,
+ iremove_cb, NULL);
ewl_widget_show(m->i);
ecore_dlist_append(m->imagelist, strdup(path2));
@@ -397,6 +449,9 @@
}
ewl_widget_destroy(m->load_win);
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void create_list_cb(Ewl_Widget *w, void *event, void *data)
@@ -437,10 +492,14 @@
m->imagelist = ecore_list_new();
m->ib = ewl_freebox_new();
- ewl_freebox_layout_type_set(EWL_FREEBOX(m->ib),
EWL_FREEBOX_LAYOUT_AUTO);
+ ewl_freebox_layout_type_set(EWL_FREEBOX(m->ib),
+ EWL_FREEBOX_LAYOUT_AUTO);
ewl_container_child_append(EWL_CONTAINER(m->iscroll), m->ib);
ewl_widget_show(m->ib);
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void reseta_cb(Ewl_Widget *w, void *event, void *data)
@@ -448,6 +507,9 @@
ewl_text_text_set(EWL_TEXT(m->atext), "");
audio = 0;
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void list_albums_cb(Ewl_Widget *w, void *event, void *data)
@@ -464,19 +526,18 @@
printf("%s\n", path2);
}
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
void addi(Ewl_Widget *w, void *event, void *data)
{
char *path;
- char *path4;
- char *pathi;
char path2[PATH_MAX];
- char path3[PATH_MAX];
- Ecore_List *dirifiles;
+ char *pathi;
Ecore_List *imagefiles;
- dirifiles = ecore_list_new();
imagefiles = ecore_list_new();
path = ewl_text_text_get(EWL_TEXT(m->directory));
@@ -489,27 +550,8 @@
snprintf(path2, PATH_MAX, "%s", path);
}
- dirifiles = ecore_file_ls(path2);
-
- while ( !ecore_list_is_empty(dirifiles) ) {
- path4 = ecore_list_remove_first(dirifiles);
- snprintf(path3, PATH_MAX, "%s%s", path2, path4);
- if ( fnmatch("*.[Pp][Nn][Gg]", path3, 0) == 0 ) {
- ecore_list_append(imagefiles, strdup(path3));
- }
- if ( fnmatch("*.[Jj][Pp][Gg]", path3, 0) == 0 ) {
- ecore_list_append(imagefiles, strdup(path3));
- }
- if ( fnmatch("*.[Jj][Pp][Ee][Gg]", path3, 0) == 0 ) {
- ecore_list_append(imagefiles, strdup(path3));
- }
- if ( fnmatch("*.[Bb][Mm][Pp]", path3, 0) == 0 ) {
- ecore_list_append(imagefiles, strdup(path3));
- }
- if ( fnmatch(".[Ss][Vv][Gg]", path3, 0) == 0 ) {
- ecore_list_append(imagefiles, strdup(path3));
- }
- }
+ imagefiles = get_images(path2);
+
while ( !ecore_list_is_empty(imagefiles) ) {
pathi = ecore_list_remove_first(imagefiles);
@@ -517,10 +559,13 @@
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_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(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_callback_append(m->i, EWL_CALLBACK_CLICKED,
iremove_cb, NULL);
+ ewl_callback_append(m->i, EWL_CALLBACK_CLICKED,
+ iremove_cb, NULL);
ewl_widget_show(m->i);
ecore_dlist_append(m->imagelist, strdup(pathi));
@@ -528,5 +573,43 @@
}
}
return;
+ w = NULL;
+ event = NULL;
+ data = NULL;
}
+Ecore_List *
+get_images(const char *dir)
+{
+ Ecore_List *dirifiles;
+ Ecore_List *imagefiles;
+
+ char *ipath;
+ char ipath2[PATH_MAX];
+
+ imagefiles = ecore_list_new();
+ dirifiles = ecore_list_new();
+
+ dirifiles = ecore_file_ls(dir);
+
+ while ( !ecore_list_is_empty(dirifiles) ) {
+ ipath = ecore_list_remove_first(dirifiles);
+ snprintf(ipath2, PATH_MAX, "%s%s", dir, ipath);
+ if ( fnmatch("*.[Pp][Nn][Gg]", ipath2, 0) == 0 ) {
+ ecore_list_append(imagefiles, strdup(ipath2));
+ }
+ if ( fnmatch("*.[Jj][Pp][Gg]", ipath2, 0) == 0 ) {
+ ecore_list_append(imagefiles, strdup(ipath2));
+ }
+ if ( fnmatch("*.[Jj][Pp][Ee][Gg]", ipath2, 0) == 0 ) {
+ ecore_list_append(imagefiles, strdup(ipath2));
+ }
+ if ( fnmatch("*.[Bb][Mm][Pp]", ipath2, 0) == 0 ) {
+ ecore_list_append(imagefiles, strdup(ipath2));
+ }
+ if ( fnmatch(".[Ss][Vv][Gg]", ipath2, 0) == 0 ) {
+ ecore_list_append(imagefiles, strdup(ipath2));
+ }
+ }
+ return imagefiles;
+}
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_browsing.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ephoto_browsing.c 17 May 2006 22:49:23 -0000 1.30
+++ ephoto_browsing.c 18 May 2006 03:29:52 -0000 1.31
@@ -72,8 +72,7 @@
ewl_container_child_append(EWL_CONTAINER(m->images),
m->dirtree);
ewl_object_maximum_size_set(EWL_OBJECT(m->dirtree), 200, 215);
- ewl_object_minimum_size_set(EWL_OBJECT(m->dirtree), 200, 215);
- ewl_tree_headers_visible_set(EWL_TREE(m->dirtree), 0);
+ ewl_tree_headers_visible_set(EWL_TREE(m->dirtree), 0);
ewl_tree_expandable_rows_set(EWL_TREE(m->dirtree), FALSE);
ewl_widget_show(m->dirtree);
@@ -87,10 +86,7 @@
m->imagetree);
ewl_tree_headers_visible_set(EWL_TREE(m->imagetree), 0);
ewl_tree_expandable_rows_set(EWL_TREE(m->imagetree), FALSE);
- ewl_object_minimum_size_set(EWL_OBJECT(m->imagetree), 200, 260);
- ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 260);
- ewl_object_fill_policy_set(EWL_OBJECT(m->imagetree),
- EWL_FLAG_FILL_VFILL | EWL_FLAG_FILL_VSHRINK);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 240);
ewl_widget_show(m->imagetree);
/******************************************/
@@ -111,7 +107,6 @@
m->texti = ewl_text_new();
ewl_widget_name_set(m->texti, pathi);
ewl_text_text_set(EWL_TEXT(m->texti), up);
- ewl_object_minimum_size_set(EWL_OBJECT(m->texti), 10, 16);
ewl_object_fill_policy_set(EWL_OBJECT(m->texti),
EWL_FLAG_FILL_ALL);
ewl_object_alignment_set(EWL_OBJECT(m->texti),
@@ -197,8 +192,6 @@
m->text = ewl_text_new();
ewl_widget_name_set(m->text, pathw);
ewl_text_text_set(EWL_TEXT(m->text), bname);
- ewl_object_minimum_size_set(EWL_OBJECT(m->text),
- 10, 16);
ewl_object_fill_policy_set(EWL_OBJECT(m->text),
EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(m->text),
@@ -246,9 +239,7 @@
m->text = ewl_text_new();
ewl_widget_name_set(m->text, itemp);
ewl_text_text_set(EWL_TEXT(m->text), bname2);
- ewl_object_minimum_size_set(EWL_OBJECT(m->text),
- 10, 16);
- ewl_object_fill_policy_set(EWL_OBJECT(m->text),
+ ewl_object_fill_policy_set(EWL_OBJECT(m->text),
EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(m->text),
EWL_FLAG_ALIGN_CENTER);
@@ -288,8 +279,6 @@
m->text = ewl_text_new();
ewl_widget_name_set(m->text, itemp);
ewl_text_text_set(EWL_TEXT(m->text), bname2);
- ewl_object_minimum_size_set(EWL_OBJECT(m->text),
- 10, 16);
ewl_object_fill_policy_set(EWL_OBJECT(m->text),
EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(m->text),
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
